From ffa62aedfd3b634ba46f93df3de5a396d03d3d91 Mon Sep 17 00:00:00 2001 From: Marvin Drescher Date: Wed, 24 Jan 2024 10:53:39 +0100 Subject: [PATCH] fix(nvim): config --- completion.lua | 2 ++ default.nix | 1 + init.lua | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/completion.lua b/completion.lua index d42ede6..a3c1329 100644 --- a/completion.lua +++ b/completion.lua @@ -99,12 +99,14 @@ vim.cmd(':set winhighlight=' .. cmp.config.window.bordered().winhighlight) -- Setup language servers. local lspconfig = require('lspconfig') local deps = require("nvim-deps") +-- deps.typescript-language-server_path lspconfig.tsserver.setup({ cmd = { (deps["typescript-language-server_path"] .. "/bin/typescript-language-server"), "--stdio" } }) +-- deps.clang-tools_path lspconfig.clangd.setup({cmd = {(deps["clang-tools_path"] .. "/bin/clangd")}}) lspconfig.bashls.setup({ cmd = {(deps["bash-language-server_path"] .. "/bin/bash-language-server")} diff --git a/default.nix b/default.nix index d742347..ac274d3 100644 --- a/default.nix +++ b/default.nix @@ -83,6 +83,7 @@ in lldb = pkgs.lldb; rust_analyzer = rust-analyzer; typst_lsp = pkgs.typst-lsp; + inherit (pkgs.nodePackages) typescript-language-server bash-language-server; }; pathsLua = pkgs.writeTextFile { name = "nvim-deps.lua"; diff --git a/init.lua b/init.lua index 9d9b614..b5de8ec 100644 --- a/init.lua +++ b/init.lua @@ -38,7 +38,7 @@ neogit.setup({ ["bitbucket.org"] = "https://bitbucket.org/${owner}/${repository}/pull-requests/new?source=${branch_name}&t=1", ["gitlab.com"] = "https://gitlab.com/${owner}/${repository}/merge_requests/new?merge_request[source_branch]=${branch_name}", ["apps.terminal"] = "http://apps.terminal/${owner}/${repository}/merge_requests/new?merge_request[source_branch]=${branch_name}" - } + }, status = { recent_commit_count = 100, },