dissimulo
4fa6f90a9e
dissimulo does not use vim. Removes the editor, its config tree, its plugin
manager, and everything that would reinstall it on a re-bootstrap.
Deleted (82 files):
vim/ (64) the whole config tree, 1.7M
doc/vim/ (8) its documentation
.vimrc, vimrc, .vim
bin/yadr/vundle.rb, yadr-vim-{add,delete,list}-plugin
bin/fix_macvim_external_display.sh MacVim on macOS, dead here anyway
vimify/ vi keybindings for readline/libedit, dropped on request
Edited:
Rakefile drop the vundle require, the vim install block, the
vundle_migration and install_vundle tasks, their two helper
methods, and the macvim homebrew line. Without this a
re-bootstrap would pull all of it straight back.
install.sh .vim/.vimrc out of the symlink list
zsh/vi-mode.zsh EDITOR/VISUAL now nano. The zsh vi keybindings stay; they
are not vim.
zsh/aliases.zsh yav/ydv/ylv, the MacVim detection block and ve removed;
ae/ze/gi now open nano
git/gitconfig mvimdiff mergetool removed, editor set to nano
.tmux.conf vim-tmux-navigator replaced with direct select-pane binds.
It ran ps piped to grep on EVERY C-h/j/k/l press to ask
whether vim held the pane: two forks per pane switch for a
question that can now only answer no. mode-keys and
status-keys vi stay, being tmux own key style, unrelated to
the editor.
.gitignore/.dockerignore/Dockerfile dead paths and the vim package
Also renames the installer banner to DRUNKENDOTFILES, piped through lolcat
when present with a plain-text fallback.
Left alone: the .yadr paths (renaming the checkout is a separate job), generic
swap-file ignores, the fasd viminfo support (third-party), and prose mentions.
129 lines
4.1 KiB
Plaintext
129 lines
4.1 KiB
Plaintext
# set your user tokens as environment variables, such as ~/.secrets
|
|
# See the README for examples.
|
|
[user]
|
|
name = dissimulo
|
|
email = connect+gitea@dustin-williams.com
|
|
[color]
|
|
ui = true
|
|
[color "branch"]
|
|
current = yellow reverse
|
|
local = yellow
|
|
remote = green
|
|
[color "diff"]
|
|
meta = yellow bold
|
|
frag = magenta bold
|
|
old = red
|
|
new = green
|
|
[alias]
|
|
# add
|
|
a = add # add
|
|
chunkyadd = add --patch # stage commits chunk by chunk
|
|
# Shows list of contributors of a repository.
|
|
contributors = shortlog --summary --numbered --email
|
|
|
|
# via http://philjackson.github.io/2013/04/07/handy-git-tips-to-stop-you-getting-fired.html
|
|
snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
|
|
snapshots = !git stash list --grep snapshot
|
|
|
|
#via http://stackoverflow.com/questions/5188320/how-can-i-get-a-list-of-git-branches-ordered-by-most-recent-commit
|
|
recent-branches = !git for-each-ref --count=15 --sort=-committerdate refs/heads/ --format='%(refname:short)'
|
|
|
|
# branch
|
|
b = branch -v # branch (verbose)
|
|
|
|
# commit
|
|
c = commit -m # commit with message
|
|
ca = commit -am # commit all with message
|
|
ci = commit # commit
|
|
amend = commit --amend # ammend your last commit
|
|
ammend = commit --amend # ammend your last commit
|
|
|
|
# checkout
|
|
co = checkout # checkout
|
|
nb = checkout -b # create and switch to a new branch (mnemonic: "git new branch branchname...")
|
|
|
|
# cherry-pick
|
|
cp = cherry-pick -x # grab a change from a branch
|
|
|
|
# diff
|
|
d = diff # diff unstaged changes
|
|
dc = diff --cached # diff staged changes
|
|
last = diff HEAD^ # diff last committed change
|
|
|
|
# log
|
|
l = log --graph --date=short
|
|
changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status
|
|
short = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\"
|
|
simple = log --pretty=format:\" * %s\"
|
|
shortnocolor = log --pretty=format:\"%h %cr %cn %s\"
|
|
|
|
# pull
|
|
pl = pull # pull
|
|
|
|
# push
|
|
ps = push # push
|
|
|
|
# rebase
|
|
rc = rebase --continue # continue rebase
|
|
rs = rebase --skip # skip rebase
|
|
|
|
# remote
|
|
r = remote -v # show remotes (verbose)
|
|
|
|
# reset
|
|
unstage = reset HEAD # remove files from index (tracking)
|
|
uncommit = reset --soft HEAD^ # go back before last commit, with files in uncommitted state
|
|
filelog = log -u # show changes to a file
|
|
mt = mergetool # fire up the merge tool
|
|
|
|
# stash
|
|
ss = stash # stash changes
|
|
sl = stash list # list stashes
|
|
sa = stash apply # apply stash (restore changes)
|
|
sd = stash drop # drop stashes (destory changes)
|
|
|
|
# status
|
|
s = status # status
|
|
st = status # status
|
|
stat = status # status
|
|
|
|
# tag
|
|
t = tag -n # show tags with <n> lines of each tag message
|
|
|
|
# svn helpers
|
|
svnr = svn rebase
|
|
svnd = svn dcommit
|
|
svnl = svn log --oneline --show-commit
|
|
[format]
|
|
pretty = format:%C(blue)%ad%Creset %C(yellow)%h%C(green)%d%Creset %C(blue)%s %C(magenta) [%an]%Creset
|
|
[mergetool]
|
|
prompt = false
|
|
[merge]
|
|
summary = true
|
|
verbosity = 1
|
|
[apply]
|
|
whitespace = nowarn
|
|
[branch]
|
|
autosetupmerge = true
|
|
[push]
|
|
# 'git push' will push the current branch to its tracking branch
|
|
# the usual default is to push all branches
|
|
default = upstream
|
|
[core]
|
|
autocrlf = false
|
|
editor = nano
|
|
excludesfile = ~/.yadr/git/gitignore
|
|
[advice]
|
|
statusHints = false
|
|
[diff]
|
|
# Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject
|
|
# instead of a/b/c/d as prefixes for patches
|
|
mnemonicprefix = true
|
|
algorithm = patience
|
|
[rerere]
|
|
# Remember my merges
|
|
# http://gitfu.wordpress.com/2008/04/20/git-rerere-rereremember-what-you-did-last-time/
|
|
enabled = true
|
|
[include]
|
|
path = ~/.gitconfig.user
|