diff --git a/flake.nix b/flake.nix
index 5630392..412f4db 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,7 +43,9 @@
                 ./graphical.nix
                 ./extra_info.nix
                 ./localinfo.nix
-				./wm.nix
+				./wm
+				./rustdev.nix
+				./git
                 inputs.zsh-traxys.home-managerModule."${system}"
                 inputs.hm-nvim-traxys.home-managerModule."${system}"
               ];
diff --git a/git/default.nix b/git/default.nix
new file mode 100644
index 0000000..2862172
--- /dev/null
+++ b/git/default.nix
@@ -0,0 +1,30 @@
+{ config, pkgs, lib, ... }:
+
+{
+  programs.git = {
+    enable = true;
+    userName = "Quentin Boyer";
+    userEmail = config.extraInfo.email;
+    delta = {
+      enable = true;
+      options = {
+        line-numbers = true;
+        syntax-theme = "Dracula";
+        plus-style = "auto \"#121bce\"";
+        plus-emph-style = "auto \"#6083eb\"";
+      };
+    };
+    extraConfig = {
+      diff = {
+        algorithm = "histogram";
+      };
+      core = {
+        excludesfile = "${config.home.homeDirectory}/.gitignore";
+      };
+    };
+  };
+
+  home.file = {
+    ".gitignore".source = ./gitignore;
+  };
+}
diff --git a/gitignore b/git/gitignore
similarity index 100%
rename from gitignore
rename to git/gitignore
diff --git a/home.nix b/home.nix
index 7d2ec25..9c99378 100644
--- a/home.nix
+++ b/home.nix
@@ -12,18 +12,12 @@ let
   };
 in
 {
-  home.sessionVariables = {
-    RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache";
-  };
-
   home.packages = with pkgs; [
     bitwarden-cli
-    rustup
     nodePackages.vscode-json-languageserver
     exa
     python3
     topgrade
-    cargo-edit
     rsync
     fd
     niv
@@ -60,35 +54,11 @@ in
       enable = true;
     };
 
-    git = {
-      enable = true;
-      userName = "Quentin Boyer";
-      userEmail = config.extraInfo.email;
-      delta = {
-        enable = true;
-        options = {
-          line-numbers = true;
-          syntax-theme = "Dracula";
-          plus-style = "auto \"#121bce\"";
-          plus-emph-style = "auto \"#6083eb\"";
-        };
-      };
-      extraConfig = {
-        diff = {
-          algorithm = "histogram";
-        };
-        core = {
-          excludesfile = "${config.home.homeDirectory}/.gitignore";
-        };
-      };
-    };
-
     zoxide = {
       enable = true;
     };
   };
   home.file = {
-    ".gitignore".source = ./gitignore;
     "bin" = {
       source = ./scripts;
       recursive = true;
diff --git a/rustdev.nix b/rustdev.nix
new file mode 100644
index 0000000..3755938
--- /dev/null
+++ b/rustdev.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, lib, ... }:
+
+{
+  home.sessionVariables = {
+    RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache";
+  };
+
+  home.packages = with pkgs; [
+	rustup
+	cargo-edit
+  ];
+}
diff --git a/wm.nix b/wm/default.nix
similarity index 100%
rename from wm.nix
rename to wm/default.nix
diff --git a/waybar.css b/wm/waybar.css
similarity index 100%
rename from waybar.css
rename to wm/waybar.css
diff --git a/wofi/config b/wm/wofi/config
similarity index 100%
rename from wofi/config
rename to wm/wofi/config
diff --git a/wofi/style.css b/wm/wofi/style.css
similarity index 100%
rename from wofi/style.css
rename to wm/wofi/style.css