working-ish, not all options

flake.nix

@@ -19,7 +19,7 @@
     {
       homeManagerModules.default = { ... }: {
         imports = [
-          ./options.nix
+          ./nixosModules/options.nix
           ./home.nix
           ./git.nix
           inputs._1password-shell-plugins.hmModules.default
@@ -31,7 +31,8 @@
 
       nixosModules.default = { config, ... }: {
         imports = [
-          ./options.nix
+          ./nixosModules/options.nix
+          ./nixosModules/scripts.nix
           inputs.home-manager.nixosModules.default
         ];
         
@@ -41,12 +42,11 @@
           extraSpecialArgs = { inherit inputs; };
           users.${config.user} = {
             imports = [
-              self.homeManagerModules.default
-              { _module.args = { nixosConfig = config; }; }
-              # self.homeManagerModules.default {
-              #   stateVersion = config.stateVersion;
-              # }
-            ];
+              self.homeManagerModules.default {
+                user = config.user;
+                stateVersion = config.stateVersion;
+              }
+            ] ++ config.extraImports;
           };
         };
       };