From 0ff839f6b676b31e7c18280ecb611bd15b3223b0 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Wed, 3 Apr 2024 16:42:44 -0500 Subject: [PATCH] adding homemanger to all hosts, homemanager gui to all workstations --- hosts/ace/default.nix | 2 -- hosts/display/default.nix | 1 - hosts/dragon/default.nix | 10 ++++------ hosts/eve/default.nix | 2 -- hosts/harper/default.nix | 1 - hosts/harper2/default.nix | 1 - hosts/loki/default.nix | 2 -- hosts/nuwww/default.nix | 1 - hosts/pihole/default.nix | 1 - hosts/pocket2/default.nix | 2 -- hosts/server/default.nix | 1 + hosts/smaug/default.nix | 2 -- hosts/t2/default.nix | 2 -- hosts/workstation/default.nix | 2 ++ hosts/www2/default.nix | 1 - 15 files changed, 7 insertions(+), 24 deletions(-) diff --git a/hosts/ace/default.nix b/hosts/ace/default.nix index 162fe4c..912b6f7 100644 --- a/hosts/ace/default.nix +++ b/hosts/ace/default.nix @@ -5,8 +5,6 @@ [ ./hardware-configuration.nix ../workstation - ../../home - ../../home/gui ../wm ]; networking.hostName = "ace"; diff --git a/hosts/display/default.nix b/hosts/display/default.nix index f0acbde..0e4b42a 100644 --- a/hosts/display/default.nix +++ b/hosts/display/default.nix @@ -5,7 +5,6 @@ [ ./hardware-configuration.nix ../../server - ../../home ]; networking.hostName = "display"; } diff --git a/hosts/dragon/default.nix b/hosts/dragon/default.nix index e15321b..127b887 100644 --- a/hosts/dragon/default.nix +++ b/hosts/dragon/default.nix @@ -4,13 +4,11 @@ imports = [ ./hardware-configuration.nix - #inputs.nixos-hardware.nixosModules.common-cpu-intel - #inputs.nixos-hardware.nixosModules.common-gpu-intel - #inputs.nixos-hardware.nixosModules.common-pc-laptop - #inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd + inputs.nixos-hardware.nixosModules.common-cpu-intel + inputs.nixos-hardware.nixosModules.common-gpu-intel + inputs.nixos-hardware.nixosModules.common-pc-laptop + inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd ../workstation - ../../home - ../../home/gui ../wm ]; networking.hostName = "dragon"; diff --git a/hosts/eve/default.nix b/hosts/eve/default.nix index e9c909e..f122bcb 100644 --- a/hosts/eve/default.nix +++ b/hosts/eve/default.nix @@ -5,8 +5,6 @@ [ ./hardware-configuration.nix ../workstation - ../../home - ../../home/gui ../wm ]; networking.hostName = "eve"; diff --git a/hosts/harper/default.nix b/hosts/harper/default.nix index 8cd08cc..76f187a 100644 --- a/hosts/harper/default.nix +++ b/hosts/harper/default.nix @@ -5,7 +5,6 @@ [ ./hardware-configuration.nix ../../server - ../../home ]; networking.hostName = "harper"; } diff --git a/hosts/harper2/default.nix b/hosts/harper2/default.nix index 8286c1f..8943dab 100644 --- a/hosts/harper2/default.nix +++ b/hosts/harper2/default.nix @@ -5,7 +5,6 @@ [ ./hardware-configuration.nix ../../server - ../../home ]; networking.hostName = "harper2"; } diff --git a/hosts/loki/default.nix b/hosts/loki/default.nix index c34d83c..c1378c2 100644 --- a/hosts/loki/default.nix +++ b/hosts/loki/default.nix @@ -6,8 +6,6 @@ ./hardware-configuration.nix ../workstation ../workstation/kvm.nix - ../../home - ../../home/gui ../wm ]; networking.hostName = "loki"; diff --git a/hosts/nuwww/default.nix b/hosts/nuwww/default.nix index 3cc444f..c7853b3 100644 --- a/hosts/nuwww/default.nix +++ b/hosts/nuwww/default.nix @@ -5,7 +5,6 @@ [ ./hardware-configuration.nix ../../server - ../../home ]; networking.hostName = "nuwww"; } diff --git a/hosts/pihole/default.nix b/hosts/pihole/default.nix index 6bbd8e1..f8716f7 100644 --- a/hosts/pihole/default.nix +++ b/hosts/pihole/default.nix @@ -5,7 +5,6 @@ [ ./hardware-configuration.nix ../../server - ../../home ]; networking.hostName = "pihole"; } diff --git a/hosts/pocket2/default.nix b/hosts/pocket2/default.nix index 401d31f..98277af 100644 --- a/hosts/pocket2/default.nix +++ b/hosts/pocket2/default.nix @@ -9,8 +9,6 @@ inputs.nixos-hardware.nixosModules.common-pc-laptop inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd ../workstation - ../../home - ../../home/gui ../wm ]; networking.hostName = "pocket2"; diff --git a/hosts/server/default.nix b/hosts/server/default.nix index 1dff141..6d0bd11 100644 --- a/hosts/server/default.nix +++ b/hosts/server/default.nix @@ -26,6 +26,7 @@ in }; imports = [ + ../../home ./systemd.nix ./tailscale.nix ./upgrade-diff.nix diff --git a/hosts/smaug/default.nix b/hosts/smaug/default.nix index 5bafa81..82146bf 100644 --- a/hosts/smaug/default.nix +++ b/hosts/smaug/default.nix @@ -5,8 +5,6 @@ [ ./hardware-configuration.nix ../workstation - ../../home - ../../home/gui ../wm ]; networking.hostName = "smaug"; diff --git a/hosts/t2/default.nix b/hosts/t2/default.nix index 49dfa5e..f783fa1 100644 --- a/hosts/t2/default.nix +++ b/hosts/t2/default.nix @@ -5,8 +5,6 @@ [ ./hardware-configuration.nix ../workstation - ../../home - ../../home/gui ../wm ]; networking.hostName = "t2"; diff --git a/hosts/workstation/default.nix b/hosts/workstation/default.nix index 4a8aaf0..d5ebcb9 100644 --- a/hosts/workstation/default.nix +++ b/hosts/workstation/default.nix @@ -26,6 +26,8 @@ in }; imports = [ + ../../home + ../../home/gui ./detect-reboot-needed.nix ./systemd.nix ./tailscale.nix diff --git a/hosts/www2/default.nix b/hosts/www2/default.nix index 7568efe..617a14b 100644 --- a/hosts/www2/default.nix +++ b/hosts/www2/default.nix @@ -5,7 +5,6 @@ [ ./hardware-configuration.nix ../../server - ../../home ]; networking.hostName = "www2"; }