diff --git a/kat/default.nix b/kat/default.nix
index 471baeb..c03f5e0 100644
--- a/kat/default.nix
+++ b/kat/default.nix
@@ -96,7 +96,6 @@ in
         ripgrep
         wget
         git
-        lazygit
         btop
         screen
         nix-search-cli
diff --git a/kat/users/default.nix b/kat/users/default.nix
index e2ea061..0cbae30 100644
--- a/kat/users/default.nix
+++ b/kat/users/default.nix
@@ -8,7 +8,8 @@
 let
   inherit (lib)
     mkEnableOption
-    optionals
+    mkIf
+    mkMerge
     ;
   zsh = import ./zsh.nix;
   config-sys = config;
@@ -28,18 +29,21 @@ in
           # TODO: ssh = mkEnableOption "ssh configuration";
           work-tooling = mkEnableOption "common work tools";
         };
-        config = {
-          home = {
-            inherit (config-sys.system) stateVersion;
-            packages =
-              [
-                pkgs.rlwrap
-              ]
-              ++ optionals config.kat.work-tooling [
-                pkgs.numbat
-              ];
-          };
-        };
+        config = mkMerge [
+          {
+            home = {
+              inherit (config-sys.system) stateVersion;
+              packages = [ pkgs.rlwrap ];
+            };
+          }
+          (mkIf config.kat.work-tooling {
+            home.packages = [ pkgs.numbat ];
+            programs.lazygit = {
+              enable = true;
+              settings.git.overrideGpg = true;
+            };
+          })
+        ];
       }
     )
   ];