Lots of changes

config/base.nix

@@ -76,10 +76,9 @@
   fonts.packages = with pkgs; [
     (nerdfonts.override { 
       fonts = [ 
+        "ComicShannsMono" 
         "FiraCode" 
-		"Agave"
+		"Iosevka"
-		"VictorMono"
-        "DroidSansMono" 
       ]; 
     })
   ];
@@ -107,7 +106,7 @@
 		(
 		catppuccin-sddm.override {
 			flavor = "mocha";
-			font  = "FiraCode Nerd Font Bold";
+			font  = "ComicShannsMono Nerd Font Bold";
 			fontSize = "17";
 			background = "${../wallpapers/inverted.png}";
 			loginBackground = true;

config/home.nix

@@ -76,8 +76,13 @@
 	eza
 	btop
 	xcolor
+	openssl
 
 	# Dev
+	unstable.cargo
+	unstable.rustc
+	cargo-generate
+	nodejs_22
 	gleam
 	gh-f
 	gh
@@ -93,16 +98,24 @@
 	ranger
 	tesseract4
 	k9s
+	kubectl
+	ngrok
 
 	#LSP
+	yaml-language-server
     nil
 	jdt-language-server
 	texlab
 	marksman
 	nodePackages_latest.bash-language-server
+	typescript
+	nodePackages_latest.typescript-language-server
+	nodePackages_latest.vls
+	nodePackages_latest.volar
 	lua-language-server
 	tree-sitter
 	gopls
+	rust-analyzer
 
 	# Geography
 	geos
@@ -133,6 +146,8 @@
 	poppler_utils
 
 	#Desktop
+	unstable.signal-desktop
+	kompare
 	pinta
     zathura
     firefox

flake.lock

@@ -1,46 +1,12 @@
 {
   "nodes": {
-    "base64-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1705041416,
-        "narHash": "sha256-fi1/gozIXtVAhJr/TOM5cu1hJ7BKgz4KaDtkbYNKYR0=",
-        "ref": "refs/heads/master",
-        "rev": "dceb7af2f73afb7aae20322cca04f27331d2e16a",
-        "revCount": 3,
-        "type": "git",
-        "url": "https://gist.github.com/tomykaira/f0fd86b6c73063283afe550bc5d77594"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://gist.github.com/tomykaira/f0fd86b6c73063283afe550bc5d77594"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "ref": "refs/heads/main",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "revCount": 92,
-        "type": "git",
-        "url": "https://github.com/numtide/flake-utils"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://github.com/numtide/flake-utils"
-      }
-    },
     "fw-pkgs": {
       "locked": {
-        "lastModified": 1717322328,
+        "lastModified": 1730710113,
-        "narHash": "sha256-Kb45yu6RgfTgtcwaj3eme5k/zjh3W3Gw5ACl7/OBYmw=",
+        "narHash": "sha256-6DtfJyoScSuTKVjPH8INHACl/7qX3OqbA61UI2u5a1c=",
         "owner": "fwastring",
         "repo": "fwpkgs",
-        "rev": "f9d01269a520872f15f5e30f286616261821b158",
+        "rev": "fb322b3c8c413c3bd4d5222fe4b9566ab2998c58",
         "type": "github"
       },
       "original": {
@@ -50,22 +16,6 @@
         "type": "github"
       }
     },
-    "gourou-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1713159448,
-        "narHash": "sha256-z/hMvFPDd3CXo4iUiZPfkUVQPPcJe+Tk6By+cibAtE0=",
-        "ref": "refs/heads/master",
-        "rev": "81faf1f9bef4d27d8659f2f16b9c65df227ee3d7",
-        "revCount": 141,
-        "type": "git",
-        "url": "https://forge.soutade.fr/soutade/libgourou"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://forge.soutade.fr/soutade/libgourou"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -73,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717527182,
+        "lastModified": 1726989464,
-        "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
+        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "845a5c4c073f74105022533907703441e0464bc3",
+        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
         "type": "github"
       },
       "original": {
@@ -87,67 +37,13 @@
         "type": "github"
       }
     },
