diff --git a/.forgejo/workflows/check.yml b/.forgejo/workflows/check.yml
index adddf31..2eb273b 100644
--- a/.forgejo/workflows/check.yml
+++ b/.forgejo/workflows/check.yml
@@ -3,22 +3,13 @@ on:
 jobs:
   check:
     runs-on: nixos
-    strategy:
-      matrix:
-        check:
-          - nvimDev
-          - nvimHeadless
-          - nvimNoBundledBins
-          - nvimNoLsp
-          - nvimNoTSGrammars
-          - treefmt
     steps:
       - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4
       - name: Run checks
         run: |
           nix --version
-          # shellcheck disable=SC2016
-          nix build --print-build-logs '.#checks.x86_64-linux.${{ matrix.check }}'
+          nix-fast-build --max-jobs 2 --no-nom --skip-cached --no-link \
+            --flake ".#checks.$(nix eval --raw --impure --expr builtins.currentSystem)"
   check-renovaterc:
     runs-on: nixos
     steps:
@@ -27,24 +18,25 @@ jobs:
         run: |
           nix --version
           nix shell nixpkgs#renovate --command renovate-config-validator
-  build:
+  build-packages:
     runs-on: nixos
     needs: check
-    strategy:
-      matrix:
-        target:
-          - audiomenu
-          - docs
-          - jpassmenu
-          - nixosConfigurations.vm.config.system.build.toplevel
-          - nvim
     steps:
       - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4
       - name: Build target
         run: |
           nix --version
-          # shellcheck disable=SC2016
-          nix build --print-build-logs '.#${{ matrix.target }}'
+          nix-fast-build --max-jobs 2 --no-nom --skip-cached --no-link \
+            --flake ".#packages.$(nix eval --raw --impure --expr builtins.currentSystem)"
+  build-vm:
+    runs-on: nixos
+    needs: build-packages
+    steps:
+      - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4
+      - name: Build VM configuration
+        run: |
+          nix --version
+          nix build --print-build-logs '.#nixosConfigurations.vm.config.system.build.toplevel'
   report-size:
     runs-on: nixos
     needs: build
diff --git a/flake-modules/default.nix b/flake-modules/default.nix
index 050721e..ce3e3c5 100644
--- a/flake-modules/default.nix
+++ b/flake-modules/default.nix
@@ -10,7 +10,8 @@ in
     ./docs.nix
     ./example-vm.nix
     ./nixos-modules.nix
-    ./nvim.nix
+    ./home-modules.nix
+    ./nixvim-modules.nix
     ./overlays.nix
     ./scripts.nix
   ];
