From 6f06cf91d5d23236ecc6b9645ce5fc955aad4bdd Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sun, 8 Jan 2017 19:28:53 +0000 Subject: [PATCH 1/9] Add rust/cargo bin path --- zshrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/zshrc b/zshrc index 15e1943..017857c 100644 --- a/zshrc +++ b/zshrc @@ -160,6 +160,9 @@ 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" + # Set the DEFAULT_USER variable to me (jonny) export DEFAULT_USER="jonny" From 52a306784a331855c9a01362904afddd9c166b12 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Wed, 8 Feb 2017 17:38:37 +0000 Subject: [PATCH 2/9] Try and make ncmpcpp current playing song more visible --- ncmpcpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ncmpcpp b/ncmpcpp index e158d15..04bcc05 100644 --- a/ncmpcpp +++ b/ncmpcpp @@ -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 # From b822957a80c6c2c439341cc99aecbfb22b404b22 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Tue, 14 Feb 2017 23:11:34 +0000 Subject: [PATCH 3/9] Fix VTE error on terminix --- zshrc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/zshrc b/zshrc index 017857c..035435b 100644 --- a/zshrc +++ b/zshrc @@ -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) From 3d57591a6a0b86d0152f29b88d3ff84b3715bcbe Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Fri, 17 Feb 2017 21:23:37 +0000 Subject: [PATCH 4/9] Use OS dependent valur for GOPATH --- zshrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zshrc b/zshrc index 035435b..3648584 100644 --- a/zshrc +++ b/zshrc @@ -151,7 +151,8 @@ auto-ls () { chpwd_functions=( auto-ls $chpwd_functions ) # Go Lang stuff -export GOPATH=$HOME/Development/go +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 From 297ac5e14c47e8f45446b2242b1592bfa3e6e300 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Tue, 7 Mar 2017 23:15:25 +0000 Subject: [PATCH 5/9] Add an alias to show all aliases --- gitconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitconfig b/gitconfig index 1ba6c61..ba46140 100644 --- a/gitconfig +++ b/gitconfig @@ -1,5 +1,7 @@ [alias] + # list aliases + aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /' | sort # lg lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ar)%Creset' # lg2 From b791dfacf3495da1363a6f41c1ba85d54d56f583 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Wed, 8 Mar 2017 13:27:03 +0000 Subject: [PATCH 6/9] Add some more aliases --- gitconfig | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gitconfig b/gitconfig index ba46140..ab18430 100644 --- a/gitconfig +++ b/gitconfig @@ -2,12 +2,14 @@ # list aliases aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /' | sort - # lg + 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] From 1396b04eca0c0c5fcdf0aa731a6e57f4fcd11507 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Thu, 25 May 2017 14:17:21 +0100 Subject: [PATCH 7/9] Add some git aliases --- zshrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/zshrc b/zshrc index 3648584..e7c41df 100644 --- a/zshrc +++ b/zshrc @@ -126,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" From b66e74a53d8be5c838b9376a1f91153bc02d869c Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Fri, 23 Jun 2017 12:46:22 +0100 Subject: [PATCH 8/9] Add ruby gems to the PATH --- zshrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/zshrc b/zshrc index e7c41df..b7aafa2 100644 --- a/zshrc +++ b/zshrc @@ -172,6 +172,9 @@ 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" From 542cda73e6ed46ec2d64ab6712b7fee409d35d4e Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Mon, 3 Jul 2017 17:32:01 +0100 Subject: [PATCH 9/9] Add spellcheck to git commit messages --- vim/vimrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vim/vimrc b/vim/vimrc index 7ec5402..ee6d0c3 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -193,6 +193,10 @@ nnoremap :echomsg "use j" nnoremap :echomsg "use j" nnoremap :echomsg "use l" +" And spell-checking +autocmd FileType gitcommit setlocal spell +set complete+=kspell + " Keymap to open NERDtree map :NERDTreeToggle " Autoclose when NERDtree is the last buffer