From fde2538cb37ddc0023faeb5d25ddf8814e451039 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Sun, 28 Jan 2024 23:31:00 -0600 Subject: [PATCH] formatting --- hosts/algiz/system.nix | 5 +++- hosts/mannaz/system.nix | 5 +++- hosts/othalan/system.nix | 10 ++++--- lib/default.nix | 7 ++++- modules/runes/algiz.nix | 58 +++++++++++++++++++------------------- modules/runes/mannaz.nix | 58 +++++++++++++++++++------------------- modules/runes/othalan.nix | 59 +++++++++++++++++++-------------------- 7 files changed, 107 insertions(+), 95 deletions(-) diff --git a/hosts/algiz/system.nix b/hosts/algiz/system.nix index ef12b5c..304deb2 100644 --- a/hosts/algiz/system.nix +++ b/hosts/algiz/system.nix @@ -1,5 +1,8 @@ {mkRune, ...}: { - users.motd = mkRune {number="6"; rune = "algiz";}; + users.motd = mkRune { + number = "6"; + rune = "algiz"; + }; swapDevices = [ { diff --git a/hosts/mannaz/system.nix b/hosts/mannaz/system.nix index a61ed91..6a04e92 100644 --- a/hosts/mannaz/system.nix +++ b/hosts/mannaz/system.nix @@ -5,7 +5,10 @@ mkRune, ... }: { - users.motd = mkRune {number="2"; rune="mannaz";}; + users.motd = mkRune { + number = "2"; + rune = "mannaz"; + }; # Use the systemd-boot EFI boot loader. boot.loader = { diff --git a/hosts/othalan/system.nix b/hosts/othalan/system.nix index 5317fd6..2787de2 100644 --- a/hosts/othalan/system.nix +++ b/hosts/othalan/system.nix @@ -3,8 +3,7 @@ pkgs, mkRune, ... -}: -let +}: let rune = import ../../modules/runes/othalan.nix; in { networking.networkmanager.enable = true; @@ -33,8 +32,11 @@ in { services.getty.greetingLine = ''<<< Welcome to NixOS ${config.system.nixos.label} (\m) - \l >>>'' - + mkRune {rune = "othalan"; runeKind = "ascii";}; - # + inputs.self.nixosModules.runes.othalan.ascii; + + mkRune { + rune = "othalan"; + runeKind = "ascii"; + }; + # + inputs.self.nixosModules.runes.othalan.ascii; # catppuccin/tty boot.kernelParams = [ diff --git a/lib/default.nix b/lib/default.nix index 28e205f..d970c57 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -10,7 +10,12 @@ supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; runes = import ../modules/runes; in rec { - mkRune = {rune, number ? "2", runeKind ? "braille"}: "^[[1;3${number}m" + runes.${rune}.${runeKind} + "^[[0m"; + mkRune = { + rune, + number ? "2", + runeKind ? "braille", + }: + "^[[1;3${number}m" + runes.${rune}.${runeKind} + "^[[0m"; forAllSystems = f: genAttrs supportedSystems (system: f nixpkgs.legacyPackages.${system}); diff --git a/modules/runes/algiz.nix b/modules/runes/algiz.nix index 728a834..a497208 100644 --- a/modules/runes/algiz.nix +++ b/modules/runes/algiz.nix @@ -1,32 +1,32 @@ { - braille = '' ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⢠⣾⣦⡀⠀⠀⠀⣶⣶⠀⠀⠀⢀⣴⣷⡄⠀⠀⠀ - ⠀⠀⠀⠀⠙⢿⣷⣄⠀⠀⣿⣿⠀⠀⣠⣾⡿⠋⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠙⢿⣷⣄⣿⣿⣠⣾⡿⠋⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠙⢿⣿⣿⡿⠋⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ - ''; - ascii = '' - :%+ ## +%: - -%@+ @@ +@%- - -%@=%%=@%- - =%@@%= - @@ - @% - @% - @% - @% - @% - @% - @@ - ## + braille = '' ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⢠⣾⣦⡀⠀⠀⠀⣶⣶⠀⠀⠀⢀⣴⣷⡄⠀⠀⠀ + ⠀⠀⠀⠀⠙⢿⣷⣄⠀⠀⣿⣿⠀⠀⣠⣾⡿⠋⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠙⢿⣷⣄⣿⣿⣠⣾⡿⠋⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠙⢿⣿⣿⡿⠋⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + ''; + ascii = '' + :%+ ## +%: + -%@+ @@ +@%- + -%@=%%=@%- + =%@@%= + @@ + @% + @% + @% + @% + @% + @% + @@ + ## ''; } diff --git a/modules/runes/mannaz.nix b/modules/runes/mannaz.nix index c2b9d98..86f8133 100644 --- a/modules/runes/mannaz.nix +++ b/modules/runes/mannaz.nix @@ -1,32 +1,32 @@ { - braille = ''⠀ - ⢰⣶⣦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⣶⡆⠀⠀ -⠀⠀⢸⣿⡿⢿⣷⣦⣄⠀⠀⠀⠀⣀⣴⣾⡿⠿⣿⡇⠀⠀ -⠀⠀⢸⣿⡇⠀⠈⠛⠿⣿⣶⣴⣿⠿⠛⠁⠀⢸⣿⡇⠀⠀ -⠀⠀⢸⣿⡇⠀⣀⣤⣶⣿⠟⠻⢿⣷⣤⣀⠀⢸⣿⡇⠀⠀ -⠀⠀⢸⣿⣷⣾⡿⠟⠉⠀⠀⠀⠀⠉⠛⢿⣷⣶⣿⡇⠀⠀ -⠀⠀⢸⣿⡟⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⢹⣿⡇⠀⠀ -⠀⠀⢸⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⡇⠀⠀ -⠀⠀⢸⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⡇⠀⠀ -⠀⠀⢸⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⡇⠀⠀ -⠀⠀⢸⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⡇⠀⠀ -⠀⠀⢸⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⡇⠀⠀ -⠀⠀⢸⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⡇⠀⠀ -⠀⠀⢸⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠸⣿⡇⠀⠀ -''; - ascii ='' - :%*: :+%= - -@%%%*- -*%%#@+ - -@- .=#@##@#=: .@+ - -@- :=#@#*%#+: .@+ - -@%%%*- :*%%#@+ - -@*: .+@+ - -@- .@+ - -@= :@+ - -@= :@+ - -@= :@+ - -@= :@+ - -@= :@+ - -%- :%= + braille = '' ⠀ + ⢰⣶⣦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⣶⡆⠀⠀ + ⠀⠀⢸⣿⡿⢿⣷⣦⣄⠀⠀⠀⠀⣀⣴⣾⡿⠿⣿⡇⠀⠀ + ⠀⠀⢸⣿⡇⠀⠈⠛⠿⣿⣶⣴⣿⠿⠛⠁⠀⢸⣿⡇⠀⠀ + ⠀⠀⢸⣿⡇⠀⣀⣤⣶⣿⠟⠻⢿⣷⣤⣀⠀⢸⣿⡇⠀⠀ + ⠀⠀⢸⣿⣷⣾⡿⠟⠉⠀⠀⠀⠀⠉⠛⢿⣷⣶⣿⡇⠀⠀ + ⠀⠀⢸⣿⡟⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⢹⣿⡇⠀⠀ + ⠀⠀⢸⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⡇⠀⠀ + ⠀⠀⢸⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⡇⠀⠀ + ⠀⠀⢸⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⡇⠀⠀ + ⠀⠀⢸⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⡇⠀⠀ + ⠀⠀⢸⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⡇⠀⠀ + ⠀⠀⢸⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⡇⠀⠀ + ⠀⠀⢸⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠸⣿⡇⠀⠀ + ''; + ascii = '' + :%*: :+%= + -@%%%*- -*%%#@+ + -@- .=#@##@#=: .@+ + -@- :=#@#*%#+: .@+ + -@%%%*- :*%%#@+ + -@*: .+@+ + -@- .@+ + -@= :@+ + -@= :@+ + -@= :@+ + -@= :@+ + -@= :@+ + -%- :%= ''; } diff --git a/modules/runes/othalan.nix b/modules/runes/othalan.nix index 5fdb935..b86795d 100644 --- a/modules/runes/othalan.nix +++ b/modules/runes/othalan.nix @@ -1,36 +1,35 @@ { ascii = '' - .+. - .*@@@*. - .+@@- -%@*. - .+@@= -%@*. - .+@%= -%@+. - +@@- :@@* - .*@%- :#@*: - .#@%: :#@#: - :#@#-*@#: - =@@@+ - .*@#-#@#: - .*@%- :#@#: - .*@%- :%@*. - +@%- -%@+ - :- -: + .+. + .*@@@*. + .+@@- -%@*. + .+@@= -%@*. + .+@%= -%@+. + +@@- :@@* + .*@%- :#@*: + .#@%: :#@#: + :#@#-*@#: + =@@@+ + .*@#-#@#: + .*@%- :#@#: + .*@%- :%@*. + +@%- -%@+ + :- -: ''; braille = '' -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⣠⣾⡿⢿⣷⣄⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⢠⣾⣿⠏⠀⠀⠙⢿⣷⣄⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⢀⣴⣿⠟⠁⠀⠀⠀⠀⠈⠻⣿⣧⡀⠀⠀⠀⠀ -⠀⠀⢀⣴⣿⠟⠁⠀⠀⠀⠀⠀⠀⠀⠀⠈⠻⣿⣦⡀⠀⠀ -⠀⠀⠀⠙⢿⣷⣄⠀⠀⠀⠀⠀⠀⠀⠀⢀⣾⣿⠏⠀⠀⠀ -⠀⠀⠀⠀⠈⠻⣿⣷⡀⠀⠀⠀⠀⢀⣴⣿⠟⠁⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠈⠻⣿⣦⡀⢀⣴⣿⠟⠁⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠈⢻⣿⣿⡿⠁⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⣠⣾⡿⢿⣿⣆⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⣠⣾⡿⠋⠀⠀⠙⢿⣷⣄⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⢠⣾⣿⠋⠀⠀⠀⠀⠀⠀⠙⢿⣷⣄⠀⠀⠀⠀ -⠀⠀⢀⣴⣿⠟⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠻⣿⣷⡀⠀⠀ -⠀⠀⠀⠙⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠋⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⣠⣾⡿⢿⣷⣄⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⢠⣾⣿⠏⠀⠀⠙⢿⣷⣄⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⢀⣴⣿⠟⠁⠀⠀⠀⠀⠈⠻⣿⣧⡀⠀⠀⠀⠀ + ⠀⠀⢀⣴⣿⠟⠁⠀⠀⠀⠀⠀⠀⠀⠀⠈⠻⣿⣦⡀⠀⠀ + ⠀⠀⠀⠙⢿⣷⣄⠀⠀⠀⠀⠀⠀⠀⠀⢀⣾⣿⠏⠀⠀⠀ + ⠀⠀⠀⠀⠈⠻⣿⣷⡀⠀⠀⠀⠀⢀⣴⣿⠟⠁⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠈⠻⣿⣦⡀⢀⣴⣿⠟⠁⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⠈⢻⣿⣿⡿⠁⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠀⠀⣠⣾⡿⢿⣿⣆⠀⠀⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⣠⣾⡿⠋⠀⠀⠙⢿⣷⣄⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⢠⣾⣿⠋⠀⠀⠀⠀⠀⠀⠙⢿⣷⣄⠀⠀⠀⠀ + ⠀⠀⢀⣴⣿⠟⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠻⣿⣷⡀⠀⠀ + ⠀⠀⠀⠙⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠋⠀⠀⠀ ''; } -