From fe68554e903e3f3912d18662da81961b7fb8931b Mon Sep 17 00:00:00 2001 From: Sam Nystrom Date: Mon, 24 Jul 2023 12:01:49 -0400 Subject: nvim: remove some more plugins --- .config/nvim/lazy-lock.json | 6 ------ .config/nvim/lua/options.lua | 6 +++--- .config/nvim/lua/plugins/dressing.lua | 17 ----------------- .config/nvim/lua/plugins/editor.lua | 1 - .config/nvim/lua/plugins/leap.lua | 10 ---------- .config/nvim/lua/plugins/lualine.lua | 12 ------------ .config/nvim/lua/plugins/spectre.lua | 13 ------------- .config/nvim/lua/plugins/textobjects.lua | 17 ----------------- .config/nvim/lua/plugins/treesitter.lua | 2 +- .config/nvim/lua/plugins/which-key.lua | 1 - 10 files changed, 4 insertions(+), 81 deletions(-) delete mode 100644 .config/nvim/lua/plugins/dressing.lua delete mode 100644 .config/nvim/lua/plugins/leap.lua delete mode 100644 .config/nvim/lua/plugins/lualine.lua delete mode 100644 .config/nvim/lua/plugins/spectre.lua delete mode 100644 .config/nvim/lua/plugins/textobjects.lua diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 6a5d897..f7effbe 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -11,13 +11,9 @@ "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "comment.nvim": { "branch": "master", "commit": "176e85eeb63f1a5970d6b88f1725039d85ca0055" }, "diffview.nvim": { "branch": "main", "commit": "73cb92d6e58c9a2d5835c490016725bfb2c3431a" }, - "dressing.nvim": { "branch": "master", "commit": "39611852fd7bbac117e939a26759bb37361f0c90" }, "friendly-snippets": { "branch": "main", "commit": "ea84a710262cb2c286d439070bad37d36fd3db25" }, "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" }, "lazy.nvim": { "branch": "main", "commit": "25beed5e2e935ebc00d7e3eed1dc502df3c40e39" }, - "leap.nvim": { "branch": "main", "commit": "7eeeb3ff74ff8cabd583a061492e76c1c6d2bac8" }, - "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, - "mini.ai": { "branch": "main", "commit": "5218ea75e635df78a807bc9d5a7162594fb76d02" }, "neogit": { "branch": "master", "commit": "3d63d76f04dc7102c83a057ded30a93822b59dec" }, "neotest": { "branch": "master", "commit": "fb0b31ae1dcdc7d68af5c66db4434ae5ebeffcfc" }, "neotest-go": { "branch": "main", "commit": "f2580cad67ef0181403cf65858ab638ffd3ede9f" }, @@ -30,7 +26,6 @@ "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" }, "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, "nvim-lspconfig": { "branch": "master", "commit": "447443a2404adc323ad2efc7c0a346a904ce694c" }, - "nvim-spectre": { "branch": "master", "commit": "1ef252c1bf569b88e7e2fafde1eb0861d4f06aa3" }, "nvim-surround": { "branch": "main", "commit": "10b20ca7d9da1ac8df8339e140ffef94f9ab3b18" }, "nvim-treesitter": { "branch": "master", "commit": "9fa6806b88905d52b5ca36094909630919b432cc" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "52f1f3280d9092bfaee5c45be5962fabee3d9654" }, @@ -38,7 +33,6 @@ "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, "telescope.nvim": { "branch": "master", "commit": "47c755d737702df7a39b640c8d9c473a728be1df" }, - "todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" }, "trouble.nvim": { "branch": "main", "commit": "20d1b30d6925213abece21d35858a16e11d1e9fc" }, "which-key.nvim": { "branch": "main", "commit": "38b990f6eabf62014018b4aae70a97d7a6c2eb88" } } \ No newline at end of file diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua index c962840..652ceae 100644 --- a/.config/nvim/lua/options.lua +++ b/.config/nvim/lua/options.lua @@ -2,10 +2,10 @@ vim.o.number = true vim.o.relativenumber = true vim.o.timeout = true vim.o.timeoutlen = 300 -vim.o.shiftwidth = 2 -vim.o.tabstop = 2 vim.o.softtabstop = 0 -vim.o.expandtab = true + +vim.o.laststatus = 2 +vim.o.statusline = "%f %y%h%w%m%r%=%l:%c %P" vim.g.mapleader = " " vim.g.maplocalleader = " " diff --git a/.config/nvim/lua/plugins/dressing.lua b/.config/nvim/lua/plugins/dressing.lua deleted file mode 100644 index 763aee8..0000000 --- a/.config/nvim/lua/plugins/dressing.lua +++ /dev/null @@ -1,17 +0,0 @@ -return { - { - "stevearc/dressing.nvim", - lazy = true, - init = function() - vim.ui.select = function(...) - require("lazy").load({ plugins = { "dressing.nvim" } }) - return vim.ui.select(...) - end - vim.ui.input = function(...) - require("lazy").load({ plugins = { "dressing.nvim" } }) - return vim.ui.input(...) - end - end, - }, -} - diff --git a/.config/nvim/lua/plugins/editor.lua b/.config/nvim/lua/plugins/editor.lua index abd1b90..21f5cdf 100644 --- a/.config/nvim/lua/plugins/editor.lua +++ b/.config/nvim/lua/plugins/editor.lua @@ -1,5 +1,4 @@ return { - { "folke/todo-comments.nvim", event = { "BufReadPre", "BufNewFile" }, opts = {} }, { "kylechui/nvim-surround", event = "VeryLazy", opts = {} }, { "numtostr/comment.nvim", event = "VeryLazy", opts = {} }, { "simrat39/rust-tools.nvim", ft = "rust", opts = {} }, diff --git a/.config/nvim/lua/plugins/leap.lua b/.config/nvim/lua/plugins/leap.lua deleted file mode 100644 index f1e7cce..0000000 --- a/.config/nvim/lua/plugins/leap.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - { - "ggandor/leap.nvim", - keys = { "s", "S" }, - config = function() - require("leap").add_default_mappings() - end - }, -} - diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua deleted file mode 100644 index ffd1e9a..0000000 --- a/.config/nvim/lua/plugins/lualine.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - { - "nvim-lualine/lualine.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - event = "VeryLazy", - opts = { - options = { - theme = "catppuccin", - }, - }, - }, -} diff --git a/.config/nvim/lua/plugins/spectre.lua b/.config/nvim/lua/plugins/spectre.lua deleted file mode 100644 index 6b4b50f..0000000 --- a/.config/nvim/lua/plugins/spectre.lua +++ /dev/null @@ -1,13 +0,0 @@ -return { - { - "nvim-pack/nvim-spectre", - dependencies = { "nvim-lua/plenary.nvim" }, - keys = { - { "S", function() require("spectre").open() end, desc = "Open Spectre" }, - { "sw", function() require("spectre").open_visual({select_word=true}) end, desc = "Search current word" }, - { "sw", function() require("spectre").open_visual() end, desc = "Search current word", mode = "v" }, - { "sp", function() require("spectre").open_file_search({select_word=true}) end, desc = "Search on current file" }, - }, - opts = {}, - }, -} diff --git a/.config/nvim/lua/plugins/textobjects.lua b/.config/nvim/lua/plugins/textobjects.lua deleted file mode 100644 index 909ece4..0000000 --- a/.config/nvim/lua/plugins/textobjects.lua +++ /dev/null @@ -1,17 +0,0 @@ -return { - { - "echasnovski/mini.ai", - event = "VeryLazy", - config = function() - local ai = require("mini.ai") - ai.setup({ - n_lines = 200, - custom_textobjects = { - F = ai.gen_spec.treesitter({ a = "@function.outer", i = "@function.inner" }), - c = ai.gen_spec.treesitter({ a = "@class.outer", i = "@class.inner" }), - }, - }) - end - }, -} - diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua index 17a498b..d948ac6 100644 --- a/.config/nvim/lua/plugins/treesitter.lua +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -17,8 +17,8 @@ return { "kotlin", "lua", "markdown", + "perl", "python", - "qmljs", "regex", "rust", "scss", diff --git a/.config/nvim/lua/plugins/which-key.lua b/.config/nvim/lua/plugins/which-key.lua index 104d728..f6f597b 100644 --- a/.config/nvim/lua/plugins/which-key.lua +++ b/.config/nvim/lua/plugins/which-key.lua @@ -9,7 +9,6 @@ return { }, ["f"] = { name = "+Telescope" }, ["d"] = { name = "+debug" }, - ["s"] = { name = "+Spectre" }, ["x"] = { name = "+Trouble" }, }) end, -- cgit v1.2.3