From c783af03be23a9c86971815c311392b827fff55c Mon Sep 17 00:00:00 2001 From: Will Ruggiano Date: Sat, 29 Jul 2023 06:11:41 -0600 Subject: [PATCH] chore: remove unused plugins --- nix/sources.json | 126 -------------- plugins/bombadil/lua/bombadil/lib/buffers.lua | 47 ------ plugins/cheat.lua | 5 - plugins/cmp.lua | 5 - plugins/diffview.lua | 15 -- plugins/git-worktree.lua | 23 --- plugins/github.lua | 155 ------------------ plugins/harpoon.lua | 27 --- plugins/lir.lua | 33 ++-- plugins/lsp.lua | 10 +- plugins/marks.lua | 13 -- plugins/neogen.lua | 3 - plugins/neogit.lua | 19 --- plugins/overseer.lua | 1 + plugins/persisted.lua | 13 -- plugins/spec.nix | 107 +----------- plugins/telescope.lua | 6 + plugins/undotree.lua | 7 - plugins/zk.lua | 26 --- 19 files changed, 20 insertions(+), 621 deletions(-) delete mode 100644 plugins/bombadil/lua/bombadil/lib/buffers.lua delete mode 100644 plugins/cheat.lua delete mode 100644 plugins/diffview.lua delete mode 100644 plugins/git-worktree.lua delete mode 100644 plugins/github.lua delete mode 100644 plugins/harpoon.lua delete mode 100644 plugins/marks.lua delete mode 100644 plugins/neogen.lua delete mode 100644 plugins/neogit.lua delete mode 100644 plugins/persisted.lua delete mode 100644 plugins/undotree.lua delete mode 100644 plugins/zk.lua diff --git a/nix/sources.json b/nix/sources.json index 6e0b114..684819d 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -17,12 +17,6 @@ "rev": "b8e6c7d966857e8ff14d9b6a23eec9214d99db32", "type": "git" }, - "bufdelete.nvim": { - "branch": "master", - "repo": "ssh://git@github.com/famiu/bufdelete.nvim", - "rev": "8933abc09df6c381d47dc271b1ee5d266541448e", - "type": "git" - }, "cargo-expand.nvim": { "branch": "main", "repo": "ssh://git@github.com/willruggiano/cargo-expand.nvim", @@ -41,12 +35,6 @@ "rev": "798e377ec859087132b81d2f347b5080580bd6b1", "type": "git" }, - "close-buffers.nvim": { - "branch": "master", - "repo": "ssh://git@github.com/kazhala/close-buffers.nvim", - "rev": "3acbcad1211572342632a6c0151f839e7dead27f", - "type": "git" - }, "cmp-buffer": { "branch": "main", "repo": "git@github.com:hrsh7th/cmp-buffer", @@ -119,36 +107,18 @@ "rev": "1d4bb1e7a0fe8bae3f97061be5fbf6f9081a27e2", "type": "git" }, - "cspell.nvim": { - "branch": "main", - "repo": "git@github.com:davidmh/cspell.nvim", - "rev": "336034f5f0ac89075306e9f3d7aefecf6dce8a61", - "type": "git" - }, "dial.nvim": { "branch": "master", "repo": "ssh://git@github.com/monaqa/dial.nvim", "rev": "747d6fd009dbc1904627868125e16cfa7c524b0d", "type": "git" }, - "diffview.nvim": { - "branch": "main", - "repo": "git@github.com:sindrets/diffview.nvim", - "rev": "63720aa5a70ce4aa386be407d0e612cd9e63861a", - "type": "git" - }, "fidget.nvim": { "branch": "main", "repo": "ssh://git@github.com/j-hui/fidget.nvim", "rev": "0ba1e16d07627532b6cae915cc992ecac249fb97", "type": "git" }, - "firvish.nvim": { - "branch": "v2", - "repo": "git@github.com:willruggiano/firvish.nvim", - "rev": "4a5f050b15955657542c07649583951aa96a934c", - "type": "git" - }, "flit.nvim": { "branch": "main", "repo": "ssh://git@github.com/ggandor/flit.nvim", @@ -167,48 +137,18 @@ "rev": "45148b3f70d244e8b8b5db60df447a2b7ac2de9d", "type": "git" }, - "gh-actions.nvim": { - "branch": "main", - "repo": "git@github.com:topaxi/gh-actions.nvim", - "rev": "ac86453f14c91928820205a0a4e3247c20621855", - "type": "git" - }, - "gh.nvim": { - "branch": "main", - "repo": "git@github.com:ldelossa/gh.nvim", - "rev": "2b5551656c1b896bf4ae06546eaaab00311f9a18", - "type": "git" - }, - "git-worktree.nvim": { - "branch": "master", - "repo": "git@github.com:ThePrimeagen/git-worktree.nvim", - "rev": "d7f4e2584e81670154f07ca9fa5dd791d9c1b458", - "type": "git" - }, "gitsigns.nvim": { "branch": "main", "repo": "ssh://git@github.com/lewis6991/gitsigns.nvim", "rev": "372d5cb485f2062ac74abc5b33054abac21d8b58", "type": "git" }, - "harpoon": { - "branch": "master", - "repo": "ssh://git@github.com/ThePrimeagen/harpoon", - "rev": "f7040fd0c44e7a4010369136547de5604b9c22a1", - "type": "git" - }, "indent-blankline.nvim": { "branch": "master", "repo": "ssh://git@github.com/lukas-reineke/indent-blankline.nvim", "rev": "018bd04d80c9a73d399c1061fa0c3b14a7614399", "type": "git" }, - "kommentary": { - "branch": "main", - "repo": "ssh://git@github.com/b3nj5m1n/kommentary", - "rev": "3a80117148c6798972bb69414423311ab151d368", - "type": "git" - }, "leap-ast.nvim": { "branch": "main", "repo": "git@github.com:ggandor/leap-ast.nvim", @@ -239,12 +179,6 @@ "rev": "1aa871f20637eccc4e1e26b0fbcf9aafc9b6caf7", "type": "git" }, - "litee.nvim": { - "branch": "main", - "repo": "git@github.com:ldelossa/litee.nvim", - "rev": "bf366a1414fd0f9401631ac8884f2f9fa4bf18d2", - "type": "git" - }, "lspkind-nvim": { "branch": "master", "repo": "git@github.com:onsails/lspkind-nvim", @@ -263,30 +197,12 @@ "rev": "84ffb80e452d95e2c46fa29a98ea11a240f7843e", "type": "git" }, - "marks.nvim": { - "branch": "master", - "repo": "ssh://git@github.com/chentoast/marks.nvim", - "rev": "76aca5069c5ce5c0099e30168649e6393e494f26", - "type": "git" - }, "neodev.nvim": { "branch": "main", "repo": "git@github.com:folke/neodev.nvim", "rev": "864b35006d3de24c60e44b566de8018f919b13e6", "type": "git" }, - "neogen": { - "branch": "main", - "repo": "git@github.com:danymat/neogen", - "rev": "9c17225aac94bdbf93baf16e1b2d2c6dcffb0901", - "type": "git" - }, - "neogit": { - "branch": "master", - "repo": "ssh://git@github.com/timuntersberger/neogit", - "rev": "69a6ca7c41b023ebf9cad70778e227b3209b40c4", - "type": "git" - }, "nui.nvim": { "branch": "main", "repo": "git@github.com:muniftanjim/nui.nvim", @@ -305,12 +221,6 @@ "rev": "1276701ed0216b94d7919d5c07845dcdf05fbde5", "type": "git" }, - "nvim-cheat.sh": { - "branch": "master", - "repo": "ssh://git@github.com/rishabhrd/nvim-cheat.sh", - "rev": "eb6acbacd39cf7c1966cb58d6586351db14607da", - "type": "git" - }, "nvim-cmp": { "branch": "main", "repo": "git@github.com:hrsh7th/nvim-cmp", @@ -419,12 +329,6 @@ "rev": "4d98c8cc90d970d87c472c04bf7ca712336cc753", "type": "git" }, - "persisted.nvim": { - "branch": "main", - "repo": "git@github.com:olimorris/persisted.nvim", - "rev": "dbdd6af1847105f5cc7f7c51a648b32a78598eec", - "type": "git" - }, "playground": { "branch": "master", "repo": "ssh://git@github.com/nvim-treesitter/playground", @@ -491,12 +395,6 @@ "rev": "580b6c48651cabb63455e97d7e131ed557b8c7e2", "type": "git" }, - "telescope-github.nvim": { - "branch": "master", - "repo": "git@github.com:willruggiano/telescope-github.nvim", - "rev": "476952cf96e60efca4c230e86cf866835dfef236", - "type": "git" - }, "telescope-manix": { "branch": "master", "repo": "git@github.com:mrcjkb/telescope-manix", @@ -539,18 +437,6 @@ "rev": "89968a1f8c72427691088e6d09d26a52c2ddc6f4", "type": "git" }, - "twilight.nvim": { - "branch": "main", - "repo": "git@github.com:folke/twilight.nvim", - "rev": "2e13bd1886562b737f38c418ed542677b41ef5cb", - "type": "git" - }, - "undotree": { - "branch": "main", - "repo": "git@github.com:jiaoshijie/undotree", - "rev": "93428c8469cf13c179025f4b32bfa4f43268d436", - "type": "git" - }, "vim-dadbod": { "branch": "master", "repo": "git@github.com:tpope/vim-dadbod", @@ -592,17 +478,5 @@ "repo": "ssh://git@github.com/gelguy/wilder.nvim", "rev": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf", "type": "git" - }, - "xit.nvim": { - "branch": "master", - "repo": "git@github.com:synaptiko/xit.nvim", - "rev": "fe89a5df51f3c08bd4cd9aa5c698d9877f99684e", - "type": "git" - }, - "zk-nvim": { - "branch": "main", - "repo": "git@github.com:mickael-menu/zk-nvim", - "rev": "ff3a9661d9054a74d8baa51743c9dc11f8a215c3", - "type": "git" } } diff --git a/plugins/bombadil/lua/bombadil/lib/buffers.lua b/plugins/bombadil/lua/bombadil/lib/buffers.lua deleted file mode 100644 index 013f44f..0000000 --- a/plugins/bombadil/lua/bombadil/lib/buffers.lua +++ /dev/null @@ -1,47 +0,0 @@ -local bufdelete = require("bufdelete").bufdelete - -local delete_buffer = function(bufnr) - if vim.fn.bufwinnr(bufnr) ~= -1 then - bufdelete(bufnr, true) - else - vim.api.nvim_buf_delete(bufnr, { force = true }) - end -end - -local function is_listed(bufnr) - local buflisted = vim.api.nvim_buf_get_option(bufnr, "buflisted") - return buflisted == true -end - -local list_loaded_buffers = function() - local bufs = vim.api.nvim_list_bufs() - local loaded = {} - for _, b in ipairs(bufs) do - if string.find(vim.fn.bufname(b), "Wilder") then - -- Don't count wilder.nvim buffers - elseif is_listed(b) then - table.insert(loaded, b) - end - end - return loaded -end - -local is_nameless_buffer = function(bufnr) - local bufname = vim.api.nvim_buf_get_name(bufnr) - return bufname == "" -end - -local list_visible_buffers = function() - local visible = {} - for _, w in ipairs(vim.api.nvim_list_wins()) do - table.insert(visible, vim.api.nvim_win_get_buf(w)) - end - return visible -end - -return { - delete = delete_buffer, - loaded = list_loaded_buffers, - nameless = is_nameless_buffer, - visible = list_visible_buffers, -} diff --git a/plugins/cheat.lua b/plugins/cheat.lua deleted file mode 100644 index 9640a45..0000000 --- a/plugins/cheat.lua +++ /dev/null @@ -1,5 +0,0 @@ -return function() - require("bombadil.lib.keymap").nnoremap("?", function() - require("nvim-cheat"):new_cheat(false) - end, { desc = "Cheatsheet" }) -end diff --git a/plugins/cmp.lua b/plugins/cmp.lua index 2679517..5171a37 100644 --- a/plugins/cmp.lua +++ b/plugins/cmp.lua @@ -1,7 +1,6 @@ return function() local cmp = require "cmp" local snippy = require "snippy" - local neogen = require "neogen" local cmp_buffer_locality_comparator = function(...) return require("cmp_buffer"):compare_locality(...) @@ -47,8 +46,6 @@ return function() i = function(fallback) if snippy.can_expand_or_advance() then snippy.expand_or_advance() - elseif neogen.jumpable() then - neogen.jump_next() elseif cmp.visible() then return cmp.mapping.select_next_item { behavior = cmp.SelectBehavior.Insert }(fallback) else @@ -60,8 +57,6 @@ return function() i = function(fallback) if snippy.can_jump(-1) then snippy.previous() - elseif neogen.jumpable(-1) then - neogen.jump_prev() elseif cmp.visible() then return cmp.mapping.select_prev_item { behavior = cmp.SelectBehavior.Insert }(fallback) else diff --git a/plugins/diffview.lua b/plugins/diffview.lua deleted file mode 100644 index 0e33933..0000000 --- a/plugins/diffview.lua +++ /dev/null @@ -1,15 +0,0 @@ -return function() - local icons = require "nvim-nonicons" - - require("diffview").setup { - icons = { - folder_closed = icons.get "file-directory", - folder_open = icons.get "file-directory", - }, - signs = { - fold_closed = icons.get "chevron-right", - fold_open = icons.get "chevron-down", - done = icons.get "check", - }, - } -end diff --git a/plugins/git-worktree.lua b/plugins/git-worktree.lua deleted file mode 100644 index 933f879..0000000 --- a/plugins/git-worktree.lua +++ /dev/null @@ -1,23 +0,0 @@ -return function() - require("git-worktree").setup {} - - local telescope = require "telescope" - telescope.load_extension "git_worktree" - - local prefix = "gw" - local mappings = { - [prefix .. "c"] = { - telescope.extensions.git_worktree.create_git_worktree, - { desc = "create" }, - }, - [prefix .. "l"] = { - telescope.extensions.git_worktree.git_worktrees, - { desc = "list" }, - }, - } - require("bombadil.lib.keymap").noremaps("n", mappings) - - require("which-key").register({ - name = "+Worktree", - }, { prefix = prefix }) -end diff --git a/plugins/github.lua b/plugins/github.lua deleted file mode 100644 index 8c374d5..0000000 --- a/plugins/github.lua +++ /dev/null @@ -1,155 +0,0 @@ -return function() - local telescope = require "telescope" - telescope.load_extension "gh" - telescope.load_extension "ui-select" - - require("litee.lib").setup { - icon_set = "nerd", - } - require("litee.gh").setup { - icon_set = "nerd", - } - - local diff = require "litee.gh.pr.diff_view" - local pr = require "litee.gh.pr" - local pr_handlers = require "litee.gh.pr.handlers" - local issues = require "litee.gh.issues" - - local prefix = "gh" - local mappings = { - [prefix .. "a"] = { - function() - require("gh-actions").open() - end, - { desc = "actions" }, - }, - [prefix .. "cc"] = { - pr.close_pr_commits, - { desc = "close" }, - }, - [prefix .. "ce"] = { - pr.expand_pr_commits, - { desc = "expand" }, - }, - [prefix .. "co"] = { - pr.open_to_pr_files, - { desc = "open" }, - }, - [prefix .. "cp"] = { - pr.popout_to_pr_files, - { desc = "popout" }, - }, - [prefix .. "cz"] = { - pr.collapse_pr_commits, - { desc = "collapse" }, - }, - [prefix .. "g"] = { - function() - require("telescope").extensions.gh.gist() - end, - { desc = "gists" }, - }, - [prefix .. "ip"] = { - issues.preview_issue_under_cursor, - { desc = "preview" }, - }, - [prefix .. "is"] = { - issues.search_issues, - { desc = "search" }, - }, - [prefix .. "lt"] = { - "LTPanel", - { desc = "toggle panel" }, - }, - [prefix .. "pc"] = { - pr.close_pull, - { desc = "close" }, - }, - [prefix .. "pd"] = { - pr.open_pr_buffer, - { desc = "details" }, - }, - [prefix .. "pe"] = { - pr.expand_pr, - { desc = "expand" }, - }, - [prefix .. "po"] = { - pr.open_pull, - { desc = "open" }, - }, - [prefix .. "pp"] = { - pr.popout_to_pr, - { desc = "pop out" }, - }, - [prefix .. "pr"] = { - pr_handlers.on_refresh, - { desc = "refresh" }, - }, - [prefix .. "ps"] = { - pr.search_pulls, - { desc = "search" }, - }, - [prefix .. "pt"] = { - pr.open_to_pr, - { desc = "open to" }, - }, - [prefix .. "pz"] = { - pr.collapse_pr, - { desc = "collapse" }, - }, - [prefix .. "rb"] = { - pr.start_review, - { desc = "begin" }, - }, - [prefix .. "rc"] = { - pr.close_pr_review, - { desc = "close" }, - }, - [prefix .. "rd"] = { - pr.delete_review, - { desc = "delete" }, - }, - [prefix .. "re"] = { - pr.expand_pr_review, - { desc = "expand" }, - }, - [prefix .. "rs"] = { - pr.submit_review, - { desc = "submit" }, - }, - [prefix .. "rz"] = { - pr.collapse_pr_review, - { desc = "collapse" }, - }, - [prefix .. "tc"] = { - diff.create_comment, - { desc = "create" }, - }, - [prefix .. "tn"] = { - diff.next_thread, - { desc = "next" }, - }, - [prefix .. "tt"] = { - diff.toggle_threads, - { desc = "toggle" }, - }, - [prefix .. "w"] = { - function() - require("telescope").extensions.gh.run() - end, - { desc = "workflows" }, - }, - } - - require("bombadil.lib.keymap").noremaps("n", mappings) - - require("which-key").register({ - name = "+Hub", - c = { name = "+Commits" }, - i = { name = "+Issues" }, - l = { name = "+Litee" }, - r = { name = "+Review" }, - p = { name = "+Pull Request" }, - t = { name = "+Threads" }, - }, { prefix = prefix }) -end diff --git a/plugins/harpoon.lua b/plugins/harpoon.lua deleted file mode 100644 index ca250ce..0000000 --- a/plugins/harpoon.lua +++ /dev/null @@ -1,27 +0,0 @@ -return function() - local nnoremap = require("bombadil.lib.keymap").nnoremap - - nnoremap("", function() - require("harpoon.ui").toggle_quick_menu() - end, { desc = "Harpoon" }) - - nnoremap("ma", function() - require("harpoon.mark").add_file() - end, { desc = "Mark file" }) - - vim.filetype.add { - harpoon = function() - return "harpoon", - function(bufnr) - for k, v in pairs { signcolumn = "no" } do - vim.api.nvim_buf_set_option(bufnr, k, v) - end - end - end, - } - - local hi = require("flavours").highlight - - hi.HarpoonWindow = "Normal" - hi.HarpoonBorder = "Normal" -end diff --git a/plugins/lir.lua b/plugins/lir.lua index 625787d..19217de 100644 --- a/plugins/lir.lua +++ b/plugins/lir.lua @@ -17,7 +17,6 @@ return function() local lir_utils = require "lir.utils" local Path = require "plenary.path" local f = require "bombadil.lib.functional" - local buffers = require "bombadil.lib.buffers" local get_context = function(absolute) local ctx = require("lir.vim").get_context() @@ -164,28 +163,15 @@ return function() actions.reload() end - -- BUG: This could delete multiple buffers if there are multiple buffers open for the same - -- filename. - custom_actions.delete = function() - local _, path = get_context() - for _, b in ipairs(vim.api.nvim_list_bufs()) do - local bname = vim.fn.bufname(b) - if bname:sub(-#path) == fname then - require("bombadil.lib.buffers").delete(b) - end - end - custom_actions.trash() - end - - local firvish = require "firvish" + local overseer = require "overseer" local function git(...) - firvish.start_job { - command = "git", - args = { ... }, - filetype = "log", - title = "git", - bopen = false, + local cmd = overseer.new_task { + cmd = vim.list_extend({ "git" }, { ... }), + components = { + { "on_complete_dispose", timeout = 5 }, + }, } + cmd:start() end custom_actions.git = { @@ -252,6 +238,7 @@ return function() actions.reload() end + ---@diagnostic disable-next-line: missing-fields lir.setup { devicons = { enable = true }, float = { winblend = 15 }, @@ -274,7 +261,7 @@ return function() y = custom_actions.yank_path, Y = custom_actions.yank_basename, - d = custom_actions.delete, + d = custom_actions.trash, c = clipboard_actions.copy, x = clipboard_actions.cut, p = clipboard_actions.paste, @@ -294,7 +281,7 @@ return function() } local explore = function() - if buffers.nameless(vim.api.nvim_get_current_buf()) then + if vim.api.nvim_buf_get_name(vim.api.nvim_get_current_buf()) == "" then vim.cmd "e ." else vim.cmd "e %:h" diff --git a/plugins/lsp.lua b/plugins/lsp.lua index 6231f2a..17c2990 100644 --- a/plugins/lsp.lua +++ b/plugins/lsp.lua @@ -348,11 +348,9 @@ return function() pathStrict = true, }, workspace = { + checkThirdParty = false, library = (function() - local thirdparty = { "busted", "lfs", "luassert", "luv" } - local library = vim.tbl_map(function(v) - return "${3rd}/" .. v .. "/library" - end, thirdparty) + local library = {} local function add(dir) for _, p in ipairs(vim.fn.expand(dir .. "/lua", false, true)) do @@ -360,10 +358,6 @@ return function() end end - for _, plugin in ipairs(require("lazy").plugins()) do - add(plugin.dir) - end - table.insert(library, require("neodev.config").types()) add "$VIMRUNTIME" diff --git a/plugins/marks.lua b/plugins/marks.lua deleted file mode 100644 index e0a7c93..0000000 --- a/plugins/marks.lua +++ /dev/null @@ -1,13 +0,0 @@ -return function() - require("marks").setup {} - - local nnoremap = require("bombadil.lib.keymap").nnoremap - - nnoremap("mb", function() - vim.api.nvim_command "MarksListBuf" - end, { desc = "Buffer marks" }) - - nnoremap("ml", function() - vim.api.nvim_command "MarksListAll" - end, { desc = "Marks" }) -end diff --git a/plugins/neogen.lua b/plugins/neogen.lua deleted file mode 100644 index deb22be..0000000 --- a/plugins/neogen.lua +++ /dev/null @@ -1,3 +0,0 @@ -return function() - require("neogen").setup {} -end diff --git a/plugins/neogit.lua b/plugins/neogit.lua deleted file mode 100644 index 15ea48b..0000000 --- a/plugins/neogit.lua +++ /dev/null @@ -1,19 +0,0 @@ -return function() - local neogit = require "neogit" - - neogit.setup { - disable_hint = true, - disable_signs = true, - integrations = { - diffview = true, - }, - } - - local nnoremap = require("bombadil.lib.keymap").nnoremap - - nnoremap("gc", function() - neogit.open { "commit" } - end, { desc = "Commit" }) - - nnoremap("gs", neogit.open, { desc = "Status" }) -end diff --git a/plugins/overseer.lua b/plugins/overseer.lua index 57230cc..1f0bb69 100644 --- a/plugins/overseer.lua +++ b/plugins/overseer.lua @@ -1,4 +1,5 @@ return function() + ---@diagnostic disable-next-line: missing-fields require("overseer").setup { component_aliases = { default = { diff --git a/plugins/persisted.lua b/plugins/persisted.lua deleted file mode 100644 index 7816821..0000000 --- a/plugins/persisted.lua +++ /dev/null @@ -1,13 +0,0 @@ -return function() - require("persisted").setup { - silent = true, - use_git_branch = true, - autosave = false, - } - - require("telescope").load_extension "persisted" - - vim.api.nvim_create_user_command("Sessions", function() - require("telescope").extensions.persisted.persisted() - end, { desc = "List sessions" }) -end diff --git a/plugins/spec.nix b/plugins/spec.nix index 7e68a20..5040242 100644 --- a/plugins/spec.nix +++ b/plugins/spec.nix @@ -23,10 +23,6 @@ in rec { config = true; }; - bufdelete = { - src = sources."bufdelete.nvim"; - }; - cargo-expand = { src = sources."cargo-expand.nvim"; ft = "rust"; @@ -41,10 +37,6 @@ in rec { ft = ["c" "cpp"]; }; - close-buffers = { - src = sources."close-buffers.nvim"; - }; - cmp = { src = sources.nvim-cmp; config = ./cmp.lua; @@ -101,7 +93,6 @@ in rec { cmp-under-comparator = { src = sources.cmp-under-comparator; }; - inherit neogen; }; }; @@ -159,14 +150,6 @@ in rec { config = ./dial.lua; }; - diffview = { - src = sources."diffview.nvim"; - config = ./diffview.lua; - dependencies = { - inherit nvim-nonicons nvim-web-devicons plenary; - }; - }; - dot-nvim = { src = sources.".nvim.nvim"; }; @@ -185,10 +168,6 @@ in rec { }; }; - firvish = { - src = sources."firvish.nvim"; - }; - fun = { package = let luafun = luajitPackages.callPackage ../pkgs/luafun.nix {}; @@ -212,36 +191,6 @@ in rec { }; }; - gh = { - src = sources."gh.nvim"; - config = ./github.lua; - dependencies = { - inherit telescope which-key; - gh-actions = { - src = sources."gh-actions.nvim"; - config = true; - dependencies = { - inherit plenary nui; - }; - }; - litee = { - src = sources."litee.nvim"; - }; - telescope-github = { - src = sources."telescope-github.nvim"; - }; - }; - paths = [pkgs.gh]; - }; - - git-worktree = { - src = sources."git-worktree.nvim"; - config = ./git-worktree.lua; - dependencies = { - inherit telescope which-key; - }; - }; - gitsigns = { src = sources."gitsigns.nvim"; config = ./gitsigns.lua; @@ -251,11 +200,6 @@ in rec { src = sources.vim-graphql; }; - harpoon = { - src = sources.harpoon; - config = ./harpoon.lua; - }; - indent_blankline = { src = sources."indent-blankline.nvim"; config = ./indent-blankline.lua; @@ -296,7 +240,7 @@ in rec { lir = { config = ./lir.lua; dependencies = { - inherit firvish nvim-web-devicons plenary; + inherit nvim-web-devicons overseer plenary; git_status = { src = sources."lir-git-status.nvim"; }; @@ -413,33 +357,10 @@ in rec { config = ./markdown.lua; }; - marks = { - src = sources."marks.nvim"; - config = ./marks.lua; - }; - - neogen = { - src = sources.neogen; - config = ./neogen.lua; - }; - - neogit = { - src = sources.neogit; - config = ./neogit.lua; - }; - nui = { src = sources."nui.nvim"; }; - nvim-cheat = { - src = sources."nvim-cheat.sh"; - config = ./cheat.lua; - dependencies = { - popfix.src = sources.popfix; - }; - }; - nvim-nonicons = { src = sources.nvim-nonicons; }; @@ -494,11 +415,6 @@ in rec { }; }; - persisted = { - src = sources."persisted.nvim"; - config = ./persisted.lua; - }; - plenary = { src = sources."plenary.nvim"; }; @@ -603,16 +519,6 @@ in rec { config = ./toggleterm.lua; }; - twilight = { - src = sources."twilight.nvim"; - config = true; - }; - - undotree = { - src = sources.undotree; - config = ./undotree.lua; - }; - which-key = { src = sources."which-key.nvim"; config = true; @@ -636,15 +542,4 @@ in rec { }; }; }; - - xit = { - src = sources."xit.nvim"; - config = true; - }; - - zk = { - src = sources.zk-nvim; - config = ./zk.lua; - paths = [pkgs.zk]; - }; } diff --git a/plugins/telescope.lua b/plugins/telescope.lua index 8760166..2f81263 100644 --- a/plugins/telescope.lua +++ b/plugins/telescope.lua @@ -81,6 +81,12 @@ return function() end, { desc = "Buffers" }, }, + ["f"] = { + function() + require("telescope.builtin").live_grep() + end, + { desc = "Find" }, + }, ["o"] = { function() require("telescope").extensions.smart_open.smart_open() diff --git a/plugins/undotree.lua b/plugins/undotree.lua deleted file mode 100644 index 33ceaa6..0000000 --- a/plugins/undotree.lua +++ /dev/null @@ -1,7 +0,0 @@ -return function() - local undotree = require "undotree" - undotree.setup() - vim.api.nvim_create_user_command("Undo", function() - undotree.toggle() - end, { desc = "Undotree" }) -end diff --git a/plugins/zk.lua b/plugins/zk.lua deleted file mode 100644 index 6a67d78..0000000 --- a/plugins/zk.lua +++ /dev/null @@ -1,26 +0,0 @@ -return function() - local zk = require "zk" - - zk.setup {} - - require("zk.commands").add("ZkNewDoc", function(options) - zk.new(vim.tbl_extend("force", { dir = "docs" }, options)) - end) - - local nnoremap = require("bombadil.lib.keymap").nnoremap - - nnoremap("z", function() - zk.edit({}, { title = "Notes" }) - end, { desc = "Notes" }) - - nnoremap("zi", zk.index, { desc = "Index notebook " }) - - nnoremap("zn", function() - zk.new { title = vim.fn.input "Title: " } - end, { desc = "New note" }) - - nnoremap("zf", function() - local query = vim.fn.input "Query: " - zk.edit({ sort = { "modified" }, match = query }, { title = string.format([[Notes matching "%s"]], query) }) - end, { desc = "Query notes" }) -end