From ac2459b8e0b1f18f04a7f2990a0b2fe2b33c4fa3 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 10 Jan 2024 17:00:23 +0100 Subject: [PATCH] Configure zigls --- flake.nix | 2 +- modules/misc/nvim/lua/plugins/lsp.lua | 13 ++++++++++++- modules/misc/nvim/lua/settings.lua | 2 ++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 50f84e5..a4ecb3d 100644 --- a/flake.nix +++ b/flake.nix @@ -105,7 +105,7 @@ kadan = mkSystem "kadan" "server" [ ({pkgs, ...}: { - environment.systemPackages = with pkgs; [tmux python3Packages.guessit mediainfo]; + environment.systemPackages = with pkgs; [tmux python3Packages.guessit mediainfo yt-dlp]; }) ]; }; diff --git a/modules/misc/nvim/lua/plugins/lsp.lua b/modules/misc/nvim/lua/plugins/lsp.lua index 5daa017..ca7e0cc 100644 --- a/modules/misc/nvim/lua/plugins/lsp.lua +++ b/modules/misc/nvim/lua/plugins/lsp.lua @@ -156,6 +156,17 @@ return { } } }, + zls = { + settings = { + enable_build_on_save = true, + }, + on_new_config = function(new_config, new_root_dir) + -- Simply disable the nix-shell wrapping and use zls from the shell.nix of the projects + -- I use nightly builds of zigs/zls + pcall(require("lspconfig").zls.document_config.default_config.on_new_config, new_config, + new_root_dir) + end, + }, }, } end, @@ -320,7 +331,7 @@ return { css = { { "prettierd", "prettier" } }, html = { { "prettierd", "prettier" } }, sql = { "pg_format" }, - cs = { "csharpier" }, + -- cs = { "csharpier" }, ["*"] = { "injected" } }, }, diff --git a/modules/misc/nvim/lua/settings.lua b/modules/misc/nvim/lua/settings.lua index 0b457b6..86d81ff 100644 --- a/modules/misc/nvim/lua/settings.lua +++ b/modules/misc/nvim/lua/settings.lua @@ -102,3 +102,5 @@ vim.cmd [[ autocmd TextYankPost * silent!lua require('vim.highlight').on_yank({higroup = 'Visual', timeout = 200}) augroup end ]] + +vim.g.zig_fmt_autosave = 0