From 4bea747ffa9fb853e898e09345aee300eb76c903 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 1 Sep 2023 12:11:15 +0100 Subject: [PATCH] revert(nvim): re-add lualine and noice This reverts commit db7d2b442f03c9d02bd8471c71f3eb483a40ca2b. --- config/neovim/after/plugin/lualine.lua | 40 --------------- config/neovim/after/plugin/noice.lua | 66 ------------------------- config/neovim/lua/opdavies/lsp/init.lua | 4 -- system/shared/home-manager.nix | 4 -- 4 files changed, 114 deletions(-) delete mode 100644 config/neovim/after/plugin/lualine.lua delete mode 100644 config/neovim/after/plugin/noice.lua diff --git a/config/neovim/after/plugin/lualine.lua b/config/neovim/after/plugin/lualine.lua deleted file mode 100644 index ac39007..0000000 --- a/config/neovim/after/plugin/lualine.lua +++ /dev/null @@ -1,40 +0,0 @@ -local status_ok, lualine = pcall(require, "lualine") -if not status_ok then - return -end - -local noice = require 'noice' - -lualine.setup { - options = { - component_separators = { left = '', right = '' }, - extensions = { "fzf", "quickfix" }, - icons_enabled = false, - section_separators = { left = '', right = '' }, - theme = "catppuccin" - }, - - sections = { - lualine_x = { - { - noice.api.status.message.get_hl, - cond = noice.api.status.message.has, - }, - { - noice.api.status.command.get, - cond = noice.api.status.command.has, - color = { fg = "#EED49F" }, - }, - { - noice.api.status.mode.get, - cond = noice.api.status.mode.has, - color = { fg = "#EED49F" }, - }, - { - noice.api.status.search.get, - cond = noice.api.status.search.has, - color = { fg = "#EED49F" }, - }, - }, - }, -} diff --git a/config/neovim/after/plugin/noice.lua b/config/neovim/after/plugin/noice.lua deleted file mode 100644 index ec6a6cd..0000000 --- a/config/neovim/after/plugin/noice.lua +++ /dev/null @@ -1,66 +0,0 @@ -local status_ok, noice = pcall(require, "noice") -if not status_ok then - return -end - -local notify = require 'notify' - -noice.setup({ - cmdline = { - format = { - cmdline = { icon = ">" }, - filter = { icon = "$" }, - help = { icon = "?" }, - lua = { icon = "☾" }, - search_down = { icon = "🔍⌄" }, - search_up = { icon = "🔍⌃" }, - }, - }, - lsp = { - override = { - ["cmp.entry.get_documentation"] = true, - ["vim.lsp.util.convert_input_to_markdown_lines"] = true, - ["vim.lsp.util.stylize_markdown"] = true, - }, - }, - popupmenu = { - kind_icons = false, - }, - presets = { - bottom_search = true, - command_palette = true, - inc_rename = false, - long_message_to_split = true, - lsp_doc_border = false, - }, -}) - -notify.setup({ - background_colour = "#1e222a", - render = "minimal", - stages = "static", - timeout = 5000, -}) - -vim.cmd [[ - highlight NotifyERRORBorder guifg=#ED8796 - highlight NotifyWARNBorder guifg=#EED49F - highlight NotifyINFOBorder guifg=#A6DA95 - highlight NotifyDEBUGBorder guifg=#B8C0E0 - highlight NotifyTRACEBorder guifg=#C6A0F6 - highlight NotifyERRORIcon guifg=#ED8796 - highlight NotifyWARNIcon guifg=#EED49F - highlight NotifyINFOIcon guifg=#A6DA95 - highlight NotifyDEBUGIcon guifg=#B8C0E0 - highlight NotifyTRACEIcon guifg=#C6A0F6 - highlight NotifyERRORTitle guifg=#ED8796 - highlight NotifyWARNTitle guifg=#EED49F - highlight NotifyINFOTitle guifg=#A6DA95 - highlight NotifyDEBUGTitle guifg=#B8C0E0 - highlight NotifyTRACETitle guifg=#C6A0F6 - highlight link NotifyERRORBody Normal - highlight link NotifyWARNBody Normal - highlight link NotifyINFOBody Normal - highlight link NotifyDEBUGBody Normal - highlight link NotifyTRACEBody Normal -]] diff --git a/config/neovim/lua/opdavies/lsp/init.lua b/config/neovim/lua/opdavies/lsp/init.lua index 4bd3b1a..b86a903 100644 --- a/config/neovim/lua/opdavies/lsp/init.lua +++ b/config/neovim/lua/opdavies/lsp/init.lua @@ -81,9 +81,5 @@ cmp.setup({ }, }) -local nmap = require "opdavies.keymap".nmap - -nmap { "r", "LspRestart" } - require "opdavies.lsp.null-ls" require "opdavies.lsp.signature" diff --git a/system/shared/home-manager.nix b/system/shared/home-manager.nix index 597f654..119d44b 100644 --- a/system/shared/home-manager.nix +++ b/system/shared/home-manager.nix @@ -542,10 +542,6 @@ in vimPlugins.vim-tmux-navigator vimPlugins.vim-unimpaired - vimPlugins.lualine-nvim - vimPlugins.noice-nvim - vimPlugins.nvim-notify - # Git vimPlugins.vim-fugitive vimPlugins.vim-rhubarb