diff --git a/flake.lock b/flake.lock
index f25d83ae..33c305ec 100644
--- a/flake.lock
+++ b/flake.lock
@@ -362,11 +362,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742771635,
-        "narHash": "sha256-HQHzQPrg+g22tb3/K/4tgJjPzM+/5jbaujCZd8s2Mls=",
+        "lastModified": 1743438213,
+        "narHash": "sha256-ZZDN+0v1r4I1xkQWlt8euOJv5S4EvElUCZMrDjTCEsY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ad0614a1ec9cce3b13169e20ceb7e55dfaf2a818",
+        "rev": "ccd7df836e1f42ea84806760f25b77b586370259",
         "type": "github"
       },
       "original": {
@@ -445,11 +445,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742721406,
-        "narHash": "sha256-as4AVwRDvrvR0gS7iMI8AN6GKBT+BdawB/vYWj9qRic=",
+        "lastModified": 1743453260,
+        "narHash": "sha256-neGi7FooD+JQfEqRye394QlSYiGGhBzTWiFJ/2neVrM=",
         "owner": "horriblename",
         "repo": "hyprgrass",
-        "rev": "a7889957ff77bdade1f57b171083053f7a3c47dd",
+        "rev": "e4cad1c7c0b49255bc9186a9c299b31df37e1303",
         "type": "github"
       },
       "original": {
@@ -476,11 +476,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1742746774,
-        "narHash": "sha256-6BMwAfC604szlL8S7BJkH8a090p0505rFB+mAiApBoo=",
+        "lastModified": 1743437607,
+        "narHash": "sha256-EEUFIq/btzh8RZ/dv69PXvC5c7ythmCYlDOzH7vriAk=",
         "ref": "refs/heads/main",
-        "rev": "e4abf26069b4d43c8f6ad6b3dfb56c952abb38c2",
-        "revCount": 5924,
+        "rev": "4c987b20e28362410d0c9f9a37bafd6f128b0a2c",
+        "revCount": 5954,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
       },
@@ -619,11 +619,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742402033,
-        "narHash": "sha256-aaBdTUJIAo9LBPpjNX96AoAi0H+O/oW8o+7SCVBAzXI=",
+        "lastModified": 1743311006,
+        "narHash": "sha256-LfKnTg1Ic17d5yPIqmMQyyHTKjMC4a82/zLdKmooayE=",
         "owner": "jas-singhfsu",
         "repo": "hyprpanel",
-        "rev": "3a5ad2a1db420f0238895f2cb1ff64acd0d2cc54",
+        "rev": "3bcd3c4710fc025bbe403948f10c3922a8bf5193",
         "type": "github"
       },
       "original": {
@@ -699,11 +699,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1742707865,
-        "narHash": "sha256-RVQQZy38O3Zb8yoRJhuFgWo/iDIDj0hEdRTVfhOtzRk=",
+        "lastModified": 1743320628,
+        "narHash": "sha256-FurMxmjEEqEMld11eX2vgfAx0Rz0JhoFm8UgxbfCZa8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dd613136ee91f67e5dba3f3f41ac99ae89c5406b",
+        "rev": "63158b9cbb6ec93d26255871c447b0f01da81619",
         "type": "github"
       },
       "original": {
@@ -738,11 +738,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1743128178,
-        "narHash": "sha256-h/05pQp7KTy83UqwfZQpuJGB5oEWYf+5kVM7RGBi47k=",
+        "lastModified": 1743454066,
+        "narHash": "sha256-8h+Ne6XNccuvkS6ZvcK7yTc+so35J2KvIOPAipFdM7o=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "e8dc75a445e7d58d4b4b5be1d13a3b1e32a5c027",
+        "rev": "0d287e4ac4f1572a4d615b46c17365ac1846dfdf",
         "type": "github"
       },
       "original": {
@@ -784,11 +784,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742058297,
-        "narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=",
+        "lastModified": 1742649964,
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
         "type": "github"
       },
       "original": {
@@ -848,11 +848,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742700801,
-        "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=",
+        "lastModified": 1743305778,
+        "narHash": "sha256-Ux/UohNtnM5mn9SFjaHp6IZe2aAnUCzklMluNtV6zFo=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852",
+        "rev": "8e873886bbfc32163fe027b8676c75637b7da114",
         "type": "github"
       },
       "original": {
@@ -889,11 +889,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1742753562,
-        "narHash": "sha256-EBXgl3sPi5AQUM58XGuuC8HQl/Df+Dbt6pOLInInJ/k=",
+        "lastModified": 1743451752,
+        "narHash": "sha256-PXHHMhGea0b4CNKXkcAPHT9AlFOrptaVwlcMjPE/MVk=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "d9df91c55643a8b5229a3ae3a496a30f14965457",
+        "rev": "b45eb498944ffeae47aba8d1e42b8449fd07ca08",
         "type": "github"
       },
       "original": {
@@ -1121,15 +1121,16 @@
         "zen-browser-flake": "zen-browser-flake"
       },
       "locked": {
-        "lastModified": 1742778302,
-        "narHash": "sha256-NJAHpa0FyxncCv1OxAytXNrvcJHyJQ6NIUml8IlHg1E=",
-        "owner": "LunaCOLON3",
+        "lastModified": 1743459111,
+        "narHash": "sha256-bdzL8iaemrKHEggM/RkCcJbTthjqDCP1NWh67JnGtJs=",
+        "owner": "firelilith",
         "repo": "zen-browser-nix",
-        "rev": "b33748cb75234c35bf71942e05fc2e23fe502db9",
+        "rev": "71d27e8f57c254348390c60d095d6f4e88f11e61",
         "type": "github"
       },
       "original": {
-        "owner": "LunaCOLON3",
+        "owner": "firelilith",
+        "ref": "native-messaging-collision",
         "repo": "zen-browser-nix",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 8595477b..06b0d79d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -51,7 +51,7 @@
     };
 
     zen-browser = {
-      url = "github:LunaCOLON3/zen-browser-nix";
+      url = "github:firelilith/zen-browser-nix/native-messaging-collision";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
diff --git a/home/lilith/default.nix b/home/lilith/default.nix
index 96ea0b54..1cfc32d9 100644
--- a/home/lilith/default.nix
+++ b/home/lilith/default.nix
@@ -17,7 +17,7 @@
     ./clipman.nix
     ./common.nix
     ./direnv.nix
-    ./firefox.nix
+    # ./firefox.nix
     ./fzf.nix
     ./git.nix
     ./gpg.nix
@@ -28,6 +28,8 @@
     ./ssh.nix
     ./stylix.nix
     ./thunderbird.nix
+
     ./zsh
+    ./nushell.nix
   ];
 }
