From 01eb2153e8a09c98d708a965d90cf2f6fb5bdc6b Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Thu, 29 Jun 2023 00:11:07 -0500 Subject: [PATCH] stuff --- lazy-lock.json | 22 ++-- lua/autocommands.lua | 7 ++ lua/keymaps.lua | 4 + lua/plugins/lsp-zero.lua | 6 +- lua/plugins/lualine.lua | 11 +- lua/plugins/null-ls.lua | 2 +- lua/plugins/treesitter.lua | 8 +- lua/plugins_disabled/cmp.lua | 19 --- lua/plugins_disabled/ide_lsp_mason.lua | 115 ------------------ .../layout-msg-popups_noice.lua | 9 -- lua/plugins_disabled/lsp.lua | 75 ------------ 11 files changed, 41 insertions(+), 237 deletions(-) delete mode 100644 lua/plugins_disabled/cmp.lua delete mode 100644 lua/plugins_disabled/ide_lsp_mason.lua delete mode 100644 lua/plugins_disabled/layout-msg-popups_noice.lua delete mode 100644 lua/plugins_disabled/lsp.lua diff --git a/lazy-lock.json b/lazy-lock.json index e4e2833..1503aa3 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,7 +1,7 @@ { "LuaSnip": { "branch": "master", "commit": "a13af80734eb28f744de6c875330c9d3c24b5f3b" }, "auto-save.nvim": { "branch": "main", "commit": "979b6c82f60cfa80f4cf437d77446d0ded0addf0" }, - "ccc.nvim": { "branch": "main", "commit": "5e85133b895b10f7dc7ce46bdad852c990a3f4b9" }, + "ccc.nvim": { "branch": "main", "commit": "4a0ddaf787cc82796e84ab8a7f70d086f250aeb6" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, @@ -10,25 +10,25 @@ "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "friendly-snippets": { "branch": "main", "commit": "49ca2a0e0e26427b550b1f64272d7fe7e4d7d51b" }, "glow.nvim": { "branch": "advanced_window", "commit": "bbd0473d72a45094495ee5600b5577823543eefe" }, - "lazy.nvim": { "branch": "main", "commit": "6b2311a46a3808e366bb251270f4cc04afb421ed" }, - "lsp-zero.nvim": { "branch": "v2.x", "commit": "8fda9a849d6ab4196ecf129905764ddefdfb64b5" }, + "lazy.nvim": { "branch": "main", "commit": "10d4371745f88837c78c8daab00c5be6e48abea4" }, + "lsp-zero.nvim": { "branch": "v2.x", "commit": "cf38e6034f2d776ebd16304a334b79543d1ffa60" }, + "lualine-lsp-progress": { "branch": "master", "commit": "21938e2a668982d1dbf3b33a43a96bc6d150a91d" }, "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "5230617372e656d4a2e1e236e03bf7e7b4b97273" }, - "mason.nvim": { "branch": "main", "commit": "02767937fc2e1b214c854a8fdde26ae1d3529dd6" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "d381fcb78d7a562c3244e1c8f76406954649db36" }, + "mason.nvim": { "branch": "main", "commit": "4be1226f48bc2011024110f37b17f5ee468df58f" }, "material.nvim": { "branch": "main", "commit": "0c725897bc3d22c45fbf25a602002ee02f06f619" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "20c2f2f5ba083bbb1e37b8bc3d590621434f31e9" }, - "nui.nvim": { "branch": "main", "commit": "062e366afcdf2bc1e9d28313a1df4ff14f05cb4e" }, + "nui.nvim": { "branch": "main", "commit": "d688cb0492ad6643cb5c6620f3b43f2a0e8c8d89" }, "null-ls.nvim": { "branch": "main", "commit": "a138b14099e9623832027ea12b4631ddd2a49256" }, "nvim-autopairs": { "branch": "master", "commit": "59df87a84c80a357ca8d8fe86e451b93ac476ccc" }, "nvim-cmp": { "branch": "main", "commit": "b8c2a62b3bd3827aa059b43be3dd4b5c45037d65" }, "nvim-lspconfig": { "branch": "master", "commit": "fefba589c56a5568a089299e36a4c8242502faaa" }, - "nvim-treesitter": { "branch": "master", "commit": "0ae494269acd469fbd896cf5d5a430dbbf4d4e95" }, - "nvim-ts-autotag": { "branch": "main", "commit": "40615e96075c743ef47aaf9de966dc348bec6459" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "0bf8fbc2ca8f8cdb6efbd0a9e32740d7a991e4c3" }, + "nvim-treesitter": { "branch": "master", "commit": "150be01d47579ba70137813348a2f0a5be7a7866" }, "openingh.nvim": { "branch": "main", "commit": "374c081409dc238018cd986410f16190d8f9f680" }, - "plenary.nvim": { "branch": "master", "commit": "36aaceb6e93addd20b1b18f94d86aecc552f30c4" }, + "playground": { "branch": "master", "commit": "2b81a018a49f8e476341dfcb228b7b808baba68b" }, + "plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" }, "rest.nvim": { "branch": "main", "commit": "d8dc204e9f6fd930d9d1d709f0d19138f804431a" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, - "telescope.nvim": { "branch": "master", "commit": "00cf15074a2997487813672a75f946d2ead95eb0" }, + "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, "undotree": { "branch": "master", "commit": "485f01efde4e22cb1ce547b9e8c9238f36566f21" } } \ No newline at end of file diff --git a/lua/autocommands.lua b/lua/autocommands.lua index 3c179c5..39b96e5 100644 --- a/lua/autocommands.lua +++ b/lua/autocommands.lua @@ -32,3 +32,10 @@ vim.api.nvim_create_autocmd("BufRead", { vim.cmd.CccHighlighterEnable() end, }) + +vim.api.nvim_create_autocmd('BufEnter', { + callback = function () + local ts_avail, parsers = pcall(require, "nvim-treesitter.parsers") + if ts_avail and parsers.has_parser() then vim.cmd.TSBufEnable "highlight" end + end, +}) diff --git a/lua/keymaps.lua b/lua/keymaps.lua index e26fe3b..4728305 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -12,6 +12,7 @@ vim.g.mapleader = " " require('util').keymaps({ n = { + [";"] = { ":", desc = "No shift command mode" }, ["n"] = { "nzzzv", desc = "Next search result centered" }, ["N"] = { "Nzzzv", desc = "Previous search result centered" }, [""] = { ":noh", desc = "Clear search on escape" }, @@ -67,6 +68,9 @@ require('util').keymaps({ ["p"] = { '"_dP', desc = "Paste w/o copying replaced content" }, ["h//g', desc = "Replace current selection"}, }, + t = { + [""] = { "", desc = "Escape the terminal" }, + }, }) diff --git a/lua/plugins/lsp-zero.lua b/lua/plugins/lsp-zero.lua index 9ae6401..47bf7b8 100644 --- a/lua/plugins/lsp-zero.lua +++ b/lua/plugins/lsp-zero.lua @@ -128,7 +128,6 @@ return { } config.lua_ls.setup(lsp.nvim_lua_ls()) - config.stylua.setup(default {}) config.rust_analyzer.setup(default {}) @@ -137,13 +136,14 @@ return { }) config.html.setup(default {}) config.eslint.setup(default {}) - config.deno.setup(default {}) config.cssls.setup(default {}) config.cssmodules_ls.setup(default {}) - config.prettier.setup(default {}) config.pyright.setup(default {}) + config.dockerls.setup(default {}) + config.docker_compose_language_service.setup(default {}) + lsp.setup() local cmp = require("cmp") diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index b3ef4f4..551a1ea 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -1,5 +1,12 @@ +local test = function () + return "test 123" +end + return { "nvim-lualine/lualine.nvim", + dependencies = { + "RingOfStorms/lualine-lsp-progress", + }, opts = { options = { theme = "codedark", @@ -9,10 +16,10 @@ return { sections = { lualine_a = {'mode'}, lualine_b = {'branch', 'diff', 'diagnostics'}, - lualine_c = {'filename'}, + lualine_c = {'filename', "lsp_progress", test}, lualine_x = {'encoding', 'filetype', 'filesize'}, lualine_y = {'searchcount', 'selectioncount'}, lualine_z = {'location'}, }, - } + }, } diff --git a/lua/plugins/null-ls.lua b/lua/plugins/null-ls.lua index af8d03c..c8a8029 100644 --- a/lua/plugins/null-ls.lua +++ b/lua/plugins/null-ls.lua @@ -35,7 +35,7 @@ return { null_ls.builtins.formatting.prettier, null_ls.builtins.formatting.stylua, null_ls.builtins.formatting.rustfmt, - null_ls.builtins.formatting.python, + -- null_ls.builtins.formatting.python, -- null_ls.builtins.code_actions.proselint, -- TODO looks interesting null_ls.builtins.code_actions.cspell.with { config = { diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index d9e48fb..d0f9bff 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -20,7 +20,7 @@ return { "TSUpdateSync", }, opts = { - -- "all", + -- ensure_installed = 'all', ensure_installed = { "lua", "http", @@ -58,9 +58,10 @@ return { "vue", "yaml", }, - auto_install = true, + auto_install = false, highlight = { enable = true, + use_languagetree = true, -- disable = function(_, bufnr) return vim.api.nvim_buf_line_count(bufnr) > 10000 end, additional_vim_regex_highlighting = false, }, @@ -74,4 +75,7 @@ return { max_file_lines = nil, }, }, + "nvim-treesitter/playground", } + + diff --git a/lua/plugins_disabled/cmp.lua b/lua/plugins_disabled/cmp.lua deleted file mode 100644 index f8957b3..0000000 --- a/lua/plugins_disabled/cmp.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - { - "hrsh7th/nvim-cmp", - dependencies = { - { - "hrsh7th/cmp-cmdline", - }, - { - "hrsh7th/cmp-path", - }, - { - "hrsh7th/cmp-buffer", - }, - { - "hrsh7th/cmp-nvim-lsp", - }, - } - }, -} diff --git a/lua/plugins_disabled/ide_lsp_mason.lua b/lua/plugins_disabled/ide_lsp_mason.lua deleted file mode 100644 index 983b431..0000000 --- a/lua/plugins_disabled/ide_lsp_mason.lua +++ /dev/null @@ -1,115 +0,0 @@ --- npm install -g cspell@latest - -local output = vim.fn.system { - "which", - "cspell", -} -if output == nil or output == "" then - -- if v:shell_error != 0 then - vim.fn.system { - "npm", - "install", - "-g", - "cspell@latest", - } -end - -return { - { - -- universal JSON schema store, where schemas for popular JSON documents can be found. - "b0o/SchemaStore.nvim", - commit = "15f37630d3abfb98607dd8e4625b731a8558b96d", - }, - { - "neovim/nvim-lspconfig", - commit = "1c13e529bd5683b54a39b633a560d2f00fcb25af", - dependencies = { - "williamboman/mason-lspconfig.nvim", - } - }, - -- NULL LS - { - "jose-elias-alvarez/null-ls.nvim", - commit = "77e53bc3bac34cc273be8ed9eb9ab78bcf67fa48", - opts = function(_, config) - -- config variable is the default definitions table for the setup function call - local null_ls = require "null-ls" - - -- Check supported formatters and linters - -- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/formatting - -- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics - config.sources = { - -- Set a formatter - null_ls.builtins.formatting.stylua, - null_ls.builtins.formatting.prettier, - null_ls.builtins.formatting.rustfmt, - -- null_ls.builtins.code_actions.proselint, -- TODO looks interesting - null_ls.builtins.code_actions.cspell.with { - config = { - find_json = function() return vim.fn.findfile("cspell.json", vim.fn.environ().HOME .. "/.config/nvim/lua/user/;") end, - }, - }, - null_ls.builtins.diagnostics.cspell.with { - extra_args = { "--config", "~/.config/nvim/lua/user/cspell.json" }, - }, - } - - config.update_in_insert = true - - return config -- return final config table - end, - }, - -- MASON - { - "williamboman/mason.nvim", - build = ":MasonUpdate", -- :MasonUpdate updates registry contents - commit = "08b2fd308e0107eab9f0b59d570b69089fd0b522", - cmd = { - "Mason", - "MasonInstall", - "MasonUninstall", - "MasonUninstallAll", - "MasonLog", - }, - opts = {} - }, - { - "williamboman/mason-lspconfig.nvim", - dependencies = { - "williamboman/mason.nvim", - }, - commit = "c55d18f3947562e699d34d89681edbf9f0e250d3", - cmd = { "LspInstall", "LspUninstall" }, - opts = { - ensure_installed = { "lua_ls", "rust_analyzer", "tsserver", "pyright", "cssls", "cssmodules_ls" }, - }, - }, - { - "jay-babu/mason-null-ls.nvim", - commit = "54d702020bf94e4eefd357f0b738317af30217eb", - event = { "BufReadPre", "BufNewFile" }, - dependencies = { - "williamboman/mason.nvim", - "jose-elias-alvarez/null-ls.nvim", - }, - opts = { - ensure_installed = { "prettier", "stylua", "black", "rust_fmt" }, - }, - }, - { - "jay-babu/mason-nvim-dap.nvim", - commit = "c836e511e796d2b6a25ad9f164f5b25d8b9ff705", - dependencies = { - "williamboman/mason.nvim", - "mfussenegger/nvim-dap", - }, - opts = { - ensure_installed = { "codelldb" }, - }, - }, - mappings = { - n = { - ["l"] = { desc = " LSP" }, - } - } -} diff --git a/lua/plugins_disabled/layout-msg-popups_noice.lua b/lua/plugins_disabled/layout-msg-popups_noice.lua deleted file mode 100644 index aa5f8e9..0000000 --- a/lua/plugins_disabled/layout-msg-popups_noice.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "folke/noice.nvim", - commit = "f5178da0097e964b37951a0ebc078fdcc14280f3", - dependencies = { - "MunifTanjim/nui.nvim", - "rcarriga/nvim-notify", - }, - event = "VeryLazy" -} diff --git a/lua/plugins_disabled/lsp.lua b/lua/plugins_disabled/lsp.lua deleted file mode 100644 index da1277d..0000000 --- a/lua/plugins_disabled/lsp.lua +++ /dev/null @@ -1,75 +0,0 @@ -return { - { - -- Mason: install and manage LSP servers, DAP servers, linters, and formatters - "williamboman/mason.nvim", - build = ":MasonUpdate", -- :MasonUpdate updates registry contents - }, - { - "williamboman/mason-lspconfig.nvim", - opts = { - -- Available servers: https://github.com/williamboman/mason-lspconfig.nvim#available-lsp-servers - ensure_installed = { - 'lua_ls', - 'rust_analyzer', - 'tsserver', - "eslint", - 'cssls', - 'cssmodules_ls', - 'pyright', - }, - }, - }, - { - "neovim/nvim-lspconfig", - config = function(_, opts) - local c = require 'lspconfig' - local u = require "lspconfig/util" - - c.lua_ls.setup { - workspace = { - library = { - [vim.fn.expand "$VIMRUNTIME/lua"] = true, - [vim.fn.expand "$VIMRUNTIME/lua/vim/lsp"] = true, - [vim.fn.stdpath "data" .. "/lazy/lazy.nvim/lua/lazy"] = true, - }, - }, - settings = { - Lua = { - diagnostics = { - globals = { "vim" } - } - } - } - } - - c.rust_analyzer.setup { - on_attach = function() end, - capabilities = {}, - filetypes = { "rust" }, - root_dir = u.root_pattern("Cargo.toml"), - settings = { - ["rust-analyzer"] = { - cargo = { - allFeatures = true, - }, - }, - }, - } - - c.tsserver.setup { - - } - - c.eslint.setup { - - } - - c.cssls.setup {} - - c.cssmodules_ls.setup {} - - c.pyright.setup {} - end - }, -} -