From 445e34615c93f623e78268af790c52c0d51437f6 Mon Sep 17 00:00:00 2001
From: Arpit Chakladar <arpitchakladar+git@gmail.com>
Date: Tue, 1 Sep 2026 04:34:36 +0530
Subject: office/development: added calcaurse config, delta config option fix

- added calcaurse configuration
- fixed git and lazygit usage of delta configuration for checking out
  diffs
---
 modules/development/git/default.nix     | 4 ++--
 modules/development/lazygit/default.nix | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'modules/development')

diff --git a/modules/development/git/default.nix b/modules/development/git/default.nix
index 21e1277..a62f866 100644
--- a/modules/development/git/default.nix
+++ b/modules/development/git/default.nix
@@ -2,7 +2,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 {
@@ -62,6 +61,7 @@
             logallrefupdates = true;
           };
           log.showSignature = true;
+          pull.rebase = true;
         }
 
         (lib.optionalAttrs config.development.git.useSSH {
@@ -72,7 +72,7 @@
           url."git@git.sr.ht:".insteadOf = "https://git.sr.ht/";
         })
 
-        (lib.optionalAttrs config.development.git.enable {
+        (lib.optionalAttrs config.development.delta.enable {
           core.pager = "delta";
           interactive.diffFilter = "delta --color-only";
           delta.navigate = true;
diff --git a/modules/development/lazygit/default.nix b/modules/development/lazygit/default.nix
index ea21841..027ef7f 100644
--- a/modules/development/lazygit/default.nix
+++ b/modules/development/lazygit/default.nix
@@ -17,8 +17,6 @@
     programs.lazygit = lib.mkIf config.development.lazygit.enable {
       enable = true;
       enableBashIntegration = config.terminal.bash.enable;
-      enableFishIntegration = config.programs.fish.enable;
-      enableNushellIntegration = config.programs.nushell.enable;
       enableZshIntegration = config.terminal.zsh.enable;
       settings = {
         gui = with config.scheme.withHashtag; {
@@ -62,8 +60,8 @@
           autoFetch = false;
         };
         git = {
-          overrideGpg = true;
-          diffRenderers = [
+          overrideGpg = config.security.gpg.enable;
+          diffRenderers = lib.mkIf config.development.delta.enable [
             {
               colorArg = "always";
               command = "delta --paging=never {{diffArgs}}";
-- 
cgit v1.2.3