Add Hyprland, attempt generalization

hosts/extern/default.nix

@@ -6,11 +6,13 @@
     ./filesystems
     ./hardware
     ./modules
+    ./users
     ../../modules/system
   ];
 
   system.wireguard.client.enable = true;
   networking.wireguard.interfaces.wgc.ips = [ "10.100.0.21/24" ];
 
+  system.stateVersion = "24.11";
   networking.hostName = "extern";
 }

hosts/extern/users/default.nix

@@ -0,0 +1,4 @@
+{ ... }:
+{
+  imports = [ ./jimbo ];
+}

hosts/extern/users/jimbo/default.nix

@@ -0,0 +1,6 @@
+{ ... }:
+{
+  home-manager.users.jimbo = {
+    home.stateVersion = "24.11";
+  };
+}

hosts/jupiter/boot/default.nix

@@ -1,44 +0,0 @@
-{ config, pkgs, ... }:
-{
-  boot = {
-    kernelPackages = pkgs.unstable.linuxPackages_latest;
-    kernel.sysctl."vm.max_map_count" = 2147483642;
-    kernelParams = [
-      "amd_iommu=on"
-      "iommu=pt"
-      "nested=1"
-      "transparent_hugepage=never"
-    ];
-
-    initrd.systemd = {
-      enable = true;
-      services.root-reset = {
-        description = "Reset root and snapshot last boot";
-        wantedBy = [ "initrd.target" ];
-        before = [ "sysroot.mount" ];
-        after = [ "dev-${config.networking.hostName}-root.device" ];
-        unitConfig.DefaultDependencies = "no";
-        serviceConfig.Type = "oneshot";
-        script = ''
-          mkdir -p /mnt
-          mount /dev/${config.networking.hostName}/root /mnt
-
-          if [[ -e /mnt/prev ]]; then
-            btrfs subvolume delete /mnt/prev
-          fi
-
-          btrfs subvolume snapshot /mnt/root /mnt/prev
-
-          btrfs subvolume list -o /mnt/root | cut -f9 -d' ' | while read subvolume; do
-            btrfs subvolume delete "/mnt/$subvolume"
-          done
-
-          btrfs subvolume delete /mnt/root
-          btrfs subvolume create /mnt/root
-
-          umount /mnt
-        '';
-      };
-    };
-  };
-}

hosts/jupiter/default.nix

@@ -1,16 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./boot
-    ./disko
-    ./filesystems
-    ./hardware
-    ./wireguard
-    ../../modules/system
-  ];
-
-  system.lanzaboote.enable = true;
-  system.libvirtd.enable = true;
-
-  networking.hostName = "jupiter";
-}

hosts/jupiter/disko/default.nix

@@ -1,97 +0,0 @@
-{ disko, config, ... }:
-{
-  imports = [ disko.nixosModules.disko ];
-
-  disko.devices = {
-    disk = {
-      "${config.networking.hostName}" = {
-        type = "disk";
-        device = "/dev/nvme0n1";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              priority = 1;
-              size = "2G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
-            };
-            luks = {
-              size = "100%";
-              content = {
-                type = "luks";
-                name = "${config.networking.hostName}-disk";
-                settings.allowDiscards = true;
-                passwordFile = "/tmp/secret.key";
-                content = {
-                  type = "lvm_pv";
-                  vg = "${config.networking.hostName}";
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-
-    lvm_vg = {
-      "${config.networking.hostName}" = {
-        type = "lvm_vg";
-        lvs = {
-          root = {
-            size = "100%";
-            content = {
-              type = "btrfs";
-              extraArgs = [ "-f" ];
-              subvolumes = {
-                "/root" = {
-                  mountpoint = "/";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" ];
-                };
-                "/prev" = {
-                  mountpoint = "/prev";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" ];
-                };
-                "/nix" = {
-                  mountpoint = "/nix";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" ];
-                };
-
-                # Impermanence
-                "/persist" = {
-                  mountpoint = "/persist";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" ];
-                };
-                "/persist/.snapshots" = { };
-
-                "/jimbo" = {
-                  mountpoint = "/persist/home/jimbo";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" ];
-                };
-                "/jimbo/.snapshots" = { };
-              };
-            };
-          };
-          swap = {
-            size = "8G";
-            content = {
-              type = "swap";
-              discardPolicy = "both";
-            };
-          };
-        };
-      };
-    };
-  };
-
-  # Needed for impermanence
-  fileSystems = {
-    "/persist".neededForBoot = true;
-    "/persist/home/jimbo".neededForBoot = true;
-  };
-}

hosts/jupiter/filesystems/default.nix

@@ -1,11 +0,0 @@
-{ ... }:
-{
-  fileSystems = {
-    # Remote
-    "/home/jimbo/JimboNFS" = {
-      device = "10.100.0.1:/export/JimboNFS";
-      fsType = "nfs4";
-      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
-    };
-  };
-}

hosts/jupiter/hardware/default.nix

@@ -1,17 +0,0 @@
-{ config, lib, ... }:
-
-{
-  boot.initrd.availableKernelModules = [
-    "nvme"
-    "xhci_pci"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-    "sdhci_pci"
-  ];
-  boot.kernelModules = [ "kvm-amd" ];
-
-  networking.useDHCP = lib.mkDefault true;
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

hosts/jupiter/wireguard/default.nix

@@ -1,23 +0,0 @@
-{ lib, config, ... }:
-{
-  networking = {
-    firewall = {
-      allowedUDPPorts = [ 51820 ];
-      trustedInterfaces = [ "wgc" ];
-    };
-
-    wireguard.interfaces.wgc = {
-      ips = [ "10.100.0.21/24" ];
-      listenPort = 51820;
-      privateKey = config.secrets.wgClientPriv;
-      peers = [
-        { # Cyberspark Server
-          publicKey = "qnOT/lXOJMaQgDUdXpyfGZB2IEyUouRje2m/bCe9ux8=";
-          allowedIPs = [ "10.100.0.0/24" ];
-          endpoint = "sv.${config.domains.jim1}:51820";
-          persistentKeepalive = 25;
-        }
-      ];
-    };
-  };
-}

hosts/tower/default.nix

@@ -15,8 +15,6 @@
   system.video.nvidia.enable = true;
   system.libvirtd.enable = true;
 
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
-
   networking.hostName = "tower";
   system.stateVersion = "24.05";
 }

hosts/tower/users/jimbo/default.nix

@@ -1,6 +1,6 @@
-{ ... }:
+{ lib, ... }:
 {
   home-manager.users.jimbo = {
-    home.stateVersion = "24.05";
+    home.stateVersion = lib.mkForce "24.05";
   };
 }