diff --git a/.gitignore b/.gitignore index a2a863f..1389dd4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,7 @@ +.DS_Store + zsh/cache/ vim/view/ +vim/spelling* + +irssi/away.log diff --git a/gitconfig b/gitconfig index ca8c981..c317f08 100644 --- a/gitconfig +++ b/gitconfig @@ -60,8 +60,6 @@ prompt = false [difftool] prompt = false -[difftool "Kaleidoscope"] - cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\" [mergetool "Kaleidoscope"] cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot trustExitCode = true diff --git a/gvimrc b/gvimrc index 577574b..c909bcb 100644 --- a/gvimrc +++ b/gvimrc @@ -5,7 +5,7 @@ if has('win32') || has('win64') || has('win32unix') set guifont=Inconsolata:h18 elseif has('mac') try - set guifont=Source\ Code\ Pro:h13 + set guifont=Source\ Code\ Pro\ Light:h13 catch set guifont=Menlo:h11 endtry @@ -15,3 +15,5 @@ endif set guioptions-=T " turn off toolbar set guioptions-=m " turn off menubar + +call togglebg#map("") diff --git a/irssi/default.theme b/irssi/default.theme index ac99356..7fbb404 100644 --- a/irssi/default.theme +++ b/irssi/default.theme @@ -118,7 +118,7 @@ abstracts = { ## # the basic styling of how to print message, $0 = nick mode, $1 = nick - msgnick = "%K<%n$0$1-%K>%n %|"; + msgnick = " %n$0$1-%k>%n %|"; # message from you is printed. "msgownnick" specifies the styling of the # nick ($0 part in msgnick) and "ownmsgnick" specifies the styling of the @@ -250,7 +250,7 @@ abstracts = { # default background for all statusbars. You can also give # the default foreground color for statusbar items. - sb_background = "%4%w"; + sb_background = "%n%0"; # default backround for "default" statusbar group #sb_default_bg = "%4"; @@ -266,14 +266,14 @@ abstracts = { sbstart = ""; # text at the end of statusbars. Use space so that it's never # used for anything. - sbend = " "; + sbend = ""; topicsbstart = "{sbstart $*}"; topicsbend = "{sbend $*}"; - prompt = "[$*] "; + prompt = "[%n$*] "; - sb = " %c[%n$*%c]%n"; + sb = "%c[%n$*%c]%n "; sbmode = "(%c+%n$*)"; sbaway = " (%GzZzZ%n)"; sbservertag = ":$0 (change with ^X)"; @@ -286,9 +286,9 @@ abstracts = { # normal text sb_act_text = "%c$*"; # public message - sb_act_msg = "%W$*"; + sb_act_msg = "%w$*"; # hilight - sb_act_hilight = "%M$*"; + sb_act_hilight = "%m$*"; # hilight with specified color, $0 = color, $1 = text sb_act_hilight_color = "$0$1-%n"; }; diff --git a/rc b/rc index 3ecd778..1ff4661 100644 --- a/rc +++ b/rc @@ -10,7 +10,6 @@ print_info -l 2 'Creating aliases' alias h='history' alias df='df -h' alias du='du -h' -alias g='git' alias v='vim' binary_exists ledger && alias l='ledger' @@ -27,6 +26,16 @@ alias addkey="ssh-agent ~/.ssh/id_rsa" alias pprint="python -c 'import sys,pprint; pprint.pprint(eval(sys.stdin.read()))'" alias pprint-json="python -c 'import sys,json;print json.dumps(json.load(sys.stdin), indent=2)'" +function g +{ + if [[ $# -gt 0 ]]; then + git $@ + else + git status --short --branch + fi + return $? +} + print_info -l 2 "Sourcing ${SYS}-specific settings" case $SYS in diff --git a/tmux.conf b/tmux.conf index 51ba709..cbc91d2 100644 --- a/tmux.conf +++ b/tmux.conf @@ -22,20 +22,32 @@ set -g mode-keys vi set -g repeat-time 0 # No left status; right status bar is session name -set -g status-bg green +set -g status-bg black set -g status-left "" +set -g status-left-bg black +set -g status-left-fg brightblue set -g status-left-attr none + set -g status-right "| #S " +set -g status-right-bg black +set -g status-right-fg brightblue set -g status-right-attr none # Start window and pane indexing from 1 instead of 0 set-option -g base-index 1 set-option -g pane-base-index 1 -# Tabs like this: " :() " -setw -g window-status-format " #I:#W(#P) " -setw -g window-status-current-bg yellow -setw -g window-status-current-format " #I:#W(#P) " +# Tabs like this: "(:)" +setw -g window-status-bg black +setw -g window-status-fg brightgreen +setw -g window-status-format "(#I:#W)" +setw -g window-status-current-bg black +setw -g window-status-current-fg yellow +setw -g window-status-current-format "(#I:#W)" + +setw -g window-status-bell-fg red +setw -g window-status-content-fg brightred +setw -g window-status-activity-fg brightred setw -g alternate-screen on diff --git a/vimrc b/vimrc index 47d7c2b..ad43215 100644 --- a/vimrc +++ b/vimrc @@ -126,8 +126,6 @@ endif set bg=dark -call togglebg#map("") - " use solarized colorscheme if the terminal can support it (or we're in a GUI) let g:solarized_termtrans = 1 let g:solarized_visibility = 'low' @@ -163,6 +161,11 @@ nnoremap j nnoremap k nnoremap l +" Usual EMACS (oh the horror!) begin-line and end-line keys for first and last +" buffer. +"nnoremap :bfirst +"nnoremap :blast +" Move between buffers with and nnoremap :bn nnoremap :bp @@ -180,6 +183,7 @@ function! strip_trailing_whitespace() call cursor(l, c) endfunction + function! FindProjectFileOrDirectory(fod) let l:dir = getcwd() " Search up the path, starting at the current working directory, for the @@ -194,14 +198,17 @@ function! FindProjectFileOrDirectory(fod) return "" endfunction + function! GetProjectRuntimeDirectory() return FindProjectFileOrDirectory("vim") endfunction + function! GetProjectFile() return FindProjectFileOrDirectory("project.vim") endfunction + function! SourceProjectFile() let l:project_file = GetProjectFile() if l:project_file != "" @@ -209,6 +216,7 @@ function! SourceProjectFile() endif endfunction + function! AddProjectRuntimeDirectory() let l:project_rtp = GetProjectRuntimeDirectory() if isdirectory(l:project_rtp) @@ -259,6 +267,11 @@ nmap gV `[v`] "let g:CommandTAcceptSelectionMap='' "let g:CommandTAcceptSelectionTabMap='' +" GitGutter shows changed lines in files. +let g:gitgutter_enabled = 0 +highlight clear SignColumn +nmap gg :ToggleGitGutter + if has('autocmd') filetype plugin indent on diff --git a/zprofile b/zprofile index 7b24140..7b917b6 100644 --- a/zprofile +++ b/zprofile @@ -12,7 +12,7 @@ print_heading -l 1 'Initializing login shell' list_tmux_sessions() { tmux_out=`tmux list-sessions 2>/dev/null` - [[ -z "$tmux_out" ]] && return + [[ -z "$tmux_out" || -n "$TMUX" ]] && return echo "You have the following active tmux sessions:" for session in ${(f)tmux_out}; do diff --git a/zsh/func/prompt_loquacious_setup b/zsh/func/prompt_loquacious_setup index 3e35fcd..242e08f 100644 --- a/zsh/func/prompt_loquacious_setup +++ b/zsh/func/prompt_loquacious_setup @@ -1,5 +1,8 @@ #!/usr/bin/zsh +# vim:sw=4:sts=4: +# # A wordy prompt theme. +# # Eryn Wells @@ -74,6 +77,7 @@ function print_newline function set_prompt_info { + PS1_HISTORY="`prompt_colorize -b -f 'green' '%h'`" PS1_NAME="`prompt_colorize -f 'magenta' '%n'` " PS1_CWD="in `prompt_colorize -f 'green' '%~'` " @@ -83,13 +87,23 @@ function set_prompt_info PS1_HOST='' fi + # Get git repo information, if it exists. See setup function for + # configuration details. vcs_info loquacious if [[ -n "$vcs_info_msg_0_" ]]; then - PS1_REPO="on $vcs_info_msg_0_ " + PS1_REPO="on $vcs_info_msg_0_ " else - PS1_REPO="" + PS1_REPO="" fi + # Show background jobs, if any. + if [[ `jobs | wc -l` -ge 1 ]]; then + PS1_JOBS='%j' + fi + + # Show background job count if any exist. + RPS1="%(1j.[`prompt_colorize -f 'magenta' '%j'`].)" + PS1_LINE='%# ' } diff --git a/zshrc b/zshrc index 275d5e0..deeb629 100644 --- a/zshrc +++ b/zshrc @@ -1,5 +1,5 @@ # .zshrc -# vim: ft=zsh fdm=marker +# vim:ft=zsh:fdm=marker:sw=4:sts=4: # # ZSH init for interactive shells # @@ -45,7 +45,7 @@ function configure_omz #{{{ DISABLE_AUTO_UPDATE="true" COMPLETION_WAITING_DOTS="true" - plugins=(autojump brew encode64 fasd git gnu-utils history osx python) + plugins=(autojump brew encode64 fasd gnu-utils history osx python) source $ZSH/oh-my-zsh.sh @@ -83,10 +83,6 @@ function configure_modules_and_functions #{{{ print_info_sub -l 2 "Adding $myfpath to fpath" fpath=($myfpath/makers $myfpath $fpath) - print_info -l 3 'Loading vcs_info' - autoload -Uz vcs_info - zstyle ':vcs_info:*' enable git - load_module 'makers' print_info -l 3 "Loading pw module" @@ -174,6 +170,28 @@ function configure_completion #{{{ } #}}} +function configure_vcs_info #{{{ +{ + print_info -l 3 'Loading vcs_info' + + autoload -U add-zsh-hook + autoload -Uz vcs_info + + zstyle ':vcs_info:*' disable bzr cdv darcs mtn svk tla cvs svn + zstyle ':vcs_info:*' enable git p4 + + zstyle ':vcs_info:git:general:*' formats '%b' + + # Export the current Git branch before every prompt. + function export_gitbranch { + vcs_info general + export gitbranch=${vcs_info_msg_0_} + } + + add-zsh-hook precmd export_gitbranch +} #}}} + + configure_general configure_omz configure_zle @@ -181,6 +199,7 @@ configure_modules_and_functions configure_zsh_aliases configure_history configure_completion +configure_vcs_info configure_prompt