Various updates

gitconfig

@@ -30,6 +30,7 @@
 	mr = !git merge $(git rb)
 	mt = merge -s recursive -X theirs
 	nb = checkout -b
+	nuke1 = reset --hard HEAD^
 	nuke = reset --hard
 	p = push
 	pf = push --force
@@ -48,8 +49,11 @@
 	s = status
 	shp = show -p
 	sq = merge --squash
+	sqt = merge --squash -s recursive -X theirs
 	ss = stash save
 	st = status
+	sy = !gitsha1yank -s
+	sum = show --stat
 	undo = reset --soft HEAD^
 	sshp = stash show -p
 [user]

script/gitsha1yank

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+#
+# Copy the last Git SHA1 to the clipboard
+
+set -e
+
+if [ "$1" == "-s" ]; then
+  args="--short"
+fi
+
+# TODO: fix for non-Darwin
+git rev-parse $args HEAD | tr -d '\n' | pbcopy

vimrc

@@ -368,8 +368,7 @@ augroup lsp_install
     au!
     autocmd User lsp_buffer_enabled call s:on_lsp_buffer_enabled()
     autocmd User lsp_diagnostics_updated call lightline#update()
-    autocmd BufWritePre *.go silent LspDocumentFormatSync
-    autocmd BufWritePre *.go silent LspCodeActionSync source.organizeImports
+    " autocmd BufWritePre *.go silent LspDocumentFormatSync
     " autocmd CursorHold <buffer> silent LspHover
 augroup END
 

zshenv

@@ -9,7 +9,7 @@ export VISUAL="vim"
 
 # ZSH:
 export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
-export HISTFILE="$ZDOTDIR/.zsh-history"
+export HISTFILE="$ZDOTDIR/.zsh_history"
 export HISTSIZE=100000
 export SAVEHIST=100000
 export HISTTIMEFORMAT="[%F %T] "

zshrc

@@ -86,9 +86,9 @@ alias sc="systemctl"
 alias sk="setkeys"
 alias ssc="sudo systemctl"
 alias sysc="systemctl"
-alias rggo="rg -g '*\.go' -g '!vendor/'"
-alias rggs="rg -g '*\.go' -g '!vendor/' -g '!*_test.go'"
-alias rggt="rg -g '*\_test.go' -g '!vendor/'"
+alias rgo="rg -g '*\.go' -g '!vendor/'"
+alias rgs="rg -g '*\.go' -g '!vendor/' -g '!*_test.go'"
+alias rgt="rg -g '*\_test.go' -g '!vendor/'"
 alias tm="tmux attach"
 alias tmd="tmux new -s default -c $HOME || tmux attach -t default"
 alias tms="tmuxsess"