jonny/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge conflict

Browse source
This commit is contained in:
Jonny Barnes 2017-07-06 10:45:04 +01:00
commit dbf759e966
4 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gitconfig
View file

@ -1,11 +1,15 @@
[alias]
# lg
# list aliases
aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /' | sort
bdm = "!git branch --merged | grep -v '*' | xargs -n 1 git branch -d"
lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ar)%Creset'
# lg2
lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
# lastchange
lastchange = log -p --follow -n 1
plog = log --graph --pretty='format:%C(red)%d%C(reset) %C(yellow)%h%C(reset) %ar %C(green)%aN%C(reset) %s'
rank = shortlog -sn --no-merges
st = status -sb
tlog = log --stat --since='1 Day Ago' --graph --pretty=oneline --abbrev-commit --date=relative
[apply]

8
ncmpcpp
View file

@ -205,15 +205,15 @@ message_delay_time = 5
#
#alternative_header_second_line_format = {{$4$b%a$/b$9}{ - $7%b$9}{ ($4%y$9)}}|{%D}
#
#now_playing_prefix = $b
now_playing_prefix = $r
#
#now_playing_suffix = $/b
now_playing_suffix = $/r
#
#browser_playlist_prefix = "$2playlist$9 "
#
#selected_item_prefix = $6
selected_item_prefix = $6
#
#selected_item_suffix = $9
selected_item_suffix = $9
#
#modified_item_prefix = $3> $9
#

4
vim/vimrc
View file

@ -193,6 +193,10 @@ nnoremap <Down> :echomsg "use j"<cr>
nnoremap <Left> :echomsg "use j"<cr>
nnoremap <Right> :echomsg "use l"<cr>
" And spell-checking
autocmd FileType gitcommit setlocal spell
set complete+=kspell
" Keymap to open NERDtree
map <C-n> :NERDTreeToggle<cr>
" Autoclose when NERDtree is the last buffer

21
zshrc
View file

@ -58,6 +58,11 @@ bindkey -v
# Source the untracked `extra` file
test -e $HOME/.extra && source $HOME/.extra
# Source VTE for Terminix
if [ $TERMINIX_ID ] || [ $VTE_VERSION ]; then
source /etc/profile.d/vte.sh
fi
# Determine the running OS
platform="unkown"
unamestr=$(uname -s)
@ -121,6 +126,9 @@ alias bubc="brew upgrade && brew cleanup"
alias bubo="brew update && brew outdated"
alias brewcurl="/usr/local/opt/curl/bin/curl --cacert /usr/local/etc/openssl/cert.pem"
alias brewssl="/usr/local/opt/openssl/bin/openssl"
alias ga="git add"
alias gf="git fetch --all; git fetch --tags"
alias gs="git status"
alias irc="ssh jmb -t '. ~/.zshrc; tmux attach -t irc'"
test "$platform" = 'linux' && alias ls="ls -F --color=always"
test "$platform" = 'osx' && alias ls="ls -FG"
@ -146,10 +154,9 @@ auto-ls () {
chpwd_functions=( auto-ls $chpwd_functions )
# Go Lang stuff
test "$platform" = 'osx' && export GOPATH="$HOME/Development/go"
test "$platform" = 'osx' && export PATH="$PATH:/usr/local/opt/go/libexec/bin:$GOPATH/bin"
test "$platform" = 'linux' && export GOPATH="$HOME/mygo"
test "$platform" = 'linux' && export PATH="$PATH:/usr/lib/go-1.7/bin:$GOPATH/bin"
test "$platform" = 'linux' && export GOPATH=$HOME/go
test "$platform" = 'osx' && export GOPATH=$HOME/Development/go
export PATH="$PATH:/usr/local/opt/go/libexec/bin:$GOPATH/bin"
# GnuPG stuff
GPG_TTY=`tty`
@ -162,6 +169,12 @@ test "$platform" = 'osx' && export PATH="$PATH:/Users/jonny/.composer/vendor/bin
# yarn PATH
export PATH="$PATH:$HOME/.yarn/bin"
# rust/cargo bin PATH
export PATH="$PATH:$HOME/.cargo/bin"
# Ruby PATH
export PATH="$PATH:$HOME/.gem/ruby/2.4.0/bin"
# Set the DEFAULT_USER variable to me (jonny)
export DEFAULT_USER="jonny"