From 3eb63178e466fda366cd1df95604a1bcae6f0eba Mon Sep 17 00:00:00 2001
From: fwastring <fredrik@wastring.com>
Date: Wed, 19 Mar 2025 08:35:54 +0100
Subject: [PATCH] Added some stuff

---
 config/base.nix                    |  7 +++--
 config/home.nix                    | 19 +++++++++----
 maskiner/desktop/configuration.nix |  2 +-
 shared/ssh.nix                     | 44 +++++++++---------------------
 4 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/config/base.nix b/config/base.nix
index 28d5633..cb1c58a 100644
--- a/config/base.nix
+++ b/config/base.nix
@@ -50,19 +50,20 @@
 	liveRestore = false;
   };
 
+	  hardware.pulseaudio.enable = false;
 	security.rtkit.enable = true;
 	services = {
+		tailscale = {
+			enable = true;
+		};
 		pipewire = {
 			enable = true;
 			alsa.enable = true;
 			alsa.support32Bit = true;
 			pulse.enable = true;
-			# If you want to use JACK applications, uncomment this
-			jack.enable = true;
 		};
 	};
   hardware = {
-    pulseaudio.enable = false;
     bluetooth = {
       enable = true;
       powerOnBoot = true;
diff --git a/config/home.nix b/config/home.nix
index 4de58d6..dbf3b86 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -13,7 +13,7 @@
     ../shared/vscode.nix
     # ../shared/dmenu.nix
 	# ../shared/rofi.nix
-	../shared/mpv.nix
+	# ../shared/mpv.nix
     ../shared/kitty.nix
     ../shared/alacritty.nix
     ../shared/tmux.nix
@@ -60,8 +60,8 @@
 	bluez
 	bluez-tools
 	unstable.betterlockscreen
-	tmux
-	unstable.fzf
+	# tmux
+	fzf
 	eza
 	btop
 	thttpd
@@ -74,18 +74,23 @@
 	light
 
 	# Dev
+	gh
 	unstable.deno
 	unstable.hugo
 	unstable.logstash
 	ngrok
 	tailwindcss
-	nodejs_22
+	nodejs_23
 	yarn
 	plantuml
 	go
-	dotnetCorePackages.sdk_8_0_3xx
+	# dotnetCorePackages.sdk_8_0_3xx
+	dotnetCorePackages.sdk_9_0_1xx
 	templ
 	goa
+	azuredatastudio
+	mdbtools
+	prettierd
 
 	#Tools
 	qrencode
@@ -98,6 +103,9 @@
 	#LSP
 	# roslyn
 	roslyn-ls
+	dockerfile-language-server-nodejs
+	docker-compose-language-service
+	bash-language-server
 	python312Packages.python-lsp-server
 	yaml-language-server
 	lua-language-server
@@ -122,6 +130,7 @@
     networkmanagerapplet
     networkmanager-l2tp
     strongswan
+	networkmanager_strongswan
 
 	# Display
     scrot
diff --git a/maskiner/desktop/configuration.nix b/maskiner/desktop/configuration.nix
index 7e12414..292c0f4 100644
--- a/maskiner/desktop/configuration.nix
+++ b/maskiner/desktop/configuration.nix
@@ -21,7 +21,7 @@
 	];
 networking.firewall = {
   enable = true;
-  allowedTCPPorts = [ 80 443 8384 22000];
+  allowedTCPPorts = [ 80 443 3000 8384 22000];
   allowedUDPPortRanges = [
     { from = 4000; to = 4007; }
     { from = 8000; to = 8010; }
diff --git a/shared/ssh.nix b/shared/ssh.nix
index 9811b93..207102d 100644
--- a/shared/ssh.nix
+++ b/shared/ssh.nix
@@ -27,42 +27,12 @@
         user = "fw";
         identityFile = "/home/fw/.ssh/fw-ssh-key";
       };
-      "ha1" = {
-        hostname = "192.168.0.180";
-        port = 22;
-        user = "fw";
-        identityFile = "/home/fw/.ssh/fw-ssh-key";
-      };
-      "ha2" = {
-        hostname = "192.168.0.133";
-        port = 22;
-        user = "fw";
-        identityFile = "/home/fw/.ssh/fw-ssh-key";
-      };
-      "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;
-        user = "github";
-        identityFile = "/home/fw/.ssh/github-ssh-key";
-      };
       "malmo" = {
         hostname = "192.168.0.138";
         port = 22;
@@ -93,7 +63,19 @@
         identityFile = "/home/fw/.ssh/fw-ssh-key";
       };
       "runner01" = {
-        hostname = "192.168.0.205";
+        hostname = "192.168.0.184";
+        port = 22;
+        user = "fw";
+        identityFile = "/home/fw/.ssh/fw-ssh-key";
+      };
+      "docker03" = {
+        hostname = "192.168.0.118";
+        port = 22;
+        user = "fw";
+        identityFile = "/home/fw/.ssh/fw-ssh-key";
+      };
+      "table" = {
+        hostname = "192.168.0.157";
         port = 22;
         user = "fw";
         identityFile = "/home/fw/.ssh/fw-ssh-key";