darwin rebuilding

flake.nix

@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
 
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -14,7 +15,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    flake-utils.url = "github:numtide/flake-utils";
+    nixovim = {
+      url = "git+https://git.sakamoto.dev/kenji/nixovim.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {
@@ -31,28 +35,26 @@
         config.allowUnfree = true;
       };
 
-      homeManagerModule = {
-        home.stateVersion = "24.05";
-      };
+      args = {inherit system pkgs;};
+
+      config = ./config.nix;
     in {
       nixosConfigurations = {
         "hakase" = nixpkgs.lib.nixosSystem {
           inherit system;
           modules = [
+            config
             ./hosts/nixos/my-nixos-desktop/configuration.nix
 
             home-manager.nixosModules.home-manager
             {
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
-              home-manager.users.youruser = homeManagerModule;
-              # home-manager.users.youruser = import ./home/youruser/home.nix;
+              home-manager.users.youruser = import ./home/youruser/home.nix;
             }
           ];
 
-          specialArgs = {
-            inherit self pkgs;
-          };
+          specialArgs = args;
         };
       };
 
@@ -60,11 +62,9 @@
         "kenji" = home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
           modules = [
-            homeManagerModule
+            config
             ./home/kenji/home.nix
           ];
-
-          # specialArgs = { inherit self; };
         };
       };
 
@@ -72,20 +72,10 @@
         "my-macbook-pro" = nix-darwin.lib.darwinSystem {
           inherit system;
           modules = [
-            ./hosts/darwin/my-macbook-pro/configuration.nix
-
-            home-manager.darwinModules.home-manager
-            {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-              home-manager.users.youruser = homeManagerModule;
-              # home-manager.users.youruser = import ./home/youruser/home.nix;
-            }
+            config
+            ./hosts/darwin/macbook-air/configuration.nix
           ];
-
-          specialArgs = {
-            inherit self pkgs;
-          };
+          specialArgs = args;
         };
       };
     });