task sync changes to all <host>/default.nix

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;
 }

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;

hosts/display/default.nix

@@ -6,7 +6,6 @@
     ./kiosk.nix
   ];
 
-  # Host-specific configuration
   networking.hostName = "display";
   variables.address = "100.72.208.107";
 

hosts/dragon/default.nix

@@ -1,17 +1,11 @@
-{
+{ inputs, config, pkgs, ... }: {
-  inputs,
-  config,
-  pkgs,
-  ...
-}: {
   imports = [
-    inputs.sops-nix.nixosModules.sops
+    inputs.nixos-hardware.nixosModules.framework-amd-ai-300-series
-    ./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
-    ../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;
 }

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;
 }

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 = {
+  # boot = {
-    binfmt.emulatedSystems = lib.optionals (pkgs.stdenv.hostPlatform.system != "aarch64-linux") [ "aarch64-linux" ];
+  #   binfmt.emulatedSystems = lib.optionals (pkgs.stdenv.hostPlatform.system != "aarch64-linux") [ "aarch64-linux" ];
-    loader = {
+  #   loader = {
-      systemd-boot = {enable = true;};
+  #     systemd-boot = {enable = true;};
-      efi = {
+  #     efi = {
-        canTouchEfiVariables = true;
+  #       canTouchEfiVariables = true;
-        efiSysMountPoint = "/boot";
+  #       efiSysMountPoint = "/boot";
-      };
+  #     };
-    };
+  #   };
-  };
+  # };
 
   primary.enable = true;
 }

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";

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";

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;

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";

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

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";
 }

hosts/pocket2/default.nix

@@ -1,32 +1,21 @@
-{
+{ inputs, outputs, libs, config, pkgs, ... }: {
-  inputs,
-  outputs,
-  libs,
-  config,
-  pkgs,
-  ...
-}: {
   imports = [
-    inputs.sops-nix.nixosModules.sops
+    ../templates/workstation.nix
-    ./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
-    ../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;
 }

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;
 }

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 = {
+  # boot = {
-    initrd = {
+  #   initrd = {
-      availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"];
+  #     availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"];
-      kernelModules = ["nvme"];
+  #     kernelModules = ["nvme"];
-    };
+  #   };
-    loader = {
+  #   loader = {
-      grub = {
+  #     grub = {
-        enable = true;
+  #       enable = true;
-        device = "/dev/sda";
+  #       device = "/dev/sda";
-        efiSupport = false;
+  #       efiSupport = false;
-      };
+  #     };
-    };
+  #   };
-  };
+  # };
 }

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 = {
+  # boot = {
-    initrd = {
+  #   initrd = {
-      availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"];
+  #     availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"];
-      kernelModules = ["nvme"];
+  #     kernelModules = ["nvme"];
-    };
+  #   };
-    loader = {
+  #   loader = {
-      grub = {
+  #     grub = {
-        enable = true;
+  #       enable = true;
-        device = "/dev/sda";
+  #       device = "/dev/sda";
-        efiSupport = false;
+  #       efiSupport = false;
-      };
+  #     };
-    };
+  #   };
-  };
+  # };
 }

hosts/www2/default.nix

@@ -1,11 +1,8 @@
-{
+{ inputs, outputs, lib, config, pkgs, ... }: {
-  inputs,
+  imports = [
-  outputs,
+    ../templates/server.nix
-  lib,
+    ./hardware-configuration.nix
-  config,
+  ];
-  pkgs,
+
-  ...
-}: {
-  imports = [inputs.sops-nix.nixosModules.sops ./hardware-configuration.nix ../server];
   networking.hostName = "www2";
 }