refactor: move modules to their own dir

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;

flake-modules/nixos-modules.nix

@@ -1,45 +1,82 @@
-{ inputs, lib, ... }:
 {
-  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.home-manager.nixosModules.home-manager
-        ] ++ lib.optional (inputs.lix-module != null) inputs.lix-module.nixosModules.default;
-        home-manager = {
-          useGlobalPkgs = true;
-          useUserPackages = true;
-          sharedModules = [ homeManagerModuleNixOS ];
+  self,
+  inputs,
+  lib,
+  ...
+}:
+let
+  modules = ../modules;
+in
+{
+  flake = {
+    nixvimModules =
+      let
+        standalone = modules + "/nixvim/standalone.nix";
+        homeManager = {
+          imports = [
+            inputs.nixvim.homeManagerModules.nixvim
+            (modules + "/nixvim")
+          ];
         };
-        # Pin nixpkgs
-        nix.registry.nixpkgs.flake = inputs.nixpkgs;
+      in
+      {
+        inherit standalone homeManager;
       };
-
-      machines = [ "vm" ];
-      mkMachine = hostname: {
-        imports = [
-          nixosModule
-          (import (../machines + "/${hostname}"))
+    homeManagerModules =
+      let
+        defaultModules = [
+          self.nixvimModules.homeManager
+          (modules + "/hm")
         ];
-        home-manager.sharedModules = [ { jhome.hostName = hostname; } ];
+        nixos = {
+          imports = defaultModules;
+        };
+        standalone = {
+          imports = defaultModules ++ [
+            inputs.stylix.homeManagerModules.stilyx
+            (
+              { config, ... }:
+              {
+                stylix.image = config.jhome.sway.background;
+              }
+            )
+          ];
+        };
+      in
+      {
+        inherit standalone nixos;
       };
-      machineModules = lib.genAttrs machines mkMachine;
-    in
-    {
-      default = nixosModule;
-      inherit nixosModule homeManagerModuleNixOS homeManagerModuleSandalone;
-    }
-    // machineModules;
+    nixosModules =
+      let
+        nixosModule = {
+          imports = [
+            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 = [ self.homeManagerModules.nixos ];
+          };
+          # Pin nixpkgs
+          nix.registry.nixpkgs.flake = inputs.nixpkgs;
+        };
+
+        machines = [ "vm" ];
+        mkMachine = hostname: {
+          imports = [
+            nixosModule
+            (import (../machines + "/${hostname}"))
+          ];
+          home-manager.sharedModules = [ { jhome.hostName = hostname; } ];
+        };
+        machineModules = lib.genAttrs machines mkMachine;
+      in
+      {
+        default = nixosModule;
+        inherit nixosModule;
+      }
+      // machineModules;
+  };
 }

flake-modules/nvim.nix

@@ -9,7 +9,7 @@
       nvimModule = extraConfig: {
         pkgs = inputs.unstable.legacyPackages.${system};
         module = {
-          imports = [ ../nvim/standalone.nix ];
+          imports = [ ../modules/nixvim/standalone.nix ];
           config = lib.mkMerge [
             { performance.combinePlugins.enable = true; }
             extraConfig

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) {

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; }; }
   ];