home-manager/default.nix

@@ -11,6 +11,7 @@ in
 {
   imports = [
     inputs.catppuccin.homeManagerModules.catppuccin
+    inputs.nixvim.homeManagerModules.nixvim
     ./btop.nix
     ./cava
     ./cursors.nix
@@ -26,7 +27,7 @@ in
     ./rofi
     ./wlogout
     ./hyprland
-    ./spicetify.nix # TODO env conflict on latest version
+    ./spicetify.nix
     ./yazi
   ];
 
@@ -34,7 +35,9 @@ in
     enable = true;
     settings = {
       # Prefer dark mode for all GTK apps
-      "org/gnome/desktop/interface".color-scheme = "prefer-dark";
+      "org/gnome/desktop/interface" = {
+        color-scheme = "prefer-dark";
+      };
     };
   };
 

home-manager/development/git.nix

@@ -11,7 +11,6 @@
 
     extraConfig = {
       push.autoSetupRemote = true;
-      safe.directory = "/etc/nixos";
     };
   };
 }

home-manager/development/nixvim/default.nix

@@ -1,11 +1,5 @@
 # Neovim configuration for Nix
-{ inputs, ... }:
-
 {
-  imports = [
-    inputs.nixvim.homeManagerModules.nixvim
-  ];
-
   catppuccin.nvim.enable = true;
 
   home.sessionVariables.EDITOR = "nvim";

home-manager/fastfetch.nix

@@ -1,7 +1,5 @@
 {
-  programs = {
+  programs.fastfetch = {
-    fish.shellAliases.fetch = "fastfetch";
-    fastfetch = {
     enable = true;
     settings = {
       logo = {
@@ -56,5 +54,4 @@
         ];
     };
   };
-  };
 }

home-manager/fish.nix

@@ -17,15 +17,9 @@ in
   programs = {
     fish = {
       enable = true;
-      # Start starship when creating a new shell
-      interactiveShellInit = ''
-        starship init fish | source
-        fortune | cowsay -f tux
-      '';
       plugins = [
         {
           # !! to get the previous command
-          # https://github.com/BrewingWeasel/fishbang
           name = "fishbang";
           src = pkgs.fetchFromGitHub {
             owner = "BrewingWeasel";
@@ -35,9 +29,6 @@ in
           };
         }
       ];
-      shellAliases = {
-        nix-shell = "nix-shell --run fish"; # Start nix-shells using fishcd
-      };
     };
 
     starship = {

home-manager/kitty.nix

@@ -8,10 +8,7 @@ in
     flavor = theme.flavor;
   };
 
-  programs = {
+  programs.kitty = {
-    # Transfer shell config to target device
-    fish.shellAliases.ssh = "kitty +kitten ssh";
-    kitty = {
     enable = common.default.terminal == "kitty";
     font.name = theme.nerdFont;
     settings = {
@@ -21,5 +18,4 @@ in
       window_padding_width = 10;
     };
   };
-  };
 }

home-manager/mpv.nix

@@ -8,9 +8,7 @@
       flavor = theme.flavor;
     };
 
-  programs = {
+  programs.mpv = {
-    fish.shellAliases.mpvl = "mpv --profile=loop";
-    mpv = {
     enable = true;
     config = {
       hwdec = "auto-safe";
@@ -18,12 +16,5 @@
       profile = "gpu-hq";
       gpu-context = "wayland";
     };
-      profiles = {
-        loop = {
-          loop-playlist = "inf";
-          loop-file = "inf";
-        };
-      };
-    };
   };
 }

modules/default.nix

@@ -10,8 +10,8 @@
     ./hyprland
     ./sddm.nix
     ./security.nix
-    ./shell.nix
     ./steam.nix
+    ./terminal
     ./qt.nix
   ];
 }

modules/hyprland/default.nix

@@ -6,7 +6,6 @@
     xdg-desktop-portal-hyprland
     hyprpolkitagent # Auth deamon providing modals for password auth
     hyprshot # Screenshots
-    # unstable.hyprsysteminfo TODO requires flake update
   ];
 
   programs = {

modules/shell.nix

@@ -1,19 +0,0 @@
-# For Fish dotfiles, see: /home-manager/fish.nix
-{ pkgs, ... }:
-
-{
-  programs = {
-    bash = {
-      # Starts the OS using Bash, then starts fish if it's not running
-      interactiveShellInit = ''
-        if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
-        then
-          shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
-          exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
-        fi
-      '';
-    };
-
-    fish.enable = true;
-  };
-}

modules/terminal/default.nix

@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ./shell.nix
+  ];
+
+  environment.systemPackages = with pkgs; [
+    kitty
+  ];
+}

modules/terminal/shell.nix

@@ -0,0 +1,32 @@
+# For Fish dotfiles, see: /home-manager/fish.nix and home-manager/starship.nix
+{ pkgs, ... }:
+
+{
+  programs = {
+    bash = {
+      # Starts the OS using Bash, then starts fish if it's not running
+      interactiveShellInit = ''
+        if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
+        then
+          shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
+          exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+        fi
+      '';
+    };
+
+    fish = {
+      enable = true;
+      # Start starship when creating a new shell
+      interactiveShellInit = ''
+        starship init fish | source
+        fortune | cowsay -f tux
+      '';
+      shellAliases = {
+        # Transfer shell config to target device
+        ssh = "kitty +kitten ssh";
+        nix-shell = "nix-shell --run fish"; # Start nix-shells using fishcd
+        fetch = "fastfetch";
+      };
+    };
+  };
+}