diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b2be92b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+result
diff --git a/flake.nix b/flake.nix
index 185d18a..68673c6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,7 +45,7 @@
       specialArgs = {
         inherit
           unstable
-	  chaotic
+          chaotic
           hardware
           lanzaboote
           mailserver
diff --git a/hosts/bomberman/system/hardware/default.nix b/hosts/bomberman/system/hardware/default.nix
index d6d255a..ef08aa9 100644
--- a/hosts/bomberman/system/hardware/default.nix
+++ b/hosts/bomberman/system/hardware/default.nix
@@ -1,9 +1,5 @@
 { config, lib, pkgs, modulesPath, ... }:
 {
-  imports = [
-    (modulesPath + "/profiles/qemu-guest.nix")
-  ];
-
   boot.initrd = {
     availableKernelModules = [
       "xhci_pci"
diff --git a/hosts/cyberspark/system/hardware/default.nix b/hosts/cyberspark/system/hardware/default.nix
index ea8cbd0..3654e22 100644
--- a/hosts/cyberspark/system/hardware/default.nix
+++ b/hosts/cyberspark/system/hardware/default.nix
@@ -1,9 +1,5 @@
 { config, lib, pkgs, modulesPath, ... }:
 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
   boot = {
     blacklistedKernelModules = [
       "pcspkr"
diff --git a/hosts/detritus/system/hardware/default.nix b/hosts/detritus/system/hardware/default.nix
index 697a79e..3fa540b 100644
--- a/hosts/detritus/system/hardware/default.nix
+++ b/hosts/detritus/system/hardware/default.nix
@@ -1,9 +1,5 @@
 { config, lib, pkgs, modulesPath, ... }:
 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
   boot = {
     kernelModules = [ "kvm-intel" ];
     initrd = {
diff --git a/hosts/firefly/system/boot/default.nix b/hosts/firefly/system/boot/default.nix
index 86a44dc..edd94c3 100644
--- a/hosts/firefly/system/boot/default.nix
+++ b/hosts/firefly/system/boot/default.nix
@@ -20,13 +20,9 @@ let
 in {
   boot = {
     kernelPackages = pkgs.unstable.linuxPackages_zen;
-    blacklistedKernelModules = [
-      "pcspkr"
-    ];               
+    blacklistedKernelModules = [ "pcspkr" ];               
     kernel.sysctl."vm.max_map_count" = 2147483642;       
-    kernelParams = commonKernelParams ++ [
-      "vfio-pci.ids=10de:1f82,10de:10fa"
-    ];
+    kernelParams = commonKernelParams ++ [ "vfio-pci.ids=10de:1f82,10de:10fa" ];
 
     # Encryption and TPM
     initrd = {
diff --git a/hosts/firefly/system/hardware/default.nix b/hosts/firefly/system/hardware/default.nix
index 2edf666..dfb4048 100644
--- a/hosts/firefly/system/hardware/default.nix
+++ b/hosts/firefly/system/hardware/default.nix
@@ -1,9 +1,5 @@
 { config, lib, modulesPath, ... }:
 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
   boot = {
     initrd = {
       availableKernelModules = [
diff --git a/hosts/lacros/system/hardware/default.nix b/hosts/lacros/system/hardware/default.nix
index f04fcd6..f194288 100644
--- a/hosts/lacros/system/hardware/default.nix
+++ b/hosts/lacros/system/hardware/default.nix
@@ -1,16 +1,12 @@
 { config, lib, modulesPath, ... }:
 
 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
   boot = {
+    kernelModules = [ "kvm-intel" ];
     initrd = {
       availableKernelModules = [ "xhci_pci" "sdhci_pci" ];
       kernelModules = [ "dm-snapshot" ];
     };
-    kernelModules = [ "kvm-intel" ];
   };
 
   fileSystems = {
diff --git a/hosts/redmond/system/hardware/default.nix b/hosts/redmond/system/hardware/default.nix
index 4b1d568..d2d12e9 100644
--- a/hosts/redmond/system/hardware/default.nix
+++ b/hosts/redmond/system/hardware/default.nix
@@ -1,10 +1,7 @@
 { config, lib, pkgs, modulesPath, ... }:
 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
   boot = {
+    kernelModules = [ "kvm-amd" ];
     initrd = {
       availableKernelModules = [
         "xhci_pci"
@@ -16,7 +13,6 @@
         "rtsx_usb_sdmmc"
       ];
     };
-    kernelModules = [ "kvm-amd" ];
   };
 
   fileSystems = {
diff --git a/hosts/shuttle/system/hardware/default.nix b/hosts/shuttle/system/hardware/default.nix
index 2de1890..ab8a862 100644
--- a/hosts/shuttle/system/hardware/default.nix
+++ b/hosts/shuttle/system/hardware/default.nix
@@ -1,7 +1,5 @@
 { config, lib, pkgs, modulesPath, ... }:
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
   boot = {
     initrd = {
       availableKernelModules = [ ];
diff --git a/hosts/treefruit/system/hardware/default.nix b/hosts/treefruit/system/hardware/default.nix
index 9975bc5..22ca3bc 100644
--- a/hosts/treefruit/system/hardware/default.nix
+++ b/hosts/treefruit/system/hardware/default.nix
@@ -1,10 +1,6 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
   boot = {
     kernelModules = [ "kvm-intel" ];
     initrd = {
diff --git a/modules/system/accounts/users/jimbo/default.nix b/modules/system/accounts/users/jimbo/default.nix
index 8ad47c8..dbf7f8f 100644
--- a/modules/system/accounts/users/jimbo/default.nix
+++ b/modules/system/accounts/users/jimbo/default.nix
@@ -7,7 +7,9 @@
       isNormalUser = true;
       openssh.authorizedKeys.keys = [
         (builtins.readFile ../../../../../hosts/firefly/id_ed25519.pub)
-        (builtins.readFile ../../../../../hosts/shuttleworth/id_ed25519.pub)
+        (builtins.readFile ../../../../../hosts/detritus/id_ed25519.pub)
+
+        (builtins.readFile ../../../../../hosts/shuttle/id_ed25519.pub)
         (builtins.readFile ../../../../../hosts/lacros/id_ed25519.pub)
         (builtins.readFile ../../../../../hosts/redmond/id_ed25519.pub)
         (builtins.readFile ../../../../../hosts/treefruit/id_ed25519.pub)
@@ -15,7 +17,7 @@
         (builtins.readFile ../../../../../hosts/cyberspark/id_ed25519.pub)
         (builtins.readFile ../../../../../hosts/bomberman/id_ed25519.pub)
 
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJahAoF74BY6GCTsFkt1ADKaraFgJJozW1Y1aBTLK0j9 pixel9"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJahAoF74BY6GCTsFkt1ADKaraFgJJozW1Y1aBTLK0j9 Pixel9"
       ];
       extraGroups = [
         "wheel"
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 8820ac9..a5ad9a7 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -2,7 +2,10 @@
 {
   nix = {
     settings = {
-      experimental-features = "nix-command flakes";
+      experimental-features = [
+        "nix-command"
+	"flakes"
+      ];
       auto-optimise-store = true;
     };
     gc = {
diff --git a/modules/system/devices/video/nvidia/default.nix b/modules/system/devices/video/nvidia/default.nix
index 03ceb16..b50af2d 100644
--- a/modules/system/devices/video/nvidia/default.nix
+++ b/modules/system/devices/video/nvidia/default.nix
@@ -4,7 +4,7 @@
   hardware.nvidia = {
     modesetting.enable = true;
     nvidiaSettings = false;
-    package = config.boot.kernelPackages.nvidiaPackages.latest;
+    package = config.boot.kernelPackages.nvidiaPackages.beta;
     open = false;
   };
 }