diff --git a/flake.lock b/flake.lock
index c8f602b..ab94877 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1057,6 +1057,26 @@
         "type": "github"
       }
     },
+    "nh-flake": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1749409404,
+        "narHash": "sha256-v02NsZ589zzPq5xsCxyrG1/ZkFbbMkUthly50QdmYKo=",
+        "owner": "nix-community",
+        "repo": "nh",
+        "rev": "003dd72d3234361c93d5be7ec9766c88e0dd1052",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nh",
+        "type": "github"
+      }
+    },
     "nix": {
       "inputs": {
         "flake-compat": [
@@ -1451,6 +1471,7 @@
         "hyprland-plugins": "hyprland-plugins",
         "hyprlock": "hyprlock",
         "hyprpanel": "hyprpanel",
+        "nh-flake": "nh-flake",
         "nix-ld": "nix-ld",
         "nixos-hardware": "nixos-hardware",
         "nixos-wsl": "nixos-wsl",
diff --git a/flake.nix b/flake.nix
index f5f71de..96744cb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,6 +28,11 @@
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
 
+    nh-flake = {
+      url = "github:nix-community/nh";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+
     ###
     # hyprland stuff
     hyprland.url = "github:hyprwm/Hyprland";
diff --git a/modules/home/apps/cli-apps/fish/default.nix b/modules/home/apps/cli-apps/fish/default.nix
index 77fb23e..eb2efc2 100644
--- a/modules/home/apps/cli-apps/fish/default.nix
+++ b/modules/home/apps/cli-apps/fish/default.nix
@@ -44,7 +44,6 @@ in
         };
         functions = {
           checkHash = "nix hash to-sri --type sha256 $(nix-prefetch-url --unpack $argv)";
-          buildandDeployYggdrasil = "nom build '.#nixosConfigurations.yggdrasil.config.system.build.toplevel' && sudo nixos-rebuild switch --flake .#yggdrasil";
           deployNixberry = "nixos-rebuild switch --flake .#nixberry --target-host nixberry --use-remote-sudo --fast";
           deployLoptland = "nixos-rebuild switch --flake .#loptland --target-host christophhollizeck.dev --use-remote-sudo --fast";
           checkPR = "cd nixpkgs && ${lib.getExe pkgs.nixpkgs-review} pr $argv --post-result --approve";
diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix
index dfe7b92..92f874b 100644
--- a/modules/nixos/nix/default.nix
+++ b/modules/nixos/nix/default.nix
@@ -1,8 +1,10 @@
 {
   config,
+  inputs,
   lib,
   namespace,
   pkgs,
+  system,
   ...
 }:
 with lib;
@@ -50,6 +52,12 @@ in
       nix-output-monitor
     ];
 
+    programs.nh = {
+      enable = true;
+      package = inputs.nh-flake.packages.${system}.nh;
+      flake = "/home/cholli/projects/config";
+    };
+
     nix =
       let
         users = [
@@ -63,7 +71,7 @@ in
 
         settings =
           {
-            experimental-features = "nix-command flakes";
+            experimental-features = "nix-command flakes repl-flake";
             http-connections = 50;
             warn-dirty = false;
             log-lines = 50;