diff --git a/flake.lock b/flake.lock
index 12b5c33..8bede17 100644
--- a/flake.lock
+++ b/flake.lock
@@ -77,11 +77,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777932387,
-        "narHash": "sha256-nUYVPiqrzr36ThiQOAr5MKeGHDBSDM3OFWkz0uDjOvc=",
+        "lastModified": 1768135262,
+        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "71a3a77326609675e9f8b51084cf23d5d1945899",
+        "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
         "type": "github"
       },
       "original": {
@@ -90,6 +90,24 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -97,11 +115,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777851538,
-        "narHash": "sha256-Gp8qwTEYNoy2yvmErVGlvLOQvrtEECCAKbonW7VJef8=",
+        "lastModified": 1779506708,
+        "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5",
+        "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f",
         "type": "github"
       },
       "original": {
@@ -118,11 +136,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778144356,
-        "narHash": "sha256-dGM+QCstz/DyLB68+JK5GWyMx4QSqmOJEVgZmy63d/g=",
+        "lastModified": 1779726696,
+        "narHash": "sha256-/p37CB5n6Wpw250b0Lq0CYwNq2D8uGKzDoBulyLcQqA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e4419d3123b780d5f4c0bceeace450424387638c",
+        "rev": "1a95e2efb477959b70b4a14c51035975c0481df6",
         "type": "github"
       },
       "original": {
@@ -131,6 +149,34 @@
         "type": "github"
       }
     },
+    "ixx": {
+      "inputs": {
+        "flake-utils": [
+          "nixvim",
+          "nuschtosSearch",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixvim",
+          "nuschtosSearch",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1754860581,
+        "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
+        "owner": "NuschtOS",
+        "repo": "ixx",
+        "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "ref": "v0.1.1",
+        "repo": "ixx",
+        "type": "github"
+      }
+    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -138,11 +184,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777780666,
-        "narHash": "sha256-8wURyQMdDkGUarSTKOGdCuFfYiwa3HbzwscUfn3STDE=",
+        "lastModified": 1779036909,
+        "narHash": "sha256-zXcwYQGCT6pzinK+1dBB2ekTVtfxGZAapb3Evdcu4fY=",
         "owner": "nix-darwin",
         "repo": "nix-darwin",
-        "rev": "8c62fba0854ba15c8917aed18894dbccb48a3777",
+        "rev": "56c666e108467d87d13508936aade6d567f2a501",
         "type": "github"
       },
       "original": {
@@ -174,11 +220,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1778143761,
-        "narHash": "sha256-lkesY6x2X2qxlqLM7CT2iM/0rP2JB7fruPN3h8POXmI=",
+        "lastModified": 1779258371,
+        "narHash": "sha256-j1iZsLy6oFApqR1oiDmHhvkwxXqcNi0aoSJj643LuwU=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "3bcaa367d4c550d687a17ac792fd5cda214ee871",
+        "rev": "c97bc4d15bd3473dd095e8e8ba57330ab1943a77",
         "type": "github"
       },
       "original": {
@@ -236,11 +282,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1777954456,
-        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
+        "lastModified": 1779560665,
+        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
+        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
         "type": "github"
       },
       "original": {
@@ -267,11 +313,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1778003029,
-        "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
+        "lastModified": 1779467186,
+        "narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
+        "rev": "b77b3de8775677f84492abe84635f87b0e153f0f",
         "type": "github"
       },
       "original": {
@@ -285,24 +331,49 @@
       "inputs": {
         "flake-parts": "flake-parts_3",
         "nixpkgs": [
-          "nixpkgs-unstable"
+          "nixpkgs"
         ],
-        "systems": "systems"
+        "nuschtosSearch": "nuschtosSearch",
+        "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1777991353,
-        "narHash": "sha256-DFwjggMV+nzCZpwK6Obxj9F+P59rbLVowGqHETfctBk=",
+        "lastModified": 1769049374,
+        "narHash": "sha256-h0Os2qqNyycDY1FyZgtbn28VF1ySP74/n0f+LDd8j+w=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "7986a276960b4dfaed9bb2c3c438b5ba71ae08f1",
+        "rev": "b8f76bf5751835647538ef8784e4e6ee8deb8f95",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "nixos-25.11",
         "repo": "nixvim",
         "type": "github"
       }
     },
+    "nuschtosSearch": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "ixx": "ixx",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1768249818,
+        "narHash": "sha256-ANfn5OqIxq3HONPIXZ6zuI5sLzX1sS+2qcf/Pa0kQEc=",
+        "owner": "NuschtOS",
+        "repo": "search",
+        "rev": "b6f77b88e9009bfde28e2130e218e5123dc66796",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "repo": "search",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "comfyui-nix": "comfyui-nix",
@@ -330,6 +401,21 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 5972a58..b8b5b18 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,8 +21,8 @@
     };
 
     nixvim = {
-      url = "github:nix-community/nixvim";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
+      url = "github:nix-community/nixvim/nixos-25.11";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
     nixos-hardware = {
diff --git a/home-manager/commands/nixvim/config.nix b/home-manager/commands/nixvim/config.nix
index a52bf60..0e94d84 100644
--- a/home-manager/commands/nixvim/config.nix
+++ b/home-manager/commands/nixvim/config.nix
@@ -27,7 +27,7 @@
 
     diagnostic.settings = {
       virtual_text = true;
-      update_in_insert = true;
+      update_in_insert = false;
       severity_sort = true;
     };
 
diff --git a/home-manager/commands/nixvim/keymaps.nix b/home-manager/commands/nixvim/keymaps.nix
index b42008e..63450ea 100644
--- a/home-manager/commands/nixvim/keymaps.nix
+++ b/home-manager/commands/nixvim/keymaps.nix
@@ -121,7 +121,7 @@
         options = {
           silent = true;
           noremap = true;
-          desc = "Glance references";
+          desc = "Yank to system clipboard";
         };
       }
     ];