diff --git a/home/lilith/direnv.nix b/home/lilith/direnv.nix
index 3a7b8add..1d20bb6f 100644
--- a/home/lilith/direnv.nix
+++ b/home/lilith/direnv.nix
@@ -1,6 +1,9 @@
-{...}: {
+{ ... }:
+{
   programs.direnv = {
     enable = true;
     nix-direnv.enable = true;
+    enableZshIntegration = true;
+    enableNushellIntegration = true;
   };
 }
diff --git a/home/lilith/firefox/default.nix b/home/lilith/firefox/default.nix
index 59ee3537..60a97ec0 100644
--- a/home/lilith/firefox/default.nix
+++ b/home/lilith/firefox/default.nix
@@ -7,13 +7,13 @@
 {
   imports = [ zen-browser.homeManagerModules.zen-browser ];
 
-  home.file.".mozilla/native-messaging-hosts".source =
-    lib.mkForce /home/lilith/.mozilla/native-messaging-hosts;
+  # home.file.".mozilla/native-messaging-hosts".source =
+  # lib.mkForce /home/lilith/.mozilla/native-messaging-hosts;
 
   programs.zen-browser = {
     enable = true;
 
-    nativeMessagingHosts = lib.mkForce (
+    nativeMessagingHosts = (
       with pkgs;
       [
         tridactyl-native
diff --git a/home/lilith/nushell.nix b/home/lilith/nushell.nix
new file mode 100644
index 00000000..d7eb4a53
--- /dev/null
+++ b/home/lilith/nushell.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+{
+  programs.nushell = {
+    enable = true;
+    plugins = with pkgs.nushellPlugins; [
+      formats
+      query
+      gstat
+    ];
+  };
+}
diff --git a/system/core/nix.nix b/system/core/nix.nix
index c20e72d8..55ac2f00 100644
--- a/system/core/nix.nix
+++ b/system/core/nix.nix
@@ -28,11 +28,27 @@
         hostName = "lilith-server-builder";
         system = "x86_64-linux";
         protocol = "ssh-ng";
+
+        speedFactor = 1;
+        supportedFeatures = [
+          "kvm"
+          "big-parallel"
+          "nixos-test"
+          "benchmark"
+        ];
       }
       {
         hostName = "lilith-pc";
         system = "x86_64-linux";
         protocol = "ssh-ng";
+
+        speedFactor = 2;
+        supportedFeatures = [
+          "kvm"
+          "big-parallel"
+          "nixos-test"
+          "benchmark"
+        ];
       }
     ];
   };