From a1a1b05f999f247b60416b92ddd590311e674721 Mon Sep 17 00:00:00 2001 From: gnat Date: Sun, 8 Sep 2024 15:31:24 -0700 Subject: [PATCH] remove most nerd font icons because I got annoyed by text rendering; improvements --- lua/core/opts.lua | 6 ++-- lua/plugins/auto-pairs.lua | 1 - lua/plugins/barbecue.lua | 11 ------- lua/plugins/indent-blankline.lua | 7 ----- lua/plugins/mini-files.lua | 1 - lua/plugins/mini-indentscope.lua | 7 +++++ lua/plugins/mini-notify.lua | 1 - lua/plugins/mini-pairs.lua | 8 ++++- lua/plugins/neotree.lua | 33 +++++++++++++++++++-- lua/plugins/nvim-navic.lua | 51 -------------------------------- lua/plugins/nvim-telescope.lua | 26 +++++++++------- 11 files changed, 63 insertions(+), 89 deletions(-) delete mode 100644 lua/plugins/auto-pairs.lua delete mode 100644 lua/plugins/barbecue.lua delete mode 100644 lua/plugins/indent-blankline.lua delete mode 100644 lua/plugins/mini-files.lua create mode 100644 lua/plugins/mini-indentscope.lua delete mode 100644 lua/plugins/mini-notify.lua delete mode 100644 lua/plugins/nvim-navic.lua diff --git a/lua/core/opts.lua b/lua/core/opts.lua index c2630ea..97b82aa 100644 --- a/lua/core/opts.lua +++ b/lua/core/opts.lua @@ -1,5 +1,5 @@ local opt = vim.opt - + opt.expandtab = true opt.smarttab = true opt.shiftwidth = 4 @@ -26,8 +26,8 @@ opt.background = 'light' opt.updatetime = 50 +opt.clipboard = "unnamedplus" + border_style = 'rounded' vim.cmd('set showtabline=2') -vim.cmd('colorscheme gruvbox') -vim.cmd('hi SpellBad gui=undercurl guifg=#cc241c') diff --git a/lua/plugins/auto-pairs.lua b/lua/plugins/auto-pairs.lua deleted file mode 100644 index 97e2c68..0000000 --- a/lua/plugins/auto-pairs.lua +++ /dev/null @@ -1 +0,0 @@ -return {} -- return {'jiangmiao/auto-pairs'} diff --git a/lua/plugins/barbecue.lua b/lua/plugins/barbecue.lua deleted file mode 100644 index aa84da8..0000000 --- a/lua/plugins/barbecue.lua +++ /dev/null @@ -1,11 +0,0 @@ -return { - "utilyre/barbecue.nvim", - name = "barbecue", - version = "*", - event = { 'LspAttach' }, - dependencies = { - "SmiteshP/nvim-navic", - "nvim-tree/nvim-web-devicons", -- optional dependency - }, - opts = {} -} diff --git a/lua/plugins/indent-blankline.lua b/lua/plugins/indent-blankline.lua deleted file mode 100644 index 502f753..0000000 --- a/lua/plugins/indent-blankline.lua +++ /dev/null @@ -1,7 +0,0 @@ -return { - -- "lukas-reineke/indent-blankline.nvim", - -- main = "ibl", - -- config = function() - -- require("ibl").setup() - -- end -} diff --git a/lua/plugins/mini-files.lua b/lua/plugins/mini-files.lua deleted file mode 100644 index 6564fc9..0000000 --- a/lua/plugins/mini-files.lua +++ /dev/null @@ -1 +0,0 @@ -return { 'echasnovski/mini.files', version = false } diff --git a/lua/plugins/mini-indentscope.lua b/lua/plugins/mini-indentscope.lua new file mode 100644 index 0000000..96f34a6 --- /dev/null +++ b/lua/plugins/mini-indentscope.lua @@ -0,0 +1,7 @@ +return{ + 'echasnovski/mini.indentscope', + version = false, + config = function() + require('mini.indentscope').setup() + end +} diff --git a/lua/plugins/mini-notify.lua b/lua/plugins/mini-notify.lua deleted file mode 100644 index 74d1e39..0000000 --- a/lua/plugins/mini-notify.lua +++ /dev/null @@ -1 +0,0 @@ -return { 'echasnovski/mini.notify', version = false } diff --git a/lua/plugins/mini-pairs.lua b/lua/plugins/mini-pairs.lua index 3d744a3..cdbd948 100644 --- a/lua/plugins/mini-pairs.lua +++ b/lua/plugins/mini-pairs.lua @@ -1 +1,7 @@ -return { 'echasnovski/mini.pairs', version = false } +return { + 'echasnovski/mini.pairs', + version = false, + config = function() + require('mini.pairs').setup() + end +} diff --git a/lua/plugins/neotree.lua b/lua/plugins/neotree.lua index fd321e8..9e237f9 100644 --- a/lua/plugins/neotree.lua +++ b/lua/plugins/neotree.lua @@ -4,11 +4,40 @@ return { branch = "v3.x", dependencies = { "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended "MunifTanjim/nui.nvim", - -- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information }, config = function() + require('neo-tree').setup({ + renderers = { + directory = { + { "indent" }, + { "current_filter" }, + { + "container", + content = { + { "name", zindex = 10 }, + { "clipboard", zindex = 10 }, + { "diagnostics", errors_only = true, zindex = 20, align = "right", hide_when_expanded = true }, + { "git_status", zindex = 20, align = "right", hide_when_expanded = true }, + }, + }, + }, + file = { + { "indent" }, + { + "container", + content = { + { "name", zindex = 10 }, + { "clipboard", zindex = 10 }, + { "bufnr", zindex = 10 }, + { "modified", zindex = 20, align = "right" }, + { "diagnostics", zindex = 20, align = "right" }, + { "git_status", zindex = 20, align = "right" }, + }, + }, + }, + } + }) vim.api.nvim_set_keymap('n', '', ':UndotreeHide:Neotree toggle', {}) end } diff --git a/lua/plugins/nvim-navic.lua b/lua/plugins/nvim-navic.lua deleted file mode 100644 index e6c879a..0000000 --- a/lua/plugins/nvim-navic.lua +++ /dev/null @@ -1,51 +0,0 @@ -return { - 'SmiteshP/nvim-navic', - event = { 'LspAttach' }, - config = function() - local navic = require('nvim-navic') - navic.setup { - icons = { - File = ' ', - Module = ' ', - Namespace = ' ', - Package = ' ', - Class = ' ', - Method = ' ', - Property = ' ', - Field = ' ', - Constructor = ' ', - Enum = ' ', - Interface = ' ', - Function = ' ', - Variable = ' ', - Constant = ' ', - String = ' ', - Number = ' ', - Boolean = ' ', - Array = ' ', - Object = ' ', - Key = ' ', - Null = ' ', - EnumMember = ' ', - Struct = ' ', - Event = ' ', - Operator = ' ', - TypeParameter = ' ' - }, - lsp = { - auto_attach = true, - preference = nil, - }, - highlight = true, - separator = " > ", - depth_limit = 0, - depth_limit_indicator = "..", - safe_output = true, - lazy_update_context = false, - click = true, - format_text = function(text) - return text - end, - } - end -} diff --git a/lua/plugins/nvim-telescope.lua b/lua/plugins/nvim-telescope.lua index eb4f27f..1c3f09d 100644 --- a/lua/plugins/nvim-telescope.lua +++ b/lua/plugins/nvim-telescope.lua @@ -2,26 +2,26 @@ return { lazy = true, 'nvim-telescope/telescope.nvim', tag = '0.1.4', - dependencies = { 'nvim-lua/plenary.nvim' }, + dependencies = { 'nvim-lua/plenary.nvim', 'nvim-telescope/telescope-media-files.nvim' }, config = function() local actions = require("telescope.actions") local keymap = vim.api.nvim_set_keymap + local canned = require("telescope._extensions.media.lib.canned") + require('telescope').setup({ extensions = { + media_files = { + filetypes = {"png", "webp", "jpg", "jpeg"}, + find_cmd = "rg" + }, media = { - backend = "ueberzug", - backend_options = { - xmove = -1, - ymove = -2, - warnings = true, - supress_backend_warning = false - }, + backend = "ueberzug", } }, defaults = { prompt_prefix = "λ ", - selection_caret = "-> ", + selection_caret = "> ", mappings = { i = { [""] = actions.which_key, @@ -37,18 +37,22 @@ return { layout_config = { width = 0.3, height = 0.4, - }, + }, }, planets = { show_pluto = true, }, + find_files = { + disable_devicons = true + }, }, - extensions = {} }) keymap('n', '', ':Telescope find_files', {}) keymap('n', 'm', ':Telescope media', {}) keymap('n', 'b', ':Telescope buffers', {}) keymap('n', 't', ':Telescope', {}) keymap('n', 'g', ':Telescope live_grep', {}) + + require('telescope').load_extension('media_files') end, }