Compare commits

...
2 Commits
Author SHA1 Message Date
proctor 8467be3c43 git: update gitconfig settings 2026-06-10 15:36:47 -05:00
proctor 8cade13a72 nvim: Try Neogit instead of Fugitive 2026-06-03 15:13:09 -05:00
3 changed files with 23 additions and 14 deletions

No files matched your search

+15
View File
@@ -15,6 +15,11 @@
defaultBranch = main
[alias] ; Command aliases for the git[1] command wrapper
last = cat-file commit HEAD
[diff]
algorithm = histogram
colorMoved = zebra # plain
mnemonicPrefix = true
renames = true
[branch]
autoSetupRebase = always
[checkout]
@@ -23,17 +28,27 @@
format = ssh
[commit]
gpgsign = true
[fetch]
all = true
prune = true
pruneTags = true
[tag]
gpgsign = true
sort = version:refname
[gpg "ssh"]
allowedSignersFile = ~/.ssh/allowed_signers
[help]
autocorrect = prompt
[merge]
conflitstyle = zdiff3
ff = only
[push]
default = current
autoSetupRemote = true
followTags = true
[rerere]
enabled = true
autoupdate = true
[remote]
pushDefault = origin
+7 -7
View File
@@ -6,17 +6,17 @@
(fn bufmap [mode from to] (util.noremap mode from to {:local? true}))
(fn map-fugitive-keys []
(bufmap :n :<leader>gp ":Git pull<CR>")
(bufmap :n :<leader>gP ":Git push<CR>")
(bufmap :n :<leader>gF ":Git push -f<CR>"))
; (fn map-fugitive-keys []
; (bufmap :n :<leader>gp ":Git pull<CR>")
; (bufmap :n :<leader>gP ":Git push<CR>")
; (bufmap :n :<leader>gF ":Git push -f<CR>"))
(vim.api.nvim_create_autocmd [:FileType]
{:pattern :fugitive :callback map-fugitive-keys})
; (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 {})
+1 -7
View File
@@ -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", "<leader>gp", ":Git pull<CR>")
bufmap("n", "<leader>gP", ":Git push<CR>")
return bufmap("n", "<leader>gF", ":Git push -f<CR>")
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}}