diff --git a/flake.lock b/flake.lock
index 95d8bd0..c75f41c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -38,11 +38,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1659881187,
-        "narHash": "sha256-9QKrAdJRQlaU3nLbfNwvjwQucuy5GCRTzPH2+w6NuxM=",
+        "lastModified": 1659896700,
+        "narHash": "sha256-PG0jBH9lpE9XBBP+sq9Gq4baZwwbeqWBnob5jFuaS+Q=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "9bbd8c3c689e076ef17eca0c3b2208068756fcb7",
+        "rev": "d023e5cc92e746c130891b6110f5cf28d9734fb4",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 3a171ae..dc8614d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,21 +8,21 @@
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     nur.url = "github:nix-community/NUR";
+    nur.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = inputs@{ self, nixpkgs, home-manager, nur, ... }:
     let
+      username = "manuel";
+
       system = "x86_64-linux";
 
       pkgs = import nixpkgs {
         inherit system;
         config = { allowUnfree = true; };
-        overlays = [ self.overlays.default ];
+        overlays = [ self.overlays.default nur.overlay ];
       };
 
-
-      lib = nixpkgs.lib;
-
     in
     {
       overlays.default =
@@ -34,10 +34,10 @@
           };
         });
 
-      nixosConfigurations.terra = lib.nixosSystem
+      nixosConfigurations.terra = nixpkgs.lib.nixosSystem
         {
           inherit system;
-          specialArgs = inputs;
+          specialArgs = { inherit inputs; };
           modules = [
             ./system/configuration.nix
             home-manager.nixosModules.home-manager
@@ -46,11 +46,13 @@
                 {
                   useGlobalPkgs = true;
                   useUserPackages = true;
-                  users.manuel = import ./user/home.nix;
-                  extraSpecialArgs = { inherit pkgs; };
+                  users.${username} = import ./user/home.nix;
+                  extraSpecialArgs = {
+                    inherit inputs;
+                    inherit pkgs;
+                  };
                 };
             }
-            nur.nixosModules.nur
           ];
         };
     };
diff --git a/user/configs/fish/fish.nix b/user/configs/fish/fish.nix
index 4f79823..c926498 100644
--- a/user/configs/fish/fish.nix
+++ b/user/configs/fish/fish.nix
@@ -31,6 +31,21 @@
         	end
         	popd &> /dev/null
       '';
+
+      nor = ''
+        pushd &> /dev/null
+        cd "${config.home.homeDirectory}/.dotfiles"
+        doas nixos-rebuild switch --upgrade --flake .#
+        popd &> /dev/null
+      '';
+
+      nou = ''
+        pushd &> /dev/null
+        cd "${config.home.homeDirectory}/.dotfiles"
+        nix flake update --commit-lock-file
+        doas nixos-rebuild switch --upgrade --flake .#
+        popd &> /dev/null
+      '';
     };
     shellAliases = {
       hm = "home-manager";