diff --git a/flake.lock b/flake.lock index bcef881..b9f2583 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1638267006, - "narHash": "sha256-heZdDlD09rnoeEiZ4wKfbXNDkO5I9qVFvX9d790h/XE=", + "lastModified": 1639871969, + "narHash": "sha256-6feWUnMygRzA9tzkrfAzpA5/NBYg75bkFxnqb1DtD7E=", "owner": "nix-community", "repo": "home-manager", - "rev": "3e93c4e8b2b479c712b7c20a428993b459118842", + "rev": "697cc8c68ed6a606296efbbe9614c32537078756", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1638279546, - "narHash": "sha256-1KCwN7twjp1dBdp0jPgVdYFztDkCR8+roo0B34J9oBY=", + "lastModified": 1641423937, + "narHash": "sha256-iIBSDySeZ79FDFiI5but9EtOIRc5Ncu/gq27Hg/yXjo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "96b4157790fc96e70d6e6c115e3f34bba7be490f", + "rev": "e67c94a1adbb5cf8a0448bc9c434589b2dd293c2", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1638873506, - "narHash": "sha256-BCZS7lDqQKgKbkTbmMtV8DI4MQDTCelbCI4f2FPjzAc=", + "lastModified": 1641520708, + "narHash": "sha256-jGELR9I16UdMZmZ4j48k+yvUOYUVKThsoft41Pgx+h4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ebb7f07eec7dc57fc14acdc0b8206b4d4fe1da07", + "rev": "9f09fe7a15bfe656de7b1648ff8a312f4e05a686", "type": "github" }, "original": { diff --git a/home/neovim/default.nix b/home/neovim/default.nix index 4511ee6..c73e16a 100644 --- a/home/neovim/default.nix +++ b/home/neovim/default.nix @@ -18,7 +18,9 @@ in programs.neovim = { enable = true; vimAlias = true; - extraConfig = builtins.readFile ./init.vim; + extraConfig = (builtins.replaceStrings + [ "{{CLANGDPATH}}" ] [ "${pkgs.clang-tools}/bin/clangd" ] + (builtins.readFile ./init.vim)); plugins = with pkgs.vimPlugins; [ editorconfig-vim fzf-vim diff --git a/home/neovim/init.vim b/home/neovim/init.vim index 573c774..11671f6 100644 --- a/home/neovim/init.vim +++ b/home/neovim/init.vim @@ -65,7 +65,10 @@ local on_attach = function(client, bufnr) end nvim_lsp['pyright'].setup { on_attach = on_attach } -nvim_lsp['clangd'].setup { on_attach = on_attach } +nvim_lsp['clangd'].setup { + on_attach = on_attach, + cmd = { "{{CLANGDPATH}}" } +} nvim_lsp['rust_analyzer'].setup { on_attach = on_attach } nvim_lsp['rnix'].setup { on_attach = on_attach }