From a00d4ed9991befc0ef9bca67a8de738ba51176a8 Mon Sep 17 00:00:00 2001
From: chfour <chfourchfour@protonmail.com>
Date: Wed, 22 Apr 2026 17:51:53 +0200
Subject: [PATCH] post-update fixups

---
 users/chfour/env-gnome.nix | 15 +--------------
 users/chfour/home.nix      | 17 +++++++++++------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/users/chfour/env-gnome.nix b/users/chfour/env-gnome.nix
index fe4b46a..5340361 100644
--- a/users/chfour/env-gnome.nix
+++ b/users/chfour/env-gnome.nix
@@ -149,20 +149,7 @@
     enable = true;
 
     # gtk3 theme
-    theme = {
-      name = "adw-gtk3-dark";
-      package = pkgs.stdenv.mkDerivation rec {
-        pname = "adw-gtk3";
-        version = src.version;
-        src = pkgs.adw-gtk3;
-        installPhase = ''
-          mkdir -p $out
-          cp -r * $out/
-          # ensure only the gtk3 theme is there (the gtk4 one seems to be breaking things)
-          rm -rf $out/share/themes/*/gtk-4.0
-        '';
-      };
-    };
+    theme = { name = "adw-gtk3"; package = pkgs.adw-gtk3; };
 
     # buggy?
     #cursorTheme = {
diff --git a/users/chfour/home.nix b/users/chfour/home.nix
index 6afe417..7c4e082 100644
--- a/users/chfour/home.nix
+++ b/users/chfour/home.nix
@@ -33,9 +33,11 @@ in {
 
   programs.git = {
     enable = true;
-
-    signing.signByDefault = true;
-    signing.key = "BD2EC4C0608DED53";
+    signing = {
+      signByDefault = true;
+      key = "BD2EC4C0608DED53";
+      format = "openpgp"; # need to switch to ssh keys ugh
+    };
 
     settings = {
       user.name = "chfour";
@@ -95,7 +97,10 @@ in {
     };
   };
 
-  xdg.userDirs.enable = isGui;
+  xdg.userDirs = {
+    enable = isGui;
+    setSessionVariables = true;
+  };
 
   services.mpd = {
     enable = isGui;
@@ -128,7 +133,7 @@ in {
         # yea
         patches = (old.patches or []) ++ [ ./signal-desktop-show-window.patch ];
       }))
-      helvum
+      crosspipe
       inkscape gimp3 libresprite
       # libresprite bc aseprite builds weird and its almost the same thing anyways
       blender
@@ -173,5 +178,5 @@ in {
   };
 
   programs.home-manager.enable = true;
-  home.stateVersion = "23.05";
+  home.stateVersion = "26.05";
 }
-- 
2.51.2