feat: Use ra-multiplex for vim && use delta for git

This commit is contained in:
Uttarayan Mondal
2024-05-13 13:02:44 +05:30
parent 589ea01c0c
commit 9520540c34
3 changed files with 29 additions and 15 deletions

View File

@@ -155,6 +155,11 @@ in {
extraConfig = { extraConfig = {
color.ui = true; color.ui = true;
core.editor = "nvim"; core.editor = "nvim";
core.pager = "${pkgs.delta}/bin/delta";
interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
delta.navigate = true;
merge.conflictStyle = "diff3";
diff.colorMoved = "default";
push.autoSetupRemote = true; push.autoSetupRemote = true;
}; };
}; };

2
flake.lock generated
View File

@@ -1498,7 +1498,7 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-YLQSn0JnhwtDyysI+JMi4SPRQjUqmHJTYEnl0FlcxpY=", "narHash": "sha256-IgVjk0l4snGVpLlanIC43+qQx/AKMuVv0JBoCZy7oxA=",
"path": "./neovim", "path": "./neovim",
"type": "path" "type": "path"
}, },

View File

@@ -121,20 +121,20 @@ in rec {
telescope = { telescope = {
enable = true; enable = true;
settings = { # settings = {
defaults = { # defaults = {
layout_strategy = "vertical"; # layout_strategy = "vertical";
layout_config = { # layout_config = {
preview_height = 0.8; # preview_height = 0.8;
vertical = { # vertical = {
size = { # size = {
width = "99%"; # width = "99%";
height = "99%"; # height = "99%";
}; # };
}; # };
}; # };
}; # };
}; # };
extensions = { extensions = {
undo.enable = true; undo.enable = true;
ui-select.enable = true; ui-select.enable = true;
@@ -195,6 +195,15 @@ in rec {
}) })
end end
''; '';
cmd =
/*
lua
*/
''
function()
return { '${pkgs.ra-multiplex}/bin/ra-multiplex', 'client' }
end
'';
}; };
dap = { dap = {
autoloadConfigurations = false; autoloadConfigurations = false;