diff --git a/flake.lock b/flake.lock
index fda5e19..5432271 100644
--- a/flake.lock
+++ b/flake.lock
@@ -59,11 +59,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700847865,
-        "narHash": "sha256-uWaOIemGl9LF813MW0AEgCBpKwFo2t1Wv3BZc6e5Frw=",
+        "lastModified": 1700900274,
+        "narHash": "sha256-KWoKDP5I1viHR4bG3ENnJ7H1DD16tXWH4ROvS0IfXw8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8cedd63eede4c22deb192f1721dd67e7460e1ebe",
+        "rev": "a462e7315deaa8194b0821f726709bb7e51a850c",
         "type": "github"
       },
       "original": {
@@ -83,11 +83,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1700873282,
-        "narHash": "sha256-xZngvZYUQxivI9Z/90i8mDpJBC61lE+kQ0Pq3EqOPx8=",
+        "lastModified": 1700967537,
+        "narHash": "sha256-TzyP5xNGF+rCj2ko+E+VOpQTtzlQ4TfDLuObEPbRX6g=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "a6eba919356b08a2a403a52c1e5e020734411668",
+        "rev": "cd96ceecc551c25631783499bd92c6662c5d3616",
         "type": "github"
       },
       "original": {
@@ -142,11 +142,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1700612854,
-        "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=",
+        "lastModified": 1700794826,
+        "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614",
+        "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
         "type": "github"
       },
       "original": {
@@ -173,11 +173,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1700865924,
-        "narHash": "sha256-3OvmS6b3bD1a3bCH3roDO7uBJrYVPhMLd+eUbmzahxk=",
+        "lastModified": 1700999123,
+        "narHash": "sha256-cHUigiOX70G8tZ6Utdl7IkYZ879GDeUkdoI9urX2WcM=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "7ddd84acfc35469739ebddbaa2f58f9eebd60869",
+        "rev": "95f618e3eaf6156578985fb5d14da500b811c52e",
         "type": "github"
       },
       "original": {
@@ -208,11 +208,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700362823,
-        "narHash": "sha256-/H7XgvrYM0IbkpWkcdfkOH0XyBM5ewSWT1UtaLvOgKY=",
+        "lastModified": 1700967639,
+        "narHash": "sha256-uuUwD/O1QcVk+TWPZFwl4ioUkC8iACj0jEXSyE/wGPI=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "49a87c6c827ccd21c225531e30745a9a6464775c",
+        "rev": "4be58d802693d7def8622ff34d36714f8db40371",
         "type": "github"
       },
       "original": {
@@ -240,18 +240,18 @@
       "flake": false,
       "locked": {
         "host": "gitlab.freedesktop.org",
-        "lastModified": 1700736101,
-        "narHash": "sha256-1Fh1xf/JX5zFbGIF9LDaffaleG6JDwwwnKby0LyiXEA=",
+        "lastModified": 1700734054,
+        "narHash": "sha256-SBu1y01WjCSrcCKvgfCDDckrZjU/OmCJT8Xc+hPow7E=",
         "owner": "wlroots",
         "repo": "wlroots",
-        "rev": "f1762f428b0ef2989c81f57ea9e810403d34d946",
+        "rev": "2eb225236eb72f27beec921e9f37ddf58e874fba",
         "type": "gitlab"
       },
       "original": {
         "host": "gitlab.freedesktop.org",
         "owner": "wlroots",
         "repo": "wlroots",
-        "rev": "f1762f428b0ef2989c81f57ea9e810403d34d946",
+        "rev": "2eb225236eb72f27beec921e9f37ddf58e874fba",
         "type": "gitlab"
       }
     },
diff --git a/modules/nixos/gui/audio/default.nix b/modules/nixos/gui/audio/default.nix
index d897058..fe70f70 100644
--- a/modules/nixos/gui/audio/default.nix
+++ b/modules/nixos/gui/audio/default.nix
@@ -10,7 +10,7 @@ in {
       alsa.enable = true;
       alsa.support32Bit = true;
       pulse.enable = true;
-      wireplumber.enable = true;
+      # wireplumber.enable = true;
     };
 
     environment.systemPackages = with pkgs; [ easyeffects ];
diff --git a/modules/nixos/system/fonts/default.nix b/modules/nixos/system/fonts/default.nix
index c9e2a37..9e1283f 100644
--- a/modules/nixos/system/fonts/default.nix
+++ b/modules/nixos/system/fonts/default.nix
@@ -3,7 +3,7 @@
   fonts = {
     enableDefaultPackages = false;
     fontDir.enable = true;
-    #fonts = with pkgs; [
+
     packages = with pkgs; [
       ibm-plex
       lmmath
@@ -25,7 +25,6 @@
       };
 
       hinting.style = "medium";
-      #  hinting.style = "hintfull";
     };
   };
 }
diff --git a/modules/nixos/system/hw/base/default.nix b/modules/nixos/system/hw/base/default.nix
index d7e34a3..dcc57c5 100644
--- a/modules/nixos/system/hw/base/default.nix
+++ b/modules/nixos/system/hw/base/default.nix
@@ -1,4 +1,4 @@
 { ... }: {
-  services.fwupd.enable = true;
+  services.fwupd.enable = false; # Note: run inside a nix-shell
   hardware.enableAllFirmware = true;
 }
diff --git a/modules/nixos/system/hw/fs/default.nix b/modules/nixos/system/hw/fs/default.nix
index 841a9be..7b842e6 100644
--- a/modules/nixos/system/hw/fs/default.nix
+++ b/modules/nixos/system/hw/fs/default.nix
@@ -1,6 +1,5 @@
 { pkgs, ... }: {
-  services.fstrim.enable = true;
-  services.gvfs.enable = true;
+  services.fstrim.enable = true; # Improves SSD life
 
   environment.systemPackages = with pkgs; [ gvfs nfs-utils ];
 }
diff --git a/modules/nixos/system/network/bluetooth/default.nix b/modules/nixos/system/network/bluetooth/default.nix
index 1ab40b5..30dd07d 100644
--- a/modules/nixos/system/network/bluetooth/default.nix
+++ b/modules/nixos/system/network/bluetooth/default.nix
@@ -1,7 +1,4 @@
 { pkgs, ... }: {
   hardware.bluetooth.enable = true;
-  hardware.brillo.enable = true;
   services.blueman.enable = true;
-
-  environment.systemPackages = with pkgs; [ bluez bluez-tools ];
 }
diff --git a/systems/iriy/default.nix b/systems/iriy/default.nix
index 1c5386b..9632ac2 100644
--- a/systems/iriy/default.nix
+++ b/systems/iriy/default.nix
@@ -1,8 +1,8 @@
 { config, inputs, ... }: {
   imports = [
     ./hardware-configuration.nix
-    #common-cpu-amd
-    #common-gpu-amd
+    # inputs.hardware.common-cpu-amd
+    # inputs.hardware.common-gpu-amd
   ];
 
   hostcfg = {