summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyren223 <ulmliad223@gmail.com>2024-07-01 23:43:21 +0300
committerKyren223 <ulmliad223@gmail.com>2024-07-01 23:43:21 +0300
commit2b202f8f49a2585e623c466c1282479a0697aebd (patch)
tree46c07c5900131ce6b5ddaf152cd64d347bcd2859
parentd35b9a784eb889fe23d593be287594c2b888ff3b (diff)
Added rename nvim plugin, removed bufferline
-rw-r--r--.config/nvim/TODO.md9
-rw-r--r--.config/nvim/lazy-lock.json4
-rw-r--r--.config/nvim/lua/options.lua1
-rw-r--r--.config/nvim/lua/plugins/bufferline.lua6
-rw-r--r--.config/nvim/lua/plugins/rename.lua14
-rw-r--r--.config/nvim/lua/plugins/telescope.lua3
-rw-r--r--.config/nvim/lua/plugins/todo.lua2
7 files changed, 28 insertions, 11 deletions
diff --git a/.config/nvim/TODO.md b/.config/nvim/TODO.md
new file mode 100644
index 0000000..2e024ce
--- /dev/null
+++ b/.config/nvim/TODO.md
@@ -0,0 +1,9 @@
+
+# Plans for the future
+
+- TODO: Look into bufferline.nvim or cokeline.nvim for "tabs"
+- TODO: Look at configuring Noice.nvim and decide if u like it or not
+
+
+
+
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 7b7d29c..0f91793 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -3,11 +3,11 @@
"LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" },
"alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
"auto-session": { "branch": "main", "commit": "879f5b30207bd53101e1034ca91330f23746f601" },
- "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" },
"harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
+ "inc-rename.nvim": { "branch": "main", "commit": "535b508c0cb14d00c1836ad901b3c531cb1152bb" },
"indent-blankline.nvim": { "branch": "master", "commit": "4288ce8128a52650e401dda42fd7651a6038f262" },
"kanagawa.nvim": { "branch": "master", "commit": "b4110528b4a12c295efd3ae222882469b2b44d4a" },
"lazy.nvim": { "branch": "main", "commit": "c501b429cf995c645454539b924aaefae45bb9eb" },
@@ -19,14 +19,12 @@
"mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
"material.nvim": { "branch": "main", "commit": "b5d0ff3ad37ba00cea3dc3dce0b0f555b481c6f4" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
- "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" },
"none-ls.nvim": { "branch": "main", "commit": "cc0a3c45047e3daf85d07c1571d65476cfce6480" },
"nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" },
"nvim": { "branch": "main", "commit": "31fcfb02c47952d5c75aec893b93b2878abe5fbb" },
"nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
"nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
"nvim-lspconfig": { "branch": "master", "commit": "bd7c76375a511994c9ca8d69441f134dc10ae3bd" },
- "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
"nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
"nvim-treesitter": { "branch": "master", "commit": "2e9c346aefda680bd14ebf40a50c2897fd637bc2" },
"nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua
index 2a8f13c..7f01e1e 100644
--- a/.config/nvim/lua/options.lua
+++ b/.config/nvim/lua/options.lua
@@ -31,6 +31,7 @@ vim.opt.smartcase = true
-- Misc
vim.opt.scrolloff = 8
vim.opt.undofile = true
+vim.opt.termguicolors = true
-- Disable warnings for missing language providers
vim.g.loaded_node_provider = 0
diff --git a/.config/nvim/lua/plugins/bufferline.lua b/.config/nvim/lua/plugins/bufferline.lua
deleted file mode 100644
index e2fe878..0000000
--- a/.config/nvim/lua/plugins/bufferline.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
- -- TODO: Configure this
- 'akinsho/bufferline.nvim',
- version = '*',
- dependencies = 'nvim-tree/nvim-web-devicons',
-}
diff --git a/.config/nvim/lua/plugins/rename.lua b/.config/nvim/lua/plugins/rename.lua
new file mode 100644
index 0000000..8b4fc8d
--- /dev/null
+++ b/.config/nvim/lua/plugins/rename.lua
@@ -0,0 +1,14 @@
+return {
+ 'smjonas/inc-rename.nvim',
+ config = function()
+ require('inc_rename').setup({})
+
+ local test = 5
+ print(test)
+
+ vim.keymap.set('n', 'R', ':IncRename ')
+ vim.keymap.set('n', 'rr', function()
+ return ':IncRename ' .. vim.fn.expand('<cword>')
+ end, { expr = true })
+ end,
+}
diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua
index 077f253..5389ac4 100644
--- a/.config/nvim/lua/plugins/telescope.lua
+++ b/.config/nvim/lua/plugins/telescope.lua
@@ -11,6 +11,7 @@ return {
vim.keymap.set('n', '<leader>h', builtin.help_tags, { desc = '[H]elp' })
vim.keymap.set('n', '<leader>m', builtin.man_pages, { desc = '[M]an Pages' })
vim.keymap.set('n', '<leader>th', builtin.colorscheme, { desc = 'List [Th]eme' })
+ vim.keymap.set('n', '<leader>ob', builtin.buffers, { desc = '[O]pen [B]uffers' })
vim.keymap.set('n', '<leader>fs', builtin.find_files, { desc = '[F]ile [S]ystem' })
vim.keymap.set('n', '<leader>fw', builtin.grep_string, { desc = '[F]ind current [W]ord' })
@@ -32,7 +33,7 @@ return {
-- TODO: Use some cool plugin to have IntelliJ-like renaming
-- Make sure to include a rr version for normal renaming and Shift+R for ciw + rr
- vim.keymap.set('n', 'R', vim.lsp.buf.rename, { desc = '[R]ename' })
+ -- vim.keymap.set('n', 'R', vim.lsp.buf.rename, { desc = '[R]ename' })
-- TODO: Look into the following
-- builtin.git_commits
diff --git a/.config/nvim/lua/plugins/todo.lua b/.config/nvim/lua/plugins/todo.lua
index 98dfdc3..553a20c 100644
--- a/.config/nvim/lua/plugins/todo.lua
+++ b/.config/nvim/lua/plugins/todo.lua
@@ -36,7 +36,7 @@ return {
after = 'fg', -- "fg" or "bg" or empty
pattern = [[.*<(KEYWORDS)\s*:]], -- pattern or table of patterns, used for highlighting (vim regex)
-- pattern = [[.*<(KEYWORDS)\s*]], -- pattern or table of patterns, used for highlighting (vim regex)
- comments_only = true,
+ comments_only = false,
max_line_len = 400,
exclude = {}, -- list of excluded filetypes
},