diff --git a/common/config/config.nix b/common/config/config.nix index ce32757..2d445f8 100644 --- a/common/config/config.nix +++ b/common/config/config.nix @@ -18,7 +18,6 @@ in { boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - networking.hostName = "kiana-pc"; # Define your hostname. networking.wireless.enable = true; networking.wireless.networks = { "NETGEAR97".psk = "pastelcello694"; diff --git a/desktop/config/default.nix b/desktop/config/default.nix index a572ca4..3a95fdf 100644 --- a/desktop/config/default.nix +++ b/desktop/config/default.nix @@ -3,4 +3,6 @@ imports = [ ./hardware-configuration.nix ]; + + networking.hostName = "kiana-desktop"; } diff --git a/desktop/home-manager/default.nix b/desktop/home-manager/default.nix index 4b42ce7..d1d344d 100644 --- a/desktop/home-manager/default.nix +++ b/desktop/home-manager/default.nix @@ -1,2 +1,4 @@ { ... }: -{} +{ + imports = [ ../../common/home-manager ]; +} diff --git a/flake.nix b/flake.nix index ad280bb..554a9f1 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ outputs = { self, lib = nixpkgs.lib; in { nixosConfigurations = { - "desktop" = lib.makeOverridable lib.nixosSystem { + "kiana-desktop" = lib.makeOverridable lib.nixosSystem { inherit system; modules = [ { _module.args = moduleArgs; } @@ -35,10 +35,10 @@ outputs = { self, ]; }; - "laptop" = lib.makeOverridable lib.nixosSystem { + "kiana-laptop" = lib.makeOverridable lib.nixosSystem { inherit system; modules = [ - { _module.args = moduleArgs } + { _module.args = moduleArgs; } ./common/config ./laptop/config home-manager.nixosModules.home-manager diff --git a/laptop/config/default.nix b/laptop/config/default.nix index 4b42ce7..e20bc66 100644 --- a/laptop/config/default.nix +++ b/laptop/config/default.nix @@ -1,2 +1,4 @@ { ... }: -{} +{ + networking.hostName = "kiana-laptop"; +} diff --git a/laptop/home-manager/default.nix b/laptop/home-manager/default.nix index 4b42ce7..d1d344d 100644 --- a/laptop/home-manager/default.nix +++ b/laptop/home-manager/default.nix @@ -1,2 +1,4 @@ { ... }: -{} +{ + imports = [ ../../common/home-manager ]; +}