From 7c7b898c5ebad500e0571041b2eb089e270d5d7b Mon Sep 17 00:00:00 2001 From: cmccay Date: Thu, 12 Jan 2023 16:42:49 -0600 Subject: [PATCH] more stuff --- nvim/.config/nvim/after/plugin/which-key.lua | 4 +++- nvim/.config/nvim/init.lua | 2 +- nvim/.config/nvim/lua/clint/colorscheme.lua | 10 ++++---- nvim/.config/nvim/lua/clint/lsp.lua | 24 ++++++++++++++++++++ nvim/.config/nvim/lua/plugins/init.lua | 4 ++-- 5 files changed, 35 insertions(+), 9 deletions(-) diff --git a/nvim/.config/nvim/after/plugin/which-key.lua b/nvim/.config/nvim/after/plugin/which-key.lua index 8f3da0f..0b245fd 100644 --- a/nvim/.config/nvim/after/plugin/which-key.lua +++ b/nvim/.config/nvim/after/plugin/which-key.lua @@ -11,6 +11,7 @@ wk.register({ f = "Find File", s = "Live Search", b = "File Browser (delete this?)", + r = "Recent Files", }, -- Git related stuff g = { @@ -34,7 +35,8 @@ wk.register({ K = "Hover", gd = "Go to definition", -- Debugging + D = "Debug UI", B = "Set Breakpoint", - [""] = "Debug: Continue", -- this doesnt work + [""] = "Debug: Continue", }, }) diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 6c5656f..913444a 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -11,6 +11,6 @@ require("clint") -- loads lua/clint/init.lua require("lazy").setup( { spec = "plugins", - install = { colorscheme = { "gruvbox", "habamax" } } + install = { colorscheme = { "gruvbox", } } } ) -- loads each lua/plugin/* diff --git a/nvim/.config/nvim/lua/clint/colorscheme.lua b/nvim/.config/nvim/lua/clint/colorscheme.lua index 6e8b3f5..a10b852 100644 --- a/nvim/.config/nvim/lua/clint/colorscheme.lua +++ b/nvim/.config/nvim/lua/clint/colorscheme.lua @@ -1,8 +1,8 @@ -- general theme vim.cmd("colorscheme gruvbox") --- ignore background color for transparency -vim.cmd("highlight Normal guibg=none") -vim.cmd("highlight NonText guibg=none") -vim.cmd("highlight Normal ctermbg=none") -vim.cmd("highlight NonText ctermbg=none") +-- -- ignore background color for transparency +-- vim.cmd("highlight Normal guibg=none") +-- vim.cmd("highlight NonText guibg=none") +-- vim.cmd("highlight Normal ctermbg=none") +-- vim.cmd("highlight NonText ctermbg=none") diff --git a/nvim/.config/nvim/lua/clint/lsp.lua b/nvim/.config/nvim/lua/clint/lsp.lua index a1e5ff8..00907ed 100644 --- a/nvim/.config/nvim/lua/clint/lsp.lua +++ b/nvim/.config/nvim/lua/clint/lsp.lua @@ -13,6 +13,11 @@ require 'lspconfig'.pyright.setup { on_attach = on_attach } +-- require 'lspconfig'.black.setup { +-- capabilities = capabilities, +-- on_attach = on_attach +-- } + require 'lspconfig'.sumneko_lua.setup { capabilities = capabilities, on_attach = on_attach, @@ -38,6 +43,25 @@ cmp.setup({ -- documentation = cmp.config.window.bordered(), }, mapping = cmp.mapping.preset.insert({ + + + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + -- elseif has_words_before() then + -- cmp.complete() + else + fallback() + end + end, { "i", "s" }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + else + fallback() + end + end, { "i", "s" }), + [''] = cmp.mapping.scroll_docs(-4), [''] = cmp.mapping.scroll_docs(4), [''] = cmp.mapping.complete(), diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index 1520879..e8b60d6 100644 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -20,7 +20,7 @@ return { local nls = require("null-ls") nls.setup({ sources = { - nls.builtins.diagnostics.selene, + nls.builtins.formatting.black, }, }) end, @@ -126,7 +126,7 @@ return { { 'nvim-lualine/lualine.nvim' }, -- Devicons - { 'kyazdani42/nvim-web-devicons' }, + { 'nvim-tree/nvim-web-devicons' }, -- Indent lines { "lukas-reineke/indent-blankline.nvim" },