Permalink
Browse files

Removed pomodoro, removed git repo status (slowness), updated tmux.co…

…nf and tweak to vim an irssi
  • Loading branch information...
1 parent 59c0e71 commit 73b495b26ed693110b751dd350cadfaaac7f4477 @mattia committed May 19, 2012
Showing with 33 additions and 12 deletions.
  1. +0 −1 bundle/vim-pomodoro
  2. +7 −1 gitconfig
  3. +6 −1 irssi/irssi_config
  4. +16 −5 tmux.conf
  5. +1 −1 vimrc
  6. +3 −3 zshrc
1 bundle/vim-pomodoro
@@ -1 +0,0 @@
-Subproject commit c2b90dfa17fd92252b5776778cb785988ecd5883
View
8 gitconfig
@@ -5,7 +5,7 @@
tool = vimdiff
[core]
editor = vim
- excludesfile = ~/.gitignore
+ excludesfile = /Users/mattia/.gitignore_global
[color]
diff = always
ui = auto
@@ -16,3 +16,9 @@
#Tell git diff to use mnemonic prefixes (index, work tree, commit, object)
#instead of the standard a and b notation:
mnemonicprefix = true
+[difftool "sourcetree"]
+ cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+ path =
+[mergetool "sourcetree"]
+ cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+ trustExitCode = true
View
7 irssi/irssi_config
@@ -7,6 +7,7 @@ servers = (
chatnet = "Undernet";
port = "6667";
},
+ { address = "irc.mozilla.org"; chatnet = "moznet"; port = "6667"; },
{ address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; },
{
address = "irc.quakenet.org";
@@ -88,11 +89,15 @@ chatnets = {
max_whois = "30";
};
SILC = { type = "SILC"; };
+ moznet = { type = "IRC"; };
};
channels = (
{ name = "#irssi"; chatnet = "ircnet"; autojoin = "No"; },
- { name = "silc"; chatnet = "silc"; autojoin = "No"; }
+ { name = "silc"; chatnet = "silc"; autojoin = "No"; },
+ { name = "#macdev"; chatnet = "moznet"; autojoin = "Yes"; },
+ { name = "#camino"; chatnet = "moznet"; autojoin = "Yes"; },
+ { name = "#coding"; chatnet = "moznet"; autojoin = "Yes"; }
);
aliases = {
View
21 tmux.conf
@@ -17,7 +17,7 @@ set-option -g display-panes-colour red
set-option -g history-limit 100000
set-option -g message-bg red
set-option -g message-fg white
-set-option -g mouse-select-pane off
+set-option -g mouse-select-pane on
set-option -g pane-active-border-bg default
set-option -g pane-active-border-fg red
set-option -g pane-border-bg default
@@ -29,6 +29,7 @@ set-option -g set-titles on
set-option -g set-titles-string ' #I-#W '
set-option -g terminal-overrides 'xterm*:smcup@:rmcup@'
set-option -g base-index 1
+set-option -g pane-base-index 1
set-option -g default-path ""
# Screen lock
@@ -47,17 +48,26 @@ set-option -g lock-command "vlock"
# Window options
set-window-option -g utf8 on
set-window-option -g clock-mode-colour blue
-set-window-option -g clock-mode-style 24
+set-window-option -g clock-mode-style 12
set-window-option -g monitor-activity on
set-window-option -g xterm-keys on
set-window-option -g automatic-rename on
set-window-option -g aggressive-resize on
+# Pane movement like vim
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+
# Custom status bar
# Bad Wolf
set -g status-fg white
set -g status-bg colour234
set -g window-status-activity-attr bold
+#set -g window-status-activity-bg colour221
+#set -g window-status-bell-bg colour221
+#set -g window-status-content-bg colour221
set -g pane-border-fg colour245
set -g pane-active-border-fg colour39
set -g message-fg colour16
@@ -69,19 +79,20 @@ set -g status-left-length 32
set -g status-right-length 150
set -g status-interval 5
-#set -g status-left '#[fg=colour16,bg=colour254,bold] #S #[fg=colour254,bg=colour238,nobold]⮀#[fg=colour15,bg=colour238,bold] #(ls ~/| wc -l | tr -d " ") #[fg=colour238,bg=colour234,nobold]⮀'
set -g status-left '#[fg=colour16,bg=colour254,bold] #S #[fg=colour254,bg=colour238,nobold]⮀#[fg=colour15,bg=colour238,bold] #(echo "Tmux") #[fg=colour238,bg=colour234,nobold]⮀'
-set -g status-right '#[fg=colour245]⮃ %R ⮃ %d %b #[fg=colour254,bg=colour234,nobold]#(~/.vim/itunes-tmux.sh)⮂#[fg=colour16,bg=colour254,bold] #h '
+set -g status-right '#[fg=colour245]⮃ %r ⮃ %d %b #[fg=colour254,bg=colour234,nobold]#(~/.vim/itunes-tmux.sh)⮂#[fg=colour16,bg=colour254,bold] #h '
set -g window-status-format "#[fg=white,bg=colour234] #I #W "
set -g window-status-current-format "#[fg=colour234,bg=colour39]⮀#[fg=colour16,bg=colour39,noreverse,bold] #I ⮁ #W #[fg=colour39,bg=colour234,nobold]⮀"
# Activity
setw -g monitor-activity on
-set -g visual-activity off
+set -g visual-activity on
+#VI movement
set-option -g status-keys vi
+setw -g mode-keys vi
# Scrolling
setw -g mode-mouse on
View
2 vimrc
@@ -56,7 +56,7 @@ let g:solarized_contrast = "high"
set nu "enable numbers column
set backupdir=~/tmp "use ~/tmp has backup dir
set directory=~/tmp ""
-set title "set window title with file edited name
+"set title "set window title with file edited name
set autoindent "Always set autoindenting on
set cursorline "Highlight the line with the cursor on
set hidden "Close buffers with unsaved changes
View
6 zshrc
@@ -6,7 +6,7 @@ HOSTNAME=`hostname`
bindkey -v
PAGER='less'
EDITOR='vim'
-TERM=xterm-256color
+TERM='xterm-256color'
# End of lines configured by zsh-newuser-install
#
# Set the percent for prompt
@@ -15,7 +15,7 @@ TERM=xterm-256color
# The following lines were added by compinstall
zstyle :compinstall filename '~/.zshrc'
-autoload -Uz vcs_info
+#autoload -Uz vcs_info
autoload -Uz compinit
compinit
# End of lines added by compinstall
@@ -58,7 +58,7 @@ compinit
setopt extendedglob
# rake for octopress
- alias rake="noglob rake"
+# alias rake="noglob rake"
#alias for ls colored output
#alias ls='ls --color=auto -F'

0 comments on commit 73b495b

Please sign in to comment.