From c661810b89d1177504fefc00a27d4ee738c8a318 Mon Sep 17 00:00:00 2001 From: winston Date: Wed, 2 Nov 2022 16:50:16 +0100 Subject: [PATCH] feat(nvim): smaller updates --- dot_config/nvim/init.lua | 1 + dot_config/nvim/lua/config/catppuccin.lua | 39 ++++++++++------------- dot_config/nvim/lua/config/colorizer.lua | 32 +++++++++---------- dot_config/nvim/lua/lsp.lua | 25 +++++++++++---- dot_config/nvim/lua/plugins.lua | 14 ++++++++ 5 files changed, 65 insertions(+), 46 deletions(-) diff --git a/dot_config/nvim/init.lua b/dot_config/nvim/init.lua index 41bfb43..ba4170d 100644 --- a/dot_config/nvim/init.lua +++ b/dot_config/nvim/init.lua @@ -25,6 +25,7 @@ vim.o.pumheight = 15 -- split directions vim.o.splitbelow = true vim.o.splitright = true +vim.o.wrap = false -- redefine word boundaries - '_' is a word seperator, this helps with snake_case vim.opt.iskeyword:remove("_") diff --git a/dot_config/nvim/lua/config/catppuccin.lua b/dot_config/nvim/lua/config/catppuccin.lua index 0536720..140f3a9 100644 --- a/dot_config/nvim/lua/config/catppuccin.lua +++ b/dot_config/nvim/lua/config/catppuccin.lua @@ -1,18 +1,5 @@ -local colors = require("catppuccin.palettes").get_palette() vim.g.catppuccin_flavour = "mocha" -local darkmode_overrides = { - base = "#000000", - crust = "#000000", - mantle = "#000000", - -- surface0 = "#101010", - -- surface1 = "#141414", - -- surface2 = "#181818", - -- overlay1 = "#202020", - -- overlay2 = "#242424", - -- overlay3 = "#282828", -} - require("catppuccin").setup({ dim_inactive = { enable = true, @@ -76,18 +63,24 @@ require("catppuccin").setup({ vim_sneak = false, vimwiki = true, }, - custom_highlights = { - DashboardHeader = { fg = colors.pink }, - DashboardCenter = { fg = colors.peach }, - DashboardShortCut = { fg = colors.yellow }, - DashboardFooter = { fg = colors.maroon }, - FloatBorder = { fg = colors.overlay0 }, - TelescopeBorder = { link = "FloatBorder" }, + highlight_overrides = { + mocha = function(colors) + return { + DashboardHeader = { fg = colors.pink }, + DashboardCenter = { fg = colors.peach }, + DashboardShortCut = { fg = colors.yellow }, + DashboardFooter = { fg = colors.maroon }, + FloatBorder = { fg = colors.overlay0 }, + TelescopeBorder = { link = "FloatBorder" }, + } + end, }, color_overrides = { - mocha = darkmode_overrides, - macchiato = darkmode_overrides, - frappe = darkmode_overrides, + mocha = { + base = "#000000", + crust = "#000000", + mantle = "#000000", + }, }, }) diff --git a/dot_config/nvim/lua/config/colorizer.lua b/dot_config/nvim/lua/config/colorizer.lua index cac8982..57ea485 100644 --- a/dot_config/nvim/lua/config/colorizer.lua +++ b/dot_config/nvim/lua/config/colorizer.lua @@ -1,26 +1,24 @@ require("colorizer").setup({ user_default_options = { - RGB = true, -- #RGB hex codes - RRGGBB = true, -- #RRGGBB hex codes - names = false, -- "Name" codes like Blue or blue - RRGGBBAA = false, -- #RRGGBBAA hex codes - AARRGGBB = false, -- 0xAARRGGBB hex codes - rgb_fn = false, -- CSS rgb() and rgba() functions - hsl_fn = false, -- CSS hsl() and hsla() functions - css = false, -- Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB - css_fn = false, -- Enable all CSS *functions*: rgb_fn, hsl_fn - -- Available modes for `mode`: foreground, background, virtualtext - mode = "background", -- Set the display mode. - -- Available methods are false / true / "normal" / "lsp" / "both" - -- True is same as normal + RGB = true, + RRGGBB = true, + names = false, + RRGGBBAA = true, + AARRGGBB = false, + rgb_fn = false, + hsl_fn = false, + css = false, + css_fn = false, + mode = "background", tailwind = true, - -- parsers can contain values used in |user_default_options| - sass = { enable = true }, -- Enable sass colors + sass = { enable = true }, + virtualtext = " ", }, buftypes = { "*", - -- exclude prompt and popup buftypes from highlight - "!prompt", + "!dashboard", + "!packer", "!popup", + "!prompt", }, }) diff --git a/dot_config/nvim/lua/lsp.lua b/dot_config/nvim/lua/lsp.lua index 9bcc4ba..2abfd35 100644 --- a/dot_config/nvim/lua/lsp.lua +++ b/dot_config/nvim/lua/lsp.lua @@ -133,15 +133,23 @@ local on_attach = function(client, bufnr) vim.keymap.set("n", "K", vim.lsp.buf.hover, bufopts) vim.keymap.set("n", "gi", vim.lsp.buf.implementation, bufopts) vim.keymap.set("n", "", vim.lsp.buf.signature_help, bufopts) - vim.keymap.set("n", "wa", vim.lsp.buf.add_workspace_folder, bufopts) - vim.keymap.set("n", "wr", vim.lsp.buf.remove_workspace_folder, bufopts) - vim.keymap.set("n", "wl", function() + vim.keymap.set("n", "wa", vim.lsp.buf.add_workspace_folder, bufopts) + vim.keymap.set( + "n", + "wr", + vim.lsp.buf.remove_workspace_folder, + bufopts + ) + vim.keymap.set("n", "wl", function() print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end, bufopts) - vim.keymap.set("n", "D", vim.lsp.buf.type_definition, bufopts) - vim.keymap.set("n", "rn", vim.lsp.buf.rename, bufopts) - vim.keymap.set("n", "ca", vim.lsp.buf.code_action, bufopts) + vim.keymap.set("n", "D", vim.lsp.buf.type_definition, bufopts) + vim.keymap.set("n", "rn", vim.lsp.buf.rename, bufopts) + vim.keymap.set("n", "ca", vim.lsp.buf.code_action, bufopts) vim.keymap.set("n", "gr", vim.lsp.buf.references, bufopts) + vim.keymap.set("n", "lr", "LspRestart", bufopts) + vim.keymap.set("n", "]d", vim.diagnostic.goto_next, bufopts) + vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, bufopts) end local lspconfig = require("lspconfig") @@ -246,6 +254,11 @@ lspconfig.ltex.setup({ }, }) +lspconfig.yamlls.setup({ + capabilities = capabilities, + on_attach = on_attach, +}) + local null = require("null-ls") local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) diff --git a/dot_config/nvim/lua/plugins.lua b/dot_config/nvim/lua/plugins.lua index a57babd..83dc099 100644 --- a/dot_config/nvim/lua/plugins.lua +++ b/dot_config/nvim/lua/plugins.lua @@ -29,6 +29,20 @@ return packer.startup({ end, }) + use({ + "Pocco81/true-zen.nvim", + config = function() + local tz = require("true-zen") + tz.setup({ + integrations = { + lualine = true, + }, + }) + Map("n", "zz", ":TZAtaraxis") + Map("n", "zf", ":TZFocus") + end, + }) + -- git gutter use({ "lewis6991/gitsigns.nvim",