diff --git a/flake.lock b/flake.lock
index 88fe7bc1..f7304e1b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,6 +20,37 @@
         "type": "github"
       }
     },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1627913399,
+        "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1629481132,
+        "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "997f7efcb746a9c140ce1f13c72263189225f482",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -120,7 +151,8 @@
       "inputs": {
         "agenix": "agenix",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "neovim-nightly-overlay": "neovim-nightly-overlay",
+        "nixpkgs": "nixpkgs_2"
       }
     }
   },
diff --git a/users/modules/alacritty.nix b/modules/home-manager/alacritty.nix
similarity index 100%
rename from users/modules/alacritty.nix
rename to modules/home-manager/alacritty.nix
diff --git a/users/modules/desktop.nix b/modules/home-manager/desktop.nix
similarity index 100%
rename from users/modules/desktop.nix
rename to modules/home-manager/desktop.nix
diff --git a/users/modules/dev.nix b/modules/home-manager/dev.nix
similarity index 100%
rename from users/modules/dev.nix
rename to modules/home-manager/dev.nix
diff --git a/users/modules/i18n.nix b/modules/home-manager/i18n.nix
similarity index 100%
rename from users/modules/i18n.nix
rename to modules/home-manager/i18n.nix
diff --git a/modules/README.adoc b/modules/nixos/README.adoc
similarity index 100%
rename from modules/README.adoc
rename to modules/nixos/README.adoc
diff --git a/modules/agenix.nix b/modules/nixos/agenix.nix
similarity index 100%
rename from modules/agenix.nix
rename to modules/nixos/agenix.nix
diff --git a/modules/archiving.nix b/modules/nixos/archiving.nix
similarity index 100%
rename from modules/archiving.nix
rename to modules/nixos/archiving.nix
diff --git a/modules/desktop.nix b/modules/nixos/desktop.nix
similarity index 100%
rename from modules/desktop.nix
rename to modules/nixos/desktop.nix
diff --git a/modules/dev.nix b/modules/nixos/dev.nix
similarity index 100%
rename from modules/dev.nix
rename to modules/nixos/dev.nix
diff --git a/modules/editors.nix b/modules/nixos/editors.nix
similarity index 100%
rename from modules/editors.nix
rename to modules/nixos/editors.nix
diff --git a/modules/themes/a-happy-gnome/README.adoc b/modules/nixos/themes/a-happy-gnome/README.adoc
similarity index 100%
rename from modules/themes/a-happy-gnome/README.adoc
rename to modules/nixos/themes/a-happy-gnome/README.adoc
diff --git a/modules/themes/a-happy-gnome/config/dconf/desktop.conf b/modules/nixos/themes/a-happy-gnome/config/dconf/desktop.conf
similarity index 100%
rename from modules/themes/a-happy-gnome/config/dconf/desktop.conf
rename to modules/nixos/themes/a-happy-gnome/config/dconf/desktop.conf
diff --git a/modules/themes/a-happy-gnome/config/dconf/keybindings.conf b/modules/nixos/themes/a-happy-gnome/config/dconf/keybindings.conf
similarity index 100%
rename from modules/themes/a-happy-gnome/config/dconf/keybindings.conf
rename to modules/nixos/themes/a-happy-gnome/config/dconf/keybindings.conf
diff --git a/modules/themes/a-happy-gnome/config/dconf/shell-extensions.conf b/modules/nixos/themes/a-happy-gnome/config/dconf/shell-extensions.conf
similarity index 100%
rename from modules/themes/a-happy-gnome/config/dconf/shell-extensions.conf
rename to modules/nixos/themes/a-happy-gnome/config/dconf/shell-extensions.conf
diff --git a/modules/themes/a-happy-gnome/default.nix b/modules/nixos/themes/a-happy-gnome/default.nix
similarity index 100%
rename from modules/themes/a-happy-gnome/default.nix
rename to modules/nixos/themes/a-happy-gnome/default.nix
diff --git a/modules/themes/default.nix b/modules/nixos/themes/default.nix
similarity index 100%
rename from modules/themes/default.nix
rename to modules/nixos/themes/default.nix
diff --git a/modules/users.nix b/modules/nixos/users.nix
similarity index 93%
rename from modules/users.nix
rename to modules/nixos/users.nix
index 373ead08..37a27efd 100644
--- a/modules/users.nix
+++ b/modules/nixos/users.nix
@@ -3,8 +3,8 @@
 
 let
   cfg = config.modules.users;
-  userModules = lib.getUsers cfg.users;
-  homeManagerModules = lib.filesToAttr ../users/modules;
+  userModules = lib.getUsers "home-manager" cfg.users;
+  homeManagerModules = lib.filesToAttr ../home-manager;
 
   users = lib.attrNames userModules;
   nonexistentUsers = lib.filter (name: !lib.elem name users) cfg.users;
diff --git a/users/foo-dogsquared/default.nix b/users/home-manager/foo-dogsquared/default.nix
similarity index 100%
rename from users/foo-dogsquared/default.nix
rename to users/home-manager/foo-dogsquared/default.nix