diff --git a/config/home.nix b/config/home.nix
index 9eea3af..4209316 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -78,6 +78,7 @@
 	xcolor
 
 	# Dev
+	gh
 	yarn
 	plantuml
 	go
@@ -89,6 +90,7 @@
 	templ
 	ranger
 	tesseract4
+	k9s
 
 	#LSP
     nil
diff --git a/flake.nix b/flake.nix
index 98e0cf4..739a539 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,6 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
 	nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 	fw-pkgs.url = "github:fwastring/fwpkgs/main";
-	knock.url = "github:BentonEdmondson/knock";
 
     # Home manager
     home-manager.url = "github:nix-community/home-manager/release-24.05";
@@ -19,7 +18,6 @@
     home-manager,
 	nixpkgs-unstable,
 	fw-pkgs,
-	knock,
     ...
   } @ inputs: let
     inherit (self) outputs;
@@ -58,7 +56,6 @@
         modules = [
 			({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
 			./maskiner/desktop/configuration.nix
-			knock
 		];
       };
       jobb = nixpkgs.lib.nixosSystem {
diff --git a/maskiner/jobb/configuration.nix b/maskiner/jobb/configuration.nix
index ad2c2c6..64e3429 100644
--- a/maskiner/jobb/configuration.nix
+++ b/maskiner/jobb/configuration.nix
@@ -15,6 +15,14 @@
 	../../config/users.nix
   ];
 
+  	environment.systemPackages = with pkgs; [
+		kubectl
+		azure-cli
+	];
+
+
+
+
   networking.hostName = myhostname;
 
 	# services.k3s = {
diff --git a/shared/fish.nix b/shared/fish.nix
index 28e9d08..e4f9af6 100644
--- a/shared/fish.nix
+++ b/shared/fish.nix
@@ -51,6 +51,7 @@
 		  latest="git log | head -1 | awk '{print $2;}' | xsel -i";
 	  };
 	  interactiveShellInit = ''
+		fish_vi_key_bindings
 		set fish_greeting # Disable greeting
 		set FLAKE_DIR "/home/fw/nix"
 		set HM_DIR "$FLAKE_DIR#fw@jobb"
diff --git a/shared/ssh.nix b/shared/ssh.nix
index d85680e..0537ab8 100644
--- a/shared/ssh.nix
+++ b/shared/ssh.nix
@@ -32,18 +32,30 @@
         user = "fw";
         identityFile = "/home/fw/.ssh/fw-ssh-key";
       };
-      "ba6" = {
-        hostname = "buildagent6";
+      "ha2" = {
+        hostname = "192.168.0.133";
         port = 22;
         user = "fw";
         identityFile = "/home/fw/.ssh/fw-ssh-key";
       };
-      "ba2" = {
+      "ha3" = {
         hostname = "192.168.0.120";
         port = 22;
         user = "fw";
         identityFile = "/home/fw/.ssh/fw-ssh-key";
       };
+      "ha4" = {
+        hostname = "192.168.0.52";
+        port = 22;
+        user = "fw";
+        identityFile = "/home/fw/.ssh/fw-ssh-key";
+      };
+      "mac" = {
+        hostname = "192.168.0.149";
+        port = 22;
+        user = "ifacts";
+        identityFile = "/home/fw/.ssh/ifacts-ssh-key";
+      };
       "backups" = {
         hostname = "192.168.0.120";
         port = 22;
@@ -62,18 +74,6 @@
         user = "fw";
         identityFile = "/home/fw/.ssh/fw-ssh-key";
       };
-      "kub1" = {
-        hostname = "192.168.0.52";
-        port = 22;
-        user = "fw";
-        identityFile = "/home/fw/.ssh/fw-ssh-key";
-      };
-      "mac" = {
-        hostname = "192.168.0.206";
-        port = 22;
-        user = "ifacts";
-        identityFile = "/home/fw/.ssh/ifacts-ssh-key";
-      };
       "malmo" = {
         hostname = "192.168.0.138";
         port = 22;
@@ -86,11 +86,17 @@
         user = "root";
       };
       "disa" = {
-        hostname = "192.168.1.242";
-        port = 22;
+        hostname = "62.63.222.22";
+        port = 55505;
         user = "disah";
         identityFile = "/home/fw/.ssh/id_rsa";
       };
+      "laptop" = {
+        hostname = "62.63.222.22";
+        port = 55504;
+        user = "fw";
+        identityFile = "/home/fw/.ssh/id_rsa";
+      };
     };
   };
 }