From 1cccc185a5a50cd211c91fc33107d39519093869 Mon Sep 17 00:00:00 2001 From: Daryl Ronningen Date: Fri, 8 Jul 2022 15:24:49 -0700 Subject: [PATCH] neovim updates --- .config/nvim/init.lua | 1 + .config/nvim/lua/user/cmp.lua | 10 +- .config/nvim/lua/user/colorscheme.lua | 1 + .config/nvim/lua/user/copilot.lua | 6 + .config/nvim/lua/user/lsp/mason.lua | 1 + .../nvim/lua/user/lsp/settings/tsserver.lua | 6 + .config/nvim/lua/user/nvimtree.lua | 1 - .config/nvim/lua/user/plugins.lua | 13 +- .config/nvim/lua/user/telescope.lua | 6 - .config/nvim/plugin/packer_compiled.lua | 352 ++++++++++++++++++ 10 files changed, 376 insertions(+), 21 deletions(-) create mode 100644 .config/nvim/lua/user/copilot.lua create mode 100644 .config/nvim/lua/user/lsp/settings/tsserver.lua create mode 100644 .config/nvim/plugin/packer_compiled.lua diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 9e58fbd..1677fb0 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -24,3 +24,4 @@ require("user.colorizer") require("user.discord") require("user.spectre") require("user.dap") +require("user.copilot") diff --git a/.config/nvim/lua/user/cmp.lua b/.config/nvim/lua/user/cmp.lua index f210c4f..27565ea 100644 --- a/.config/nvim/lua/user/cmp.lua +++ b/.config/nvim/lua/user/cmp.lua @@ -103,19 +103,19 @@ cmp.setup({ vim_item.kind = string.format("%s", kind_icons[vim_item.kind]) vim_item.menu = ({ nvim_lsp = "[LSP]", - cmp_tabnine = "[TABNINE]", + copilot = "[COPILOT]", npm = "[NPM]", nvim_lua = "[NVIM_LUA]", - luasnip = "[Snippet]", - buffer = "[Buffer]", - path = "[Path]", + luasnip = "[SNIPPET]", + buffer = "[BUFFER]", + path = "[PATH6]", })[entry.source.name] return vim_item end, }, sources = { + { name = "copilot" }, { name = "nvim_lsp" }, - { name = "cmp_tabnine" }, { name = "npm" }, { name = "nvim_lua" }, { name = "luasnip" }, diff --git a/.config/nvim/lua/user/colorscheme.lua b/.config/nvim/lua/user/colorscheme.lua index 818e615..f42924d 100644 --- a/.config/nvim/lua/user/colorscheme.lua +++ b/.config/nvim/lua/user/colorscheme.lua @@ -2,3 +2,4 @@ vim.g.nord_italic = false vim.g.nord_contrast = true vim.g.nord_borders = true require("nord").set() +require("lsp-colors").setup() diff --git a/.config/nvim/lua/user/copilot.lua b/.config/nvim/lua/user/copilot.lua new file mode 100644 index 0000000..47d7e89 --- /dev/null +++ b/.config/nvim/lua/user/copilot.lua @@ -0,0 +1,6 @@ +local status_ok, copilot = pcall(require, "copilot") +if not status_ok then + return +end + +copilot.setup({}) diff --git a/.config/nvim/lua/user/lsp/mason.lua b/.config/nvim/lua/user/lsp/mason.lua index 64c0259..ecf332c 100644 --- a/.config/nvim/lua/user/lsp/mason.lua +++ b/.config/nvim/lua/user/lsp/mason.lua @@ -17,3 +17,4 @@ lspconfig.util.default_config = vim.tbl_extend("force", lspconfig.util.default_c require("user.lsp.settings.sumneko_lua") require("user.lsp.settings.jsonls") +require("user.lsp.settings.tsserver") diff --git a/.config/nvim/lua/user/lsp/settings/tsserver.lua b/.config/nvim/lua/user/lsp/settings/tsserver.lua new file mode 100644 index 0000000..c9b7428 --- /dev/null +++ b/.config/nvim/lua/user/lsp/settings/tsserver.lua @@ -0,0 +1,6 @@ +local status_ok, lspconfig = pcall(require, "lspconfig") +if not status_ok then + return +end + +lspconfig.tsserver.setup({}) diff --git a/.config/nvim/lua/user/nvimtree.lua b/.config/nvim/lua/user/nvimtree.lua index 66a00ea..a1f9fae 100644 --- a/.config/nvim/lua/user/nvimtree.lua +++ b/.config/nvim/lua/user/nvimtree.lua @@ -46,7 +46,6 @@ nvim_tree.setup({ enable = true, ignore = true, timeout = 500, - watcher = true, }, view = { width = 30, diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua index 56c7ec5..18b1b45 100644 --- a/.config/nvim/lua/user/plugins.lua +++ b/.config/nvim/lua/user/plugins.lua @@ -41,10 +41,10 @@ return packer.startup(function(use) use("nvim-lua/popup.nvim") use("nvim-lua/plenary.nvim") use("kyazdani42/nvim-web-devicons") - use("tami5/sqlite.lua") -- Themes use("shaunsingh/nord.nvim") + use("folke/lsp-colors.nvim") -- Completion use("hrsh7th/nvim-cmp") @@ -54,8 +54,8 @@ return packer.startup(function(use) use("saadparwaiz1/cmp_luasnip") use("hrsh7th/cmp-nvim-lsp") use("hrsh7th/cmp-nvim-lua") - use({ "tzachar/cmp-tabnine", run = "./install.sh" }) use("David-Kunz/cmp-npm") + use("zbirenbaum/copilot-cmp") -- Snippets use("L3MON4D3/LuaSnip") @@ -67,25 +67,20 @@ return packer.startup(function(use) use("jose-elias-alvarez/null-ls.nvim") use("b0o/SchemaStore.nvim") use("ray-x/lsp_signature.nvim") + -- use("github/copilot.vim") -- ENABLE ON FIRST TIME ONLY! + use("zbirenbaum/copilot.lua") -- Trouble use("folke/trouble.nvim") -- Telescope use("nvim-telescope/telescope.nvim") - use("nvim-telescope/telescope-media-files.nvim") - use("nvim-telescope/telescope-node-modules.nvim") - use("cljoly/telescope-repo.nvim") - use("xiyaowong/telescope-emoji.nvim") - use("nvim-telescope/telescope-project.nvim") - use("nvim-telescope/telescope-frecency.nvim") use({ "nvim-telescope/telescope-fzf-native.nvim", run = "make" }) use("nvim-telescope/telescope-dap.nvim") -- Treesitter use({ "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" }) use("p00f/nvim-ts-rainbow") - use("nvim-treesitter/playground") use("JoosepAlviste/nvim-ts-context-commentstring") -- Autopairs diff --git a/.config/nvim/lua/user/telescope.lua b/.config/nvim/lua/user/telescope.lua index dc110cd..1cce2b9 100644 --- a/.config/nvim/lua/user/telescope.lua +++ b/.config/nvim/lua/user/telescope.lua @@ -3,13 +3,7 @@ if not status_ok then return end -telescope.load_extension("media_files") telescope.load_extension("fzf") -telescope.load_extension("node_modules") -telescope.load_extension("repo") -telescope.load_extension("emoji") -telescope.load_extension("project") -telescope.load_extension("frecency") telescope.load_extension("dap") local actions = require("telescope.actions") diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua new file mode 100644 index 0000000..b0ac084 --- /dev/null +++ b/.config/nvim/plugin/packer_compiled.lua @@ -0,0 +1,352 @@ +-- Automatically generated packer.nvim plugin loader code + +if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then + vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') + return +end + +vim.api.nvim_command('packadd packer.nvim') + +local no_errors, error_msg = pcall(function() + + local time + local profile_info + local should_profile = false + if should_profile then + local hrtime = vim.loop.hrtime + profile_info = {} + time = function(chunk, start) + if start then + profile_info[chunk] = hrtime() + else + profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 + end + end + else + time = function(chunk, start) end + end + +local function save_profiles(threshold) + local sorted_times = {} + for chunk_name, time_taken in pairs(profile_info) do + sorted_times[#sorted_times + 1] = {chunk_name, time_taken} + end + table.sort(sorted_times, function(a, b) return a[2] > b[2] end) + local results = {} + for i, elem in ipairs(sorted_times) do + if not threshold or threshold and elem[2] > threshold then + results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' + end + end + + _G._packer = _G._packer or {} + _G._packer.profile_output = results +end + +time([[Luarocks path setup]], true) +local package_path_str = "/home/relms/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/relms/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/relms/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/relms/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/relms/.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 + +if not string.find(package.cpath, install_cpath_pattern, 1, true) then + package.cpath = package.cpath .. ';' .. install_cpath_pattern +end + +time([[Luarocks path setup]], false) +time([[try_loadstring definition]], true) +local function try_loadstring(s, component, name) + local success, result = pcall(loadstring(s), name, _G.packer_plugins[name]) + if not success then + vim.schedule(function() + vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) + end) + end + return result +end + +time([[try_loadstring definition]], false) +time([[Defining packer_plugins]], true) +_G.packer_plugins = { + ["Comment.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/Comment.nvim", + url = "https://github.com/numToStr/Comment.nvim" + }, + LuaSnip = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/LuaSnip", + url = "https://github.com/L3MON4D3/LuaSnip" + }, + ["SchemaStore.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/SchemaStore.nvim", + url = "https://github.com/b0o/SchemaStore.nvim" + }, + ["alpha-nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/alpha-nvim", + url = "https://github.com/goolord/alpha-nvim" + }, + ["bufferline.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/bufferline.nvim", + url = "https://github.com/akinsho/bufferline.nvim" + }, + ["cmp-buffer"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/cmp-buffer", + url = "https://github.com/hrsh7th/cmp-buffer" + }, + ["cmp-cmdline"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/cmp-cmdline", + url = "https://github.com/hrsh7th/cmp-cmdline" + }, + ["cmp-npm"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/cmp-npm", + url = "https://github.com/David-Kunz/cmp-npm" + }, + ["cmp-nvim-lsp"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", + url = "https://github.com/hrsh7th/cmp-nvim-lsp" + }, + ["cmp-nvim-lua"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua", + url = "https://github.com/hrsh7th/cmp-nvim-lua" + }, + ["cmp-path"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/cmp-path", + url = "https://github.com/hrsh7th/cmp-path" + }, + cmp_luasnip = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/cmp_luasnip", + url = "https://github.com/saadparwaiz1/cmp_luasnip" + }, + ["copilot-cmp"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/copilot-cmp", + url = "https://github.com/zbirenbaum/copilot-cmp" + }, + ["copilot.lua"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/copilot.lua", + url = "https://github.com/zbirenbaum/copilot.lua" + }, + ["friendly-snippets"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/friendly-snippets", + url = "https://github.com/rafamadriz/friendly-snippets" + }, + ["gitsigns.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/gitsigns.nvim", + url = "https://github.com/lewis6991/gitsigns.nvim" + }, + ["impatient.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/impatient.nvim", + url = "https://github.com/lewis6991/impatient.nvim" + }, + ["indent-blankline.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim", + url = "https://github.com/lukas-reineke/indent-blankline.nvim" + }, + ["lsp-colors.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/lsp-colors.nvim", + url = "https://github.com/folke/lsp-colors.nvim" + }, + ["lsp_signature.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/lsp_signature.nvim", + url = "https://github.com/ray-x/lsp_signature.nvim" + }, + ["lualine.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/lualine.nvim", + url = "https://github.com/nvim-lualine/lualine.nvim" + }, + ["markdown-preview.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/markdown-preview.nvim", + url = "https://github.com/iamcco/markdown-preview.nvim" + }, + ["mason.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/mason.nvim", + url = "https://github.com/williamboman/mason.nvim" + }, + ["nord.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/nord.nvim", + url = "https://github.com/shaunsingh/nord.nvim" + }, + ["null-ls.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/null-ls.nvim", + url = "https://github.com/jose-elias-alvarez/null-ls.nvim" + }, + ["nvim-autopairs"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/nvim-autopairs", + url = "https://github.com/windwp/nvim-autopairs" + }, + ["nvim-cmp"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/nvim-cmp", + url = "https://github.com/hrsh7th/nvim-cmp" + }, + ["nvim-colorizer.lua"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/nvim-colorizer.lua", + url = "https://github.com/norcalli/nvim-colorizer.lua" + }, + ["nvim-dap"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/nvim-dap", + url = "https://github.com/mfussenegger/nvim-dap" + }, + ["nvim-dap-ui"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/nvim-dap-ui", + url = "https://github.com/rcarriga/nvim-dap-ui" + }, + ["nvim-dap-virtual-text"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/nvim-dap-virtual-text", + url = "https://github.com/theHamsta/nvim-dap-virtual-text" + }, + ["nvim-lspconfig"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", + url = "https://github.com/neovim/nvim-lspconfig" + }, + ["nvim-navic"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/nvim-navic", + url = "https://github.com/SmiteshP/nvim-navic" + }, + ["nvim-notify"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/nvim-notify", + url = "https://github.com/rcarriga/nvim-notify" + }, + ["nvim-spectre"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/nvim-spectre", + url = "https://github.com/windwp/nvim-spectre" + }, + ["nvim-tree.lua"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/nvim-tree.lua", + url = "https://github.com/kyazdani42/nvim-tree.lua" + }, + ["nvim-treesitter"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/nvim-treesitter", + url = "https://github.com/nvim-treesitter/nvim-treesitter" + }, + ["nvim-ts-context-commentstring"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/nvim-ts-context-commentstring", + url = "https://github.com/JoosepAlviste/nvim-ts-context-commentstring" + }, + ["nvim-ts-rainbow"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/nvim-ts-rainbow", + url = "https://github.com/p00f/nvim-ts-rainbow" + }, + ["nvim-web-devicons"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", + url = "https://github.com/kyazdani42/nvim-web-devicons" + }, + ["packer.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/packer.nvim", + url = "https://github.com/wbthomason/packer.nvim" + }, + ["plenary.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/plenary.nvim", + url = "https://github.com/nvim-lua/plenary.nvim" + }, + ["popup.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/popup.nvim", + url = "https://github.com/nvim-lua/popup.nvim" + }, + ["presence.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/presence.nvim", + url = "https://github.com/andweeb/presence.nvim" + }, + ["telescope-dap.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/telescope-dap.nvim", + url = "https://github.com/nvim-telescope/telescope-dap.nvim" + }, + ["telescope-fzf-native.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/telescope-fzf-native.nvim", + url = "https://github.com/nvim-telescope/telescope-fzf-native.nvim" + }, + ["telescope.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/telescope.nvim", + url = "https://github.com/nvim-telescope/telescope.nvim" + }, + ["toggleterm.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/toggleterm.nvim", + url = "https://github.com/akinsho/toggleterm.nvim" + }, + ["trouble.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/trouble.nvim", + url = "https://github.com/folke/trouble.nvim" + }, + ["vim-bbye"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/vim-bbye", + url = "https://github.com/moll/vim-bbye" + }, + ["vim-better-whitespace"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/vim-better-whitespace", + url = "https://github.com/ntpeters/vim-better-whitespace" + }, + ["vim-illuminate"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/vim-illuminate", + url = "https://github.com/RRethy/vim-illuminate" + }, + ["vim-wakatime"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/vim-wakatime", + url = "https://github.com/wakatime/vim-wakatime" + }, + ["which-key.nvim"] = { + loaded = true, + path = "/home/relms/.local/share/nvim/site/pack/packer/start/which-key.nvim", + url = "https://github.com/folke/which-key.nvim" + } +} + +time([[Defining packer_plugins]], false) +if should_profile then save_profiles() end + +end) + +if not no_errors then + error_msg = error_msg:gsub('"', '\\"') + vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') +end