From 7722d6fa41f381dba9e4f5b869cd1c29eacecd7f Mon Sep 17 00:00:00 2001
From: fwastring <fredrik@wastring.com>
Date: Sun, 22 Jun 2025 23:03:13 +0200
Subject: [PATCH] Lots of new things

---
 config/dev.nix                    |  3 +++
 config/programs.nix               |  4 ++++
 config/system.nix                 |  8 ++++++++
 maskiner/laptop/configuration.nix | 20 ++++++++++++++++++++
 shared/dwm.nix                    |  2 +-
 shared/fish.nix                   | 17 ++++++++++++-----
 6 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/config/dev.nix b/config/dev.nix
index f62ccec..75932cc 100644
--- a/config/dev.nix
+++ b/config/dev.nix
@@ -21,6 +21,9 @@ in
 		dotnetCorePackages.sdk_8_0_3xx
 		docker-slim
 
+		awscli
+		unstable.minio-client
+		hugo
 		sqlc
 		postgresql
 		go-migrate-pg
diff --git a/config/programs.nix b/config/programs.nix
index 0138afe..a32f21d 100644
--- a/config/programs.nix
+++ b/config/programs.nix
@@ -12,6 +12,7 @@
 		extraRules = ''
 			KERNEL=="ttyACM0", MODE:="666"
 			ACTION=="add", KERNEL=="sd[a-e][0-9]", ENV{ID_FS_UUID}=="3039-3932", RUN+="${pkgs.systemd}/bin/systemd-mount --no-block -A -G -o gid=users,fmask=113,dmask=002 /dev/%k /mnt/sdcard"
+			ACTION=="add", KERNEL=="sd[a-e]", ENV{ID_FS_UUID}=="66BA-4EBA", RUN+="${pkgs.systemd}/bin/systemd-mount --no-block -A -G -o gid=users,fmask=113,dmask=002 /dev/%k /mnt/kobo"
 		'';
 		packages = with pkgs; [
 			vial
@@ -30,9 +31,12 @@
 		slack
 		speedcrunch
 		remmina
+
 		# Browsers
 		librewolf
 		unstable.qutebrowser
+		jan
+		chawan
 
 		# Capturing
 		byzanz
diff --git a/config/system.nix b/config/system.nix
index 89a7690..a3f1ec8 100644
--- a/config/system.nix
+++ b/config/system.nix
@@ -62,5 +62,13 @@
 			pass-update
 		]))
 		lazygit
+
+		# Typesetting
+		typst
+		typstyle
+		tinymist
+		websocat
+		nix-search-cli
+		libsixel
 	];
 }
diff --git a/maskiner/laptop/configuration.nix b/maskiner/laptop/configuration.nix
index 8164841..aa10918 100644
--- a/maskiner/laptop/configuration.nix
+++ b/maskiner/laptop/configuration.nix
@@ -34,6 +34,26 @@
         			'';
     };
   };
+  services.syncthing = {
+	  enable = true;
+	  user = "fw";
+	  openDefaultPorts = true; # Open ports in the firewall for Syncthing
+	  dataDir = "/home/fw";  # default location for new folders
+		configDir = "/home/fw/.config/syncthing";
+	  settings = {
+		  devices = {
+			  "laptop" = { id = "SCW3Z3J-NQHIKXZ-T4MR7JR-YE2VL4S-RDZ7W4F-PMSPWCQ-SGF2XLQ-CDQ3SQT"; };
+			  "fw-iphone" = { id = "CWKHS4T-PTMW6A7-EBKRQJW-YOLUWIX-CC5IBYD-Z4LDXTO-MMRHXYM-A2FA2AQ"; };
+			};
+		  folders = {
+			  "vaults" = {
+				path = "/home/fw/vaults";
+				devices = [ "laptop" "fw-iphone" ];
+				ignorePerms = false; # Enable file permission syncing
+			  };
+			};
+		};
+	};
 
   system.stateVersion = "23.11";
 }
diff --git a/shared/dwm.nix b/shared/dwm.nix
index 676a2e9..c1905f9 100644
--- a/shared/dwm.nix
+++ b/shared/dwm.nix
@@ -8,7 +8,7 @@ let
   dwm = pkgs.dwm.overrideAttrs (old: {
     src = builtins.fetchGit {
       url = "https://github.com/FredzyW/dwm-conf.git";
-      rev = "37dd7f92bb93d4994ab0d504a7b57618eb48f3aa";
+      rev = "9c31e04088fbe20be6dce79c55b9368d3f37654a";
     };
     nativeBuildInputs = with pkgs; [
       xorg.libX11.dev
diff --git a/shared/fish.nix b/shared/fish.nix
index 015ed72..c0a8347 100644
--- a/shared/fish.nix
+++ b/shared/fish.nix
@@ -43,11 +43,18 @@
       cam = "jira issue create && jira issue assign && jira issue move";
       latest = "git log | head -1 | awk '{print $2;}' | xsel -ib";
       vpnup = "nmcli con up 'iFacts VPN'";
-      vpndown = "nmcli con down 'iFacts VPN'";
-		dl = {
-			setCursor = "&";
-			expansion = "yt-dlp -o \"~/videor/%(title)s - %(uploader)s\" \"&\"";
-		};
+      s = {
+		  setCursor = "%";
+		  expansion = "cha https://search.wastring.com/search?q=%";
+	  };
+      vpndown = {
+		  setCursor = "%";
+		  expansion = "nmcli con down 'iFacts VPN'";
+	  };
+	  dl = {
+	  	setCursor = "&";
+		expansion = "yt-dlp -o \"~/videor/%(title)s - %(uploader)s\" \"&\"";
+	};
     };
     interactiveShellInit = ''
       		fish_vi_key_bindings