-    "knock": {
-      "inputs": {
-        "base64-src": "base64-src",
-        "flake-utils": "flake-utils",
-        "gourou-src": "gourou-src",
-        "nixpkgs": "nixpkgs",
-        "pugixml-src": "pugixml-src",
-        "updfparser-src": "updfparser-src"
-      },
-      "locked": {
-        "lastModified": 1721181121,
-        "narHash": "sha256-181wtuVI4l6mWUMwDe0HkvoqKWrDF+UVL0E83YEztks=",
-        "owner": "BentonEdmondson",
-        "repo": "knock",
-        "rev": "0aa4005fd4f2ee1b41c20643017c8f0a2bdf6262",
-        "type": "github"
-      },
-      "original": {
-        "owner": "BentonEdmondson",
-        "repo": "knock",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1720928027,
+        "lastModified": 1730327045,
-        "narHash": "sha256-Ze8frbrRJAuEJWVWf9bExMoFshPYhAmp1Nq5VYkzlVU=",
+        "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
-        "ref": "refs/heads/master",
-        "rev": "048f85c494ef4fcd90889537f78e8548f5abcaf0",
-        "revCount": 652811,
-        "type": "git",
-        "url": "https://github.com/nixos/nixpkgs"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://github.com/nixos/nixpkgs"
-      }
-    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1718318537,
-        "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420",
+        "rev": "080166c15633801df010977d9d7474b4a6c549d7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1718208800,
-        "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b",
         "type": "github"
       },
       "original": {
@@ -157,61 +53,29 @@
         "type": "github"
       }
     },
-    "pugixml-src": {
+    "nixpkgs-unstable": {
-      "flake": false,
       "locked": {
-        "lastModified": 1720456557,
+        "lastModified": 1730531603,
-        "narHash": "sha256-0KZgn1PASbEb+Xl9XDZI+uifWwKPL6pVC1Lgbnjbet0=",
+        "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
-        "ref": "refs/heads/master",
+        "owner": "NixOS",
-        "rev": "30cc354fe37114ec7a0a4ed2192951690357c2ed",
+        "repo": "nixpkgs",
-        "revCount": 1799,
+        "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
-        "type": "git",
+        "type": "github"
-        "url": "https://github.com/zeux/pugixml"
       },
       "original": {
-        "type": "git",
+        "owner": "NixOS",
-        "url": "https://github.com/zeux/pugixml"
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "root": {
       "inputs": {
         "fw-pkgs": "fw-pkgs",
         "home-manager": "home-manager",
-        "knock": "knock",
+        "nixpkgs": "nixpkgs",
-        "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "updfparser-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1711214903,
-        "narHash": "sha256-HD73WGZ4e/3T7vQmwU/lRADtvsInFG62uqvJmF773Rk=",
-        "ref": "refs/heads/master",
-        "rev": "6060d123441a06df699eb275ae5ffdd50409b8f3",
-        "revCount": 33,
-        "type": "git",
-        "url": "https://forge.soutade.fr/soutade/updfparser"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://forge.soutade.fr/soutade/updfparser"
-      }
     }
   },
   "root": "root",

maskiner/server/configuration.nix

@@ -67,6 +67,7 @@
     (nerdfonts.override { 
       fonts = [ 
         "FiraCode" 
+        "Iosevka" 
         "DroidSansMono" 
       ]; 
     })

shared/dwm.nix

@@ -3,7 +3,7 @@ let
   dwm = pkgs.dwm.overrideAttrs (old: {
     src = builtins.fetchGit {
       url = "https://github.com/FredzyW/dwm-conf.git";
-      rev = "48302683403ca7457590c0a55c73ab5cc7e4113a";
+      rev = "3b9d96ece2c814a1c50d59de68587b2a4eee4ff8";
     };
     nativeBuildInputs = with pkgs; [ 
       xorg.libX11.dev

shared/fish.nix

@@ -48,7 +48,7 @@
 		  home="home-manager switch --flake $HM_DIR";
 		  reb="sudo nixos-rebuild switch --flake $SYSTEM_DIR";
 		  cam="jira issue create && jira issue assign && jira issue move";
-		  latest="git log | head -1 | awk '{print $2;}' | xsel -i";
+		  latest="git log | head -1 | awk '{print $2;}' | xsel -ib";
 	  };
 	  interactiveShellInit = ''
 		fish_vi_key_bindings

shared/kitty.nix

@@ -3,18 +3,18 @@
   programs.kitty = {
     enable = true;
     font = if myhostname == "laptop" then {
-      name = "FiraCode Nerd Font Bold";
+      # name = "Iosevka Nerd Font Bold";
-      size = 24;
+      name = "ComicShannsMono Nerd Font Bold";
+      size = 20;
     } else {
-      name = "FiraCode Nerd Font Bold";
+      # name = "Iosevka Nerd Font Bold";
+      name = "ComicShannsMono Nerd Font Bold";
       size = 13;
     };
     shellIntegration = {
       mode = "no-cursor";
     };
-    # theme = "Catppuccin-Latte";
     theme = "Catppuccin-Mocha";
-    # theme = "Catppuccin-Macchiato";
     settings = {
       confirm_os_window_close = 2;
       cursor_shape = "block";

shared/tmux.nix

@@ -25,6 +25,7 @@
 			'';
 		}
 		fw-pkgs.tmuxPlugins.spotify
+		fw-pkgs.tmuxPlugins.tmux-fzf-window
 		{
 			plugin = fw-pkgs.tmuxPlugins.minimal;
 			extraConfig = ''