diff --git a/README.md b/README.md
index f28c533..e61079f 100644
--- a/README.md
+++ b/README.md
@@ -97,12 +97,7 @@ sudo nano /mnt/etc/nixos/hardware-configuration.nix
 
 **Add BEFORE `fileSystems` section (replace UUID with yours):**
 ```nix
-boot.initrd.luks.devices = {
-  cryptroot = {
-    device = "/dev/disk/by-uuid/YOUR-LUKS-UUID";
-    preLVM = true;
-  };
-};
+boot.initrd.luks.devices.cryptroot.device = "/dev/disk/by-uuid/YOUR-LUKS-UUID";
 ```
 
 **Also make sure SWAP is mounted**
diff --git a/flake.lock b/flake.lock
index 9d94f40..a407b39 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,11 +17,11 @@
         "wintypes_shim": "wintypes_shim"
       },
       "locked": {
-        "lastModified": 1791516752,
-        "narHash": "sha256-hb1mfDpFUWCTWfGx7rDoFH8B+zItlPbW6jinXRpJnFw=",
+        "lastModified": 1792710311,
+        "narHash": "sha256-Uyd6UpHOZ6ly18cIlWz6HBIw5TfV4lCqVpcr01Lzer0=",
         "owner": "mrshmllow",
         "repo": "affinity-nix",
-        "rev": "47d5b16c3e2e2412c0d5df9963c02d0e8c5e97d6",
+        "rev": "69c5cb42a7dd596027183776d82bf206d732fc91",
         "type": "github"
       },
       "original": {
@@ -116,11 +116,11 @@
     },
     "crane": {
       "locked": {
-        "lastModified": 1790899423,
-        "narHash": "sha256-THGtz65UGJU+sonZidRboyCMk+9DclpMF7pwL4uDV4M=",
+        "lastModified": 1792350552,
+        "narHash": "sha256-292lvpvxTGKryKxh3/3tcIVi85CwYGdl4oOi113Sob8=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "47b6b27ed9a3a9181415e4367d0c30ab2a0e0250",
+        "rev": "e675a36b7377bebe41d548388a2501cbb16d380d",
         "type": "github"
       },
       "original": {
@@ -159,11 +159,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1792296368,
-        "narHash": "sha256-7jUSkqPNuYLZfP46HfiraqKJTbL9FAWMtlKM1DOMmFo=",
+        "lastModified": 1792814573,
+        "narHash": "sha256-7+ojfPKvE9KK61UE4mKK4VrDXXwkGgKbch3Gx9YvFZY=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "b7117a93a4ede917b7d4a356872b9a4a54967e11",
+        "rev": "59de78807c1f0e7746285a4479ce961f05bb8ad2",
         "type": "gitlab"
       },
       "original": {
@@ -303,11 +303,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1790500375,
-        "narHash": "sha256-XN3sDtn8TU9hAc9xqZ+SqRB/HHm2wjxM6aSWYLJU+oo=",
+        "lastModified": 1791909798,
+        "narHash": "sha256-VAhpCOmrun/KXimYfR8NM88bciKCui7CqHHhThSzgag=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "a0e4241b51206fbcbf52fd322eb5f0cd80f153c4",
+        "rev": "1ba1dbfe28738c9a71c266be6efa5b89e75491a9",
         "type": "github"
       },
       "original": {
@@ -342,11 +342,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1792098797,
-        "narHash": "sha256-u4DIIZgznEGzByxXrxWCXK19VcMtTBmi/M9gZ7Jk9bM=",
+        "lastModified": 1792818371,
+        "narHash": "sha256-yhEZAzZRNvzYpoAlyFY3wM75V9BmkIXJIueof8S5gOg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "640725978b99076e18e069f6e7d2959124584f8f",
+        "rev": "2cd3234928f60bbff695a7ee56115ef7799c47cd",
         "type": "github"
       },
       "original": {
@@ -415,11 +415,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1792094642,
-        "narHash": "sha256-zp8ToDMnqZcu4o4IH9pdwXFXGp7yLm/M0dEnNWnyd7I=",
+        "lastModified": 1792773339,
+        "narHash": "sha256-rZLrzrC6i+jnTAlvPZHogKDulY7WWDEv9hJeHieO7Zw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fe13242281a67641c0102cdb1087f0ebe586c7df",
+        "rev": "3ec636362e1816bc2f0888fa0fa2c69f1bc9e504",
         "type": "github"
       },
       "original": {
@@ -451,11 +451,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1792347896,
-        "narHash": "sha256-Ty1wTxDluBqvNUyogrgKz+Bq0ur8RQl1FQ1ZEo3QyCs=",
+        "lastModified": 1792871159,
+        "narHash": "sha256-LPPfc9Dg7Gpu74ihbgqeeFXeg4VDn2WY7CnLEcV2wx4=",
         "owner": "noctalia-dev",
         "repo": "noctalia-shell",
-        "rev": "aa0aa81ad2432ca63634d49bb5380f5db2114888",
+        "rev": "a44918e576578cce0e69ba22e5ab0ead87d967ce",
         "type": "github"
       },
       "original": {
@@ -692,11 +692,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1791110613,
-        "narHash": "sha256-O5XhWb2cQqo+OG0fpDhK/RfsPUetdw24aop/22e74tE=",
+        "lastModified": 1791885023,
+        "narHash": "sha256-C3alQ2MEt0zVrUSho5NUDo3jmhbff72++bfwoqT9Omo=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "930ae5bbd97d4fc4c33c588bfd417c882d353e71",
+        "rev": "0d6d739a833ba9a9c93034862e4a7b061a062a1c",
         "type": "github"
       },
       "original": {
diff --git a/hosts/Garand-Desktop/hardware.nix b/hosts/Garand-Desktop/hardware.nix
index 3eff2dd..ff7f03c 100644
--- a/hosts/Garand-Desktop/hardware.nix
+++ b/hosts/Garand-Desktop/hardware.nix
@@ -22,12 +22,7 @@
         "sd_mod"
       ];
       kernelModules = ["dm-snapshot"];
-      luks.devices = {
-        cryptroot = {
-          device = "/dev/disk/by-uuid/7c018698-d35c-4ee6-92a8-5e4edf914065";
-          preLVM = true;
-        };
-      };
+      luks.devices.cryptroot.device = "/dev/disk/by-uuid/7c018698-d35c-4ee6-92a8-5e4edf914065";
     };
     kernelModules = ["kvm-amd"];
     extraModulePackages = [];
