Modify like, basically everything idk, probably a lot of secrets and url names and colmena and whatnot

hosts/flight/boot/default.nix

@@ -1,8 +1,11 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 {
   boot = {
-    kernelPackages = pkgs.linuxPackages_latest;
-    loader.grub.enable = true;
+    kernelPackages = pkgs.linuxPackages;
+    loader.limine = {
+      enable = true;
+      biosDevice = lib.mkForce "/dev/disk/by-id/ata-XSTAR_SSD_64GB_XSFA2011000462";
+    };
     plymouth.enable = true;
   };
 }

hosts/flight/default.nix

@@ -2,10 +2,9 @@
 {
   imports = [
     ./boot
-    ./disko
     ./filesystems
     ./hardware
-    ./services
+    ./root
     ./user
   ];
 
@@ -14,5 +13,5 @@
     stateVersion = "25.05";
   };
 
-  deployment.targetHost = "";
+  deployment.targetHost = "409:b2b1:966c:b13:6d67:2d6b:45e2:f048";
 }

hosts/flight/disko/default.nix

@@ -1,106 +0,0 @@
-{ config, disko, ... }:
-{
-  imports = [ disko.nixosModules.disko ];
-
-  disko.devices = {
-    disk = {
-      "${config.networking.hostName}" = {
-        type = "disk";
-        device = "/dev/sda";
-        content = {
-          type = "gpt";
-          partitions = {
-            boot = {
-              size = "1M";
-              type = "EF02";
-            };
-            ESP = {
-              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"
-                    "ssd"
-                  ];
-                };
-                "/prev" = {
-                  mountpoint = "/prev";
-                  mountOptions = [
-                    "compress=zstd"
-                    "noexec"
-                    "ssd"
-                  ];
-                };
-                "/nix" = {
-                  mountpoint = "/nix";
-                  mountOptions = [
-                    "compress=zstd"
-                    "ssd"
-                  ];
-                };
-
-                # Impermanence
-                "/persist" = {
-                  mountpoint = "/persist";
-                  mountOptions = [
-                    "compress=zstd"
-                    "ssd"
-                  ];
-                };
-                "/persist/.snapshots" = { };
-                "/persist/home" = { };
-                "/persist/home/.snapshots" = { };
-              };
-            };
-          };
-          swap = {
-            size = "8G";
-            content = {
-              type = "swap";
-              discardPolicy = "both";
-            };
-          };
-        };
-      };
-    };
-  };
-
-  # Needed for impermanence
-  fileSystems."/persist".neededForBoot = true;
-}

hosts/flight/filesystems/default.nix

@@ -2,7 +2,7 @@
 {
   fileSystems = {
     "/persist/storage" = {
-      device = "/dev/disk/by-uuid/d0d6783f-ad51-4d85-b8a9-3374f6460ef6";
+      device = "/dev/disk/by-uuid/3d6f81f2-7fa5-40a2-85bb-56f4cab63773";
       fsType = "btrfs";
       options = [
         "nofail"

hosts/flight/hardware/default.nix

@@ -1,22 +1,35 @@
-{ modulesPath, ... }:
+{ config, modulesPath, ... }:
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot = {
     initrd = {
       availableKernelModules = [
-        "ahci"
         "ehci_pci"
+        "ahci"
+        "xhci_pci"
+        "usb_storage"
         "sd_mod"
         "sr_mod"
-        "xhci_pci"
       ];
       kernelModules = [ "dm-snapshot" ];
     };
     kernelModules = [ "kvm-intel" ];
   };
 
-  hardware.cpu.intel.updateMicrocode = true;
+  services.xserver.videoDrivers = [ "nvidia" ];
+
+  hardware = {
+    cpu.intel.updateMicrocode = true;
+    nvidia = {
+      package = config.boot.kernelPackages.nvidiaPackages.legacy_390;
+      prime = {
+        sync.enable = true;
+        intelBusId = "PCI:0:2:0";
+        nvidiaBusId = "PCI:1:0:0";
+      };
+    };
+  };
 
   nixpkgs.hostPlatform = "x86_64-linux";
 }

hosts/flight/root/default.nix

@@ -0,0 +1,54 @@
+{ config, name, ... }:
+{
+  boot.initrd.luks.devices."${name}-disk".device = "/dev/disk/by-uuid/0fc43c11-c382-4e37-812b-8866b1b20e68";
+
+  fileSystems = {
+    "/boot" = {
+      device = "/dev/disk/by-uuid/FA96-EF11";
+      fsType = "vfat";
+      options = [ "umask=0077" ];
+    };
+
+    "/" = {
+      device = "/dev/disk/by-uuid/bbaf733b-14af-417b-b1c8-2f0534995483";
+      fsType = "btrfs";
+      options = [
+        "compress=zstd"
+        "ssd"
+        "subvol=root"
+      ];
+    };
+    "/prev" = {
+      device = "/dev/disk/by-uuid/bbaf733b-14af-417b-b1c8-2f0534995483";
+      fsType = "btrfs";
+      options = [
+        "compress=zstd"
+        "noexec"
+        "ssd"
+        "subvol=prev"
+      ];
+    };
+    "/nix" = {
+      device = "/dev/disk/by-uuid/bbaf733b-14af-417b-b1c8-2f0534995483";
+      fsType = "btrfs";
+      options = [
+        "compress=zstd"
+        "ssd"
+        "subvol=nix"
+      ];
+    };
+
+    "/persist" = {
+      device = "/dev/disk/by-uuid/bbaf733b-14af-417b-b1c8-2f0534995483";
+      fsType = "btrfs";
+      neededForBoot = true;
+      options = [
+        "compress=zstd"
+        "ssd"
+        "subvol=persist"
+      ];
+    };
+  };
+
+  swapDevices = [ { device = "/dev/disk/by-uuid/93ac8c5c-c947-4b45-a12a-146e87398517"; } ];
+}

hosts/flight/services/default.nix

@@ -1,11 +0,0 @@
-{ lib, ... }:
-{
-  networking.useNetworkd = lib.mkForce false;
-
-  services.globalprotect.enable = true;
-
-  virtualisation = {
-    libvirtd.enable = true;
-    vmware.host.enable = true;
-  };
-}

hosts/flight/user/default.nix

@@ -1,8 +1,7 @@
-{ config, ... }:
+{ config, lib, ... }:
 {
-  home-manager.users."${config.vars.mainUser}".home = {
-    guifull.enable = true;
-    school.enable = true;
-    enableNixpkgsReleaseCheck = false;
+  home-manager.users."${config.vars.mainUser}" = {
+    home.guifull.enable = true;
+    wayland.windowManager.sway.extraSessionCommands = lib.mkForce "";
   };
 }