From 2f513c3a0a48ea08611ea2851150a2b3ac8b68e7 Mon Sep 17 00:00:00 2001 From: Shubham Pawar Date: Tue, 24 Dec 2024 14:51:28 +0530 Subject: [PATCH] chore: using mini.operators and disabling subversive plugin --- .config/nvim-astro/after/plugin/options.lua | 2 +- .config/nvim-astro/lua/plugins/astrolsp.lua | 1 - .config/nvim-astro/lua/plugins/astroui.lua | 2 +- .config/nvim-astro/lua/plugins/mini/move.lua | 2 +- .../nvim-astro/lua/plugins/mini/operators.lua | 4 ++-- .config/nvim-astro/lua/plugins/subversive.lua | 1 + .config/nvim-lazy/lua/config/options.lua | 4 ++++ .../nvim-lazy/lua/plugins/mini/operators.lua | 20 +++++++++---------- .config/nvim-lazy/lua/plugins/subversive.lua | 1 + .config/nvim/after/plugin/options.lua | 2 +- .config/nvim/lua/plugins/mini/operators.lua | 4 ++-- .config/nvim/lua/plugins/subversive.lua | 2 ++ README.md | 14 ++++++++----- 13 files changed, 35 insertions(+), 24 deletions(-) diff --git a/.config/nvim-astro/after/plugin/options.lua b/.config/nvim-astro/after/plugin/options.lua index 8855bb1..83449b3 100644 --- a/.config/nvim-astro/after/plugin/options.lua +++ b/.config/nvim-astro/after/plugin/options.lua @@ -46,5 +46,5 @@ o.wildignore:append { } if vim.fn.executable "rg" == 1 then - o.grepprg = "rg --vimgrep -uu --smart-case" -- Also check RIPGREP_CONFIG_PATH="$HOME/.config/ripgreprc" + o.grepprg = "rg --vimgrep -uu --smart-case -g '!{.git/,node_modules/,android/,ios/,dist/,vendor/}'" -- Also check RIPGREP_CONFIG_PATH="$HOME/.config/ripgreprc" end diff --git a/.config/nvim-astro/lua/plugins/astrolsp.lua b/.config/nvim-astro/lua/plugins/astrolsp.lua index a8e723b..91c1706 100644 --- a/.config/nvim-astro/lua/plugins/astrolsp.lua +++ b/.config/nvim-astro/lua/plugins/astrolsp.lua @@ -50,7 +50,6 @@ return { -- pyright = function(_, opts) require("lspconfig").pyright.setup(opts) end -- or a custom handler function can be passed emmet_ls = function(_, opts) opts.on_attach = function(client, bufnr) - vim.print "in the on_attach of emmet" vim.keymap.set("i", "", function() client.request( "textDocument/completion", diff --git a/.config/nvim-astro/lua/plugins/astroui.lua b/.config/nvim-astro/lua/plugins/astroui.lua index 59a2cda..28aa924 100644 --- a/.config/nvim-astro/lua/plugins/astroui.lua +++ b/.config/nvim-astro/lua/plugins/astroui.lua @@ -5,7 +5,7 @@ return { opts = { status = { colors = { - buffer_active_bg = "#173063", + buffer_active_bg = "#182b3f", }, }, }, diff --git a/.config/nvim-astro/lua/plugins/mini/move.lua b/.config/nvim-astro/lua/plugins/mini/move.lua index c1617cd..87f4daf 100644 --- a/.config/nvim-astro/lua/plugins/mini/move.lua +++ b/.config/nvim-astro/lua/plugins/mini/move.lua @@ -5,7 +5,7 @@ return { { ">", mode = "v" }, { "<", mode = "v" }, { "K", mode = "v" }, - { "L", mode = "v" }, + { "J", mode = "v" }, "", "", "", diff --git a/.config/nvim-astro/lua/plugins/mini/operators.lua b/.config/nvim-astro/lua/plugins/mini/operators.lua index c7b1aa6..69eebd5 100644 --- a/.config/nvim-astro/lua/plugins/mini/operators.lua +++ b/.config/nvim-astro/lua/plugins/mini/operators.lua @@ -7,13 +7,13 @@ return { { "g=", mode = { "n", "x" }, desc = "Evalute" }, { "ge", mode = { "n", "x" }, desc = "Exchange" }, { "gm", mode = { "n", "x" }, desc = "Duplicate" }, - { "gR", mode = { "n", "x" }, desc = "Replace with register" }, + { "gy", mode = { "n", "x" }, desc = "Replace with register" }, { "gs", mode = { "n", "x" }, desc = "Sort" }, }, opts = { -- Exchange text regions exchange = { prefix = "ge" }, - replace = { prefix = "gR" }, + replace = { prefix = "gy" }, }, config = function(_, opts) require("mini.operators").setup(opts) end, } diff --git a/.config/nvim-astro/lua/plugins/subversive.lua b/.config/nvim-astro/lua/plugins/subversive.lua index e419710..ce38305 100644 --- a/.config/nvim-astro/lua/plugins/subversive.lua +++ b/.config/nvim-astro/lua/plugins/subversive.lua @@ -1,6 +1,7 @@ ---@type LazySpec return { "svermeulen/vim-subversive", + enabled = false, keys = { { "x", "(SubversiveSubstitute)", noremap = false }, { "X", "(SubversiveSubstituteToEndOfLine)", noremap = false }, diff --git a/.config/nvim-lazy/lua/config/options.lua b/.config/nvim-lazy/lua/config/options.lua index 7e120fe..66e1d5a 100644 --- a/.config/nvim-lazy/lua/config/options.lua +++ b/.config/nvim-lazy/lua/config/options.lua @@ -33,3 +33,7 @@ vim.opt.wildignore:append({ "vendor", ".git", }) + +if vim.fn.executable("rg") == 1 then + vim.opt.grepprg = "rg --vimgrep --smart-case" -- Also check RIPGREP_CONFIG_PATH="$HOME/.config/ripgreprc" +end diff --git a/.config/nvim-lazy/lua/plugins/mini/operators.lua b/.config/nvim-lazy/lua/plugins/mini/operators.lua index 93e178e..f273d10 100644 --- a/.config/nvim-lazy/lua/plugins/mini/operators.lua +++ b/.config/nvim-lazy/lua/plugins/mini/operators.lua @@ -1,21 +1,21 @@ ---@type LazySpec return { - 'echasnovski/mini.operators', - version = '*', + "echasnovski/mini.operators", + version = "*", enabled = true, keys = { - { 'g=', mode = { 'n', 'x' }, desc = 'Evalute' }, - { 'ge', mode = { 'n', 'x' }, desc = 'Exchange' }, - { 'gm', mode = { 'n', 'x' }, desc = 'Duplicate' }, - { 'gR', mode = { 'n', 'x' }, desc = 'Replace with register' }, - { 'gs', mode = { 'n', 'x' }, desc = 'Sort' }, + { "g=", mode = { "n", "x" }, desc = "Evalute" }, + { "ge", mode = { "n", "x" }, desc = "Exchange" }, + { "gm", mode = { "n", "x" }, desc = "Duplicate" }, + { "gy", mode = { "n", "x" }, desc = "Replace with register" }, + { "gs", mode = { "n", "x" }, desc = "Sort" }, }, opts = { -- Exchange text regions - exchange = { prefix = 'ge' }, - replace = { prefix = 'gR' }, + exchange = { prefix = "ge" }, + replace = { prefix = "gy" }, }, config = function(_, opts) - require('mini.operators').setup(opts) + require("mini.operators").setup(opts) end, } diff --git a/.config/nvim-lazy/lua/plugins/subversive.lua b/.config/nvim-lazy/lua/plugins/subversive.lua index e419710..ce38305 100644 --- a/.config/nvim-lazy/lua/plugins/subversive.lua +++ b/.config/nvim-lazy/lua/plugins/subversive.lua @@ -1,6 +1,7 @@ ---@type LazySpec return { "svermeulen/vim-subversive", + enabled = false, keys = { { "x", "(SubversiveSubstitute)", noremap = false }, { "X", "(SubversiveSubstituteToEndOfLine)", noremap = false }, diff --git a/.config/nvim/after/plugin/options.lua b/.config/nvim/after/plugin/options.lua index 5c3cd5d..45435c8 100644 --- a/.config/nvim/after/plugin/options.lua +++ b/.config/nvim/after/plugin/options.lua @@ -92,7 +92,7 @@ o.iskeyword:append '-' if vim.fn.executable 'rg' == 1 then o.grepformat = '%f:%l:%c:%m' - o.grepprg = 'rg --vimgrep --no-heading --smart-case' -- Also check RIPGREP_CONFIG_PATH="$HOME/.config/ripgreprc" + o.grepprg = 'rg --vimgrep --smart-case' -- Also check RIPGREP_CONFIG_PATH="$HOME/.config/ripgreprc" end vim.schedule(function() diff --git a/.config/nvim/lua/plugins/mini/operators.lua b/.config/nvim/lua/plugins/mini/operators.lua index 93e178e..f018851 100644 --- a/.config/nvim/lua/plugins/mini/operators.lua +++ b/.config/nvim/lua/plugins/mini/operators.lua @@ -7,13 +7,13 @@ return { { 'g=', mode = { 'n', 'x' }, desc = 'Evalute' }, { 'ge', mode = { 'n', 'x' }, desc = 'Exchange' }, { 'gm', mode = { 'n', 'x' }, desc = 'Duplicate' }, - { 'gR', mode = { 'n', 'x' }, desc = 'Replace with register' }, + { 'gy', mode = { 'n', 'x' }, desc = 'Replace with register' }, { 'gs', mode = { 'n', 'x' }, desc = 'Sort' }, }, opts = { -- Exchange text regions exchange = { prefix = 'ge' }, - replace = { prefix = 'gR' }, + replace = { prefix = 'gy' }, }, config = function(_, opts) require('mini.operators').setup(opts) diff --git a/.config/nvim/lua/plugins/subversive.lua b/.config/nvim/lua/plugins/subversive.lua index 0b6b104..ac251dc 100644 --- a/.config/nvim/lua/plugins/subversive.lua +++ b/.config/nvim/lua/plugins/subversive.lua @@ -1,5 +1,7 @@ +---@type LazySpec return { 'svermeulen/vim-subversive', + enabled = false, keys = { { 'x', '(SubversiveSubstitute)', noremap = false }, { 'X', '(SubversiveSubstituteToEndOfLine)', noremap = false }, diff --git a/README.md b/README.md index 91dacda..4c10a80 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,17 @@ # Personal Dotfiles ## Main -- WM :- [Awesomewm](.config/awesome/README.md) -- Terminal :- Kitty(main) & xterm(secondary) -- Editor :- [Neovim](https://github.com/shubham-cpp/dotfiles/tree/main/.config/nvim)\([nightly](https://github.com/neovim/neovim/wiki/Building-Neovim)\) -- Shell :- Zsh -- Run launcher :- [dmenu_run_history](https://tools.suckless.org/dmenu/scripts/dmenu_run_with_command_history) and rofi + +- WM :- [Hyprland](.config/hyprland) +- DE :- KDE +- Terminal :- Kitty(main) & alacritty(secondary) +- Editor :- [Neovim](https://github.com/shubham-cpp/dotfiles/tree/main/.config/nvim) +- Shell :- Fish +- OS :- [CachyOS](https://cachyos.org/) +- Run launcher :- [rofi](https://github.com/lbonn/rofi)(its rofi-wayland) ## Installation + ```bash # Install stow(https://wiki.archlinux.org/title/Dotfiles) : # A program that i use for dotfile management