diff --git a/flake.nix b/flake.nix index f0a9634..70c4562 100644 --- a/flake.nix +++ b/flake.nix @@ -12,28 +12,27 @@ outputs = { nixpkgs, home-manager, ... }@inputs: { nixosConfigurations = { - "um790-nix" = nixpkgs.lib.nixosSystem { + "eris" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ - ./configuration.nix + ./hosts/eris/configuration.nix ]; }; }; homeConfigurations = { - "origami@um790-nix" = home-manager.lib.homeManagerConfiguration { + "origami@eris" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; - modules = [ ./home/um790.nix ]; + modules = [ ./home/hosts/eris.nix ]; extraSpecialArgs = { inherit inputs; }; }; "origami@metis" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; - modules = [ ./home/metis.nix ]; + modules = [ ./home/hosts/metis.nix ]; extraSpecialArgs = { inherit inputs; }; }; }; }; } - diff --git a/home/um790.nix b/home/hosts/eris.nix similarity index 100% rename from home/um790.nix rename to home/hosts/eris.nix diff --git a/home/metis.nix b/home/hosts/metis.nix similarity index 100% rename from home/metis.nix rename to home/hosts/metis.nix diff --git a/home/modules/shell.nix b/home/modules/shell.nix index 0a750c0..a3c7fbf 100644 --- a/home/modules/shell.nix +++ b/home/modules/shell.nix @@ -60,7 +60,7 @@ "cloc" = "scc"; "cat" = "bat"; "x" = "atool -x"; - "flake-update" = "nixos-rebuild switch --use-remote-sudo --flake ${config.home.homeDirectory}/flakes#um790-nix"; + "flake-update" = "nixos-rebuild switch --use-remote-sudo --flake ${config.home.homeDirectory}/flakes#eris"; "cl" = "clear"; }; }; diff --git a/configuration.nix b/hosts/eris/configuration.nix similarity index 99% rename from configuration.nix rename to hosts/eris/configuration.nix index b64cdea..e9d1105 100644 --- a/configuration.nix +++ b/hosts/eris/configuration.nix @@ -26,7 +26,7 @@ }; }; - networking.hostName = "um790-nix"; + networking.hostName = "eris"; networking.networkmanager.enable = true; time.timeZone = "Asia/Shanghai"; @@ -173,4 +173,3 @@ system.stateVersion = "23.11"; } - diff --git a/hardware-configuration.nix b/hosts/eris/hardware-configuration.nix similarity index 100% rename from hardware-configuration.nix rename to hosts/eris/hardware-configuration.nix