diff --git a/nvim/.config/nvim/fnl/plugins/tpope.fnl b/nvim/.config/nvim/fnl/plugins/tpope.fnl index f24ea7c..f7c21ed 100644 --- a/nvim/.config/nvim/fnl/plugins/tpope.fnl +++ b/nvim/.config/nvim/fnl/plugins/tpope.fnl @@ -6,17 +6,17 @@ (fn bufmap [mode from to] (util.noremap mode from to {:local? true})) -(fn map-fugitive-keys [] - (bufmap :n :gp ":Git pull") - (bufmap :n :gP ":Git push") - (bufmap :n :gF ":Git push -f")) - -(vim.api.nvim_create_autocmd [:FileType] - {:pattern :fugitive :callback map-fugitive-keys}) +; (fn map-fugitive-keys [] +; (bufmap :n :gp ":Git pull") +; (bufmap :n :gP ":Git push") +; (bufmap :n :gF ":Git push -f")) + +; (vim.api.nvim_create_autocmd [:FileType] +; {:pattern :fugitive :callback map-fugitive-keys}) [(tx :tpope/vim-dadbod {}) (tx :tpope/vim-dispatch {}) -(tx :tpope/vim-fugitive {}) +; (tx :tpope/vim-fugitive {}) (tx :tpope/vim-git {:lazy false}) (tx :tpope/vim-pathogen {}) (tx :tpope/vim-rails {}) diff --git a/nvim/.config/nvim/lua/plugins/tpope.lua b/nvim/.config/nvim/lua/plugins/tpope.lua index 59d79bb..48149fa 100644 --- a/nvim/.config/nvim/lua/plugins/tpope.lua +++ b/nvim/.config/nvim/lua/plugins/tpope.lua @@ -3,10 +3,4 @@ local util = require("dotfiles.util") local function bufmap(mode, from, to) return util.noremap(mode, from, to, {["local?"] = true}) end -local function map_fugitive_keys() - bufmap("n", "gp", ":Git pull") - bufmap("n", "gP", ":Git push") - return bufmap("n", "gF", ":Git push -f") -end -vim.api.nvim_create_autocmd({"FileType"}, {pattern = "fugitive", callback = map_fugitive_keys}) -return {{"tpope/vim-dadbod"}, {"tpope/vim-dispatch"}, {"tpope/vim-fugitive"}, {"tpope/vim-git", lazy = false}, {"tpope/vim-pathogen"}, {"tpope/vim-rails"}, {"tpope/vim-repeat"}, {"tpope/vim-rhubarb"}, {"tpope/vim-surround"}, {"tpope/vim-unimpaired"}, {"tpope/vim-vinegar", lazy = false}} +return {{"tpope/vim-dadbod"}, {"tpope/vim-dispatch"}, {"tpope/vim-git", lazy = false}, {"tpope/vim-pathogen"}, {"tpope/vim-rails"}, {"tpope/vim-repeat"}, {"tpope/vim-rhubarb"}, {"tpope/vim-surround"}, {"tpope/vim-unimpaired"}, {"tpope/vim-vinegar", lazy = false}}