diff --git a/home-manager/commands/nixvim/plugins/codecompanion.nix b/home-manager/commands/nixvim/plugins/codecompanion.nix
index 739d68c..c92dd5a 100644
--- a/home-manager/commands/nixvim/plugins/codecompanion.nix
+++ b/home-manager/commands/nixvim/plugins/codecompanion.nix
@@ -25,7 +25,7 @@
           };
         };
         opts = {
-          log_level = "TRACE";
+          log_level = "ERROR";
           send_code = true;
           use_default_actions = true;
           use_default_prompts = true;
diff --git a/home-manager/commands/nixvim/plugins/default.nix b/home-manager/commands/nixvim/plugins/default.nix
index 40ed44d..5f6b0bd 100644
--- a/home-manager/commands/nixvim/plugins/default.nix
+++ b/home-manager/commands/nixvim/plugins/default.nix
@@ -5,7 +5,8 @@
   ...
 }: {
   imports = [
-    #./blink-cmp.nix
+    ./blink-cmp.nix
+    # ./codecompanion.nix
     ./glance.nix
     ./illuminate.nix
     ./indent-blankline.nix
@@ -18,21 +19,15 @@
   ];
 
   programs.nixvim.plugins = {
-    cmp-nvim-lsp.enable = true;
-    cmp.enable = true;
-    cmp_luasnip.enable = true;
     colorizer.enable = true;
     comment.enable = true;
     diffview.enable = true;
     direnv.enable = true;
     gitblame.enable = true;
     gitsigns.enable = true;
-    # hardtime.enable = true;
     intellitab.enable = true;
     lastplace.enable = true;
     lsp-format.enable = true;
-    lsp-lines.enable = true;
-    lsp-signature.enable = true;
     lualine.enable = true;
     luasnip.enable = true;
     markview.enable = true;
@@ -42,13 +37,20 @@
     nvim-autopairs.enable = true;
     refactoring.enable = true;
     toggleterm.enable = true;
-    treesitter.enable = true;
+    treesitter = {
+      enable = true;
+      settings = {
+        highlight.enable = true;
+      };
+    };
     web-devicons.enable = true;
     zig.enable = true;
   };
 
-  programs.nixvim.performance.byteCompileLua = {
-    enable = true;
-    plugins = true;
+  programs.nixvim.performance = {
+    byteCompileLua = {
+      enable = true;
+      plugins = true;
+    };
   };
 }
diff --git a/home-manager/commands/nixvim/plugins/illuminate.nix b/home-manager/commands/nixvim/plugins/illuminate.nix
index 467336d..6674f29 100644
--- a/home-manager/commands/nixvim/plugins/illuminate.nix
+++ b/home-manager/commands/nixvim/plugins/illuminate.nix
@@ -1,14 +1,23 @@
 {
   programs.nixvim.plugins = {
-    illuminate.settings = {
+    illuminate = {
       enable = true;
-      delay = 100;
-      minCountToHighlight = 1;
-      modesAllowlist = [
-        "n"
-        "i"
-        "v"
-      ];
+      settings = {
+        delay = 300;
+        under_cursor = false;
+        min_count_to_highlight = 1;
+        filetypes_denylist = [
+          "NvimTree"
+          "neo-tree"
+          "telescope"
+          "dashboard"
+          "Outline"
+          "Trouble"
+          "lazy"
+        ];
+        large_file_cutoff = 5000;
+        large_file_overrides.min_count_to_highlight = 0;
+      };
     };
   };
 }
diff --git a/home-manager/commands/nixvim/plugins/lint.nix b/home-manager/commands/nixvim/plugins/lint.nix
index ae49225..cad388c 100644
--- a/home-manager/commands/nixvim/plugins/lint.nix
+++ b/home-manager/commands/nixvim/plugins/lint.nix
@@ -5,7 +5,7 @@
       autoCmd = {
         event = [
           "InsertLeave"
-          "TextChanged"
+          "BufWritePost"
         ];
       };
     };
diff --git a/home-manager/commands/starship.nix b/home-manager/commands/starship.nix
index 69da0e7..b4f10d5 100644
--- a/home-manager/commands/starship.nix
+++ b/home-manager/commands/starship.nix
@@ -11,7 +11,6 @@
           "$git_status"
           "$hostname"
           "$golang"
-          "$direnv"
           "$status"
         ];
 
