From 193266693d0d7913b31c2b5ff311adf9a4855f9b Mon Sep 17 00:00:00 2001 From: Steffen Becker Date: Sat, 23 Nov 2013 20:00:03 +0100 Subject: [PATCH] remove oh-my-zsh --- .gitmodules | 3 --- exports | 8 +++++- oh-my-zsh | 1 - tmux.conf | 66 +++++++++++++++++++++++++++++--------------------- vimrc | 70 +++++++++++++++++++++++++++++------------------------ zshrc | 20 +++------------ 6 files changed, 87 insertions(+), 81 deletions(-) delete mode 100644 .gitmodules delete mode 160000 oh-my-zsh diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 9abcfb7..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "oh-my-zsh"] - path = oh-my-zsh - url = git@github.com:webgefrickel/oh-my-zsh.git diff --git a/exports b/exports index 650ca61..3193d89 100644 --- a/exports +++ b/exports @@ -1,11 +1,17 @@ # Terminal export TERM="screen-256color" +# shell +export SHELL=/usr/local/bin/zsh + # brew CASK export HOMEBREW_CASK_OPTS="--appdir=/Applications" # paths -export PATH=/usr/local/bin:/usr/local/sbin:$HOME/.rvm/bin:$PATH +export PATH=/usr/local/bin:/usr/local/sbin:$PATH +export PATH=$HOME/.rvm/bin:$PATH +export PATH=$HOME/.tmuxifier/bin:$PATH + export MANPATH=/usr/local/share/man:$MANPATH # disable stupid ._ and dsstore files diff --git a/oh-my-zsh b/oh-my-zsh deleted file mode 160000 index bf4afdf..0000000 --- a/oh-my-zsh +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bf4afdf274522f8d7d22e59a47c0e6226cd9d69a diff --git a/tmux.conf b/tmux.conf index 85860ab..2223920 100644 --- a/tmux.conf +++ b/tmux.conf @@ -4,44 +4,68 @@ set -g default-terminal "screen-256color" # zsh set-option -g default-shell $SHELL +# bind default prefix to ctrl-a +set -g prefix C-a +unbind-key C-b +bind-key a send-prefix + + + +# use vim motions :-) +setw -g mode-keys vi + +# copy & paste shortcut +unbind [ +unbind p +bind Escape copy-mode +bind p paste-buffer + # reparing copy & paste -set-option -g default-command "reattach-to-user-namespace -l zsh" +# Setup 'v' to begin selection as in Vim +bind-key -t vi-copy v begin-selection +bind-key -t vi-copy y copy-pipe "reattach-to-user-namespace pbcopy" + +# Update default binding of `Enter` to also use copy-pipe +unbind -t vi-copy Enter +bind-key -t vi-copy Enter copy-pipe "reattach-to-user-namespace pbcopy" + + # Fix for sending keys to Vim setw -g xterm-keys on +# set esc-timeout to 50ms (better vim) +set -sg escape-time 50 + + -# bind default prefix to ctrl-a -set -g prefix C-a -unbind-key C-b -bind-key a send-prefix # Force a reload of te config file unbind-key r bind-key r source-file ~/.tmux.conf \; display-message "Configuration reloaded!" -# set esc-timeout to 50ms (better vim) -set -sg escape-time 50 - # Saner window splitting unbind % bind \ split-window -h bind - split-window -v + # Easier resizing unbind-key -n C-j unbind-key -n C-k unbind-key -n C-h unbind-key -n C-l + bind-key -r C-j resize-pane -D bind-key -r C-k resize-pane -U bind-key -r C-h resize-pane -L bind-key -r C-l resize-pane -R # Navigation -bind-key -r j select-pane -D -bind-key -r k select-pane -U -bind-key -r h select-pane -L -bind-key -r l select-pane -R +bind-key j select-pane -D +bind-key k select-pane -U +bind-key h select-pane -L +bind-key l select-pane -R + # Mouse support set -g mouse-select-pane on @@ -49,18 +73,7 @@ set -g mouse-select-window on set -g mouse-resize-pane on setw -g mode-mouse on -# Copy mode -setw -g mode-keys vi -bind ` copy-mode -unbind [ -unbind p -bind p paste-buffer -bind -t vi-copy v begin-selection -bind -t vi-copy y copy-selection -bind -t vi-copy Escape cancel -bind y run "tmux save-buffer - | reattach-to-user-namespace pbcopy" - -# Number windows and panes from 1 +# counting panes starts at 1 set -g base-index 1 setw -g pane-base-index 1 @@ -68,7 +81,7 @@ setw -g pane-base-index 1 set -g display-time 2000 -# default statusbar colors / solarized dark +# statusbar colors solarized dark set-option -g status-bg black set-option -g status-fg yellow set-option -g status-attr default @@ -84,8 +97,7 @@ set-option -g display-panes-active-colour blue set-option -g display-panes-colour brightred set-window-option -g clock-mode-colour green - -# Custom status bar - Powerline symbols: ⮂ ⮃ ⮀ ⮁ ⭤ +# Custom status bar - with Powerline symbols: ⮂ ⮃ ⮀ ⮁ ⭤ set -g status-left-length 32 set -g status-right-length 150 set -g status-interval 5 diff --git a/vimrc b/vimrc index 2b6dca3..aeac573 100644 --- a/vimrc +++ b/vimrc @@ -168,9 +168,10 @@ set noerrorbells " don't beep set visualbell " don't beep -" ========== Custom Keymappings ========== +" Custom key mappings and shortcuts +" ====================================================================== -" Typos +" Fix some common typos command! -bang E e command! -bang Q q command! -bang W w @@ -292,17 +293,21 @@ nnoremap za nnoremap c :execute "vimgrep /" . expand("") . "/j **" cnext -" ========== PLugins leaders and other config ========== -" search using Ag - the Silver Surfer ftw! +" Plugins +" ====================================================================== +" +" Ag nnoremap a :Ag -" Nerdtree toggle + +" NERDtree nnoremap n :NERDTreeToggle let NERDTreeMinimalUI=1 let NERDTreeWinSize=50 let NERDTreeShowHidden=1 -" fugitive shortcuts -- 20+ increases window-height + +" fugitive shortcuts (20+ increases window-height) nnoremap gs :Gstatus20+ nnoremap gd :Gdiff20+ nnoremap gc :Gcommit20+ @@ -311,12 +316,14 @@ nnoremap gl :Glog20+ nnoremap gp :Git push20+ nnoremap gw :Gwrite20+ + " TComment nnoremap / :TComment vnoremap / :TComment inoremap / :TComment -" Tabularize a == think align + +" Tabularize (a == think align) nmap a= :Tabularize /= vmap a= :Tabularize /= nmap a{ :Tabularize /{ @@ -329,21 +336,24 @@ nmap a :Tabularize / vmap a :Tabularize / -" easymotion config leader m +" easymotion let g:EasyMotion_leader_key = 'm' -" ultisnips in custom dir -let g:UltiSnipsSnippetDirectories=["snippets"] + +" ultisnips +let g:UltiSnipsSnippetDirectories = ["snippets"] -" Enable syntastic syntax checking +" Syntastic " no checking for xhtml/html -- because of fluidtemplate for TYPO3 " and no checking for scss.css because of CSS3 and SASS-Variable -" errors for included files - let codekit handle this -let g:syntastic_auto_jump=0 -let g:syntastic_mode_map = { 'mode': 'active', - \ 'active_filetypes': ['ruby', 'php', 'javascript'], - \ 'passive_filetypes': ['xhtml', 'html', 'scss', 'scss.css'] } +let g:syntastic_auto_jump = 0 +let g:syntastic_mode_map = { + \ 'mode': 'active', + \ 'active_filetypes': ['ruby', 'php', 'javascript'], + \ 'passive_filetypes': ['xhtml', 'html', 'scss', 'scss.css', 'css'] + \ } + " CtrlP nnoremap b :CtrlPBuffer @@ -357,15 +367,16 @@ let g:ctrlp_custom_ignore = { \ 'file': '\v\.(exe|so|dll|zip|gz|png|gif|jpg|tif|psd|pdf|mp4|webm|mp3)$', \ } + " Gist filetype-detection let g:gist_detect_filetype = 1 " airline config +let g:airline_theme = 'solarized' +let g:airline_left_sep = '▶' +let g:airline_right_sep = '◀' -let g:airline_theme='solarized' -let g:airline_left_sep='▶' -let g:airline_right_sep='◀' " Mac Dash.app integration nmap d DashSearch @@ -375,24 +386,19 @@ let g:dash_map = { \ } -" ========== Custom Pseudofunctions ========== -" Phakefiles syntax is php -au BufNewFile,BufRead Phakefile set ft=php - -" Remember last location in file -if has("autocmd") - au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") - \| exe "normal g'\"" | endif -endif - - - -" Other functions +" Other functions / Onload, Autocommands " ====================================================================== " spell correction on text-files autocmd BufRead,BufNewFile *.{md|rst|txt} setlocal spell +" Phakefiles syntax is php +au BufNewFile,BufRead Phakefile set ft=php +" Remember last location/cursor in file +if has("autocmd") + au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") + \| exe "normal g'\"" | endif +endif diff --git a/zshrc b/zshrc index 6efd8dd..43f5b1e 100644 --- a/zshrc +++ b/zshrc @@ -1,30 +1,16 @@ -# Path to your oh-my-zsh configuration. -ZSH=$HOME/.oh-my-zsh -ZSH_THEME="webgefrickel" +# Load the functions, aliases, function etc. - -# default plugins to load -plugins=(brew git git-flow github history-substring-search jake-node npm node gem osx zsh-syntax-highlighting) - - -source $ZSH/oh-my-zsh.sh -unsetopt correct_all - - -# Load the shell dotfiles, and then some: -# * ~/.path can be used to extend `$PATH`. -# * ~/.extra can be used for other settings you don’t want to commit. for file in ~/.{exports,aliases,functions}; do [ -r "$file" ] && source "$file" done unset file -# z script installed via homebrew -. `brew --prefix`/etc/profile.d/z.sh +eval "$(tmuxifier init -)" # rvm TODO use rbenv in the future [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" + PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting