diff --git a/modules/hm/dev.nix b/modules/hm/dev.nix index b5ba9e3..571619b 100644 --- a/modules/hm/dev.nix +++ b/modules/hm/dev.nix @@ -123,21 +123,9 @@ in # Jujutsu (alternative DVCS (git-compatible)) jujutsu = { enable = true; - # Use the more up to date version of jj package = pkgs.unstable.jujutsu; settings = { - ui = lib.mkMerge [ - # If `bat` is available use it as the pager - (lib.mkIf config.programs.bat.enable { pager = "bat"; }) - # if hunk.nvim is enabled use it as a diff editor - (lib.mkIf config.programs.nixvim.plugins.hunk.enable { - diff-editor = [ - "nvim" - "-c" - "DiffEditor $left $right $output" - ]; - }) - ]; + ui.pager = "bat"; fix.tools = builtins.mapAttrs (tool: cmd: jjFormatters.${tool} cmd) nvimFormatters; # mimic git commit --verbose by adding a diff templates.draft_commit_description = '' diff --git a/modules/nixvim/dev-plugins.nix b/modules/nixvim/dev-plugins.nix index 4a4ff8a..eb47a0e 100644 --- a/modules/nixvim/dev-plugins.nix +++ b/modules/nixvim/dev-plugins.nix @@ -174,7 +174,6 @@ in mode = "virtualtext"; }; }; - hunk.enable = true; otter.enable = true; }; }