chore: cleanup

modules/base/default.nix

@@ -18,6 +18,11 @@
           home = {
             inherit stateVersion;
           };
+
+          catppuccin = {
+            flavor = "mocha";
+            accent = "lavender";
+          };
         };
 
       nixos.base =

modules/base/home/fish.nix

@@ -37,15 +37,16 @@
           fish = {
             enable = true;
             shellInit = ''
-              set -x LESS_TERMCAP_mb \e'[01;32m'
+              # Auto-start Tmux on SSH login  
-              set -x LESS_TERMCAP_md \e'[01;32m'
+              if test -n "$SSH_TTY" && test -z "$TMUX"  
-              set -x LESS_TERMCAP_me \e'[0m'
+                if command -v tmux > /dev/null 2>&1  
-              set -x LESS_TERMCAP_se \e'[0m'
+                  if tmux has-session -t ssh-auto 2>/dev/null  
-              set -x LESS_TERMCAP_so \e'[01;47;34m'
+                    tmux attach-session -t ssh-auto  
-              set -x LESS_TERMCAP_ue \e'[0m'
+                  else  
-              set -x LESS_TERMCAP_us \e'[01;36m'
+                    tmux new-session -s ssh-auto  
-              set -x LESS -R
+                  end  
-              set -x GROFF_NO_SGR 1
+                end  
+              end
             '';
             shellAliases = {
               vim = "hx";

modules/base/home/kitty.nix

@@ -1,49 +0,0 @@
-{
-  flake.modules = {
-    homeManager.cholli =
-      { pkgs, ... }:
-      {
-        catppuccin.kitty.enable = true;
-
-        home.packages = [
-          pkgs.kitty
-        ];
-
-        home.sessionVariables.TERMINAL = "kitty";
-
-        home.file.".config/Thunar/uca.xml".text = ''
-          <?xml version="1.0" encoding="UTF-8"?>
-          <actions>
-          <action>
-          	<icon>kitty</icon>
-          	<name>Open Kitty here</name>
-          	<submenu></submenu>
-          	<unique-id>1726095927116900-1</unique-id>
-          	<command>${pkgs.kitty}/bin/kitty %f</command>
-          	<description>Example for a custom action</description>
-          	<range></range>
-          	<patterns>*</patterns>
-          	<startup-notify/>
-          	<directories/>
-          </action>
-          </actions>
-        '';
-
-        programs.kitty = {
-          enable = true;
-          # themeFile = "tokyo_night_night";
-          font = {
-            name = "FiraCode Nerd Font";
-            size = 15;
-          };
-          shellIntegration.enableFishIntegration = true;
-          settings = {
-            "background_opacity" = "0.90";
-            "shell" = "fish";
-            "confirm_os_window_close" = "0";
-          };
-        };
-
-      };
-  };
-}

modules/base/home/terminal.nix

@@ -0,0 +1,39 @@
+{
+  flake.modules = {
+    homeManager.cholli =
+      { pkgs, ... }:
+      {
+        catppuccin.kitty.enable = true;
+        home.sessionVariables.TERMINAL = "kitty";
+        programs.kitty = {
+          enable = true;
+          font = {
+            name = "FiraCode Nerd Font";
+            size = 15;
+          };
+          shellIntegration.enableFishIntegration = true;
+          settings = {
+            background_opacity = 0.9;
+            shell = "fish";
+            confirm_os_window_close = 0;
+          };
+        };
+
+        #   catppuccin.ghostty.enable = true;
+        #   programs.ghostty = {
+        #     enable = true;
+        #     enableFishIntegration = true;
+        #     installVimSyntax = true;
+        #     settings = {
+        #       font-family = "FiraCode Nerd Font";
+        #       font-size = 15;
+        #       font-codepoint-map = "U+E000-U+E00A,U+E0A0-U+E0A3,U+E0B0-U+E0C8,U+E0CA,U+E0CC-U+E0D7,U+E200-U+E2A9,U+E300-U+E3E3,U+E5FA-U+E6B7,U+E700-U+E8EF,U+EA60-U+EC1E,U+ED00-U+F2FF,U+EE00-U+EE0B,U+F300-U+F381,U+F400-U+F533,U+F0001-U+F1AF0=Symbols Nerd Font";
+        #       background-opacity = 0.9;
+        #       clipboard-paste-protection = true;
+        #       confirm-close-surface = false;
+        #       mouse-scroll-multiplier = 0.3;
+        #     };
+        #   };
+      };
+  };
+}

modules/base/system/fonts.nix

@@ -1,23 +1,19 @@
 {
-
   flake.modules.nixos.base =
     { pkgs, ... }:
     {
-      environment.variables = {
+      fonts = {
-        # Enable icons in tooling since we have nerdfonts.
+        enableDefaultPackages = true;
-        LOG_ICONS = "true";
+
+        packages = with pkgs; [
+          nerd-fonts.fira-code
+          nerd-fonts.jetbrains-mono
+          nerd-fonts.symbols-only
+        ];
+
+        fontconfig = {
+          useEmbeddedBitmaps = true;
+        };
       };
-
-      fonts.packages = with pkgs; [
-        font-awesome
-        powerline-fonts
-        powerline-symbols
-        nerd-fonts.code-new-roman
-        nerd-fonts.fira-code
-        nerd-fonts.symbols-only
-        nerd-fonts.jetbrains-mono
-        fira
-      ];
-
     };
 }

modules/base/system/nixdaemon.nix

@@ -29,6 +29,9 @@
         enable = true;
         package = inputs.nh-flake.packages.${pkgs.stdenv.hostPlatform.system}.nh;
         flake = "/home/${username}/projects/config";
+
+        clean.enable = true;
+        clean.extraArgs = "--keep-since 7d --keep 5";
       };
 
       nix = {
@@ -77,12 +80,6 @@
             keep-outputs = true;
             keep-derivations = true;
           });
-
-        gc = {
-          automatic = true;
-          dates = "daily";
-          options = "--delete-older-than 7d";
-        };
       };
     };
 }

modules/desktop/niri.nix

@@ -70,8 +70,6 @@
       {
         config = lib.mkIf (osConfig.networking.hostName == "yggdrasil" && osConfig.programs.niri.enable) {
           catppuccin = {
-            flavor = "mocha";
-            accent = "lavender";
             cursors = {
               enable = true;
             };
@@ -322,7 +320,7 @@
                   "Mod+Shift+E".action = actions.quit;
                   "Ctrl+Alt+Delete".action = actions.quit;
 
-                  "Mod+Return".action.spawn = "${lib.getExe pkgs.kitty}";
+                  "Mod+Return".action.spawn = "${lib.getExe config.programs.kitty.package}";
 
                   "Mod+Escape" = {
                     allow-inhibiting = false;

modules/server/default.nix

@@ -0,0 +1,18 @@
+{
+  flake.modules.nixos.server =
+    { ... }:
+    {
+      programs.tmux = {
+        enable = true;
+
+        clock24 = true;
+        newSession = true;
+        keyMode = "vi";
+        terminal = "kitty";
+        extraConfig = ''
+          set -g mouse on
+        '';
+      };
+
+    };
+}