diff --git a/.gitconfig b/.gitconfig index b7ceabc..0269ea2 100644 --- a/.gitconfig +++ b/.gitconfig @@ -4,6 +4,6 @@ [diff] tool = vimdiff [difftool] - prompt = false + prompt = true [push] default = simple diff --git a/.ncmpcpp/config b/.ncmpcpp/config index 350a6b5..d7f040f 100644 --- a/.ncmpcpp/config +++ b/.ncmpcpp/config @@ -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_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}" # #tag_editor_album_format = "{(%y) }%b" diff --git a/.vim/ftplugin/tex.vim b/.vim/ftplugin/tex.vim index 0b9c779..00f8995 100644 --- a/.vim/ftplugin/tex.vim +++ b/.vim/ftplugin/tex.vim @@ -1,2 +1,3 @@ setlocal spell spelllang=en_us setlocal linebreak +setlocal textwidth=80 diff --git a/.vimrc b/.vimrc index d58b9a8..88243c1 100644 --- a/.vimrc +++ b/.vimrc @@ -29,6 +29,7 @@ set ignorecase set smartcase set background=dark +set t_ut= execute pathogen#infect() diff --git a/.zshrc b/.zshrc index 28eefba..548d263 100644 --- a/.zshrc +++ b/.zshrc @@ -41,6 +41,7 @@ alias ocamldebug='rlwrap ocamldebug' alias rm='rm -i' alias shell='ps -p $$ -o comm=' alias sml='rlwrap sml' +alias sshp='ssh -o PubkeyAuthentication=no' alias style='clang-format-3.5 -style=Google' alias telnet='rlwrap telnet' diff --git a/bin/afs b/bin/afs index 520a556..70d7751 100755 --- a/bin/afs +++ b/bin/afs @@ -1,4 +1,10 @@ #!/bin/bash -kinit +klist -s +if [ $? -eq 0 ] +then + echo -e "\e[92mReusing old credentials\e[0m" +else + kinit +fi aklog klist diff --git a/install.sh b/install.sh index f2525d9..22b892b 100755 --- a/install.sh +++ b/install.sh @@ -4,3 +4,4 @@ git submodule sync; git submodule update; rsync --exclude ".git/" --exclude ".git*" --exclude "install.sh" --exclude "py3status" -avhE --no-perms . ~; +cp ./.gitconfig ~/.gitconfig;