From c930fb7e7aae23b24bec4d6b84550f8bb037c660 Mon Sep 17 00:00:00 2001 From: Michael Housh Date: Fri, 29 Sep 2023 23:49:56 -0400 Subject: [PATCH] Added lazy git --- .luarc.json | 81 +++++++++++++++++++ nvim/lazy-lock.json | 33 -------- nvim/m-housh/init.lua | 1 + nvim/m-housh/lazy-lock.json | 11 ++- nvim/m-housh/lua/user/plugin/diffview.lua | 96 +++++++++++------------ nvim/m-housh/lua/user/plugin/lazygit.lua | 10 +++ nvim/m-housh/lua/user/plugin/neogit.lua | 76 +++++++++--------- nvim/m-housh/lua/user/plugins.lua | 26 ++++-- 8 files changed, 208 insertions(+), 126 deletions(-) create mode 100644 .luarc.json delete mode 100644 nvim/lazy-lock.json create mode 100644 nvim/m-housh/lua/user/plugin/lazygit.lua diff --git a/.luarc.json b/.luarc.json new file mode 100644 index 0000000..d602248 --- /dev/null +++ b/.luarc.json @@ -0,0 +1,81 @@ +{ + "workspace.library": [ + "/Users/michael/.local/share/m-housh/lazy/neodev.nvim/types/stable", + "/opt/homebrew/Cellar/neovim/0.9.2/share/nvim/runtime/lua", + "/Users/michael/.local/share/m-housh/lazy/bufdelete.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/diffview.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/lsp_signature.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/neo-tree.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/neodev.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/telescope-fzf-native.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/nvim-lspconfig/lua", + "/Users/michael/.local/share/m-housh/lazy/nvim-cmp/lua", + "/Users/michael/.local/share/m-housh/lazy/nvim-treesitter-textobjects/lua", + "/Users/michael/.local/share/m-housh/lazy/nui.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/nightfox.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/cmp-buffer/lua", + "/Users/michael/.local/share/m-housh/lazy/cmp-path/lua", + "/Users/michael/.local/share/m-housh/lazy/nvim-treesitter/lua", + "/Users/michael/.local/share/m-housh/lazy/nvim-lsp-installer/lua", + "/Users/michael/.local/share/m-housh/lazy/cmp-cmdline/lua", + "/Users/michael/.local/share/m-housh/lazy/lazy.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/cmp-spell/lua", + "/Users/michael/.local/share/m-housh/lazy/wrapping.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/cmp-calc/lua", + "/Users/michael/.local/share/m-housh/lazy/which-key.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/mason-lspconfig.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/formatter.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/cmp-nvim-lsp/lua", + "/Users/michael/.local/share/m-housh/lazy/cmp-emoji/lua", + "/Users/michael/.local/share/m-housh/lazy/nvim-web-devicons/lua", + "/Users/michael/.local/share/m-housh/lazy/plenary.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/neogit/lua", + "/Users/michael/.local/share/m-housh/lazy/overseer.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/lualine.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/mason.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/telescope.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/lspkind-nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/swift.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/toggleterm.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/neodev.nvim/types/stable", + "/opt/homebrew/Cellar/neovim/0.9.2/share/nvim/runtime/lua", + "/Users/michael/.local/share/m-housh/lazy/bufdelete.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/diffview.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/lsp_signature.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/neo-tree.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/neodev.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/telescope-fzf-native.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/nvim-lspconfig/lua", + "/Users/michael/.local/share/m-housh/lazy/nvim-cmp/lua", + "/Users/michael/.local/share/m-housh/lazy/nvim-treesitter-textobjects/lua", + "/Users/michael/.local/share/m-housh/lazy/nui.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/nightfox.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/cmp-buffer/lua", + "/Users/michael/.local/share/m-housh/lazy/cmp-path/lua", + "/Users/michael/.local/share/m-housh/lazy/nvim-treesitter/lua", + "/Users/michael/.local/share/m-housh/lazy/nvim-lsp-installer/lua", + "/Users/michael/.local/share/m-housh/lazy/cmp-cmdline/lua", + "/Users/michael/.local/share/m-housh/lazy/lazy.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/cmp-spell/lua", + "/Users/michael/.local/share/m-housh/lazy/wrapping.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/cmp-calc/lua", + "/Users/michael/.local/share/m-housh/lazy/which-key.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/mason-lspconfig.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/formatter.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/cmp-nvim-lsp/lua", + "/Users/michael/.local/share/m-housh/lazy/cmp-emoji/lua", + "/Users/michael/.local/share/m-housh/lazy/nvim-web-devicons/lua", + "/Users/michael/.local/share/m-housh/lazy/plenary.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/neogit/lua", + "/Users/michael/.local/share/m-housh/lazy/overseer.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/lualine.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/mason.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/telescope.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/lspkind-nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/swift.nvim/lua", + "/Users/michael/.local/share/m-housh/lazy/toggleterm.nvim/lua", + "/Users/michael/.dotfiles/nvim/m-housh/lua", + "/Users/michael/.dotfiles/nvim/m-housh/lua", + "${3rd}/luv/library" + ] +} \ No newline at end of file diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json deleted file mode 100644 index c181ee7..0000000 --- a/nvim/lazy-lock.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "bufdelete.nvim": { "branch": "master", "commit": "07d1f8ba79dec59d42b975a4df1c732b2e4e37b4" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" }, - "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, - "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp-spell": { "branch": "master", "commit": "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa" }, - "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" }, - "diffview.nvim": { "branch": "main", "commit": "a111d19ccceac6530448d329c63f998f77b5626e" }, - "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" }, - "lsp_signature.nvim": { "branch": "master", "commit": "51784ba4ce87b362c139b8c2db6583c0aec20536" }, - "lspkind-nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, - "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "f014db32437aa61c86fc0ef1067cd2bc6a37205c" }, - "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "2d89ca96e08eb6e9c8e50e1bb4738bc5125c9f12" }, - "neogit": { "branch": "master", "commit": "66ba8b8cacc4481cc9002aa8b518c5f01f685b56" }, - "nightfox.nvim": { "branch": "main", "commit": "e886e39e592e89f316536a6f070365a9d88901c9" }, - "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" }, - "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, - "nvim-lsp-installer": { "branch": "main", "commit": "17e0bfa5f2c8854d1636fcd036dc8284db136baa" }, - "nvim-lspconfig": { "branch": "master", "commit": "cc388d3f6b9c7c943ae2b2dcd46ad470fd257f91" }, - "nvim-treesitter": { "branch": "master", "commit": "f9034812d8335356ef3ede49110d1569624033fa" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" }, - "nvim-web-devicons": { "branch": "master", "commit": "973ab742f143a796a779af4d786ec409116a0d87" }, - "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, - "telescope.nvim": { "branch": "0.1.x", "commit": "54930e1abfc94409e1bb9266e752ef8379008592" }, - "vim-vsnip": { "branch": "master", "commit": "be277461265f1e5c7db470aa479f30956597ea9e" }, - "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" } -} \ No newline at end of file diff --git a/nvim/m-housh/init.lua b/nvim/m-housh/init.lua index 90c25d6..c9a27fd 100644 --- a/nvim/m-housh/init.lua +++ b/nvim/m-housh/init.lua @@ -10,6 +10,7 @@ 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 b13d9b6..eef89c6 100644 --- a/nvim/m-housh/lazy-lock.json +++ b/nvim/m-housh/lazy-lock.json @@ -1,4 +1,5 @@ { + "bufdelete.nvim": { "branch": "master", "commit": "07d1f8ba79dec59d42b975a4df1c732b2e4e37b4" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, @@ -6,15 +7,21 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, - "diffview.nvim": { "branch": "main", "commit": "a111d19ccceac6530448d329c63f998f77b5626e" }, + "formatter.nvim": { "branch": "master", "commit": "34dcdfa0c75df667743b2a50dd99c84a557376f0" }, "lazy.nvim": { "branch": "main", "commit": "6a2c47e6424a3f1e373bfeb714b716f6be13501c" }, + "lazygit.nvim": { "branch": "main", "commit": "de35012036d43bca03628d40d083f7c02a4cda3f" }, + "lsp_signature.nvim": { "branch": "master", "commit": "bdf3dc7bb03edd25c2173e0e31c2fb122052ed23" }, + "lspkind-nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "81e30dd629de24cbb26d08073ee938ab40006695" }, + "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "71f1841ba6c652908678cece623f52c1fea8a6cd" }, "neodev.nvim": { "branch": "main", "commit": "58b1c0740e8ad79ce71e2649a449bb90536435cf" }, - "neogit": { "branch": "master", "commit": "e238f075a81806dc2dce803422beef42540a312e" }, "nightfox.nvim": { "branch": "main", "commit": "fe2fc7b93d66349eff2c5baa6cec922ee3958f56" }, "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" }, "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, + "nvim-lsp-installer": { "branch": "main", "commit": "17e0bfa5f2c8854d1636fcd036dc8284db136baa" }, + "nvim-lspconfig": { "branch": "master", "commit": "576c8a5987bb276d234dd1d04e6c9fe60da1185d" }, "nvim-treesitter": { "branch": "master", "commit": "16ea2969ea0a5ba902fceece9b2db10c7c9ba2d6" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" }, "nvim-web-devicons": { "branch": "master", "commit": "45d0237c427baba8cd05e0ab26d30e2ee58c2c82" }, diff --git a/nvim/m-housh/lua/user/plugin/diffview.lua b/nvim/m-housh/lua/user/plugin/diffview.lua index fe54e53..4bc74ce 100644 --- a/nvim/m-housh/lua/user/plugin/diffview.lua +++ b/nvim/m-housh/lua/user/plugin/diffview.lua @@ -1,48 +1,48 @@ -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 -} +-- 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/lazygit.lua b/nvim/m-housh/lua/user/plugin/lazygit.lua new file mode 100644 index 0000000..cf77818 --- /dev/null +++ b/nvim/m-housh/lua/user/plugin/lazygit.lua @@ -0,0 +1,10 @@ +return { + "kdheepak/lazygit.nvim", + dependencies = { + "nvim-telescope/telescope.nvim", + "nvim-lua/plenary.nvim" + }, + config = function() + require("telescope").load_extension("lazygit") + end, +} diff --git a/nvim/m-housh/lua/user/plugin/neogit.lua b/nvim/m-housh/lua/user/plugin/neogit.lua index c19d6e9..cfb812b 100644 --- a/nvim/m-housh/lua/user/plugin/neogit.lua +++ b/nvim/m-housh/lua/user/plugin/neogit.lua @@ -1,38 +1,38 @@ -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", -} +-- 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/plugins.lua b/nvim/m-housh/lua/user/plugins.lua index ed8e524..b54f177 100644 --- a/nvim/m-housh/lua/user/plugins.lua +++ b/nvim/m-housh/lua/user/plugins.lua @@ -17,19 +17,35 @@ require("lazy").setup({ path = '~/LocalProjects/plugins', fallback = true }, + + -- Theme -- + { import = 'user.plugin.theme' }, + + -- Completions -- { import = 'user.plugin.cmp' }, - { import = 'user.plugin.diffview' }, + + -- LSP -- { 'folke/neodev.nvim', opts = {} }, { import = 'user.plugin.lsp' }, { import = 'user.plugin.lualine' }, - { import = 'user.plugin.neogit' }, + + + { import = 'user.plugin.swift' }, + { import = 'user.plugin.neo-tree' }, { import = 'user.plugin.overseer' }, - { import = 'user.plugin.swift' }, { import = 'user.plugin.telescope' }, - { import = 'user.plugin.theme' }, - { import = 'user.plugin.toggleterm' }, { import = 'user.plugin.treesitter' }, + + -- Git -- + --{ import = 'user.plugin.diffview' }, + { import = 'user.plugin.lazygit' }, + --{ import = 'user.plugin.neogit' }, + + + -- Utilities -- + { import = 'user.plugin.toggleterm' }, { import = 'user.plugin.which-key' }, { import = 'user.plugin.wrapping' }, + })