update to 25.05 and new screenshot solution, because the old one broke

common/nixos-wayland.nix

@@ -58,7 +58,7 @@
   };
 
   fonts.packages = with pkgs; [
-    (nerdfonts.override {fonts = ["Hack"];})
+    nerd-fonts.hack
   ];
 
   home-manager.users.me.services.swayosd.enable = true;
@@ -305,7 +305,23 @@
               #resume 'swaymsg "output * dpms on"' \
             #before-sleep 'swaylock -f -c 000000 -i $lock_bg'
 
-          bindsym $mod+Shift+s exec "${./..}/scripts/screenshot.sh"
+          bindsym $mod+Shift+s exec "${
+            let
+              innerScript = pkgs.writeScript "screenshot-inner" ''
+                geometry=$(slurp -c "#ff0000ff")
+
+                if [[ "$?" != "0" ]]
+                then
+                  pkill wayfreeze || true
+                  exit
+                fi
+
+                grim -g "$geometry" -t ppm - | satty --filename - --copy-command=wl-copy --early-exit &
+
+                pkill wayfreeze || true
+              '';
+            in "${pkgs.wayfreeze}/bin/wayfreeze --after-freeze-cmd ${innerScript}"
+          }"
 
           bindsym $mod+p exec $menu -show combi -combi-modes "ssh,run"
 

flake.nix

@@ -3,7 +3,7 @@
 
   ################################### INPUTS #########################################
 	inputs = {
-		nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
+		nixpkgs.url = "github:NixOS/nixpkgs/release-25.05";
 		#nixpkgs.url = "github:NixOS/nixpkgs/b9562c824b11473587286eb499680129c2d0d4f1";
 		#nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
@@ -20,7 +20,7 @@
     };
 
 		home-manager = {
-			url = "github:nix-community/home-manager/release-24.11";
+			url = "github:nix-community/home-manager/release-25.05";
 			#url = "github:nix-community/home-manager/release-24.05";
 			inputs.nixpkgs.follows = "nixpkgs";
 		};

programs/neovim.nix

@@ -45,10 +45,11 @@
 					"filetypes" = [ "nix" ];
 					"rootPatterns" =  [ "flake.nix" ];
 				};
-				"typst" = {
+				#"typst" = {
-					"command" = "${pkgs.typst-lsp}/bin/typst-lsp";
+          # error: 'typst-lsp' has been removed due to lack of upstream maintenance, consider using 'tinymist' instead
-					"filetypes" = [ "typ" "typst" ];
+					#"command" = "${pkgs.typst-lsp}/bin/typst-lsp"; 
-				};
+					#"filetypes" = [ "typ" "typst" ];
+				#};
 		  };
 		  "svelte.enable-ts-plugin" = true;
 		};

scripts/screenshot.sh

@@ -1,14 +0,0 @@
-hyprpicker -r -z &
-
-geometry=$(slurp -c '#ff0000ff')
-
-if [[ "$?" != "0" ]]
-then
-  pkill hyprpicker || true
-  exit
-fi
-
-
-grim -g "$geometry" -t ppm - | satty --filename - --copy-command=wl-copy --early-exit &
-
-pkill hyprpicker || true

users/me/gui-home.nix

@@ -82,7 +82,7 @@
 
     # gui packages
 		obsidian
-    gnome.eog
+    eog
 		xorg.xkbcomp
 		haskellPackages.xmonad-extras
 		haskellPackages.xmonad-contrib
@@ -92,7 +92,7 @@
 		spotify
 		networkmanagerapplet
 		haskellPackages.xmobar
-		dolphin
+		kdePackages.dolphin
 		mupdf
 		xclip
 		stalonetray