diff options
| author | Ariel D'Alessandro <ariel.dalessandro@auto1.com> | 2023-01-24 11:00:47 +0100 |
|---|---|---|
| committer | Ariel D'Alessandro <ariel.dalessandro@auto1.com> | 2023-01-24 11:00:47 +0100 |
| commit | 726c5b307e99203d57683b64fb9c4de9aec7fbef (patch) | |
| tree | c4fc361e62aea5b28920bce2ad356822343a0b0a | |
| parent | bd1c60e0ec2fba947b3381f86086fe39116ed918 (diff) | |
| download | nvim-conf-726c5b307e99203d57683b64fb9c4de9aec7fbef.tar.gz nvim-conf-726c5b307e99203d57683b64fb9c4de9aec7fbef.zip | |
feat: try neogit instead of fugitive
| -rw-r--r-- | lazy-lock.json | 3 | ||||
| -rw-r--r-- | lua/plugins/fugitive.lua | 1 | ||||
| -rw-r--r-- | lua/plugins/fzf.lua | 9 | ||||
| -rw-r--r-- | lua/plugins/neogit.lua | 5 | ||||
| -rw-r--r-- | lua/plugins/telescope.lua | 16 |
5 files changed, 21 insertions, 13 deletions
diff --git a/lazy-lock.json b/lazy-lock.json index 380dd0b..0f24475 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -13,7 +13,6 @@ "composer.nvim": { "branch": "main", "commit": "e62eaaef7c978d96a2abfeb2ca570650a4f21528" }, "dressing.nvim": { "branch": "master", "commit": "4436d6f41e2f6b8ada57588acd1a9f8b3d21453c" }, "fidget.nvim": { "branch": "main", "commit": "44585a0c0085765195e6961c15529ba6c5a2a13b" }, - "fzf": { "branch": "master", "commit": "618d3178033d80fbe13b70e6387c3f0673a1bf7a" }, "fzf.vim": { "branch": "master", "commit": "bdf48c282ad2174c25c059b3cdb7956427b07a99" }, "git-worktree.nvim": { "branch": "master", "commit": "d7f4e2584e81670154f07ca9fa5dd791d9c1b458" }, "gitsigns.nvim": { "branch": "main", "commit": "7b37bd5c2dd4d7abc86f2af096af79120608eeca" }, @@ -29,6 +28,7 @@ "mason-tool-installer.nvim": { "branch": "main", "commit": "27f61f75a71bb3c2504a17e02b571f79cae43676" }, "mason.nvim": { "branch": "main", "commit": "22c8a1e67adb51179b26f0e37e87af24baf3fb89" }, "mind.nvim": { "branch": "v2.2", "commit": "79e0ca131d5e37dfa65f3f0e725d99742e4ff783" }, + "neogit": { "branch": "master", "commit": "de227f740bb29f90d62f9a6112f926de5f052358" }, "null-ls.nvim": { "branch": "main", "commit": "18497120fa0db0a3b9e53870ac8f342be4bffb57" }, "nvim-autopairs": { "branch": "master", "commit": "31042a5823b55c4bfb30efcbba2fc1b5b53f90dc" }, "nvim-cmp": { "branch": "main", "commit": "11a95792a5be0f5a40bab5fc5b670e5b1399a939" }, @@ -67,7 +67,6 @@ "vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" }, "vim-easy-align": { "branch": "master", "commit": "12dd6316974f71ce333e360c0260b4e1f81169c3" }, "vim-eunuch": { "branch": "master", "commit": "291ef1f8c8996ca7715df1032a35a27b12d7b5cf" }, - "vim-fugitive": { "branch": "master", "commit": "2febbe1f00be04f16daa6464cb39214a8566ec4b" }, "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }, "vim-rhubarb": { "branch": "master", "commit": "cad60fe382f3f501bbb28e113dfe8c0de6e77c75" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua index ccce9b5..897aeb9 100644 --- a/lua/plugins/fugitive.lua +++ b/lua/plugins/fugitive.lua @@ -1,5 +1,6 @@ return { "tpope/vim-fugitive", + enabled = false, keys = { { "<leader>ga", ":Git fetch --all -p<cr>" }, { "<leader>gl", ":Git pull<cr>" }, diff --git a/lua/plugins/fzf.lua b/lua/plugins/fzf.lua deleted file mode 100644 index f074a8e..0000000 --- a/lua/plugins/fzf.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "junegunn/fzf.vim", - dependencies = { - { - "tpope/vim-dispatch", - cmd = { "Make", "Dispatch" } - }, - }, -} diff --git a/lua/plugins/neogit.lua b/lua/plugins/neogit.lua new file mode 100644 index 0000000..e3d29c5 --- /dev/null +++ b/lua/plugins/neogit.lua @@ -0,0 +1,5 @@ +return { + "TimUntersberger/neogit", + cmd = {"Neogit"}, + config = true, +} diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index 8a8117a..a32e4f4 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -7,10 +7,22 @@ return { { "kyazdani42/nvim-web-devicons" }, { "nvim-telescope/telescope-file-browser.nvim" }, { "nvim-telescope/telescope-ui-select.nvim" }, - { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, + { + "nvim-telescope/telescope-fzf-native.nvim", + build = "make", + dependencies = { + "junegunn/fzf.vim", + dependencies = { + { + "tpope/vim-dispatch", + cmd = { "Make", "Dispatch" } + }, + }, + } + }, }, event = "VeryLazy", - config = function () + config = function() require("alpha.telescope.setup") require("alpha.telescope.mappings") end |