mixed: gpg fixes, refactoring

darwin/home.nix

@@ -1,7 +1,13 @@
-{config, ...}: {
-  services.gpg-agent.pinentryFlavor = null;
+{config,lib,...}: let
+  inherit (lib.modules) mkForce mkMerge;
+in {
+  services.gpg-agent = {
+    enable = mkForce false;
+    pinentryFlavor = null;
+  };
 
-  home.file."${config.programs.gpg.homedir}/gpg-agent.conf".text = ''
-    pinentry-program /opt/homebrew/bin/pinentry-mac
-  '';
+  home.file."${config.programs.gpg.homedir}/gpg-agent.conf".text = mkMerge [
+    config.services.gpg-agent.extraConfig
+    "pinentry-program /opt/homebrew/bin/pinentry-mac"
+  ];
 }

darwin/kat.nix

@@ -1,14 +0,0 @@
-{pkgs, ...}: {
-  users.users.kat = {
-    name = "kat";
-    home = "/Users/kat";
-    shell = pkgs.zsh;
-    uid = 501;
-  };
-  users.knownUsers = [
-    "kat"
-  ];
-  home-manager.users.kat.programs.zsh.initExtraFirst = ''
-    source /etc/static/zshrc
-  '';
-}

darwin/modules/blank.nix

@@ -1 +0,0 @@
-_: {}