From 5b7025f6d56cc95bee71daf5296e86a2839c396d Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Wed, 7 Feb 2024 10:49:03 -0600 Subject: [PATCH] standardize runes --- lib/default.nix | 18 +++++------------- modules/runes/algiz.nix | 2 +- modules/runes/mannaz.nix | 2 +- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index 630c804..3306354 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -10,15 +10,15 @@ supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; runes = import ../modules/runes; in rec { + forAllSystems = f: genAttrs supportedSystems (system: f nixpkgs.legacyPackages.${system}); mkRune = { rune, - number ? "2", + number ? "6", runeKind ? "braille", }: - "[1;3${number}m\n" + runes.${rune}.${runeKind} + "\n"; - - forAllSystems = f: genAttrs supportedSystems (system: f nixpkgs.legacyPackages.${system}); + "[1;3${number}m\n\n" + runes.${rune}.${runeKind} + "\n"; + isNixFile = path: hasSuffix ".nix" path; buildOizys = _: forAllSystems ( pkgs: let @@ -29,8 +29,6 @@ in rec { } ); - isNixFile = path: hasSuffix ".nix" path; - mkSystem = hostname: nixosSystem { system = "x86_64-linux"; @@ -39,13 +37,7 @@ in rec { ++ filter isNixFile (listFilesRecursive (../. + "/hosts/${hostname}")); specialArgs = {inherit inputs mkRune;}; }; - - mapHosts = dir: - mapAttrs - (name: _: mkSystem name) - (readDir dir); - - + mapHosts = dir: mapAttrs (name: _: mkSystem name) (readDir dir); buildHosts = _: mapHosts ../hosts; findModules = modulesPath: listToAttrs (findModulesList modulesPath); diff --git a/modules/runes/algiz.nix b/modules/runes/algiz.nix index a497208..bb6fa85 100644 --- a/modules/runes/algiz.nix +++ b/modules/runes/algiz.nix @@ -1,5 +1,5 @@ { - braille = '' ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + braille = '' ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ⠀⠀⠀⢠⣾⣦⡀⠀⠀⠀⣶⣶⠀⠀⠀⢀⣴⣷⡄⠀⠀⠀ ⠀⠀⠀⠀⠙⢿⣷⣄⠀⠀⣿⣿⠀⠀⣠⣾⡿⠋⠀⠀⠀⠀ ⠀⠀⠀⠀⠀⠀⠙⢿⣷⣄⣿⣿⣠⣾⡿⠋⠀⠀⠀⠀⠀⠀ diff --git a/modules/runes/mannaz.nix b/modules/runes/mannaz.nix index 86f8133..cee3707 100644 --- a/modules/runes/mannaz.nix +++ b/modules/runes/mannaz.nix @@ -1,5 +1,5 @@ { - braille = '' ⠀ + braille = '' ⠀ ⢰⣶⣦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⣶⡆⠀⠀ ⠀⠀⢸⣿⡿⢿⣷⣦⣄⠀⠀⠀⠀⣀⣴⣾⡿⠿⣿⡇⠀⠀ ⠀⠀⢸⣿⡇⠀⠈⠛⠿⣿⣶⣴⣿⠿⠛⠁⠀⢸⣿⡇⠀⠀