From 4364fb17f10e48c3579c1532c6018cb1ea0c558b Mon Sep 17 00:00:00 2001 From: Don Harper Date: Wed, 20 May 2026 08:04:16 -0500 Subject: [PATCH] task sync changes to all /default.nix --- hosts/ace/default.nix | 15 ++++---------- hosts/book/default.nix | 2 -- hosts/display/default.nix | 1 - hosts/dragon/default.nix | 14 ++++--------- hosts/eve/default.nix | 15 ++++---------- hosts/fred/default.nix | 35 +++++++++++++-------------------- hosts/harper/default.nix | 12 ++---------- hosts/harper2/default.nix | 12 ++---------- hosts/loki/default.nix | 2 -- hosts/nuwww/default.nix | 12 ++---------- hosts/pi1/default.nix | 11 ++--------- hosts/pihole/default.nix | 12 ++---------- hosts/pocket2/default.nix | 21 +++++--------------- hosts/smaug/default.nix | 16 ++++----------- hosts/w1/default.nix | 41 +++++++++++++++------------------------ hosts/w2/default.nix | 40 ++++++++++++++------------------------ hosts/www2/default.nix | 15 ++++++-------- 17 files changed, 81 insertions(+), 195 deletions(-) diff --git a/hosts/ace/default.nix b/hosts/ace/default.nix index 090c9e1..1d25f70 100644 --- a/hosts/ace/default.nix +++ b/hosts/ace/default.nix @@ -1,17 +1,10 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{ inputs, outputs, lib, config, pkgs, ... }: { imports = [ + ../templates/workstation.nix inputs.sops-nix.nixosModules.sops ./hardware-configuration.nix - # ../disko/mmcblk.nix - ../workstation ]; + networking.hostName = "ace"; variables.swayScale = "0.75"; @@ -19,5 +12,5 @@ gui.enable = true; kmscon.enable = true; }; - wm = {sway.enable = true;}; + wm.sway.enable = true; } diff --git a/hosts/book/default.nix b/hosts/book/default.nix index fc7d9e4..5cb3d3f 100644 --- a/hosts/book/default.nix +++ b/hosts/book/default.nix @@ -5,12 +5,10 @@ ./hardware-configuration.nix ]; - # Host-specific configuration networking.hostName = "book"; variables.address = "100.72.121.75"; variables.swayScale = "1.5"; - # Enable roles for this host roles = { gui.enable = true; kmscon.enable = true; diff --git a/hosts/display/default.nix b/hosts/display/default.nix index a81425a..0e19e64 100644 --- a/hosts/display/default.nix +++ b/hosts/display/default.nix @@ -6,7 +6,6 @@ ./kiosk.nix ]; - # Host-specific configuration networking.hostName = "display"; variables.address = "100.72.208.107"; diff --git a/hosts/dragon/default.nix b/hosts/dragon/default.nix index 03b7149..1500efb 100644 --- a/hosts/dragon/default.nix +++ b/hosts/dragon/default.nix @@ -1,17 +1,11 @@ -{ - inputs, - config, - pkgs, - ... -}: { +{ inputs, config, pkgs, ... }: { imports = [ - inputs.sops-nix.nixosModules.sops - ./hardware-configuration.nix + inputs.nixos-hardware.nixosModules.framework-amd-ai-300-series 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 + ./hardware-configuration.nix ]; networking.hostName = "dragon"; variables.swayScale = "1.0"; @@ -21,5 +15,5 @@ kmscon.enable = true; auto-cpufreq.enable = true; }; - wm = {sway.enable = true;}; + wm.sway.enable = true; } diff --git a/hosts/eve/default.nix b/hosts/eve/default.nix index 54bc6a9..5c9705b 100644 --- a/hosts/eve/default.nix +++ b/hosts/eve/default.nix @@ -1,18 +1,11 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{ inputs, outputs, lib, config, pkgs, ... }: { imports = [ + ../templates/workstation.nix inputs.nixos-hardware.nixosModules.google-pixelbook inputs.sops-nix.nixosModules.sops ./hardware-configuration.nix - # ../disko/mmcblk.nix - ../workstation ]; + networking.hostName = "eve"; variables.swayScale = "1.5"; @@ -22,5 +15,5 @@ kmscon.enable = true; auto-cpufreq.enable = true; }; - wm = {sway.enable = true;}; + wm.sway.enable = true; } diff --git a/hosts/fred/default.nix b/hosts/fred/default.nix index eef7a6f..91e0629 100644 --- a/hosts/fred/default.nix +++ b/hosts/fred/default.nix @@ -1,31 +1,22 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{ inputs, outputs, lib, config, pkgs, ... }: { imports = [ - inputs.sops-nix.nixosModules.sops + ../templates/server.nix ./hardware-configuration.nix - ../server ./docker.nix - # ./podman.nix - # ../server/unifi.nix ]; + networking.hostName = "fred"; variables.address = "100.72.236.170"; - boot = { - binfmt.emulatedSystems = lib.optionals (pkgs.stdenv.hostPlatform.system != "aarch64-linux") [ "aarch64-linux" ]; - loader = { - systemd-boot = {enable = true;}; - efi = { - canTouchEfiVariables = true; - efiSysMountPoint = "/boot"; - }; - }; - }; + # boot = { + # binfmt.emulatedSystems = lib.optionals (pkgs.stdenv.hostPlatform.system != "aarch64-linux") [ "aarch64-linux" ]; + # loader = { + # systemd-boot = {enable = true;}; + # efi = { + # canTouchEfiVariables = true; + # efiSysMountPoint = "/boot"; + # }; + # }; + # }; primary.enable = true; } diff --git a/hosts/harper/default.nix b/hosts/harper/default.nix index 541f633..5ddcd92 100644 --- a/hosts/harper/default.nix +++ b/hosts/harper/default.nix @@ -1,15 +1,7 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{ inputs, outputs, lib, config, pkgs, ... }: { imports = [ - inputs.sops-nix.nixosModules.sops + ../templates/server.nix ./hardware-configuration.nix - ../server ]; networking.hostName = "harper"; variables.address = "100.72.0.3"; diff --git a/hosts/harper2/default.nix b/hosts/harper2/default.nix index 31ea45b..2045a87 100644 --- a/hosts/harper2/default.nix +++ b/hosts/harper2/default.nix @@ -1,15 +1,7 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{ inputs, outputs, lib, config, pkgs, ... }: { imports = [ - inputs.sops-nix.nixosModules.sops + ../templates/server.nix ./hardware-configuration.nix - ../server ]; networking.hostName = "harper2"; variables.address = "100.72.0.4"; diff --git a/hosts/loki/default.nix b/hosts/loki/default.nix index accec6c..08a7b61 100644 --- a/hosts/loki/default.nix +++ b/hosts/loki/default.nix @@ -5,12 +5,10 @@ ./hardware-configuration.nix ]; - # Host-specific configuration networking.hostName = "loki"; variables.address = "100.72.0.1"; variables.swayScale = "1.2"; - # Enable roles for this host roles = { citrix.enable = true; zoom.enable = true; diff --git a/hosts/nuwww/default.nix b/hosts/nuwww/default.nix index d937c37..4406de5 100644 --- a/hosts/nuwww/default.nix +++ b/hosts/nuwww/default.nix @@ -1,15 +1,7 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{ inputs, outputs, lib, config, pkgs, ... }: { imports = [ - inputs.sops-nix.nixosModules.sops + ../templates/server.nix ./hardware-configuration.nix - ../server ]; networking.hostName = "nuwww"; variables.address = "100.72.2.1"; diff --git a/hosts/pi1/default.nix b/hosts/pi1/default.nix index f6dc824..f8707df 100644 --- a/hosts/pi1/default.nix +++ b/hosts/pi1/default.nix @@ -1,13 +1,6 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{ inputs, outputs, lib, config, pkgs, ... }: { imports = [ - inputs.sops-nix.nixosModules.sops + ../templates/server.nix ./hardware-configuration.nix ../pi-server ./kiosk.nix diff --git a/hosts/pihole/default.nix b/hosts/pihole/default.nix index 10b0b41..ce3506a 100644 --- a/hosts/pihole/default.nix +++ b/hosts/pihole/default.nix @@ -1,15 +1,7 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{ inputs, outputs, lib, config, pkgs, ... }: { imports = [ - inputs.sops-nix.nixosModules.sops + ../templates/server.nix ./hardware-configuration.nix - ../server ]; networking.hostName = "pihole"; } diff --git a/hosts/pocket2/default.nix b/hosts/pocket2/default.nix index fef4063..7b731ed 100644 --- a/hosts/pocket2/default.nix +++ b/hosts/pocket2/default.nix @@ -1,32 +1,21 @@ -{ - inputs, - outputs, - libs, - config, - pkgs, - ... -}: { +{ inputs, outputs, libs, config, pkgs, ... }: { imports = [ - inputs.sops-nix.nixosModules.sops - ./hardware-configuration.nix + ../templates/workstation.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 - ../workstation + ./hardware-configuration.nix ]; + networking.hostName = "pocket2"; variables.address = "192.168.1.12"; variables.swayScale = "1.7"; roles = { - citrix.enable = false; - zoom.enable = false; gui.enable = true; kmscon.enable = true; - games.enable = false; - auto-cpufreq.enable = false; gnome-calendar.enable = true; }; - wm = {sway.enable = true;}; + wm.sway.enable = true; } diff --git a/hosts/smaug/default.nix b/hosts/smaug/default.nix index 1bda0c8..c6bafd4 100644 --- a/hosts/smaug/default.nix +++ b/hosts/smaug/default.nix @@ -1,20 +1,13 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{ inputs, outputs, lib, config, pkgs, ... }: { imports = [ + ../templates/workstation.nix inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x260 inputs.nixos-hardware.nixosModules.common-pc-laptop inputs.nixos-hardware.nixosModules.common-pc-ssd inputs.sops-nix.nixosModules.sops ./hardware-configuration.nix - # ../disko/sda.nix - ../workstation ]; + networking.hostName = "smaug"; variables.address = "100.72.248.81"; variables.swayScale = "0.75"; @@ -22,8 +15,7 @@ roles = { gui.enable = true; kmscon.enable = true; - auto-cpufreq.enable = true; gnome-calendar.enable = true; }; - wm = {sway.enable = true;}; + wm.sway.enable = true; } diff --git a/hosts/w1/default.nix b/hosts/w1/default.nix index 2347dfb..9b3c49c 100644 --- a/hosts/w1/default.nix +++ b/hosts/w1/default.nix @@ -1,32 +1,23 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{ inputs, outputs, lib, config, pkgs, ... }: { imports = [ - inputs.sops-nix.nixosModules.sops + ../templates/server.nix ./hardware-configuration.nix - ./network.nix - ../server ./podman.nix - # ../server/searxng.nix ]; + networking.hostName = "w1"; variables.address = "100.72.16.240"; - boot = { - initrd = { - availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; - kernelModules = ["nvme"]; - }; - loader = { - grub = { - enable = true; - device = "/dev/sda"; - efiSupport = false; - }; - }; - }; + # boot = { + # initrd = { + # availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; + # kernelModules = ["nvme"]; + # }; + # loader = { + # grub = { + # enable = true; + # device = "/dev/sda"; + # efiSupport = false; + # }; + # }; + # }; } diff --git a/hosts/w2/default.nix b/hosts/w2/default.nix index 56b798d..254c8b4 100644 --- a/hosts/w2/default.nix +++ b/hosts/w2/default.nix @@ -1,30 +1,20 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{ inputs, outputs, lib, config, pkgs, ... }: { imports = [ - inputs.sops-nix.nixosModules.sops + ../templates/server.nix ./hardware-configuration.nix - ./network.nix - ../server - # ../server/searxng.nix ]; networking.hostName = "w1"; - boot = { - initrd = { - availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; - kernelModules = ["nvme"]; - }; - loader = { - grub = { - enable = true; - device = "/dev/sda"; - efiSupport = false; - }; - }; - }; + # boot = { + # initrd = { + # availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; + # kernelModules = ["nvme"]; + # }; + # loader = { + # grub = { + # enable = true; + # device = "/dev/sda"; + # efiSupport = false; + # }; + # }; + # }; } diff --git a/hosts/www2/default.nix b/hosts/www2/default.nix index 84bde36..dc8e403 100644 --- a/hosts/www2/default.nix +++ b/hosts/www2/default.nix @@ -1,11 +1,8 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { - imports = [inputs.sops-nix.nixosModules.sops ./hardware-configuration.nix ../server]; +{ inputs, outputs, lib, config, pkgs, ... }: { + imports = [ + ../templates/server.nix + ./hardware-configuration.nix + ]; + networking.hostName = "www2"; }