diff --git a/home/modules/programs/chromium/default.nix b/home/modules/chromium/default.nix
similarity index 92%
rename from home/modules/programs/chromium/default.nix
rename to home/modules/chromium/default.nix
index 01e6faa..4d465ef 100644
--- a/home/modules/programs/chromium/default.nix
+++ b/home/modules/chromium/default.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+_: {
   programs.chromium = {
     enable = true;
     commandLineArgs = ["--restore-last-session"];
diff --git a/home/modules/default.nix b/home/modules/default.nix
index 25af7d6..0849010 100644
--- a/home/modules/default.nix
+++ b/home/modules/default.nix
@@ -1,7 +1,7 @@
 inputs: {
   "home" = import ./home.nix inputs;
   "wezterm" = import ./wezterm inputs;
-  "programs/nixpkgs" = import ./programs/nixpkgs inputs;
+  "nixpkgs" = import ./nixpkgs inputs;
   "mutablerepos" = import ./mutablerepos.nix inputs;
 
   #  "i3" = import ./i3 inputs;
@@ -15,4 +15,9 @@ inputs: {
   "way-displays" = import ./way-displays inputs;
 
   "dotfiles" = import ./dotfiles inputs;
+  "neovim" = import ./neovim inputs;
+  "chromium" = import ./chromium inputs;
+  "direnv" = import ./direnv inputs;
+  "gpg" = import ./gpg inputs;
+  "rust" = import ./rust inputs;
 }
diff --git a/home/modules/programs/direnv/default.nix b/home/modules/direnv/default.nix
similarity index 100%
rename from home/modules/programs/direnv/default.nix
rename to home/modules/direnv/default.nix
diff --git a/home/modules/programs/gpg/default.nix b/home/modules/gpg/default.nix
similarity index 92%
rename from home/modules/programs/gpg/default.nix
rename to home/modules/gpg/default.nix
index 607c102..20c28fb 100644
--- a/home/modules/programs/gpg/default.nix
+++ b/home/modules/gpg/default.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+_: {pkgs, ...}: {
   programs.gpg.enable = true;
   services.gpg-agent = {
     enable = true;
diff --git a/home/modules/programs/neovim/default.nix b/home/modules/neovim/default.nix
similarity index 74%
rename from home/modules/programs/neovim/default.nix
rename to home/modules/neovim/default.nix
index 4dc0082..4f24462 100644
--- a/home/modules/programs/neovim/default.nix
+++ b/home/modules/neovim/default.nix
@@ -1,8 +1,4 @@
-{
-  neovim-nightly-overlay,
-  pkgs,
-  ...
-}: {
+{neovim-nightly-overlay, ...}: {pkgs, ...}: {
   programs.neovim = {
     package = neovim-nightly-overlay.packages.${pkgs.system}.default;
     enable = true;
diff --git a/home/modules/programs/nixpkgs/default.nix b/home/modules/nixpkgs/default.nix
similarity index 100%
rename from home/modules/programs/nixpkgs/default.nix
rename to home/modules/nixpkgs/default.nix
diff --git a/home/modules/programs/default.nix b/home/modules/programs/default.nix
deleted file mode 100644
index 0af18d3..0000000
--- a/home/modules/programs/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  ./direnv
-  ./chromium
-  ./gpg
-  ./neovim
-  ./rust
-]
diff --git a/home/modules/programs/rust/default.nix b/home/modules/programs/rust/default.nix
deleted file mode 100644
index 1f52fad..0000000
--- a/home/modules/programs/rust/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  home = {
-    packages = with pkgs; [
-      rustup
-      gcc
-    ];
-    sessionPath = ["$HOME/.cargo/bin"];
-  };
-}
diff --git a/home/modules/rust/default.nix b/home/modules/rust/default.nix
new file mode 100644
index 0000000..b7db99d
--- /dev/null
+++ b/home/modules/rust/default.nix
@@ -0,0 +1,7 @@
+_: {pkgs, ...}: {
+  home.packages = [
+    pkgs.rustup
+    pkgs.gcc
+  ];
+  home.sessionPath = ["$HOME/.cargo/bin"];
+}