North 20

configuration.nix

@@ -1,6 +1,4 @@
-{  pkgs, pkgs-unstable, rice, inputs, ... }:
+{  pkgs, pkgs-unstable, inputs, ... }:
-let
-in
 {
   imports = [
     inputs.sops-nix.nixosModules.sops
@@ -9,6 +7,7 @@ in
     ./system-modules/nvidia.nix 
     ./system-modules/users.nix
     ./system-modules/sound.nix
+    ./system-modules/fonts.nix
     ./system-modules/boot.nix
     ./system-modules/dm.nix
     ./system-modules/networking.nix
@@ -91,22 +90,6 @@ in
     VISUAL = "hx";  
   };
 
-  fonts.packages = with pkgs; [
-    noto-fonts
-    noto-fonts-cjk
-    noto-fonts-emoji
-  ] ++ (with rice.font; [
-    base.package
-    code.package
-  ]) ++ (with pkgs-unstable; [
-    newcomputermodern
-  ]);
-
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-
 
   programs.hyprland = {
     # config is done with home-manager

flake.nix

@@ -153,6 +153,8 @@
             # package = (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; });
           };
           base = {
+            # name = "NewComputerModern08";
+            # package = pkgs.newcomputermodern;
             name = "Atkinson Hyperlegible";
             package = pkgs.atkinson-hyperlegible;
           };

home-modules/fish.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, rice, user, allowed, secrets, ... }: 
+{ pkgs, lib, rice, user, ... }: 
 lib.mkIf (user != "tv")
 {
   home.packages = with pkgs; [
@@ -24,11 +24,11 @@ lib.mkIf (user != "tv")
         $(echo -e "$logo" | sed -n 3p): $(cat /etc/*-release | grep PRETTY_NAME | cut -c 14- | rev | cut -c 2- | rev)
         $(echo -e "$logo" | sed -n 4p): ''${XDG_CURRENT_DESKTOP^}
         $(echo -e "$logo" | sed -n 5p): ''${TERM^}
-        $(echo -e "$logo" | sed -n 6p): $(bash --version | head --lines 1 | cut -f -4 -d' ')
+        $(echo -e "$logo" | sed -n 6p): $(bash --version | head --lines 1 | cut -f -4 -d' ' | sed -E 's-(.*?), version (.*?)\(.*-\1 \2-g')
         $(echo -e "$logo" | sed -n 7p): fish $(fish --version | rev | cut -f 1 -d' ' | rev)
         $(echo -e "$logo" | sed -n 8p): ''$(uname -r)
-        $(echo -e "$logo" | sed -n 9p): $($EDITOR --version | head -n 1)
+        $(echo -e "$logo" | sed -n 9p): $($EDITOR --version | head -n 1 | sed -E 's-(.+?) \(.*-\1-g')
-        $(echo -e "$logo" | sed -n 10p): $(yazi --version)
+        $(echo -e "$logo" | sed -n 10p): $(yazi --version | yazi --version | sed -E 's-(.*?) \(.*-\1-g')
         $(echo -e "$logo" | sed -n 11p): $(starship --version | head -n 1)
         "
         echo -e "$msg"

home-modules/hyprland.nix

@@ -291,6 +291,7 @@ lib.mkIf (user != "tv")
         "float, title:^(wlogout)$"
         "float, imv"
         "float, title:^(Page Info — .*)$"
+        "float, title:^(Compact folders)$"
         "tile, sent"
         "fullscreen, wlogout"
         "workspace 14, lutris"
@@ -381,9 +382,9 @@ lib.mkIf (user != "tv")
         # "SUPER SHIFT, T, exec, alacritty -e sh -c "ssh nxace""
         "SUPER,       T, exec, kitty"
         "SUPER SHIFT, T, exec, kitty -e sh -c 'ssh nxace'"
-        "SUPER,       Z, swapactiveworkspaces, HDMI-A-1 HDMI-A-2"
+        # "SUPER,       Z, "
         "SUPER,       U, exec, thunderbird "
-        # "SUPER,       I,  "
+        "SUPER,       I, exec, kitty -e fish -c 'hx ~/nix-dots/ && fish'"
         "SUPER,       O, exec, obsidian "
         "SUPER,       P, pin "
         # "SUPER,       Ü,"
@@ -398,13 +399,11 @@ lib.mkIf (user != "tv")
         "SUPER,       S, exec, spotify"
         "SUPER,       D, exec, vesktop"
         "SUPER,       F, fullscreen"
-        "SUPER,       G, exec, xrandr --verbose --output 'DP-1' --primary && lutris"
+        # "SUPER,       G,"
-        "SUPER SHIFT, G, exec, /home/nx2/scripts/cursor-lock-toggle.sh"
+        "SUPER,       H, movefocus, l"
-        # "SUPER SHIFT CTRL, G, exec, /home/nx2/scripts/disable-side-monitors.sh"
+        "SUPER,       J, movefocus, d"
-        "SUPER,       H, exec, chatterino"
+        "SUPER,       K, movefocus, u"
-        "SUPER,       J, focusmonitor, $left"
+        "SUPER,       L, movefocus, r"
-        "SUPER,       K, focusmonitor, $main"
-        "SUPER,       L, focusmonitor, $right"
         # "SUPER,       Ö,"
         # "SUPER,       Ä,"
         # "SUPER,       #,"
@@ -417,9 +416,9 @@ lib.mkIf (user != "tv")
         "SUPER,       Y, submap, scrR"
         "SUPER,       X, exec, pkill wlogout || wlogout --protocol layer-shell -b 3"
         # "SUPER,       C, exec, /home/nx2/scripts/quickconfig/quickconfig.sh "
-        "SUPER,       C, exec, codium,"
+        "SUPER,       C, exec, chatterino"
         "SUPER,       V, togglefloating, "
-        "SUPER,       B, exec, bitwarden-desktop"
+        "SUPER,       B, exec, bitwarden"
         "SUPER,       N, togglesplit"
         # "SUPER,       M, exec, /home/nx2/scripts/meme-full-screen/meme-full-screen.sh "
         # "SUPER,       comma, exec, /home/nx2/scripts/change-language.sh"

home-modules/programming/gleam.nix

@@ -2,5 +2,6 @@
 {
   home.packages = with pkgs; [
     gleam
+    erlang
   ];
 }

system-modules/fonts.nix

@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+{
+  fonts.packages = with pkgs; [
+    noto-fonts
+    noto-fonts-cjk
+    noto-fonts-emoji
+    newcomputermodern
+    atkinson-hyperlegible
+    (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
+  ] ++ (with rice.font; [
+    base.package
+    code.package
+  ]) ++ (with pkgs-unstable; [
+  ]);
+}

system-modules/gpg.nix

@@ -3,6 +3,7 @@
   environment.systemPackages = with pkgs; [
     gnupg
   ];
+
   programs.gnupg = {
     dirmngr.enable = true;
     agent = {