diff --git a/flake.lock b/flake.lock
index e65d347..6e71213 100644
--- a/flake.lock
+++ b/flake.lock
@@ -31,11 +31,11 @@
         "yaml": "yaml"
       },
       "locked": {
-        "lastModified": 1739484523,
-        "narHash": "sha256-WVPL9pKnLCJaY2bHD9ZnJZe1qH4Kl2RELw1kDvbVOZ0=",
+        "lastModified": 1739810732,
+        "narHash": "sha256-2ZJ3kB0LUAdYs2DH2mnnbDiiSR6yoqUDCdnQTCSrjRo=",
         "ref": "dev",
-        "rev": "3c22d1beed609a4536163cb8adcf249e82c9b349",
-        "revCount": 214,
+        "rev": "86d452422e784e164b8ac093a8dabf920caa1cf9",
+        "revCount": 216,
         "type": "git",
         "url": "ssh://git@github.com/RobloxUSArmyCID/CIDBot"
       },
@@ -106,11 +106,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739724290,
-        "narHash": "sha256-dvByZPuVmBgOBLq8GohBy9hEd0/JXj5goXK2OY1Pvgk=",
+        "lastModified": 1739913864,
+        "narHash": "sha256-WhzgQjadrwnwPJQLLxZUUEIxojxa7UWDkf7raAkB1Lw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ec130e700959ee10b63eedbc87758d20264a9588",
+        "rev": "97ac0801d187b2911e8caa45316399de12f6f199",
         "type": "github"
       },
       "original": {
@@ -177,11 +177,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739580444,
-        "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=",
+        "lastModified": 1739866667,
+        "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8bb37161a0488b89830168b81c48aed11569cb93",
+        "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
         "type": "github"
       },
       "original": {
@@ -231,16 +231,15 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1739360736,
-        "narHash": "sha256-fBqriSsDhA2kNePAT01ZOYX1LCK7vF1OcNApUN49FvI=",
+        "lastModified": 1739751511,
+        "narHash": "sha256-aKM96IPTHxpnPDSGl8+jo4WIPFUUDQTQKHGTZ3IkYhE=",
         "owner": "NotAShelf",
         "repo": "nvf",
-        "rev": "b9968f13bdcb947a25388e5c3992063c8cd8c9b9",
+        "rev": "e42bcbe1ecb3392ecd8a7638edf991b9628f4d55",
         "type": "github"
       },
       "original": {
         "owner": "NotAShelf",
-        "ref": "npins-fixes",
         "repo": "nvf",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index fbf75a7..dfcea87 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,7 +13,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nvf = {
-      url = "github:NotAShelf/nvf/npins-fixes";
+      url = "github:NotAShelf/nvf";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     cidbot = {
diff --git a/system/adb.nix b/system/adb.nix
new file mode 100644
index 0000000..4d88645
--- /dev/null
+++ b/system/adb.nix
@@ -0,0 +1,4 @@
+{userSettings, ...}: {
+  programs.adb.enable = true;
+  users.users.${userSettings.username}.extraGroups = ["adbusers"];
+}
diff --git a/system/configuration.nix b/system/configuration.nix
index c59081c..90b7432 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -9,6 +9,7 @@
     else ./none.nix;
 in {
   imports = [
+    ./adb.nix
     ./bluetooth.nix
     ./bootloader.nix
     ./hardware-configuration.nix
diff --git a/system/hardware-configuration.nix b/system/hardware-configuration.nix
index 6d0eb88..54f4510 100644
--- a/system/hardware-configuration.nix
+++ b/system/hardware-configuration.nix
@@ -8,23 +8,23 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/2b034ca9-3690-4c1e-a1eb-78d5d39e1d7f";
+    { device = "/dev/disk/by-uuid/2bc3ba6c-abbb-43e6-bc80-62e9216147b7";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/F57E-2E3D";
+    { device = "/dev/disk/by-uuid/7FE4-23CC";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
-  
-  swapDevices = [{device = "/swapfile"; size = 16 * 1024; }];
+
+  swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
diff --git a/user/misc.nix b/user/misc.nix
index 8da7b5a..47da0a2 100644
--- a/user/misc.nix
+++ b/user/misc.nix
@@ -32,6 +32,6 @@
     brightnessctl
     cliphist
     heroic
-    ciscoPacketTracer8
+#    ciscoPacketTracer8
   ];
 }
diff --git a/user/nvf.nix b/user/nvf.nix
index 88ae840..9eb19c3 100644
--- a/user/nvf.nix
+++ b/user/nvf.nix
@@ -46,6 +46,7 @@
         css.enable = true;
         zig.enable = true;
         bash.enable = true;
+        clang.enable = true;
       };
       presence.neocord = {
         enable = true;