From 00c5e0cca68df350df5c96fb6fdeb4ff2d2e08ed Mon Sep 17 00:00:00 2001 From: Michael Housh Date: Sat, 30 Sep 2023 00:01:38 -0400 Subject: [PATCH] Removed old git plugins. --- nvim/m-housh/init.lua | 1 - nvim/m-housh/lazy-lock.json | 1 - nvim/m-housh/lua/user/mappings.lua | 3 ++ nvim/m-housh/lua/user/plugin/diffview.lua | 48 ----------------------- nvim/m-housh/lua/user/plugin/neogit.lua | 38 ------------------ nvim/m-housh/lua/user/plugin/overseer.lua | 10 ----- nvim/m-housh/lua/user/plugins.lua | 19 ++++----- 7 files changed, 10 insertions(+), 110 deletions(-) delete mode 100644 nvim/m-housh/lua/user/plugin/diffview.lua delete mode 100644 nvim/m-housh/lua/user/plugin/neogit.lua delete mode 100644 nvim/m-housh/lua/user/plugin/overseer.lua diff --git a/nvim/m-housh/init.lua b/nvim/m-housh/init.lua index c9a27fd..90c25d6 100644 --- a/nvim/m-housh/init.lua +++ b/nvim/m-housh/init.lua @@ -10,7 +10,6 @@ require('user.autocmd') -- Plugins require('user.plugins') -require("telescope").load_extension("lazygit") -- Theme (must stay after plugins are loaded) require('user.theme') diff --git a/nvim/m-housh/lazy-lock.json b/nvim/m-housh/lazy-lock.json index eef89c6..6679cc6 100644 --- a/nvim/m-housh/lazy-lock.json +++ b/nvim/m-housh/lazy-lock.json @@ -25,7 +25,6 @@ "nvim-treesitter": { "branch": "master", "commit": "16ea2969ea0a5ba902fceece9b2db10c7c9ba2d6" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" }, "nvim-web-devicons": { "branch": "master", "commit": "45d0237c427baba8cd05e0ab26d30e2ee58c2c82" }, - "overseer.nvim": { "branch": "master", "commit": "8065976876cea89d0b99ffef4d997b930296f0e8" }, "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" }, "swift.nvim": { "branch": "main", "commit": "a84cb608b0076aef39d3d4b1d20448a86a73b2eb" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, diff --git a/nvim/m-housh/lua/user/mappings.lua b/nvim/m-housh/lua/user/mappings.lua index f710f30..66b721e 100644 --- a/nvim/m-housh/lua/user/mappings.lua +++ b/nvim/m-housh/lua/user/mappings.lua @@ -32,6 +32,9 @@ keymap("x", "J", ":move '>+1gv-gv", default_options) -- Toggle neo-tree open or closed keymap("n", "", ":Neotree toggle", default_options) +-- Toggle Lazy Git +keymap("n", 'gg', ':LazyGit', default_options) + -- Toggle term key maps, that get attached when terminal is opened. function _G.set_terminal_keymaps() local opts = { buffer = 0 } diff --git a/nvim/m-housh/lua/user/plugin/diffview.lua b/nvim/m-housh/lua/user/plugin/diffview.lua deleted file mode 100644 index 4bc74ce..0000000 --- a/nvim/m-housh/lua/user/plugin/diffview.lua +++ /dev/null @@ -1,48 +0,0 @@ --- return { --- "sindrets/diffview.nvim", --- cmd = { --- "DiffviewOpen", --- "DiffviewClose", --- "DiffviewToggleFiles", --- "DiffviewFocusFiles" --- }, --- config = function() --- local cb = require('diffview.config').diffview_callback --- --- require('diffview').setup { --- diff_binaries = false, -- Show diffs for binaries --- use_icons = true, -- Requires nvim-web-devicons --- file_panel = { --- width = 35, --- }, --- key_bindings = { --- disable_defaults = false, -- Disable the default key bindings --- -- The `view` bindings are active in the diff buffers, only when the current --- -- tabpage is a Diffview. --- view = { --- [""] = cb("select_next_entry"), -- Open the diff for the next file --- [""] = cb("select_prev_entry"), -- Open the diff for the previous file --- ["e"] = cb("focus_files"), -- Bring focus to the files panel --- ["b"] = cb("toggle_files"), -- Toggle the files panel. --- }, --- file_panel = { --- ["j"] = cb("next_entry"), -- Bring the cursor to the next file entry --- [""] = cb("next_entry"), --- ["k"] = cb("prev_entry"), -- Bring the cursor to the previous file entry. --- [""] = cb("prev_entry"), --- [""] = cb("select_entry"), -- Open the diff for the selected entry. --- ["o"] = cb("select_entry"), --- ["<2-LeftMouse>"] = cb("select_entry"), --- ["-"] = cb("toggle_stage_entry"), -- Stage / unstage the selected entry. --- ["S"] = cb("stage_all"), -- Stage all entries. --- ["U"] = cb("unstage_all"), -- Unstage all entries. --- ["R"] = cb("refresh_files"), -- Update stats and entries in the file list. --- [""] = cb("select_next_entry"), --- [""] = cb("select_prev_entry"), --- ["e"] = cb("focus_files"), --- ["b"] = cb("toggle_files"), --- } --- } --- } --- end --- } diff --git a/nvim/m-housh/lua/user/plugin/neogit.lua b/nvim/m-housh/lua/user/plugin/neogit.lua deleted file mode 100644 index cfb812b..0000000 --- a/nvim/m-housh/lua/user/plugin/neogit.lua +++ /dev/null @@ -1,38 +0,0 @@ --- return { --- "TimUntersberger/neogit", --- dependencies = { --- "nvim-lua/plenary.nvim", --- "nvim-telescope/telescope.nvim", -- optional --- "sindrets/diffview.nvim", -- optional --- }, --- opts = { --- disable_signs = false, --- disable_context_highlighting = false, --- disable_commit_confirmation = true, --- -- customize displayed signs --- signs = { --- -- { CLOSED, OPENED } --- section = { ">", "v" }, --- item = { ">", "v" }, --- hunk = { "", "" }, --- }, --- integrations = { --- diffview = true --- }, --- -- override/add mappings --- mappings = { --- -- modify status buffer mappings --- status = { --- -- Adds a mapping with "B" as key that does the "BranchPopup" command --- ["B"] = "BranchPopup", --- ["C"] = "CommitPopup", --- -- ["P"] = "PullPopup", --- ["S"] = "Stage", --- -- ["D"] = "Discard", --- -- Removes the default mapping of "s" --- -- ["s"] = "", --- } --- } --- }, --- cmd = "Neogit", --- } diff --git a/nvim/m-housh/lua/user/plugin/overseer.lua b/nvim/m-housh/lua/user/plugin/overseer.lua deleted file mode 100644 index c6f9e3f..0000000 --- a/nvim/m-housh/lua/user/plugin/overseer.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - 'stevearc/overseer.nvim', - dependencies = { - 'akinsho/toggleterm.nvim', - }, - opts = { - strategy = "toggleterm" - }, -} - diff --git a/nvim/m-housh/lua/user/plugins.lua b/nvim/m-housh/lua/user/plugins.lua index b54f177..837601c 100644 --- a/nvim/m-housh/lua/user/plugins.lua +++ b/nvim/m-housh/lua/user/plugins.lua @@ -24,26 +24,21 @@ require("lazy").setup({ -- Completions -- { import = 'user.plugin.cmp' }, + -- Git -- + { import = 'user.plugin.lazygit' }, + -- LSP -- { 'folke/neodev.nvim', opts = {} }, { import = 'user.plugin.lsp' }, { import = 'user.plugin.lualine' }, - - - { import = 'user.plugin.swift' }, - - { import = 'user.plugin.neo-tree' }, - { import = 'user.plugin.overseer' }, - { import = 'user.plugin.telescope' }, { import = 'user.plugin.treesitter' }, - -- Git -- - --{ import = 'user.plugin.diffview' }, - { import = 'user.plugin.lazygit' }, - --{ import = 'user.plugin.neogit' }, - + -- Navigation -- + { import = 'user.plugin.neo-tree' }, + { import = 'user.plugin.telescope' }, -- Utilities -- + { import = 'user.plugin.swift' }, { import = 'user.plugin.toggleterm' }, { import = 'user.plugin.which-key' }, { import = 'user.plugin.wrapping' },