diff --git a/homeManagerModules/cliPrograms/fastfetch/fastfetch.nix b/homeManagerModules/cliPrograms/fastfetch/default.nix
similarity index 100%
rename from homeManagerModules/cliPrograms/fastfetch/fastfetch.nix
rename to homeManagerModules/cliPrograms/fastfetch/default.nix
diff --git a/homeManagerModules/cliPrograms/helix/helix.nix b/homeManagerModules/cliPrograms/helix/default.nix
similarity index 100%
rename from homeManagerModules/cliPrograms/helix/helix.nix
rename to homeManagerModules/cliPrograms/helix/default.nix
diff --git a/homeManagerModules/cliPrograms/starship/starship.nix b/homeManagerModules/cliPrograms/starship/default.nix
similarity index 100%
rename from homeManagerModules/cliPrograms/starship/starship.nix
rename to homeManagerModules/cliPrograms/starship/default.nix
diff --git a/homeManagerModules/default.nix b/homeManagerModules/default.nix
index 1ec7f21..2d4e66a 100644
--- a/homeManagerModules/default.nix
+++ b/homeManagerModules/default.nix
@@ -1,8 +1,7 @@
 { lib, ... }:
 {
   imports = [
-    #./zsh.nix
-    ./fish.nix
+    ./shells/fish.nix
     ./niri/niri.nix
 
     ./development/rust.nix
@@ -12,27 +11,23 @@
     ./cliPrograms/hyfetch.nix
     ./cliPrograms/git.nix
 
-    ./cliPrograms/starship/starship.nix
-    ./cliPrograms/fastfetch/fastfetch.nix
-    ./cliPrograms/helix/helix.nix
+    ./cliPrograms/starship
+    ./cliPrograms/fastfetch
+    ./cliPrograms/helix
 
     ./desktopPrograms/firefox.nix
     ./desktopPrograms/amberol.nix
 
-    ./desktopPrograms/zed/zed.nix
-    ./desktopPrograms/wezterm/wezterm.nix
-    ./desktopPrograms/vscodium/vscodium.nix
+    ./desktopPrograms/zed
+    ./desktopPrograms/wezterm
+    ./desktopPrograms/vscodium
   ];
 
   settings = {
     shell.fish.enable = lib.mkDefault true;
 
     development = {
-      rust = {
-        enable = lib.mkDefault false;
-        enableVSCode = lib.mkDefault false;
-      };
-
+      rust.enable = lib.mkDefault false;
       bun.enable = lib.mkDefault false;
     };
 
@@ -44,10 +39,10 @@
       zed.enable = lib.mkDefault false;
 
       pass.enable = lib.mkDefault true;
-      hyfetch.enable = lib.mkDefault false;
-      git.enable = lib.mkDefault true;
-      starship.enable = lib.mkDefault false;
       fastfetch.enable = lib.mkDefault true;
+      git.enable = lib.mkDefault true;
+      hyfetch.enable = lib.mkDefault false;
+      starship.enable = lib.mkDefault false;
       helix.enable = lib.mkDefault false;
     };
   };
diff --git a/homeManagerModules/desktopPrograms/vscodium/vscodium.nix b/homeManagerModules/desktopPrograms/vscodium/default.nix
similarity index 69%
rename from homeManagerModules/desktopPrograms/vscodium/vscodium.nix
rename to homeManagerModules/desktopPrograms/vscodium/default.nix
index 13c7e20..28d05f6 100644
--- a/homeManagerModules/desktopPrograms/vscodium/vscodium.nix
+++ b/homeManagerModules/desktopPrograms/vscodium/default.nix
@@ -22,9 +22,8 @@
       enableExtensionUpdateCheck = false;
       mutableExtensionsDir = false;
 
-      extensions =
-        with pkgs.vscode-marketplace;
-        [
+      extensions = lib.mkMerge [
+        (with pkgs.vscode-marketplace; [
           ms-vscode.live-server
           mhutchie.git-graph
           pkief.material-icon-theme
@@ -35,16 +34,26 @@
           jnoortheen.nix-ide
           biomejs.biome
           kdl-org.kdl
-        ]
-        ++ (with pkgs.open-vsx; [
+        ])
+        (with pkgs.open-vsx; [
           jeanp413.open-remote-ssh
           antfu.unocss
           bierner.markdown-preview-github-styles
           sumneko.lua
         ])
-        ++ ([
-          pkgs.vscode-extensions.ms-vscode.cpptools
-        ]);
+        (with pkgs.vscode-extensions; [
+          ms-vscode.cpptools
+        ])
+        (lib.mkIf config.settings.development.rust.enable (
+          with pkgs.vscode-extensions;
+          [
+            rust-lang.rust-analyzer
+          ]
+          ++ (with pkgs.open-vsx; [
+            tamasfe.even-better-toml
+          ])
+        ))
+      ];
 
       userSettings = builtins.fromJSON (builtins.readFile ./settings.json);
     };
diff --git a/homeManagerModules/desktopPrograms/wezterm/wezterm.nix b/homeManagerModules/desktopPrograms/wezterm/default.nix
similarity index 100%
rename from homeManagerModules/desktopPrograms/wezterm/wezterm.nix
rename to homeManagerModules/desktopPrograms/wezterm/default.nix
diff --git a/homeManagerModules/desktopPrograms/zed/zed.nix b/homeManagerModules/desktopPrograms/zed/default.nix
similarity index 100%
rename from homeManagerModules/desktopPrograms/zed/zed.nix
rename to homeManagerModules/desktopPrograms/zed/default.nix
diff --git a/homeManagerModules/development/rust.nix b/homeManagerModules/development/rust.nix
index 25788ad..788ca4a 100644
--- a/homeManagerModules/development/rust.nix
+++ b/homeManagerModules/development/rust.nix
@@ -7,7 +7,6 @@
 {
   options.settings.development.rust = {
     enable = lib.mkEnableOption "enable rust toolchain and various dev tools";
-    enableVSCode = lib.mkEnableOption "enable VSCode extension for rust";
   };
 
   config = lib.mkIf config.settings.development.rust.enable {
@@ -17,15 +16,5 @@
       rustfmt
       rust-analyzer
     ];
-
-    programs.vscode.extensions = lib.mkIf config.settings.development.rust.enableVSCode (
-      with pkgs.vscode-extensions;
-      [
-        rust-lang.rust-analyzer
-      ]
-      ++ (with pkgs.open-vsx; [
-        tamasfe.even-better-toml
-      ])
-    );
   };
 }
diff --git a/homeManagerModules/fish.nix b/homeManagerModules/shells/fish.nix
similarity index 100%
rename from homeManagerModules/fish.nix
rename to homeManagerModules/shells/fish.nix
diff --git a/homeManagerModules/zsh.nix b/homeManagerModules/shells/zsh.nix
similarity index 100%
rename from homeManagerModules/zsh.nix
rename to homeManagerModules/shells/zsh.nix
diff --git a/hosts/main-laptop/home.nix b/hosts/main-laptop/home.nix
index ad11ce6..686e634 100644
--- a/hosts/main-laptop/home.nix
+++ b/hosts/main-laptop/home.nix
@@ -6,10 +6,7 @@
 }:
 {
 
-  imports = [
-    #../../homeManagerModules/zsh.nix
-    ../../homeManagerModules/default.nix
-  ];
+  imports = [ ../../homeManagerModules ];
 
   settings = {
     development = {