diff --git a/hosts/eva-01/configuration.nix b/hosts/eva-01/configuration.nix
index 08ea566..74245bc 100644
--- a/hosts/eva-01/configuration.nix
+++ b/hosts/eva-01/configuration.nix
@@ -71,6 +71,18 @@
     intel-vaapi-driver
   ];
 
+  # Btrfs filesystem
+  services.btrfs.autoScrub = {
+    enable = true;
+    interval = "weekly";
+    fileSystems = ["/"];
+  };
+
+  boot.kernel.sysctl = {
+      # 11th Gen Intel Tiger Lake performance fix
+      "dev.i915.perf_stream_paranoid" = 0;
+  };
+
   networking.hostName = "eva-01"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
@@ -266,6 +278,7 @@
   environment.systemPackages = with pkgs; [
     # System-level only
     fprintd
+    btrfs-progs
   ];
 
   fonts.packages = with pkgs; [
diff --git a/hosts/eva-01/hardware-configuration.nix b/hosts/eva-01/hardware-configuration.nix
index 8c9e038..2d88b87 100644
--- a/hosts/eva-01/hardware-configuration.nix
+++ b/hosts/eva-01/hardware-configuration.nix
@@ -13,13 +13,14 @@
   ];
 
   boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "uas" "sd_mod"];
-  boot.initrd.kernelModules = [];
+  boot.initrd.kernelModules = ["btrfs"];
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/0ec1b4fd-ca0f-4938-a038-37a69ec00b21";
-    fsType = "ext4";
+    fsType = "btrfs";
+    options = [ "subvol=root" "compress=zstd" "discard=async" "noatime" ];
   };
 
   fileSystems."/boot" = {
diff --git a/hosts/eva-02/configuration.nix b/hosts/eva-02/configuration.nix
index d6ff4f6..f019dce 100644
--- a/hosts/eva-02/configuration.nix
+++ b/hosts/eva-02/configuration.nix
@@ -62,6 +62,7 @@
     user = "rogueking";
     #onActivation.autoUpdate = true;
     brews = [
+      "aria2"
       "docker"
       "ckan"
       "esptool"