diff --git a/hosts/Garand-Laptop/hardware.nix b/hosts/Garand-Laptop/hardware.nix
index b1dd5e6..ee4d7a7 100644
--- a/hosts/Garand-Laptop/hardware.nix
+++ b/hosts/Garand-Laptop/hardware.nix
@@ -20,10 +20,7 @@
         "sd_mod"
       ];
       kernelModules = ["dm-snapshot"];
-      luks.devices.cryptroot = {
-        device = "/dev/disk/by-uuid/6abc2228-823e-42b0-94c7-48fda757732c";
-        preLVM = true;
-      };
+      luks.devices.cryptroot.device = "/dev/disk/by-uuid/6abc2228-823e-42b0-94c7-48fda757732c";
     };
     kernelModules = ["kvm-amd"];
     extraModulePackages = [];
diff --git a/modules/core/printing.nix b/modules/core/printing.nix
index 9140bcf..a939e2e 100644
--- a/modules/core/printing.nix
+++ b/modules/core/printing.nix
@@ -24,15 +24,11 @@
       enable = true;
       nssmdns4 = true;
       openFirewall = true;
-      publish = {
-        enable = true;
-        userServices = true;
+      settings.publish = {
+        disable-publishing = false;
+        disable-user-service-publishing = false;
+        publish-addresses = true;
       };
-      # settings.publish = {
-      #   disable-publishing = false;
-      #   disable-user-service-publishing = false;
-      #   publish-adresses = true;
-      # };
     };
 
     ipp-usb.enable = true;
diff --git a/modules/core/xdg.nix b/modules/core/xdg.nix
index ff9eead..27421a3 100644
--- a/modules/core/xdg.nix
+++ b/modules/core/xdg.nix
@@ -3,7 +3,6 @@
     enable = true;
     wlr.enable = true;
     extraPortals = with pkgs; [
-      xdg-desktop-portal-hyprland
       xdg-desktop-portal-gtk
     ];
     configPackages = [pkgs.hyprland];
diff --git a/modules/home/codex/default.nix b/modules/home/codex/default.nix
index 3cf58b0..eb87728 100644
--- a/modules/home/codex/default.nix
+++ b/modules/home/codex/default.nix
@@ -7,8 +7,9 @@
   options.codex.enable = lib.mkEnableOption "Codex";
 
   config = lib.mkIf config.codex.enable {
-    home.packages = [
-      pkgs.nodejs
+    home.packages = with pkgs; [
+      nodejs
+      bubblewrap
     ];
 
     programs.codex = {
diff --git a/modules/home/opencode/default.nix b/modules/home/opencode/default.nix
index 203b8b7..b1dc56b 100644
--- a/modules/home/opencode/default.nix
+++ b/modules/home/opencode/default.nix
@@ -9,7 +9,12 @@
   config.programs.opencode = lib.mkIf config.opencode.enable {
     enable = true;
     package = pkgs.opencode;
-    validateFiles.config = true;
+    validateFiles = {
+      config = false;
+      cli = false;
+    };
+    mutableSettings = true;
+    cli = {};
   };
 
   imports = [
diff --git a/modules/home/opencode/extra-packages.nix b/modules/home/opencode/extra-packages.nix
index e4aaf38..51b042b 100644
--- a/modules/home/opencode/extra-packages.nix
+++ b/modules/home/opencode/extra-packages.nix
@@ -4,7 +4,6 @@
     ruff
     biome
     bun
-    beads
     rust-analyzer
     alejandra
     docker