diff --git a/flake-modules/docs.nix b/flake-modules/docs.nix
index cc85766..76ffb19 100644
--- a/flake-modules/docs.nix
+++ b/flake-modules/docs.nix
@@ -5,17 +5,18 @@
     {
       packages =
         let
+          modules = ../modules;
           filterVisible =
             toplevelOption: option:
             option // { visible = option.visible && builtins.elemAt option.loc 0 == toplevelOption; };
           home-eval = lib.evalModules {
-            modules = [ ../home/options.nix ];
+            modules = [ (modules + "/hm/options.nix") ];
             specialArgs = {
               inherit pkgs;
             };
           };
-          nvim-eval = lib.evalModules { modules = [ ../nvim/options.nix ]; };
-          nixos-eval = lib.evalModules { modules = [ ../system/options.nix ]; };
+          nvim-eval = lib.evalModules { modules = [ (modules + "/nixvim/options.nix") ]; };
+          nixos-eval = lib.evalModules { modules = [ (modules + "/nixos/options.nix") ]; };
           home-markdown =
             (pkgs.nixosOptionsDoc {
               inherit (home-eval) options;
diff --git a/flake-modules/home-modules.nix b/flake-modules/home-modules.nix
new file mode 100644
index 0000000..8d8ca71
--- /dev/null
+++ b/flake-modules/home-modules.nix
@@ -0,0 +1,34 @@
+{ self, inputs, ... }:
+let
+  modules = ../modules;
+in
+{
+  # FIXME(25.05): this version of HM should have the flake module
+  # imports = [ inputs.home-manager.flakeModules.home-manager ];
+
+  flake.homeModules =
+    let
+      defaultModules = [
+        inputs.nixvim.homeManagerModules.nixvim
+        self.nixvimModules.homeManager
+        (modules + "/hm")
+      ];
+      nixos = {
+        imports = defaultModules;
+      };
+      standalone = {
+        imports = defaultModules ++ [
+          inputs.stylix.homeManagerModules.stilyx
+          (
+            { config, ... }:
+            {
+              stylix.image = config.jhome.sway.background;
+            }
+          )
+        ];
+      };
+    in
+    {
+      inherit standalone nixos;
+    };
+}
diff --git a/flake-modules/nixos-modules.nix b/flake-modules/nixos-modules.nix
index 1422669..41bd64f 100644
--- a/flake-modules/nixos-modules.nix
+++ b/flake-modules/nixos-modules.nix
@@ -1,27 +1,25 @@
-{ inputs, lib, ... }:
+{
+  self,
+  inputs,
+  lib,
+  ...
+}:
+let
+  modules = ../modules;
+in
 {
   flake.nixosModules =
     let
-      nvim-config = {
-        imports = [
-          inputs.nixvim.homeManagerModules.nixvim
-          ../nvim
-        ];
-      };
-      homeManagerModuleSandalone = import ../home {
-        inherit nvim-config;
-        inherit (inputs) stylix;
-      };
-      homeManagerModuleNixOS = import ../home { inherit nvim-config; };
       nixosModule = {
         imports = [
-          (import ../system { inherit (inputs) stylix; })
+          inputs.stylix.nixosModules.stylix
           inputs.home-manager.nixosModules.home-manager
+          (modules + "/nixos")
         ] ++ lib.optional (inputs.lix-module != null) inputs.lix-module.nixosModules.default;
         home-manager = {
           useGlobalPkgs = true;
           useUserPackages = true;
-          sharedModules = [ homeManagerModuleNixOS ];
+          sharedModules = [ self.homeModules.nixos ];
         };
         # Pin nixpkgs
         nix.registry.nixpkgs.flake = inputs.nixpkgs;
@@ -39,7 +37,7 @@
     in
     {
       default = nixosModule;
-      inherit nixosModule homeManagerModuleNixOS homeManagerModuleSandalone;
+      inherit nixosModule;
     }
     // machineModules;
 }
diff --git a/flake-modules/nixvim-modules.nix b/flake-modules/nixvim-modules.nix
new file mode 100644
index 0000000..9841d46
--- /dev/null
+++ b/flake-modules/nixvim-modules.nix
@@ -0,0 +1,60 @@
+{ self, inputs, ... }:
+let
+  modules = ../modules;
+in
+{
+  imports = [ inputs.nixvim.flakeModules.default ];
+
+  nixvim = {
+    packages.enable = true;
+    checks.enable = false; # FIXME: borked due to nix-community/nixvim#3074
+  };
+
+  flake.nixvimModules = {
+    standalone = modules + "/nixvim/standalone.nix";
+    homeManager = modules + "/nixvim";
+  };
+
+  perSystem =
+    { system, ... }:
+    let
+      nvimModule = extraConfig: {
+        inherit system;
+        modules = [
+          self.nixvimModules.standalone
+          { performance.combinePlugins.enable = true; }
+          extraConfig
+        ];
+      };
+      modules = {
+        nvim = nvimModule { };
+        # Smaller derivations
+        nvim-headless = nvimModule {
+          jhome.nvim.dev.enable = false;
+          jhome.nvim.reduceSize = true;
+        };
+        nvim-small = nvimModule {
+          jhome.nvim.dev.bundleLSPs = false;
+        };
+        nvim-no-ts = nvimModule {
+          jhome.nvim.dev.bundleGrammars = false;
+        };
+        nvim-no-lsps = nvimModule {
+          jhome.nvim.dev = {
+            bundleLSPs = false;
+            bundleGrammars = false;
+          };
+        };
+      };
+    in
+    {
+      checks = builtins.mapAttrs (
+        _name: module:
+        inputs.nixvim.lib.${system}.check.mkTestDerivationFromNixvimModule {
+          module.imports = module.modules;
+        }
+      ) modules;
+
+      nixvimConfigurations = builtins.mapAttrs (_name: inputs.nixvim.lib.evalNixvim) modules;
+    };
+}
diff --git a/flake-modules/nvim.nix b/flake-modules/nvim.nix
deleted file mode 100644
index 89832f3..0000000
--- a/flake-modules/nvim.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ inputs, ... }:
-{
-  perSystem =
-    { lib, system, ... }:
-    let
-      nixvimLib = inputs.nixvim.lib.${system};
-      nixvim = inputs.nixvim.legacyPackages.${system};
-      testNvimModule = nixvimLib.check.mkTestDerivationFromNixvimModule;
-      nvimModule = extraConfig: {
-        pkgs = inputs.unstable.legacyPackages.${system};
-        module = {
-          imports = [ ../nvim/standalone.nix ];
-          config = lib.mkMerge [
-            { performance.combinePlugins.enable = true; }
-            extraConfig
-          ];
-        };
-      };
-      moduleDev = nvimModule { };
-      moduleHeadless = nvimModule {
-        jhome.nvim.dev.enable = false;
-        jhome.nvim.reduceSize = true;
-      };
-      moduleNoLsp = nvimModule { jhome.nvim.dev.bundleLSPs = false; };
-      moduleNoTSGrammars = nvimModule { jhome.nvim.dev.bundleGrammars = false; };
-      moduleNoBundledBins = nvimModule {
-        jhome.nvim.dev = {
-          bundleLSPs = false;
-          bundleGrammars = false;
-        };
-      };
-    in
-    {
-      # Check standalone nvim build
-      checks = {
-        nvimDev = testNvimModule moduleDev;
-        nvimHeadless = testNvimModule moduleHeadless;
-        nvimNoLsp = testNvimModule moduleNoLsp;
-        nvimNoTSGrammars = testNvimModule moduleNoTSGrammars;
-        nvimNoBundledBins = testNvimModule moduleNoBundledBins;
-      };
-
-      # Nvim standalone module
-      packages = {
-        nvim = nixvim.makeNixvimWithModule moduleDev;
-        # Smaller derivations
-        nvim-headless = nixvim.makeNixvimWithModule moduleHeadless;
-        nvim-small = nixvim.makeNixvimWithModule moduleNoBundledBins;
-        nvim-no-ts = nixvim.makeNixvimWithModule moduleNoTSGrammars;
-        nvim-no-lsps = nixvim.makeNixvimWithModule moduleNoLsp;
-      };
-    };
-}
diff --git a/home/default.nix b/modules/hm/default.nix
similarity index 96%
rename from home/default.nix
rename to modules/hm/default.nix
index 2a8e6a5..0f1e59a 100644
--- a/home/default.nix
+++ b/modules/hm/default.nix
@@ -1,7 +1,3 @@
-{
-  nvim-config,
-  stylix ? null,
-}:
 {
   config,
   pkgs,
@@ -17,17 +13,11 @@ let
     path: default: if osConfig == null then default else lib.attrsets.attrByPath path default osConfig;
 in
 {
-  imports =
-    [
-      nvim-config
-      ./options.nix
-      ./gui
-      ./users.nix
-    ]
-    ++ lib.optionals (stylix != null) [
-      stylix.homeManagerModules.stylix
-      { stylix.image = cfg.sway.background; }
-    ];
+  imports = [
+    ./options.nix
+    ./gui
+    ./users.nix
+  ];
 
   config = lib.mkMerge [
     (lib.mkIf (cfg.enable && cfg.styling.enable) {
diff --git a/home/gui/default.nix b/modules/hm/gui/default.nix
similarity index 100%
rename from home/gui/default.nix
rename to modules/hm/gui/default.nix
diff --git a/home/gui/keybindings.nix b/modules/hm/gui/keybindings.nix
similarity index 100%
rename from home/gui/keybindings.nix
rename to modules/hm/gui/keybindings.nix
diff --git a/home/gui/sway-config.nix b/modules/hm/gui/sway-config.nix
similarity index 100%
rename from home/gui/sway-config.nix
rename to modules/hm/gui/sway-config.nix
diff --git a/home/gui/waybar-settings.nix b/modules/hm/gui/waybar-settings.nix
similarity index 100%
rename from home/gui/waybar-settings.nix
rename to modules/hm/gui/waybar-settings.nix
diff --git a/home/options.nix b/modules/hm/options.nix
similarity index 100%
rename from home/options.nix
rename to modules/hm/options.nix
diff --git a/home/users.nix b/modules/hm/users.nix
similarity index 100%
rename from home/users.nix
rename to modules/hm/users.nix
diff --git a/system/default.nix b/modules/nixos/default.nix
similarity index 98%
rename from system/default.nix
rename to modules/nixos/default.nix
index 3fdd0cf..58eb1e4 100644
--- a/system/default.nix
+++ b/modules/nixos/default.nix
@@ -1,4 +1,3 @@
-{ stylix }:
 {
   config,
   pkgs,
@@ -22,7 +21,6 @@ in
   imports = [
     ./options.nix
     ./gui
-    stylix.nixosModules.stylix
     { stylix = import ./stylix-config.nix { inherit config pkgs; }; }
   ];
 
diff --git a/system/gui/default.nix b/modules/nixos/gui/default.nix
similarity index 100%
rename from system/gui/default.nix
rename to modules/nixos/gui/default.nix
diff --git a/system/options.nix b/modules/nixos/options.nix
similarity index 100%
rename from system/options.nix
rename to modules/nixos/options.nix
diff --git a/system/starship-nerdfont-symbols.nix b/modules/nixos/starship-nerdfont-symbols.nix
similarity index 100%
rename from system/starship-nerdfont-symbols.nix
rename to modules/nixos/starship-nerdfont-symbols.nix
diff --git a/system/starship-shorter-text.nix b/modules/nixos/starship-shorter-text.nix
similarity index 100%
rename from system/starship-shorter-text.nix
rename to modules/nixos/starship-shorter-text.nix
diff --git a/system/stylix-config.nix b/modules/nixos/stylix-config.nix
similarity index 100%
rename from system/stylix-config.nix
rename to modules/nixos/stylix-config.nix
diff --git a/nvim/augroups.nix b/modules/nixvim/augroups.nix
similarity index 100%
rename from nvim/augroups.nix
rename to modules/nixvim/augroups.nix
diff --git a/nvim/default.nix b/modules/nixvim/default.nix
similarity index 100%
rename from nvim/default.nix
rename to modules/nixvim/default.nix
diff --git a/nvim/dev-plugins.nix b/modules/nixvim/dev-plugins.nix
similarity index 100%
rename from nvim/dev-plugins.nix
rename to modules/nixvim/dev-plugins.nix
diff --git a/nvim/extraPlugins/default.nix b/modules/nixvim/extraPlugins/default.nix
similarity index 100%
rename from nvim/extraPlugins/default.nix
rename to modules/nixvim/extraPlugins/default.nix
diff --git a/nvim/extraPlugins/generated.nix b/modules/nixvim/extraPlugins/generated.nix
similarity index 100%
rename from nvim/extraPlugins/generated.nix
rename to modules/nixvim/extraPlugins/generated.nix
diff --git a/nvim/extraPlugins/plugins b/modules/nixvim/extraPlugins/plugins
similarity index 100%
rename from nvim/extraPlugins/plugins
rename to modules/nixvim/extraPlugins/plugins
diff --git a/nvim/mappings.nix b/modules/nixvim/mappings.nix
similarity index 100%
rename from nvim/mappings.nix
rename to modules/nixvim/mappings.nix
diff --git a/nvim/options.nix b/modules/nixvim/options.nix
similarity index 100%
rename from nvim/options.nix
rename to modules/nixvim/options.nix
diff --git a/nvim/plugins.nix b/modules/nixvim/plugins.nix
similarity index 100%
rename from nvim/plugins.nix
rename to modules/nixvim/plugins.nix
diff --git a/nvim/standalone.nix b/modules/nixvim/standalone.nix
similarity index 100%
rename from nvim/standalone.nix
rename to modules/nixvim/standalone.nix