summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lua/ben/plugins/fugitive.lua1
-rw-r--r--lua/ben/plugins/yadm-telescope.lua2
-rw-r--r--lua/ben/plugins/yadm.lua2
3 files changed, 3 insertions, 2 deletions
diff --git a/lua/ben/plugins/fugitive.lua b/lua/ben/plugins/fugitive.lua
index 28edb7f..4b73c42 100644
--- a/lua/ben/plugins/fugitive.lua
+++ b/lua/ben/plugins/fugitive.lua
@@ -13,6 +13,7 @@ return {
{ "<leader>gc", "<cmd>G commit<CR>" }, -- G.it C.ommit
{ "<leader>gu", "<cmd>G push<CR>" }, -- G.it push U.pstream
{ "<leader>gp", "<cmd>G pull<CR>" }, -- G.it P.ull
+ { "<leader>gf", "<cmd>G fetch<CR>" }, -- G.it F.etch
},
config = function()
-- Use > and < to fix merge conflicts (keep the cursor in the middle of the screen)
diff --git a/lua/ben/plugins/yadm-telescope.lua b/lua/ben/plugins/yadm-telescope.lua
index dbe0105..2e3b6ad 100644
--- a/lua/ben/plugins/yadm-telescope.lua
+++ b/lua/ben/plugins/yadm-telescope.lua
@@ -1,5 +1,5 @@
return {
- "pschitt/telescope-yadm.nvim",
+ "pschmitt/telescope-yadm.nvim",
dependencies = { "nvim-telescope/telescope.nvim" },
cond = function()
return vim.fn.executable("yadm") == 1
diff --git a/lua/ben/plugins/yadm.lua b/lua/ben/plugins/yadm.lua
index b5b823c..de6389e 100644
--- a/lua/ben/plugins/yadm.lua
+++ b/lua/ben/plugins/yadm.lua
@@ -7,7 +7,7 @@ return {
end,
config = function()
require("yadm").setup({
- yadm_dir = vim.fn.expand("$XDG_DATA_HOME/yadm/repo.git"),
+ yadm_dir = vim.fn.expand("$HOME/.local/share/yadm/repo.git"),
})
end,
}