From 55eb8578960c206034044dd0b39af852b27ab093 Mon Sep 17 00:00:00 2001 From: Benjamin Kyd Date: Thu, 16 Feb 2023 14:41:54 +0000 Subject: [PATCH] not smh --- common/.config/nvim/lua/lsp-general.lua | 4 +- common/.config/nvim/lua/plugins.lua | 2 +- .../.config/nvim/plugin/packer_compiled.lua | 76 +++++++++---------- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/common/.config/nvim/lua/lsp-general.lua b/common/.config/nvim/lua/lsp-general.lua index 64dc5e4..824ba61 100644 --- a/common/.config/nvim/lua/lsp-general.lua +++ b/common/.config/nvim/lua/lsp-general.lua @@ -18,7 +18,7 @@ local function installServers(names) end -- find a list of available ones here: https://github.com/williamboman/nvim-lsp-installer -installServers({'angularls', 'bashls', 'dockerls', 'sumneko_lua', 'pyright', 'jsonls', 'cssls', 'tsserver'}) +installServers({'angularls', 'bashls', 'dockerls', 'lua_ls', 'pyright', 'jsonls', 'cssls', 'tsserver'}) -- setup installed servers lsp_installer.on_server_ready(function(server) @@ -28,7 +28,7 @@ lsp_installer.on_server_ready(function(server) -- if server.name == "tsserver" then -- opts.root_dir = function() ... end -- end - if server.name == 'sumneko_lua' then + if server.name == 'lua_ls' then opts = require'lsp-server-config.lua' end diff --git a/common/.config/nvim/lua/plugins.lua b/common/.config/nvim/lua/plugins.lua index ed624d5..5884de2 100644 --- a/common/.config/nvim/lua/plugins.lua +++ b/common/.config/nvim/lua/plugins.lua @@ -94,7 +94,6 @@ local packer = require('packer').startup(function(use) -- show startup time use 'dstein64/vim-startuptime' - -- UX improvements use({ "folke/noice.nvim", @@ -107,6 +106,7 @@ local packer = require('packer').startup(function(use) use 'rcarriga/nvim-notify' + -- FUNCTIONAL CODING STUFF -- lsp config diff --git a/common/.config/nvim/plugin/packer_compiled.lua b/common/.config/nvim/plugin/packer_compiled.lua index 56f2657..54454fd 100644 --- a/common/.config/nvim/plugin/packer_compiled.lua +++ b/common/.config/nvim/plugin/packer_compiled.lua @@ -49,8 +49,8 @@ local function save_profiles(threshold) end time([[Luarocks path setup]], true) -local package_path_str = "/home/ben/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/ben/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/ben/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/ben/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/ben/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" +local package_path_str = "/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" if not string.find(package.path, package_path_str, 1, true) then package.path = package.path .. ';' .. package_path_str end @@ -76,184 +76,184 @@ time([[Defining packer_plugins]], true) _G.packer_plugins = { catppuccin = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/catppuccin", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/catppuccin", url = "https://github.com/catppuccin/nvim" }, ["cmp-buffer"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/cmp-buffer", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-buffer", url = "https://github.com/hrsh7th/cmp-buffer" }, ["cmp-cmdline"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/cmp-cmdline", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-cmdline", url = "https://github.com/hrsh7th/cmp-cmdline" }, ["cmp-nvim-lsp"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", url = "https://github.com/hrsh7th/cmp-nvim-lsp" }, ["cmp-path"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/cmp-path", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-path", url = "https://github.com/hrsh7th/cmp-path" }, ["cmp-vsnip"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/cmp-vsnip", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-vsnip", url = "https://github.com/hrsh7th/cmp-vsnip" }, ["codewindow.nvim"] = { config = { "\27LJ\2\nW\0\0\3\0\4\0\b6\0\0\0'\2\1\0B\0\2\0029\1\2\0B\1\1\0019\1\3\0B\1\1\1K\0\1\0\27apply_default_keybinds\nsetup\15codewindow\frequire\0" }, loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/codewindow.nvim", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/codewindow.nvim", url = "https://github.com/gorbit99/codewindow.nvim" }, ["dressing.nvim"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/dressing.nvim", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/dressing.nvim", url = "https://github.com/stevearc/dressing.nvim" }, ["galaxyline.nvim"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/galaxyline.nvim", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/galaxyline.nvim", url = "https://github.com/glepnir/galaxyline.nvim" }, ["gitsigns.nvim"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/gitsigns.nvim", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/gitsigns.nvim", url = "https://github.com/lewis6991/gitsigns.nvim" }, ["indent-blankline.nvim"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim", url = "https://github.com/lukas-reineke/indent-blankline.nvim" }, ["leap.nvim"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/leap.nvim", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/leap.nvim", url = "https://github.com/ggandor/leap.nvim" }, ["lsp-colors.nvim"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/lsp-colors.nvim", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/lsp-colors.nvim", url = "https://github.com/folke/lsp-colors.nvim" }, ["lsp-trouble.nvim"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/lsp-trouble.nvim", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/lsp-trouble.nvim", url = "https://github.com/folke/lsp-trouble.nvim" }, ["lspsaga.nvim"] = { config = { "\27LJ\2\n9\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\flspsaga\frequire\0" }, loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/lspsaga.nvim", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/lspsaga.nvim", url = "https://github.com/glepnir/lspsaga.nvim" }, ["mini.indentscope"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/mini.indentscope", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/mini.indentscope", url = "https://github.com/echasnovski/mini.indentscope" }, ["mini.starter"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/mini.starter", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/mini.starter", url = "https://github.com/echasnovski/mini.starter" }, nerdcommenter = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/nerdcommenter", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/nerdcommenter", url = "https://github.com/scrooloose/nerdcommenter" }, ["noice.nvim"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/noice.nvim", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/noice.nvim", url = "https://github.com/folke/noice.nvim" }, ["nui.nvim"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/nui.nvim", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/nui.nvim", url = "https://github.com/MunifTanjim/nui.nvim" }, ["nvim-bqf"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-bqf", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-bqf", url = "https://github.com/kevinhwang91/nvim-bqf" }, ["nvim-cmp"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-cmp", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-cmp", url = "https://github.com/hrsh7th/nvim-cmp" }, ["nvim-lsp-installer"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer", url = "https://github.com/williamboman/nvim-lsp-installer" }, ["nvim-lspconfig"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", url = "https://github.com/neovim/nvim-lspconfig" }, ["nvim-notify"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-notify", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-notify", url = "https://github.com/rcarriga/nvim-notify" }, ["nvim-spectre"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-spectre", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-spectre", url = "https://github.com/windwp/nvim-spectre" }, ["nvim-treesitter"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-treesitter", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-treesitter", url = "https://github.com/nvim-treesitter/nvim-treesitter" }, ["nvim-web-devicons"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", url = "https://github.com/nvim-tree/nvim-web-devicons" }, ["packer.nvim"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/packer.nvim", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/packer.nvim", url = "https://github.com/wbthomason/packer.nvim" }, ["plenary.nvim"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/plenary.nvim", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/plenary.nvim", url = "https://github.com/nvim-lua/plenary.nvim" }, ["smart-splits.nvim"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/smart-splits.nvim", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/smart-splits.nvim", url = "https://github.com/mrjones2014/smart-splits.nvim" }, ["telescope.nvim"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/telescope.nvim", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/telescope.nvim", url = "https://github.com/nvim-telescope/telescope.nvim" }, ["vim-illuminate"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/vim-illuminate", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/vim-illuminate", url = "https://github.com/RRethy/vim-illuminate" }, ["vim-startuptime"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/vim-startuptime", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/vim-startuptime", url = "https://github.com/dstein64/vim-startuptime" }, ["vim-surround"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/vim-surround", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/vim-surround", url = "https://github.com/tpope/vim-surround" }, ["vim-vsnip"] = { loaded = true, - path = "/home/ben/.local/share/nvim/site/pack/packer/start/vim-vsnip", + path = "/home/benk/.local/share/nvim/site/pack/packer/start/vim-vsnip", url = "https://github.com/hrsh7th/vim-vsnip" } }