🧹 Mpv loop config, moved fish aliases to proper files

modules/default.nix

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

modules/shell.nix

@@ -0,0 +1,19 @@
+# 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

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

modules/terminal/shell.nix

@@ -1,32 +0,0 @@
-# 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";
-      };
-    };
-  };
-}