Tweak recovery iso

flake.nix

@@ -214,12 +214,19 @@
           ];
         };
 
-        # Installer iso
+        # Installer/rescue iso
         iso_x86_64 = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = [
             "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix"
             "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
+            ({ pkgs, lib, config, ... }: {
+              boot.supportedFilesystems = [ "zfs" ];
+              boot.zfs.forceImportRoot = false;
+              # Generated with head -c4 /dev/urandom | od -A none -t x4
+              networking.hostId = "9affdaa4";
+              environment.systemPackages = with pkgs; [ ];
+            })
           ];
         };
       };

home-manager/linux/programs/hyprland.nix

@@ -36,10 +36,10 @@ in with lib; {
       extraConfig = ''
                 # Set environment variables to force wayland
                 env = XCURSOR_SIZE,24
-        env = GDK_BACKEND,wayland,x11
-        env = QT_QPA_PLATFORM,wayland;xcb
-        env = SDL_VIDEODRIVER,wayland
-        env = CLUTTER_BACKEND,wayland
+                # env = GDK_BACKEND,wayland,x11
+                # env = QT_QPA_PLATFORM,wayland;xcb
+                # env = SDL_VIDEODRIVER,wayland
+                # env = CLUTTER_BACKEND,wayland
                 input {
                   kb_layout = us
                   kb_variant =
@@ -273,6 +273,9 @@ in with lib; {
                 # OBS
                 bind = SHIFT, F10, pass,^(com\.obsproject\.Studio)$
                 bind = SHIFT, F11, pass,^(com\.obsproject\.Studio)$
+
+        	# Start polkit agent
+        	exec-once = systemctl --user start plasma-polkit-agent.service
       '';
     };
 

machines/levitation/configuration.nix

@@ -58,21 +58,15 @@ in {
         docker = false;
         podman = true;
       };
-      windows = {
-        enable = false;
-        mount = {
-          device = "/dev/nvme0n1p2";
-          mountPoint = "/mnt/windows";
-          keyFile = config.sops.secrets."windows-bitlocker-key".path;
-        };
-      };
+      windows = { enable = false; };
     };
   };
   # Configure networking
   networking = {
     domain = "mccarty.io";
     useDHCP = true;
-    nat.externalInterface = "enp5s0";
+    interfaces.enp6s0.useDHCP = true;
+    nat.externalInterface = "enp6s0";
     # Open ports for soulseek and weylus
     firewall = {
       allowedTCPPorts = [ 61377 1701 9001 ];
@@ -100,4 +94,10 @@ in {
     enable = true;
     package = unstable.vmware-workstation;
   };
+
+  # ZFS
+  boot.supportedFilesystems = [ "zfs" ];
+  boot.zfs.forceImportRoot = false;
+  # Generated with head -c4 /dev/urandom | od -A none -t x4
+  networking.hostId = "bc94e9d3";
 }

machines/levitation/hardware.nix

@@ -53,18 +53,29 @@
   fileSystems."/home/nathan/Music" = {
     device = "10.0.0.139:/mnt/tank/root/nathan/music";
     fsType = "nfs";
+    options = [ "x-systemd.automount" "noauto" ];
   };
   fileSystems."/mnt/general" = {
     device = "10.0.0.139:/mnt/tank/root/shares/general";
     fsType = "nfs";
+    options = [ "x-systemd.automount" "noauto" ];
   };
   fileSystems."/mnt/archive" = {
     device = "10.0.0.139:/mnt/tank/root/shares/archive";
     fsType = "nfs";
+    options = [ "x-systemd.automount" "noauto" ];
   };
   fileSystems."/mnt/books" = {
     device = "10.0.0.139:/mnt/tank/root/data/books";
     fsType = "nfs";
+    options = [ "x-systemd.automount" "noauto" ];
+  };
+
+  environment.etc.crypttab = {
+    enable = true;
+    text = ''
+      crypt-bigssd UUID=751c00cb-32ed-4aa9-83f6-5d65955480a5 /var/big-ssd-keyfile luks
+    '';
   };
 
   swapDevices = [{

machines/levitation/passthrough.nix

@@ -8,6 +8,9 @@ let
     "10de:1ad9" # Usb ????
   ];
 in {
+  ##
+  ## Kernel configuration
+  ##
   boot = {
     kernelParams = [
       # enable iommu
@@ -19,17 +22,37 @@ in {
     initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ];
   };
 
+  ##
+  ## Virtualization setup
+  ##
   environment.systemPackages = with pkgs; [ looking-glass-client ];
   virtualisation.spiceUSBRedirection.enable = true;
   virtualisation.libvirtd = {
     qemu = {
+      # Enable tpm for windows 11
       swtpm.enable = true;
       ovmf = {
         enable = true;
+        # Needed for secure boot
         packages = [ pkgs.OVMFFull.fd ];
       };
     };
   };
+  # Looking glass shared memory
   systemd.tmpfiles.rules =
     [ "f /dev/shm/looking-glass 0660 nathan qemu-libvirtd -" ];
+
+  ##
+  ## Networking
+  ##
+  # Setup bridge 
+  networking.bridges = { "qemu-br0" = { interfaces = [ "enp6s0" ]; }; };
+  networking.interfaces.qemu-br0 = {
+    ipv4.addresses = [{
+      address = "10.0.0.247";
+      prefixLength = 21;
+    }];
+  };
+  networking.defaultGateway = "10.0.4.1";
+  networking.nameservers = [ "10.0.0.10" ];
 }

modules/linux/hyprland.nix

@@ -23,7 +23,7 @@ in with lib; {
       # Turn on GDM for login
       services.xserver = {
         enable = true;
-        autorun = true;
+        autorun = false;
         # Enable plasma for the applications
         desktopManager.plasma5.enable = true;
         displayManager.defaultSession = "hyprland";