From 80c9e70386335babd0c7558c6b078db0278e84eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=88=D0=BE=D0=B2=D0=B0=D0=BD=20=D0=82=D0=BE=D0=BA=D0=B8?= =?UTF-8?q?=D1=9B-=D0=A8=D1=83=D0=BC=D0=B0=D1=80=D0=B0=D1=86?= Date: Mon, 31 Jul 2023 23:57:35 +0200 Subject: [PATCH] Aesthetic changes --- lua/plugins/harpoon.lua | 3 ++ lua/plugins/hlblocks.lua | 29 ++++++++++++ lua/plugins/init.lua | 7 ++- lua/plugins/lazy.lua | 35 ++++++++++++--- lua/plugins/lualine.lua | 2 +- lua/plugins/mini.lua | 3 -- lua/plugins/noice.lua | 85 ++++++++++++++++++++++++++++++++++++ lua/plugins/smoothcursor.lua | 35 --------------- 8 files changed, 152 insertions(+), 47 deletions(-) create mode 100644 lua/plugins/hlblocks.lua create mode 100644 lua/plugins/noice.lua delete mode 100644 lua/plugins/smoothcursor.lua diff --git a/lua/plugins/harpoon.lua b/lua/plugins/harpoon.lua index d40310f..54550cd 100644 --- a/lua/plugins/harpoon.lua +++ b/lua/plugins/harpoon.lua @@ -1,6 +1,9 @@ local mark = require("harpoon.mark") local ui = require("harpoon.ui") +vim.g.mapleader = " " + + vim.keymap.set("n", "ma", mark.add_file) vim.keymap.set("n", "mm", ui.toggle_quick_menu) diff --git a/lua/plugins/hlblocks.lua b/lua/plugins/hlblocks.lua new file mode 100644 index 0000000..6c56b71 --- /dev/null +++ b/lua/plugins/hlblocks.lua @@ -0,0 +1,29 @@ +require('hlchunk').setup({ + indent = { + chars = { "·", "·", "·", "·", }, -- more code can be found in https://unicodeplus.com/ +-- chars = { "│", "¦", "┆", "┊", }, -- more code can be found in https://unicodeplus.com/ + + style = { + "#333333", + }, + }, + blank = { + enable = false, + }, + + chunk = { + chars = { + horizontal_line = "─", + vertical_line = "│", + left_top = "╭", + left_bottom = "╰", + right_arrow = ">", + }, + style = "#00ffff", + }, + + line_num = { + style = "#00ffff", + }, + +}) diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index af2f3f6..f729dad 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -1,9 +1,9 @@ require("plugins.lazy") +require("plugins.noice") + require("plugins.neorg") -require("plugins.smoothcursor") require("plugins.treesitter") -require("plugins.harpoon") require("plugins.drop") require("plugins.mini") require("plugins.lsp-zero") @@ -12,3 +12,6 @@ require("plugins.devicons") require("plugins.lualine") require("plugins.veil") + +require("plugins.harpoon") +require("plugins.hlblocks") diff --git a/lua/plugins/lazy.lua b/lua/plugins/lazy.lua index 4158100..5d3aabb 100644 --- a/lua/plugins/lazy.lua +++ b/lua/plugins/lazy.lua @@ -24,26 +24,39 @@ require("lazy").setup({ "navarasu/onedark.nvim", "HiPhish/nvim-ts-rainbow2", - "gen740/SmoothCursor.nvim", "folke/twilight.nvim", "folke/zen-mode.nvim", "MunifTanjim/nui.nvim", - "nvim-tree/nvim-web-devicons", - "tamton-aquib/staline.nvim", "kassio/neoterm", - "willothy/veil.nvim", "bkad/camelcasemotion", "ggandor/lightspeed.nvim", "tpope/vim-commentary", - "preservim/nerdtree", "ThePrimeagen/harpoon", "eandrju/cellular-automaton.nvim", "dbinagi/nomodoro", + "EdenEast/nightfox.nvim", + + + { + + "shellRaining/hlchunk.nvim", + event = { "UIEnter" }, + + }, + + + { + 'windwp/nvim-autopairs', + event = "InsertEnter", + opts = {} -- this is equalent to setup({}) function + }, + + { "nvim-lualine/lualine.nvim", @@ -72,7 +85,9 @@ require("lazy").setup({ { "folke/noice.nvim", - config = true, + config = function () + require("plugins.noice") + end }, @@ -96,6 +111,14 @@ require("lazy").setup({ }, + -- File manager who? + { + "ms-jpq/chadtree", + version = 'chad', + build = 'python3 -m chadtree deps', + }, + + -- need that syntax highlight amirite { "nvim-treesitter/nvim-treesitter", diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index 512e57f..8b87a20 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -1,7 +1,7 @@ require('lualine').setup { options = { icons_enabled = true, - theme = 'onedark', + theme = 'carbonfox', component_separators = { left = '', right = ''}, section_separators = { left = '', right = ''}, disabled_filetypes = { diff --git a/lua/plugins/mini.lua b/lua/plugins/mini.lua index e28c15a..0b402fc 100644 --- a/lua/plugins/mini.lua +++ b/lua/plugins/mini.lua @@ -1,5 +1,2 @@ require('mini.cursorword').setup() -require('mini.pairs').setup() require('mini.trailspace').setup() -require('mini.hipatterns').setup() -require('mini.indentscope').setup() diff --git a/lua/plugins/noice.lua b/lua/plugins/noice.lua new file mode 100644 index 0000000..71b175c --- /dev/null +++ b/lua/plugins/noice.lua @@ -0,0 +1,85 @@ +require("noice").setup({ + noice = { + health = { + checker = false + }, + cmdline = { + format = { + cmdline = { + pattern = "^:", + icon = " ", + lang = "vim", + }, + search_down = { + kind = "search", + pattern = "^/", + icon = " ", + lang = "regex", + }, + search_up = { + kind = "search", + pattern = "^%?", + icon = " ", + lang = "regex" + }, + filter = { + pattern = "^:%s*!", + icon = "$", + lang = "bash" + }, + lua = { + pattern = "^:%s*lua%s+", + icon = "", + lang = "lua" + }, + help = { + pattern = "^:%s*h%s+", + icon = "" + }, + input = {} + } + }, + opts = { + win_options = { + winhighlight = { + Normal = "NormalFloat", + FloatBorder = "FloatBorder" + } + } + } + }, + lsp = { + progress = { + enabled = true + }, + override = { + ["vim.lsp.util.convert_input_to_markdown_lines"] = true, + ["vim.lsp.util.stylize_markdown"] = true, + ["cmp.entry.get_documentation"] = true + } + }, + views = { + cmdline_popup = { + position = { + row = 0, + col = "50%" + }, + size = { + width = "98%" + }, + border = { + style = "none", + padding = { 1, 1 }, + }, + } + }, + presets = { + long_message_to_split = true, + lsp_doc_border = true + }, + popupmenu = { + backend = "cmp" + }, + format = {} +}) + diff --git a/lua/plugins/smoothcursor.lua b/lua/plugins/smoothcursor.lua deleted file mode 100644 index 30d8d5d..0000000 --- a/lua/plugins/smoothcursor.lua +++ /dev/null @@ -1,35 +0,0 @@ - - -require('smoothcursor').setup({ - autostart = true, - cursor = "", -- cursor shape (need nerd font) - texthl = "SmoothCursor", -- highlight group, default is { bg = nil, fg = "#FFD400" } - linehl = nil, -- highlight sub-cursor line like 'cursorline', "CursorLine" recommended - type = "default", -- define cursor movement calculate function, "default" or "exp" (exponential). - fancy = { - enable = true, -- enable fancy mode - head = { cursor = "", texthl = "SmoothCursor", linehl = nil }, - body = { - { cursor = "", texthl = "SmoothCursorYellow" }, - { cursor = "", texthl = "SmoothCursorYellow" }, - { cursor = "●", texthl = "SmoothCursorYellow" }, - { cursor = "●", texthl = "SmoothCursorYellow" }, - { cursor = "•", texthl = "SmoothCursorYellow" }, - { cursor = ".", texthl = "SmoothCursorYellow" }, - { cursor = ".", texthl = "SmoothCursorYellow" }, - }, - tail = { cursor = nil, texthl = "SmoothCursor" } - }, - flyin_effect = nil, -- "bottom" or "top" - speed = 50, -- max is 100 to stick to your current position - intervals = 25, -- tick interval - priority = 10, -- set marker priority - timeout = 1500, -- timout for animation - threshold = 3, -- animate if threshold lines jump - disable_float_win = false, -- disable on float window - enabled_filetypes = nil, -- example: { "lua", "vim" } - disabled_filetypes = nil, -- this option will be skipped if enabled_filetypes is set. example: { "TelescopePrompt", "NvimTree" } -}) - - -