Merge branch 'master' of github.com:aarongut/dotfiles

This commit is contained in:
2016-07-13 23:14:57 -04:00
5 changed files with 5 additions and 2 deletions

View File

@@ -4,6 +4,6 @@
[diff] [diff]
tool = vimdiff tool = vimdiff
[difftool] [difftool]
prompt = false prompt = true
[push] [push]
default = simple default = simple

View File

@@ -166,7 +166,7 @@ playlist_disable_highlight_delay = "3"
## ##
# #
song_list_format = "{$2%c$9: $5%C %t$9 {$7(%p)$9}}|{{{{$2%a$9}{ $4%b$9}: }{$5%t$9}}|{$5%f$9}}$R{$3(%l)$9}" song_list_format = "{$2%c$9: $5%C %t$9 {$7(%p)$9}}|{{{{$2%a$9}{ $4%b$9}: }{$5%t$9}}|{$5%f$9}}$R{$3(%l)$9}"
song_status_format = "{{$2%c$9: $5%C$9 }|{$2%a$9{ $4\"%b\"{ (%y)$9}} - }{$5%t$9}}|{$4%f$9}" song_status_format = "{{$2%c$9: $5%C$9 }|{$2%a$9{ $4%b{ (%y)$9}} - }{$5%t$9}}|{$4%f$9}"
song_library_format = "{%n - }{%t}|{%f}" song_library_format = "{%n - }{%t}|{%f}"
# #
#tag_editor_album_format = "{(%y) }%b" #tag_editor_album_format = "{(%y) }%b"

View File

@@ -1,2 +1,3 @@
setlocal spell spelllang=en_us setlocal spell spelllang=en_us
setlocal linebreak setlocal linebreak
setlocal textwidth=80

1
.zshrc
View File

@@ -41,6 +41,7 @@ alias ocamldebug='rlwrap ocamldebug'
alias rm='rm -i' alias rm='rm -i'
alias shell='ps -p $$ -o comm=' alias shell='ps -p $$ -o comm='
alias sml='rlwrap sml' alias sml='rlwrap sml'
alias sshp='ssh -o PubkeyAuthentication=no'
alias style='clang-format-3.5 -style=Google' alias style='clang-format-3.5 -style=Google'
alias telnet='rlwrap telnet' alias telnet='rlwrap telnet'

View File

@@ -4,3 +4,4 @@ git submodule sync;
git submodule update; git submodule update;
rsync --exclude ".git/" --exclude ".git*" --exclude "install.sh" --exclude "py3status" -avhE --no-perms . ~; rsync --exclude ".git/" --exclude ".git*" --exclude "install.sh" --exclude "py3status" -avhE --no-perms . ~;
cp ./.gitconfig ~/.gitconfig;