diff options
| -rw-r--r-- | .config/nvim/lua/custom/config/language-servers.lua | 60 | ||||
| -rw-r--r-- | .config/nvim/lua/custom/plugins/mason.lua | 4 | ||||
| -rw-r--r-- | .zshrc | 2 | ||||
| -rw-r--r-- | hosts/laptop-nixos/home.nix | 2 |
4 files changed, 35 insertions, 33 deletions
diff --git a/.config/nvim/lua/custom/config/language-servers.lua b/.config/nvim/lua/custom/config/language-servers.lua index 5e62067..0f07d95 100644 --- a/.config/nvim/lua/custom/config/language-servers.lua +++ b/.config/nvim/lua/custom/config/language-servers.lua @@ -1,18 +1,18 @@ -- NOTE: a table or true to enable, false to disable return { - -- lua_ls = { - -- settings = { - -- diagnostics = { globals = { 'vim' } }, - -- telemetry = { enabled = false }, - -- hint = { enable = true }, - -- workspace = { - -- library = { - -- [vim.fn.expand('$VIMRUNTIME/lua')] = true, - -- [vim.fn.stdpath('config') .. '/lua'] = true, - -- }, - -- }, - -- }, - -- }, -- lua + lua_ls = { + settings = { + diagnostics = { globals = { 'vim' } }, + telemetry = { enabled = false }, + hint = { enable = true }, + workspace = { + library = { + [vim.fn.expand('$VIMRUNTIME/lua')] = true, + [vim.fn.stdpath('config') .. '/lua'] = true, + }, + }, + }, + }, -- lua -- clangd = { -- cmd = { -- 'clangd', @@ -65,7 +65,7 @@ return { -- ts_ls = true, -- javascript/typescript -- astro = true, -- astro framework -- mdx_analyzer = true, -- markdown with JS I think - -- -- marksman = true, -- Markdown LSP + -- marksman = true, -- Markdown LSP -- markdown_oxide = true, -- Markdown LSP but better -- gopls = { -- cmd = { 'gopls' }, @@ -111,20 +111,20 @@ return { -- }, -- }, -- Go LSP -- jdtls = true, -- java - -- -- sqlls = true, - -- -- sqls = { - -- -- on_attach = function(client, bufnr) - -- -- require('sqls').on_attach(client, bufnr) - -- -- end, - -- -- settings = { - -- -- sqls = { - -- -- connections = { - -- -- { - -- -- driver = 'sqlite3', - -- -- dataSourceName = '/home/kyren/projects/eko/server.db', - -- -- }, - -- -- }, - -- -- }, - -- -- }, - -- -- }, + -- sqlls = true, + -- sqls = { + -- on_attach = function(client, bufnr) + -- require('sqls').on_attach(client, bufnr) + -- end, + -- settings = { + -- sqls = { + -- connections = { + -- { + -- driver = 'sqlite3', + -- dataSourceName = '/home/kyren/projects/eko/server.db', + -- }, + -- }, + -- }, + -- }, + -- }, } diff --git a/.config/nvim/lua/custom/plugins/mason.lua b/.config/nvim/lua/custom/plugins/mason.lua index 8232b88..ca4cb32 100644 --- a/.config/nvim/lua/custom/plugins/mason.lua +++ b/.config/nvim/lua/custom/plugins/mason.lua @@ -17,7 +17,7 @@ return { lazy = false, opts = { ensure_installed = { - -- 'stylua', -- lua formatting + 'stylua', -- lua formatting -- 'clang-format', -- C/C++ formatter -- 'codelldb', -- C/C++ debugger -- 'cpplint', -- C/C++ linter @@ -25,7 +25,7 @@ return { -- 'isort', -- python formatter for imports -- 'flake8', -- python linter -- 'gofumpt', -- go formatter - -- -- 'golangci-lint', -- go linter + -- 'golangci-lint', -- go linter -- 'prettierd', -- multi-lang formatter -- 'prettier', -- prettierd but slower, used as a fallback -- 'jq', -- json formatter @@ -71,7 +71,7 @@ alias ga='git add' # Env vars export FLAKE=~/dotfiles/ export EDITOR=nvim -export PAGER='nvim -R' +export PAGER=nvimpager export MANPAGER='nvim +Man!' export FZF_DEFAULT_OPTS=" \ --color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 \ diff --git a/hosts/laptop-nixos/home.nix b/hosts/laptop-nixos/home.nix index 6d92306..f15da4c 100644 --- a/hosts/laptop-nixos/home.nix +++ b/hosts/laptop-nixos/home.nix @@ -40,6 +40,8 @@ fastfetch btop protonvpn-gui + unzip + nvimpager ]; # Home Manager is pretty good at managing dotfiles. The primary way to manage |