feat(git): update config
This commit is contained in:
parent
270a78aaea
commit
a17f9eba6c
@ -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 = {
|
||||
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user