feat(git): update config

This commit is contained in:
Evan Reichard 2024-02-17 11:05:12 -05:00
parent 270a78aaea
commit a17f9eba6c
2 changed files with 18 additions and 1 deletions

View File

@ -4,6 +4,9 @@
programs.git = {
enable = true;
userName = "Evan Reichard";
aliases = {
lg = "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all -n 15";
};
includes = [
{
path = "~/.config/git/work";
@ -14,6 +17,15 @@
condition = "gitdir:~/Development/git/personal/";
}
];
extraConfig = {
core = {
autocrlf = "input";
safecrlf = "true";
};
merge = {
conflictstyle = "zdiff3";
};
};
};
xdg.configFile = {

View File

@ -81,7 +81,12 @@ nvim_lsp.eslint.setup {
}
-- Svelte LSP Configuration
nvim_lsp.svelte.setup {cmd = {nix_vars.sveltels, "--stdio"}}
nvim_lsp.svelte.setup {
on_attach = on_attach_no_formatting,
flags = lsp_flags,
capabilities = capabilities,
cmd = {nix_vars.sveltels, "--stdio"}
}
-- Go LSP Configuration
nvim_lsp.gopls.setup {