diff --git a/hosts/macbook/home.nix b/hosts/macbook/home.nix index 4fe3d56..1bfe6bd 100644 --- a/hosts/macbook/home.nix +++ b/hosts/macbook/home.nix @@ -2,6 +2,7 @@ { imports = [ + ../../modules/home-manager/git ../../modules/home-manager/neovim ../../modules/home-manager/emacs ../../modules/home-manager/wezterm diff --git a/modules/home-manager/git/default.nix b/modules/home-manager/git/default.nix index 76a9e6f..0aa120a 100644 --- a/modules/home-manager/git/default.nix +++ b/modules/home-manager/git/default.nix @@ -5,5 +5,16 @@ enable = true; userName = "Michael Thomson"; userEmail = "michael@michaelthomson.dev"; + includes = [ + { + condition = "gitdir:~/dev/work/"; + contents = { + user = { + email = "mthomson@konradgroup.com"; + name = "Michael Thomson"; + }; + }; + } + ]; }; } diff --git a/modules/home-manager/neovim/nvim/lua/plugins/lsp.lua b/modules/home-manager/neovim/nvim/lua/plugins/lsp.lua index e9b7244..26ccc38 100644 --- a/modules/home-manager/neovim/nvim/lua/plugins/lsp.lua +++ b/modules/home-manager/neovim/nvim/lua/plugins/lsp.lua @@ -88,7 +88,7 @@ return { lsp.lua_ls.setup({}) lsp.nil_ls.setup({}) - lsp.clangd.setup({}) + lsp.ccls.setup({}) lsp.astro.setup({}) end, },