diff --git a/.gitignore b/.gitignore index e69de29..3ff237f 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +hosts/hakase/hardware-configuration.nix diff --git a/flake.nix b/flake.nix index e1694d5..4579153 100644 --- a/flake.nix +++ b/flake.nix @@ -48,20 +48,22 @@ args = mkArgs system; # Use the helper for common args in { nixosConfigurations = { - desktop = lib.nixosSystem { + hakase = lib.nixosSystem { inherit system; specialArgs = args; - modules = []; # Add your NixOS modules here + modules = [./hosts/hakase/configuration.nix]; # Add your NixOS modules here }; }; homeConfigurations = { # Assuming you want home-manager configurations for all default systems - desktop = home-manager.lib.homeManagerConfiguration { + hakase = home-manager.lib.homeManagerConfiguration { pkgs = import nixpkgs { inherit system; extraSpecialArgs = args; }; - modules = []; # Add your Home Manager modules here + modules = [ + ./home/hakase.nix + ]; # Add your Home Manager modules here }; }; } @@ -70,8 +72,6 @@ darwinConfigurations = { macos = darwin.lib.darwinSystem { system = "aarch64-darwin"; - # *** CRITICAL CHANGE HERE *** - # Pass the result of mkArgs, AND the mkArgs function itself specialArgs = (mkArgs "aarch64-darwin") // {inherit mkArgs;}; modules = [ ./hosts/macos/darwin.nix