Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: csand/dotfiles
base: b6aabb2e3f
...
head fork: csand/dotfiles
compare: 91308f0bd2
  • 3 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 6 additions and 6 deletions.
  1. +5 −5 tmux/.tmux.conf
  2. +1 −1  vim/.vim/plugins
View
10 tmux/.tmux.conf
@@ -44,9 +44,9 @@ setw -g window-status-activity-bg black
setw -g window-status-activity-fg green
setw -g window-status-activity-attr bold
-set -g pane-border-fg black
+set -g pane-border-fg colour239
set -g pane-border-bg black
-set -g pane-active-border-fg black
+set -g pane-active-border-fg colour214
set -g pane-active-border-bg black
# Window options
@@ -73,9 +73,8 @@ unbind C-b
unbind C-s
unbind %
unbind '"'
-unbind p
-bind C-s last-window
+bind C-t last-window
bind v split-window -h
bind s split-window -v
bind S choose-session
@@ -91,6 +90,7 @@ bind -r L resize-pane -R 5
bind C new-window \; command-prompt "Rename window '%%'"
bind c new-window
bind , command-prompt "Rename window '%%'"
+bind \; command-prompt
# Copy mode
bind [ copy-mode
@@ -99,5 +99,5 @@ bind -t vi-copy v begin-selection
bind -t vi-copy y copy-selection
# Fix tmux detaching from clipboard
-set -g default-command "hash reattach-to-user-namespace && reattach-to-user-namespace -l zsh"
+# set -g default-command "hash reattach-to-user-namespace && reattach-to-user-namespace -l zsh"
View
2  vim/.vim/plugins
@@ -14,6 +14,7 @@ Bundle 'davidhalter/jedi-vim'
Bundle 'epmatsw/ag.vim'
Bundle 'ervandew/supertab'
Bundle 'gmarik/vundle'
+Bundle 'guns/xterm-color-table.vim'
Bundle 'juanpabloaj/help.vim'
Bundle 'kien/ctrlp.vim'
Bundle 'mattn/zencoding-vim'
@@ -31,7 +32,6 @@ Bundle 'Better-CSS-Syntax-for-Vim'
Bundle 'Haskell-Highlight-Enhanced'
Bundle 'JSON.vim'
Bundle 'Puppet-Syntax-Highlighting'
-Bundle 'bbommarito/vim-slim'
Bundle 'bryanjswift/vim-rust'
Bundle 'cakebaker/scss-syntax.vim'
Bundle 'depuracao/vim-rdoc'

No commit comments for this range

Something went wrong with that request. Please try again.