diff --git a/home/terminal/fish/default.nix b/home/terminal/fish/default.nix
index 033685c..f112e93 100644
--- a/home/terminal/fish/default.nix
+++ b/home/terminal/fish/default.nix
@@ -1,17 +1,17 @@
 { pkgs, lib, ... }:
+let
+  inherit (lib.my) checkPath;
+in
 {
   programs.fish = {
     enable = true;
     shellAbbrs = {
       clip = "wl-copy";
-
-      sd = ''cd "$(dirname "$HOME/$(env --chdir ~ fzf)")"'';
-
     };
     functions = {
       gitignore = "curl -sL https://www.gitignore.io/api/$argv";
       mv-bad-creation-date = ''
-        ${lib.my.checkPath pkgs.exiftool "exiftool"} -if 'not $CreateDate' -p '$FileName' "$PWD/$argv[1]" | xargs -I {} mv -i "$PWD/$argv[1]/{}" "$argv[2]"
+        ${checkPath pkgs.exiftool "exiftool"} -if 'not $CreateDate' -p '$FileName' "$PWD/$argv[1]" | xargs -I {} mv -i "$PWD/$argv[1]/{}" "$argv[2]"
       '';
       rename-images = ''
         set -f input "$PWD/$argv[1]"
@@ -19,7 +19,7 @@
         if not test -d $input
             echo "input is not a directory"
         else
-            ${lib.my.checkPath pkgs.exiftool "exiftool"} -if '$CreateDate' -p '$FileName' "$input" | xargs -I {} jhead -n%Y-%m-%d-%H%M%S "$input/{}"
+            ${checkPath pkgs.exiftool "exiftool"} -if '$CreateDate' -p '$FileName' "$input" | xargs -I {} jhead -n%Y-%m-%d-%H%M%S "$input/{}"
         end
       '';
       fish_prompt = builtins.readFile ./fish_prompt.fish;
diff --git a/modules/default.nix b/modules/default.nix
index bf6155d..16b10b7 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -7,15 +7,6 @@
     ./portals.nix
     ./env.nix
 
-    ./programs/firefox.nix
-    ./programs/thunderbird.nix
-    ./programs/sway.nix
-    ./programs/lazygit.nix
-    ./programs/steam.nix
-    ./programs/hyprland.nix
-    ./programs/ssh.nix
-    ./programs/fish.nix
-
     ./system/printing.nix
     ./system/audio.nix
     ./system/mime.nix
@@ -25,5 +16,6 @@
     ./nix
     ./themes
     ./commons
+    ./programs
   ];
 }
diff --git a/modules/programs/default.nix b/modules/programs/default.nix
new file mode 100644
index 0000000..dd8961e
--- /dev/null
+++ b/modules/programs/default.nix
@@ -0,0 +1,12 @@
+{
+  imports = [
+    ./firefox.nix
+    ./thunderbird.nix
+    ./sway.nix
+    ./lazygit.nix
+    ./steam.nix
+    ./hyprland.nix
+    ./ssh.nix
+    ./fish.nix
+  ];
+}