From 4fd17ccf0c258a26de95b7cf65c509a3b4ee6a0f Mon Sep 17 00:00:00 2001 From: thek4n Date: Fri, 19 Apr 2024 09:09:31 +0300 Subject: [PATCH] refactor(nvim-plugins) --- home/user/.config/bash/aliases | 2 +- home/user/.config/nvim/lua/plugins/coding.lua | 101 +++++++++++++ .../.config/nvim/lua/plugins/colorschemes.lua | 30 ---- home/user/.config/nvim/lua/plugins/dotenv.lua | 12 -- .../nvim/lua/plugins/indent_blankline.lua | 9 -- .../user/.config/nvim/lua/plugins/lualine.lua | 74 ---------- .../user/.config/nvim/lua/plugins/mdimage.lua | 8 -- home/user/.config/nvim/lua/plugins/misc.lua | 26 ++-- home/user/.config/nvim/lua/plugins/neodev.lua | 19 --- .../.config/nvim/lua/plugins/neoscroll.lua | 10 -- .../user/.config/nvim/lua/plugins/postman.lua | 6 - .../nvim/lua/plugins/refactoring-nvim.lua | 68 --------- .../{vim_textobj.lua => textobjects.lua} | 9 +- home/user/.config/nvim/lua/plugins/ui.lua | 136 ++++++++++++++++++ .../.config/nvim/lua/plugins/which_key.lua | 6 - .../user/.config/terminal-colors.d/cal.scheme | 3 - 16 files changed, 260 insertions(+), 259 deletions(-) create mode 100644 home/user/.config/nvim/lua/plugins/coding.lua delete mode 100644 home/user/.config/nvim/lua/plugins/colorschemes.lua delete mode 100644 home/user/.config/nvim/lua/plugins/dotenv.lua delete mode 100644 home/user/.config/nvim/lua/plugins/indent_blankline.lua delete mode 100644 home/user/.config/nvim/lua/plugins/lualine.lua delete mode 100644 home/user/.config/nvim/lua/plugins/mdimage.lua delete mode 100644 home/user/.config/nvim/lua/plugins/neodev.lua delete mode 100644 home/user/.config/nvim/lua/plugins/neoscroll.lua delete mode 100644 home/user/.config/nvim/lua/plugins/postman.lua delete mode 100644 home/user/.config/nvim/lua/plugins/refactoring-nvim.lua rename home/user/.config/nvim/lua/plugins/{vim_textobj.lua => textobjects.lua} (62%) create mode 100644 home/user/.config/nvim/lua/plugins/ui.lua delete mode 100644 home/user/.config/nvim/lua/plugins/which_key.lua delete mode 100644 home/user/.config/terminal-colors.d/cal.scheme diff --git a/home/user/.config/bash/aliases b/home/user/.config/bash/aliases index 370de36..d1ce4f7 100644 --- a/home/user/.config/bash/aliases +++ b/home/user/.config/bash/aliases @@ -60,7 +60,7 @@ alias nowdate='date +"%d-%m-%Y"' alias cal='cal -m' # vim -alias vi='\nvim' +alias vi='nvim' alias svi="sudo -E nvim" # net diff --git a/home/user/.config/nvim/lua/plugins/coding.lua b/home/user/.config/nvim/lua/plugins/coding.lua new file mode 100644 index 0000000..845a705 --- /dev/null +++ b/home/user/.config/nvim/lua/plugins/coding.lua @@ -0,0 +1,101 @@ +return { + { + "ellisonleao/dotenv.nvim", + config = function() + require('dotenv').setup({ + enable_on_load = true, -- will load your .env file upon loading a buffer + }) + + vim.api.nvim_create_autocmd("BufEnter", { + pattern = "*", callback = require('dotenv').autocmd + }) + end + }, + { + "ThePrimeagen/refactoring.nvim", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-treesitter/nvim-treesitter", + }, + config = function() + require("telescope").load_extension("refactoring") + end, + keys = { + { + "rr", + ":lua require('refactoring').select_refactor()", + desc = "Select refactoring", + mode = {"n", "x"}, + }, + -- Refactoring operations + { + "re", + "lua require('refactoring').refactor('Extract Function')", + desc = "Extract Function", + mode = "x", + }, + { + "rf", + "lua require('refactoring').refactor('Extract Function To File')", + desc = "Extract Function To File", + mode = "x", + }, + { + "rv", + "lua require('refactoring').refactor('Extract Variable')", + desc = "Extract Variable", + mode = "x", + }, + { + "rI", + "lua require('refactoring').refactor('Inline Function')", + desc = "Inline Function", + mode = "n", + }, + { + "ri", + "lua require('refactoring').refactor('Inline Variable')", + desc = "Inline Variable", + mode = {"n", "x"}, + }, + -- Extract block + { + "rb", + "lua require('refactoring').refactor('Extract Block')", + desc = "Extract Block", + mode = "n", + }, + { + "rbf", + "lua require('refactoring').refactor('Extract Block To File')", + desc = "Extract Block To File", + mode = "n", + }, + -- Telescope + { + "fr", + "lua require('telescope').extensions.refactoring.refactors()", + mode = "n", + } + } + }, + { + 'folke/neodev.nvim', + ft = {'lua'}, + dependencies = { + 'neovim/nvim-lspconfig' + }, + config = function() + require('neodev').setup() + require('lspconfig').lua_ls.setup({ + settings = { + Lua = { + completion = { + callSnippet = "Replace" + } + } + } + }) + end + }, +} \ No newline at end of file diff --git a/home/user/.config/nvim/lua/plugins/colorschemes.lua b/home/user/.config/nvim/lua/plugins/colorschemes.lua deleted file mode 100644 index fd4e920..0000000 --- a/home/user/.config/nvim/lua/plugins/colorschemes.lua +++ /dev/null @@ -1,30 +0,0 @@ -return { - { - 'EdenEast/nightfox.nvim', - config = function() - local colorscheme = require("nightfox") - colorscheme.compile() - colorscheme.setup() - vim.cmd.colorscheme("nightfox") - end - }, - { - 'ellisonleao/gruvbox.nvim' - }, - { - 'xiyaowong/transparent.nvim', - config = function() - require("transparent").setup({ - exclude_groups = {'CursorLine'}, - }) - end - }, - { - 'lukas-reineke/virt-column.nvim', - config = function() - require("virt-column").setup({ - virtcolumn = '81' - }) - end - }, -} \ No newline at end of file diff --git a/home/user/.config/nvim/lua/plugins/dotenv.lua b/home/user/.config/nvim/lua/plugins/dotenv.lua deleted file mode 100644 index 253c473..0000000 --- a/home/user/.config/nvim/lua/plugins/dotenv.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - "ellisonleao/dotenv.nvim", - config = function() - require('dotenv').setup({ - enable_on_load = true, -- will load your .env file upon loading a buffer - }) - - vim.api.nvim_create_autocmd("BufEnter", { - pattern = "*", callback = require('dotenv').autocmd - }) - end -} diff --git a/home/user/.config/nvim/lua/plugins/indent_blankline.lua b/home/user/.config/nvim/lua/plugins/indent_blankline.lua deleted file mode 100644 index d168936..0000000 --- a/home/user/.config/nvim/lua/plugins/indent_blankline.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "lukas-reineke/indent-blankline.nvim", - config = function() - require("ibl").setup({ - scope = { enabled = false }, - }) - end, - main = "ibl" -} diff --git a/home/user/.config/nvim/lua/plugins/lualine.lua b/home/user/.config/nvim/lua/plugins/lualine.lua deleted file mode 100644 index 64b4406..0000000 --- a/home/user/.config/nvim/lua/plugins/lualine.lua +++ /dev/null @@ -1,74 +0,0 @@ - -local function get_virtual_env() - return vim.fs.basename(os.getenv("VIRTUAL_ENV")) -end - -function GET_FORMATTED_VIRTUAL_ENV() - if vim.bo.filetype == 'python' then - return "<" .. get_virtual_env() .. ">" - end - return "" -end - -function DETECT_INDENT_TYPE() - if vim.bo.expandtab then - return vim.bo.shiftwidth .. " spaces" - else - return vim.bo.shiftwidth / vim.bo.tabstop .. " tabs (" .. vim.bo.tabstop .. ")" - end -end - -local function is_absolute_path(path) - return string.sub(path, 1, 1) == '/' or string.sub(path, 1, 1) == '~' -end - -return { - 'nvim-lualine/lualine.nvim', - event = "VeryLazy", - config = function() - require("lualine").setup({ - options = { - component_separators = { left = '', right = '' }, - }, - sections = { - lualine_a = {'mode'}, - lualine_b = {'branch', 'diff', 'diagnostics'}, - lualine_c = { - { - 'vim.fn.getcwd()', - fmt = function(str) - local res = str - - res = str:gsub(os.getenv("HOME"), "~") - - return res - end, - color = { fg = 'white', gui='bold' }, - padding = { left = 1, right = 0 } - }, - { - 'filename', - fmt = function(str) - local res = str - - if is_absolute_path(res) then - res = " " .. res - else - res = "/" .. res - end - - return res - end, - file_status = true, - path = 1, - padding = { left = 0, right = 1 } - }, - }, - lualine_x = {'GET_FORMATTED_VIRTUAL_ENV()', 'DETECT_INDENT_TYPE()', 'filetype'}, - lualine_y = {'progress'}, - lualine_z = {'location'}, - }, - }) - end, - dependencies = { 'kyazdani42/nvim-web-devicons' } -} \ No newline at end of file diff --git a/home/user/.config/nvim/lua/plugins/mdimage.lua b/home/user/.config/nvim/lua/plugins/mdimage.lua deleted file mode 100644 index c7f0fac..0000000 --- a/home/user/.config/nvim/lua/plugins/mdimage.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - "thek4n/mdimage.nvim", - config = function() - require("mdimage").setup({ - target_path = "./.img", - }) - end -} \ No newline at end of file diff --git a/home/user/.config/nvim/lua/plugins/misc.lua b/home/user/.config/nvim/lua/plugins/misc.lua index 26122a9..cd0b38a 100644 --- a/home/user/.config/nvim/lua/plugins/misc.lua +++ b/home/user/.config/nvim/lua/plugins/misc.lua @@ -1,9 +1,7 @@ return { - 'HiPhish/rainbow-delimiters.nvim', 'tpope/vim-repeat', 'google/vim-searchindex', 'rbgrouleff/bclose.vim', - 'chaoren/vim-wordmotion', 'preservim/vim-pencil', { 'windwp/nvim-autopairs', @@ -33,12 +31,6 @@ return { require("Comment").setup() end }, - { - 'norcalli/nvim-colorizer.lua', - config = function() - require('colorizer').setup() - end - }, { 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate', @@ -53,10 +45,6 @@ return { }) end }, - { - 'nvim-treesitter/nvim-treesitter-textobjects', - dependencies = { 'nvim-treesitter/nvim-treesitter' }, - }, { 'folke/trouble.nvim', dependencies = { 'kyazdani42/nvim-web-devicons' }, @@ -64,4 +52,18 @@ return { require("trouble").setup() end }, + { + "thek4n/mdimage.nvim", + config = function() + require("mdimage").setup({ + target_path = "./.img", + }) + end + }, + { + "thek4n/postman.nvim", + config = function() + vim.keymap.set("n", "rl", 'PostmanExec') + end + } } \ No newline at end of file diff --git a/home/user/.config/nvim/lua/plugins/neodev.lua b/home/user/.config/nvim/lua/plugins/neodev.lua deleted file mode 100644 index e889372..0000000 --- a/home/user/.config/nvim/lua/plugins/neodev.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - 'folke/neodev.nvim', - ft = {'lua'}, - dependencies = { - 'neovim/nvim-lspconfig' - }, - config = function() - require('neodev').setup() - require('lspconfig').lua_ls.setup({ - settings = { - Lua = { - completion = { - callSnippet = "Replace" - } - } - } - }) - end -} diff --git a/home/user/.config/nvim/lua/plugins/neoscroll.lua b/home/user/.config/nvim/lua/plugins/neoscroll.lua deleted file mode 100644 index 5eac30e..0000000 --- a/home/user/.config/nvim/lua/plugins/neoscroll.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - 'karb94/neoscroll.nvim', - config = function() - require('neoscroll').setup({ - mappings = {'', '', '', - '', '', 'zt', 'zz', 'zb'}, - respect_scrolloff = false, - }) - end -} \ No newline at end of file diff --git a/home/user/.config/nvim/lua/plugins/postman.lua b/home/user/.config/nvim/lua/plugins/postman.lua deleted file mode 100644 index 9ebd721..0000000 --- a/home/user/.config/nvim/lua/plugins/postman.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "thek4n/postman.nvim", - config = function() - vim.keymap.set("n", "rl", 'PostmanExec') - end -} \ No newline at end of file diff --git a/home/user/.config/nvim/lua/plugins/refactoring-nvim.lua b/home/user/.config/nvim/lua/plugins/refactoring-nvim.lua deleted file mode 100644 index 0d1dbc6..0000000 --- a/home/user/.config/nvim/lua/plugins/refactoring-nvim.lua +++ /dev/null @@ -1,68 +0,0 @@ -return { - "ThePrimeagen/refactoring.nvim", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-treesitter/nvim-treesitter", - }, - config = function() - require("telescope").load_extension("refactoring") - end, - keys = { - { - "rr", - ":lua require('refactoring').select_refactor()", - desc = "Select refactoring", - mode = {"n", "x"}, - }, - -- Refactoring operations - { - "re", - "lua require('refactoring').refactor('Extract Function')", - desc = "Extract Function", - mode = "x", - }, - { - "rf", - "lua require('refactoring').refactor('Extract Function To File')", - desc = "Extract Function To File", - mode = "x", - }, - { - "rv", - "lua require('refactoring').refactor('Extract Variable')", - desc = "Extract Variable", - mode = "x", - }, - { - "rI", - "lua require('refactoring').refactor('Inline Function')", - desc = "Inline Function", - mode = "n", - }, - { - "ri", - "lua require('refactoring').refactor('Inline Variable')", - desc = "Inline Variable", - mode = {"n", "x"}, - }, - -- Extract block - { - "rb", - "lua require('refactoring').refactor('Extract Block')", - desc = "Extract Block", - mode = "n", - }, - { - "rbf", - "lua require('refactoring').refactor('Extract Block To File')", - desc = "Extract Block To File", - mode = "n", - }, - -- Telescope - { - "fr", - "lua require('telescope').extensions.refactoring.refactors()", - mode = "n", - } - }, -} \ No newline at end of file diff --git a/home/user/.config/nvim/lua/plugins/vim_textobj.lua b/home/user/.config/nvim/lua/plugins/textobjects.lua similarity index 62% rename from home/user/.config/nvim/lua/plugins/vim_textobj.lua rename to home/user/.config/nvim/lua/plugins/textobjects.lua index 13fac9d..5c268cb 100644 --- a/home/user/.config/nvim/lua/plugins/vim_textobj.lua +++ b/home/user/.config/nvim/lua/plugins/textobjects.lua @@ -8,5 +8,12 @@ return { 'sgur/vim-textobj-parameter', event = "InsertEnter", dependencies = { 'kana/vim-textobj-user' } - } + }, + { + 'chaoren/vim-wordmotion', + }, + { + 'nvim-treesitter/nvim-treesitter-textobjects', + dependencies = { 'nvim-treesitter/nvim-treesitter' }, + }, } \ No newline at end of file diff --git a/home/user/.config/nvim/lua/plugins/ui.lua b/home/user/.config/nvim/lua/plugins/ui.lua new file mode 100644 index 0000000..213a13b --- /dev/null +++ b/home/user/.config/nvim/lua/plugins/ui.lua @@ -0,0 +1,136 @@ +local function get_virtual_env() + return vim.fs.basename(os.getenv("VIRTUAL_ENV")) +end + +function GET_FORMATTED_VIRTUAL_ENV() + if vim.bo.filetype == 'python' then + return "<" .. get_virtual_env() .. ">" + end + return "" +end + +function DETECT_INDENT_TYPE() + if vim.bo.expandtab then + return vim.bo.shiftwidth .. " spaces" + else + return vim.bo.shiftwidth / vim.bo.tabstop .. " tabs (" .. vim.bo.tabstop .. ")" + end +end + +local function is_absolute_path(path) + return string.sub(path, 1, 1) == '/' or string.sub(path, 1, 1) == '~' +end + +return { + "folke/twilight.nvim", + 'HiPhish/rainbow-delimiters.nvim', + { + 'nvim-lualine/lualine.nvim', + event = "VeryLazy", + config = function() + require("lualine").setup({ + options = { + component_separators = { left = '', right = '' }, + }, + sections = { + lualine_a = {'mode'}, + lualine_b = {'branch', 'diff', 'diagnostics'}, + lualine_c = { + { + 'vim.fn.getcwd()', + fmt = function(str) + local res = str + + res = str:gsub(os.getenv("HOME"), "~") + + return res + end, + color = { fg = 'white', gui='bold' }, + padding = { left = 1, right = 0 } + }, + { + 'filename', + fmt = function(str) + local res = str + + if is_absolute_path(res) then + res = " " .. res + else + res = "/" .. res + end + + return res + end, + file_status = true, + path = 1, + padding = { left = 0, right = 1 } + }, + }, + lualine_x = {'GET_FORMATTED_VIRTUAL_ENV()', 'DETECT_INDENT_TYPE()', 'filetype'}, + lualine_y = {'progress'}, + lualine_z = {'location'}, + }, + }) + end, + dependencies = { 'kyazdani42/nvim-web-devicons' }, + }, + { + 'EdenEast/nightfox.nvim', + config = function() + local colorscheme = require("nightfox") + colorscheme.compile() + colorscheme.setup() + vim.cmd.colorscheme("nightfox") + end + }, + { + 'ellisonleao/gruvbox.nvim' + }, + { + 'xiyaowong/transparent.nvim', + config = function() + require("transparent").setup({ + exclude_groups = {'CursorLine'}, + }) + end + }, + { + 'lukas-reineke/virt-column.nvim', + config = function() + require("virt-column").setup({ + virtcolumn = '81' + }) + end + }, + { + 'norcalli/nvim-colorizer.lua', + config = function() + require('colorizer').setup() + end + }, + { + "lukas-reineke/indent-blankline.nvim", + config = function() + require("ibl").setup({ + scope = { enabled = false }, + }) + end, + main = "ibl" + }, + { + 'karb94/neoscroll.nvim', + config = function() + require('neoscroll').setup({ + mappings = {'', '', '', + '', '', 'zt', 'zz', 'zb'}, + respect_scrolloff = false, + }) + end + }, + { + 'folke/which-key.nvim', + config = function() + require("which-key").setup() + end + }, +} \ No newline at end of file diff --git a/home/user/.config/nvim/lua/plugins/which_key.lua b/home/user/.config/nvim/lua/plugins/which_key.lua deleted file mode 100644 index 00c0d14..0000000 --- a/home/user/.config/nvim/lua/plugins/which_key.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - 'folke/which-key.nvim', - config = function() - require("which-key").setup() - end -} diff --git a/home/user/.config/terminal-colors.d/cal.scheme b/home/user/.config/terminal-colors.d/cal.scheme deleted file mode 100644 index ca0f96d..0000000 --- a/home/user/.config/terminal-colors.d/cal.scheme +++ /dev/null @@ -1,3 +0,0 @@ -weekend 31 -today 30;47 -header 1;37 \ No newline at end of file