diff options
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/core/init.lua | 3 | ||||
| -rw-r--r-- | lua/plugins/colorscheme.lua | 5 | ||||
| -rw-r--r-- | lua/plugins/lf.lua | 21 | ||||
| -rw-r--r-- | lua/plugins/lsp.lua | 122 | ||||
| -rw-r--r-- | lua/plugins/telescope.lua | 3 |
5 files changed, 35 insertions, 119 deletions
diff --git a/lua/core/init.lua b/lua/core/init.lua index 89623fc..5d31e97 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -4,7 +4,8 @@ vim.opt.wildmenu=true -- Show mathes with tab-completion vim.opt.number=true vim.opt.relativenumber=true vim.opt.ruler=true -vim.opt.laststatus=0 +-- vim.opt.laststatus=0 +vim.opt.laststatus=3 vim.opt.splitbelow=true vim.opt.splitright=true vim.opt.tabstop=2 diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 26231b5..b088a30 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -31,6 +31,7 @@ return { -- No nonsense, very stoic lsp = { underline = true }, }, }) + local fullbg = "#111a1f" vim.cmd.colorscheme('no-clown-fiesta') vim.api.nvim_set_hl(0,"LineNr",{fg="#727272"}) -- vim.api.nvim_set_hl(0,"Visual",{bg="#171717"}) @@ -39,5 +40,9 @@ return { -- No nonsense, very stoic vim.api.nvim_set_hl(0,"VertSplit",{bg="none",fg="#727272"}) vim.api.nvim_set_hl(0,"WinSeparator",{bg="none",fg="#727272"}) vim.api.nvim_set_hl(0,"StatusLine",{bg="none",fg="#727272"}) + vim.api.nvim_set_hl(0,"LazyNormal",{bg=fullbg}) + -- vim.api.nvim_set_hl(0,"MasonNormal",{bg=fullbg}) + vim.api.nvim_set_hl(0,"NormalFloat",{bg=fullbg}) + vim.api.nvim_set_hl(0,"FloatBorder",{bg="none",fg=fullbg}) end, } diff --git a/lua/plugins/lf.lua b/lua/plugins/lf.lua deleted file mode 100644 index 1ad7090..0000000 --- a/lua/plugins/lf.lua +++ /dev/null @@ -1,21 +0,0 @@ -return { - "lmburns/lf.nvim", - lazy = false, - dependencies = { - { "akinsho/toggleterm.nvim", version = "*", config = true }, - }, - config = function() - vim.g.lf_netrw = 1 - require("lf").setup({ - border = "rounded", - winblend = 20, - focus_on_open = true, - highlights = { -- highlights passed to toggleterm - Normal = {link = "Normal"}, - NormalFloat = {link = 'Normal'}, - FloatBorder = {guifg = "#111a1f", guibg = "#bada55"}, - }, - }) - vim.api.nvim_set_keymap("n", "<leader>lf", "<cmd>Lf<cr>", { noremap = true, silent = true }) - end, -} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index ffb48fa..1a45845 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -1,103 +1,31 @@ return { "neovim/nvim-lspconfig", dependencies = { - "williamboman/mason.nvim", - "williamboman/mason-lspconfig.nvim", - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-buffer", - "hrsh7th/cmp-path", - "hrsh7th/cmp-cmdline", - "hrsh7th/nvim-cmp", - "L3MON4D3/LuaSnip", - "saadparwaiz1/cmp_luasnip", - "j-hui/fidget.nvim", + { + "nvim-telescope/telescope.nvim" + }, + { + "hrsh7th/nvim-cmp", + dependencies = { + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/cmp-buffer", + }, + } }, - + lazy=false, config = function() - local cmp = require('cmp') - local cmp_lsp = require("cmp_nvim_lsp") - local capabilities = vim.tbl_deep_extend( - "force", - {}, - vim.lsp.protocol.make_client_capabilities(), - cmp_lsp.default_capabilities()) - - require("fidget").setup({}) - require("mason").setup() - require("mason-lspconfig").setup({ - ensure_installed = { - "vimls", - "lua_ls", - - "gopls", - "golangci_lint_ls", - - "sqlls", - "dockerls", - "docker_compose_language_service", - - "graphql", - "yamlls", - - "rust_analyzer", - "clangd", - }, - handlers = { - function(server_name) -- default handler (optional) - - require("lspconfig")[server_name].setup { - capabilities = capabilities - } - end, - - ["lua_ls"] = function() - local lspconfig = require("lspconfig") - lspconfig.lua_ls.setup { - capabilities = capabilities, - settings = { - Lua = { - runtime = { version = "Lua 5.1" }, - diagnostics = { - globals = { "vim", "it", "describe", "before_each", "after_each" }, - } - } - } - } - end, - } - }) - - local cmp_select = { behavior = cmp.SelectBehavior.Select } - - cmp.setup({ - snippet = { - expand = function(args) - require('luasnip').lsp_expand(args.body) -- For `luasnip` users. - end, - }, - mapping = cmp.mapping.preset.insert({ - ['<C-p>'] = cmp.mapping.select_prev_item(cmp_select), - ['<C-n>'] = cmp.mapping.select_next_item(cmp_select), - ['<C-y>'] = cmp.mapping.confirm({ select = true }), - ["<C-Space>"] = cmp.mapping.complete(), - }), - sources = cmp.config.sources({ - { name = 'nvim_lsp' }, - { name = 'luasnip' }, -- For luasnip users. - }, { - { name = 'buffer' }, - }) - }) - - vim.diagnostic.config({ - float = { - focusable = false, - style = "minimal", - border = "rounded", - source = "always", - header = "", - prefix = "", - }, - }) - end + telescope = require('telescope') + require'lspconfig'.gopls.setup{ + on_attach = function() + vim.keymap.set("n", "K", vim.lsp.buf.hover, {buffer=0}) + vim.keymap.set("n", "<leader>r", vim.lsp.buf.rename, {buffer=0}) + vim.keymap.set("n", "gd", vim.lsp.buf.definition, {buffer=0}) + vim.keymap.set("n", "gt", vim.lsp.buf.type_definition, {buffer=0}) + vim.keymap.set("n", "gi", vim.lsp.buf.implementation, {buffer=0}) + vim.keymap.set("n", "<leader>fa", vim.lsp.buf.code_action, {buffer=0}) + vim.keymap.set("n", "<leader>fn", vim.diagnostic.goto_next, {buffer=0}) + vim.keymap.set("n", "<leader>fp", vim.diagnostic.goto_previous, {buffer=0}) + end + } + end, } diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index f0efe69..4acf424 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -21,6 +21,9 @@ return { -- F.ind B.ranch { "<leader>fb", '<cmd>lua require("telescope.builtin").grep_branches()<cr>' }, + + -- F.ix L.ist + { "<leader>fl", "<cmd>Telescope diagnostics<cr>" } }, cmd = { "Telescope", |