rob
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Various updates

This commit is contained in:
Rob Watson 2021-07-21 11:12:56 +02:00
parent 1aad7008c7
commit 1ab2be14c4
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gitconfig
View File

@ -9,7 +9,8 @@
b = branch b = branch
bn = rev-parse --abbrev-ref HEAD bn = rev-parse --abbrev-ref HEAD
br = branch br = branch
ca = commit --amend ca = commit --amend --no-edit
cae = commit --amend
cdf = clean -df cdf = clean -df
cdfn = clean -dfn cdfn = clean -dfn
cf = !git commit --fixup $(git log --invert-grep --grep fixup -n1 --oneline --format=format:%h) cf = !git commit --fixup $(git log --invert-grep --grep fixup -n1 --oneline --format=format:%h)
@ -48,7 +49,7 @@
re = rebase re = rebase
rh = reset --hard rh = reset --hard
rom = !sh -c 'git fetch && git rebase origin/master' rom = !sh -c 'git fetch && git rebase origin/master'
rr = !git reset --hard $(git rb) rr = !sh -c 'git fetch && git reset --hard $(git rb)'
s = status s = status
shp = show -p shp = show -p
sl = stash list sl = stash list

1
nvimrc
View File

@ -215,6 +215,7 @@ _G.run_tests = function()
vim.api.nvim_command([[silent up]]) vim.api.nvim_command([[silent up]])
-- TODO: check that it is not the current window, if the window has a non-term buffer
local winid = _G._test_cmd_to_wins[cmd] local winid = _G._test_cmd_to_wins[cmd]
if winid == nil or not vim.api.nvim_win_is_valid(winid) or not vim.call("win_gotoid", winid) == -1 then if winid == nil or not vim.api.nvim_win_is_valid(winid) or not vim.call("win_gotoid", winid) == -1 then
vim.api.nvim_command([[10split]]) vim.api.nvim_command([[10split]])

2
script/cleanvimplugins
View File

@ -12,7 +12,7 @@ pluginhome=$HOME/.vim/pack/git-plugins
cd $pluginhome/opt cd $pluginhome/opt
find . -mindepth 1 -maxdepth 1 -type d -print0 | while read -d $'\0' pluginpath find . -mindepth 1 -maxdepth 1 -type d -print0 | while read -d $'\0' pluginpath
do do
if ! grep -q "$pluginpath" $HOME/.vimrc ; then if ! grep -q "$pluginpath" $HOME/.config/nvim/init.vim ; then
basename=$(basename $pluginpath) basename=$(basename $pluginpath)
echo "rm -rf $pluginhome/opt/$basename" echo "rm -rf $pluginhome/opt/$basename"
fi fi

2
zshrc
View File

@ -77,7 +77,7 @@ alias gp="git push"
alias gst="git status" alias gst="git status"
alias gt="go test" alias gt="go test"
alias gta="go test ./..." alias gta="go test ./..."
alias ji="jira" alias ji="jira -b"
alias k9="kill -9" alias k9="kill -9"
alias ll="exa -l --group-directories-first --git" alias ll="exa -l --group-directories-first --git"
alias ls="exa --color=auto" alias ls="exa --color=auto"