diff options
| -rw-r--r-- | flake.nix | 12 | ||||
| -rw-r--r-- | hosts/adam/audio.nix (renamed from hosts/desktop/audio.nix) | 0 | ||||
| -rw-r--r-- | hosts/adam/configuration.nix (renamed from hosts/desktop/configuration.nix) | 4 | ||||
| -rw-r--r-- | hosts/adam/hardware-configuration.nix (renamed from hosts/desktop/hardware-configuration.nix) | 0 | ||||
| -rw-r--r-- | hosts/adam/home.nix (renamed from hosts/desktop/home.nix) | 0 | ||||
| -rw-r--r-- | hosts/adam/wooting.nix (renamed from hosts/desktop/wooting.nix) | 0 | ||||
| -rw-r--r-- | hosts/lilith/configuration.nix (renamed from hosts/macbook/configuration.nix) | 4 | ||||
| -rw-r--r-- | hosts/lilith/home.nix (renamed from hosts/macbook/home.nix) | 0 | ||||
| -rw-r--r-- | hosts/sachiel/configuration.nix (renamed from hosts/vps/configuration.nix) | 14 | ||||
| -rw-r--r-- | hosts/sachiel/hardware-configuration.nix (renamed from hosts/vps/hardware-configuration.nix) | 0 |
10 files changed, 22 insertions, 12 deletions
@@ -34,8 +34,8 @@ in { nixosConfigurations = { - desktop = lib.mkSystem { - host = "desktop"; + adam = lib.mkSystem { + host = "adam"; username = "leander"; system = linux-system; overlays = overlays; @@ -44,14 +44,14 @@ inputs.spicetify-nix.homeManagerModules.spicetify ]; }; - vps = lib.mkSystem { - host = "vps"; + sachiel = lib.mkSystem { + host = "sachiel"; username = "administrator"; system = linux-system; }; }; - darwinConfigurations.macbook = lib.mkSystem { - host = "macbook"; + darwinConfigurations.lilith = lib.mkSystem { + host = "lilith"; username = username; system = darwin-system; overlays = overlays; diff --git a/hosts/desktop/audio.nix b/hosts/adam/audio.nix index e34b073..e34b073 100644 --- a/hosts/desktop/audio.nix +++ b/hosts/adam/audio.nix diff --git a/hosts/desktop/configuration.nix b/hosts/adam/configuration.nix index 5d5cb37..5e29cfc 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/adam/configuration.nix @@ -1,4 +1,4 @@ -{ pkgs, username, ... }: +{ pkgs, host, username, ... }: { @@ -29,7 +29,7 @@ # Network networking = { - hostName = "nixos"; + hostName = host; networkmanager.enable = true; }; diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/adam/hardware-configuration.nix index 9338f30..9338f30 100644 --- a/hosts/desktop/hardware-configuration.nix +++ b/hosts/adam/hardware-configuration.nix diff --git a/hosts/desktop/home.nix b/hosts/adam/home.nix index 3e831d8..3e831d8 100644 --- a/hosts/desktop/home.nix +++ b/hosts/adam/home.nix diff --git a/hosts/desktop/wooting.nix b/hosts/adam/wooting.nix index 742ef29..742ef29 100644 --- a/hosts/desktop/wooting.nix +++ b/hosts/adam/wooting.nix diff --git a/hosts/macbook/configuration.nix b/hosts/lilith/configuration.nix index b9d2d02..b43278d 100644 --- a/hosts/macbook/configuration.nix +++ b/hosts/lilith/configuration.nix @@ -1,8 +1,10 @@ -{ username, ... }: +{ host, username, ... }: { users.users.${username}.home = "/Users/${username}"; + networking.hostName = host; + system.primaryUser = username; system.defaults = { dock = { diff --git a/hosts/macbook/home.nix b/hosts/lilith/home.nix index a0d25e4..a0d25e4 100644 --- a/hosts/macbook/home.nix +++ b/hosts/lilith/home.nix diff --git a/hosts/vps/configuration.nix b/hosts/sachiel/configuration.nix index 3811615..781d5c3 100644 --- a/hosts/vps/configuration.nix +++ b/hosts/sachiel/configuration.nix @@ -1,4 +1,9 @@ -{ pkgs, username, ... }: +{ + pkgs, + host, + username, + ... +}: { imports = [ @@ -7,8 +12,11 @@ boot.tmp.cleanOnBoot = true; zramSwap.enable = true; - networking.hostName = "vps"; - networking.domain = "schererleander.de"; + + networking = { + hostName = host; + domain = "schererleander.de"; + }; security.sudo = { enable = true; diff --git a/hosts/vps/hardware-configuration.nix b/hosts/sachiel/hardware-configuration.nix index 68ab0a2..68ab0a2 100644 --- a/hosts/vps/hardware-configuration.nix +++ b/hosts/sachiel/hardware-configuration.nix |