From 98eb00007ceda66b383c5c671dfadcf5d5d065e2 Mon Sep 17 00:00:00 2001 From: Evan Reichard Date: Tue, 2 Jan 2024 10:51:04 -0500 Subject: [PATCH] update git config --- git/config/personal | 5 +++++ git/config/work | 5 +++++ git/default.nix | 21 ++++++++++++++++++++- nvim/config/lua/lsp-config.lua | 1 + 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 git/config/personal create mode 100644 git/config/work diff --git a/git/config/personal b/git/config/personal new file mode 100644 index 0000000..719b0e8 --- /dev/null +++ b/git/config/personal @@ -0,0 +1,5 @@ +[core] + sshCommand = "ssh -i ~/Keys/personal" + +[user] + email = evan@reichard.io diff --git a/git/config/work b/git/config/work new file mode 100644 index 0000000..426f3e9 --- /dev/null +++ b/git/config/work @@ -0,0 +1,5 @@ +[core] + sshCommand = "ssh -i ~/Keys/work" + +[user] + email = evan@prophet.security diff --git a/git/default.nix b/git/default.nix index 078e850..7133264 100644 --- a/git/default.nix +++ b/git/default.nix @@ -4,7 +4,26 @@ programs.git = { enable = true; userName = "Evan Reichard"; - userEmail = "evan@reichard.io"; + includes = [ + { + path = "~/.config/git/work"; + condition = "gitdir:~/Development/git/work/"; + } + { + path = "~/.config/git/personal"; + condition = "gitdir:~/Development/git/personal/"; + } + ]; + }; + + xdg.configFile = { + + # Copy Configuration + git = { + source = ./config; + recursive = true; + }; + }; } diff --git a/nvim/config/lua/lsp-config.lua b/nvim/config/lua/lsp-config.lua index e1823d8..9ad4f78 100644 --- a/nvim/config/lua/lsp-config.lua +++ b/nvim/config/lua/lsp-config.lua @@ -98,6 +98,7 @@ null_ls.setup({ null_ls.builtins.completion.spell, null_ls.builtins.formatting.nixpkgs_fmt, null_ls.builtins.formatting.lua_format, + null_ls.builtins.formatting.prettier.with({filetypes = {"svelte"}}), null_ls.builtins.formatting.prettier, null_ls.builtins.formatting.gofmt, null_ls.builtins.diagnostics.sqlfluff, null_ls.builtins.formatting.sqlfluff