diff options
| author | Skullheadx <andrew.montgomery@warpengine.ai> | 2026-06-29 14:38:08 -0400 |
|---|---|---|
| committer | Skullheadx <andrew.montgomery@warpengine.ai> | 2026-06-29 14:38:08 -0400 |
| commit | a00086f63df186181c254a164c77b974cc7a5c7c (patch) | |
| tree | f7d6ac98ab49166250a1635059ae032b3719a5be /hosts | |
| parent | remove work legacy, move more pkgs to common for darwin (diff) | |
| download | nixos-a00086f63df186181c254a164c77b974cc7a5c7c.tar.gz nixos-a00086f63df186181c254a164c77b974cc7a5c7c.tar.bz2 nixos-a00086f63df186181c254a164c77b974cc7a5c7c.zip | |
DRY for username
Diffstat (limited to '')
| -rw-r--r-- | hosts/bear/configuration.nix | 9 | ||||
| -rw-r--r-- | hosts/icon/configuration.nix | 3 | ||||
| -rw-r--r-- | hosts/kenosis/configuration.nix | 8 | ||||
| -rw-r--r-- | hosts/kenosis/legacy.nix | 3 | ||||
| -rw-r--r-- | hosts/nepsis/configuration.nix | 2 |
5 files changed, 17 insertions, 8 deletions
diff --git a/hosts/bear/configuration.nix b/hosts/bear/configuration.nix index dc96c7a..7b0eed3 100644 --- a/hosts/bear/configuration.nix +++ b/hosts/bear/configuration.nix @@ -3,15 +3,20 @@ pkgs, inputs, nvim, + username, ... }: { + imports = [ + ./../../hjem-darwin.nix + ]; + networking = { computerName = "bear"; hostName = "bear"; localHostName = "bear"; }; # Primary user for user-specific settings (dock, etc.) - system.primaryUser = "andrewmontgomery"; + system.primaryUser = username; # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget environment.systemPackages = with pkgs; [ @@ -70,7 +75,7 @@ homebrew = { enable = true; - user = "andrewmontgomery"; + user = username; taps = [ ]; diff --git a/hosts/icon/configuration.nix b/hosts/icon/configuration.nix index 62c5bb8..f47a87f 100644 --- a/hosts/icon/configuration.nix +++ b/hosts/icon/configuration.nix @@ -2,6 +2,7 @@ config, pkgs, inputs, + username, ... }: { imports = [ @@ -63,7 +64,7 @@ # systemd.services.fcgiwrap.serviceConfig.ReadOnlyPaths = ["/srv/git"]; # Define a user account. Don't forget to set a password with ‘passwd’. users.users = { - andrew = { + ${username} = { isNormalUser = true; extraGroups = [ diff --git a/hosts/kenosis/configuration.nix b/hosts/kenosis/configuration.nix index be792e9..68498c5 100644 --- a/hosts/kenosis/configuration.nix +++ b/hosts/kenosis/configuration.nix @@ -3,10 +3,12 @@ pkgs, inputs, nvim, + username, ... }: { imports = [ # ./legacy.nix + ./../../hjem-darwin.nix ]; networking = { @@ -15,7 +17,7 @@ localHostName = "kenosis"; }; # Primary user for user-specific settings (dock, etc.) - system.primaryUser = "andrew"; + system.primaryUser = username; # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget environment.systemPackages = with pkgs; [ @@ -48,7 +50,7 @@ homebrew = { enable = true; - user = "andrew"; + user = username; taps = [ ]; @@ -61,7 +63,7 @@ "firefox" "chatgpt" "capcut" - "docker" + "docker-desktop" "musicbrainz-picard" "gimp" ]; diff --git a/hosts/kenosis/legacy.nix b/hosts/kenosis/legacy.nix index 5d3ed93..9058952 100644 --- a/hosts/kenosis/legacy.nix +++ b/hosts/kenosis/legacy.nix @@ -1,6 +1,7 @@ { config, pkgs, + username, ... }: { environment.systemPackages = with pkgs; [ @@ -14,7 +15,7 @@ homebrew = { enable = true; - user = "andrew"; + user = username; taps = [ ]; diff --git a/hosts/nepsis/configuration.nix b/hosts/nepsis/configuration.nix index 0cf4c69..c7ef1f0 100644 --- a/hosts/nepsis/configuration.nix +++ b/hosts/nepsis/configuration.nix @@ -8,7 +8,7 @@ ./hardware-configuration.nix ./../../lockscreen.nix ./../../x11.nix - ./../../hjem.nix + ./../../hjem-linux.nix ./../../audio.nix ./../../vim.nix ]; |