diff options
| -rw-r--r-- | modules/development/git/default.nix | 4 | ||||
| -rw-r--r-- | modules/development/lazygit/default.nix | 6 | ||||
| -rw-r--r-- | modules/office/calcaurse/default.nix | 22 | ||||
| -rw-r--r-- | modules/office/default.nix | 1 | ||||
| -rw-r--r-- | users/arpit.nix | 1 |
5 files changed, 28 insertions, 6 deletions
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}}"; diff --git a/modules/office/calcaurse/default.nix b/modules/office/calcaurse/default.nix new file mode 100644 index 0000000..9800dad --- /dev/null +++ b/modules/office/calcaurse/default.nix @@ -0,0 +1,22 @@ +# Text-based calendar and scheduling application +{ + config, + lib, + pkgs, + ... +}: +{ + options.office.calcaurse = { + enable = lib.mkEnableOption "Enables calcurse."; + package = lib.mkOption { + type = lib.types.package; + readOnly = true; + default = pkgs.calcurse; + description = "The calcurse package to use."; + }; + }; + + config = lib.mkIf config.office.calcaurse.enable { + home.packages = [ config.office.calcaurse.package ]; + }; +} diff --git a/modules/office/default.nix b/modules/office/default.nix index 8628151..1150e39 100644 --- a/modules/office/default.nix +++ b/modules/office/default.nix @@ -2,6 +2,7 @@ { ... }: { imports = [ + ./calcaurse ./zathura ]; } diff --git a/users/arpit.nix b/users/arpit.nix index 7710c19..0a52b57 100644 --- a/users/arpit.nix +++ b/users/arpit.nix @@ -61,6 +61,7 @@ networking.usque.warp.enable = true; # Office + office.calcaurse.enable = true; office.zathura.enable = true; # Security |