✨ Just recipe to update single flake, moved some home configs

home-manager/btop.nix

@@ -5,4 +5,6 @@
     enable = true;
     flavor = theme.flavor;
   };
+
+  programs.btop.enable = true;
 }

home-manager/default.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   inputs,
   common,
   ...
@@ -20,6 +19,7 @@ in
     ./fish.nix
     ./freetube.nix
     ./gtk.nix
+    ./gpg.nix
     ./kitty.nix
     ./media
     ./nextcloud.nix
@@ -31,8 +31,6 @@ in
     ./zen
   ];
 
-  dconf.enable = true;
-
   home = {
     username = username;
     homeDirectory = dir.home;
@@ -47,17 +45,6 @@ in
     stateVersion = common.system.version;
   };
 
-  programs = {
-    btop.enable = true;
-
-    # Let Home Manager install and manage itself.
-    home-manager.enable = true;
-  };
-
-  services = {
-    gpg-agent = {
-      enable = true;
-      pinentryPackage = pkgs.pinentry-curses;
-    };
-  };
+  # Let Home Manager install and manage itself.
+  programs.home-manager.enable = true;
 }

home-manager/gpg.nix

@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  services.gpg-agent = {
+    enable = true;
+    enableFishIntegration = true;
+    pinentryPackage = pkgs.pinentry-curses;
+  };
+}

home-manager/gtk.nix

@@ -1,15 +1,19 @@
 { theme, ... }:
 
 {
+  # TODO deprecated, remove
   catppuccin.gtk = {
     enable = true;
     flavor = theme.flavor;
     icon.enable = true;
   };
 
-  dconf.settings = {
-    # Prefer dark mode for all GTK apps
-    "org/gnome/desktop/interface".color-scheme = "prefer-dark";
+  dconf = {
+    enable = true;
+    settings = {
+      # Prefer dark mode for all GTK apps
+      "org/gnome/desktop/interface".color-scheme = "prefer-dark";
+    };
   };
 
   gtk.enable = true;