From 8426c840ba68bc5884e396f84eaf2e692cbb8c54 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Tue, 12 Mar 2013 10:58:12 -0700 Subject: [PATCH 1/7] Ignore irssi's away.log Conflicts: .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index e5014bb..1389dd4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ zsh/cache/ vim/view/ vim/spelling* + +irssi/away.log From 27789e5f3dc188355e79ef671cd20c332afb9fa8 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Tue, 12 Mar 2013 11:00:44 -0700 Subject: [PATCH 2/7] Remove duplicate difftool entry for Kaleidoscope --- gitconfig | 2 -- 1 file changed, 2 deletions(-) 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 From 402d298f52e6a533eeeee16178f89ed05fdc3eeb Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Tue, 12 Mar 2013 11:00:55 -0700 Subject: [PATCH 3/7] Irssi theme tweaks --- irssi/default.theme | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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"; }; From 4129bc6022b27e0b7e8205d03b8574bb21e5a747 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Tue, 12 Mar 2013 11:01:09 -0700 Subject: [PATCH 4/7] Tmux theme tweaks Looks more like @vilhalmer's config: https://twitter.com/vilhalmer/status/311529816304267264 --- tmux.conf | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/tmux.conf b/tmux.conf index 51ba709..7198b08 100644 --- a/tmux.conf +++ b/tmux.conf @@ -22,20 +22,31 @@ 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-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 From 5b3bc2653be8f1f23b101e3269d12facc427cae4 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Tue, 12 Mar 2013 11:03:11 -0700 Subject: [PATCH 5/7] Extra linebreaks in vimrc --- vimrc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vimrc b/vimrc index 31824fe..1581dbf 100644 --- a/vimrc +++ b/vimrc @@ -183,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 @@ -197,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 != "" @@ -212,6 +216,7 @@ function! SourceProjectFile() endif endfunction + function! AddProjectRuntimeDirectory() let l:project_rtp = GetProjectRuntimeDirectory() if isdirectory(l:project_rtp) From 5ba6c60a912d66ad0abb31f93c1f375f01159259 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Tue, 12 Mar 2013 13:57:58 -0700 Subject: [PATCH 6/7] Set PS1_JOBS --- zsh/func/prompt_loquacious_setup | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/zsh/func/prompt_loquacious_setup b/zsh/func/prompt_loquacious_setup index 646c688..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 @@ -84,11 +87,18 @@ 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. From f90198bf2b063c5338c5bda0a8f0d0ca4c3f49d1 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Tue, 12 Mar 2013 13:58:13 -0700 Subject: [PATCH 7/7] Add configure_vcs_info function to zshrc --- zshrc | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/zshrc b/zshrc index 275d5e0..baf8ccc 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 # @@ -174,6 +174,26 @@ function configure_completion #{{{ } #}}} +function configure_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 +201,7 @@ configure_modules_and_functions configure_zsh_aliases configure_history configure_completion +configure_vcs_info configure_prompt