Skip to content

Commit

Permalink
Minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
albandiguer committed Apr 23, 2016
1 parent 6fad341 commit a04c6db
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iqE
bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim(diff)?$' && tmux send-keys C-l) || tmux select-pane -R"
bind -n C-\ run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim(diff)?$' && tmux send-keys 'C-\\') || tmux select-pane -l"

bind c new-window -c "#{pane_current_path}"

# ----------------------
# set some pretty colors
# ----------------------
Expand Down
2 changes: 2 additions & 0 deletions .vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ set wildmode=longest,list
" make tab completion for files/buffers act like bash
set wildmenu
let mapleader=","
" disable Ex mode
map Q <Nop>
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" CUSTOM AUTOCMDS
Expand Down
3 changes: 3 additions & 0 deletions .zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ function list_port_usage() {
sudo netstat -tulpn
}

<<<<<<< HEAD
alias compose='docker-compose'


Expand Down Expand Up @@ -146,3 +147,5 @@ function loaddockermachineenv() {
}
loaddockermachineenv

## fancy cat
alias ccat='pygmentize -g'
6 changes: 0 additions & 6 deletions install.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
#!/bin/zsh

# TODO finish
# symlink .vim directory
# Do something for .zsh/after/ files ?

echo 'Magic starting'

DIR=~/dev/dotfiles
for file in $DIR/.*
do
Expand Down

0 comments on commit a04c6db

Please sign in to comment.