summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bashrc.files/colors3
-rw-r--r--.tmux.conf24
-rw-r--r--.vim/vimrc_files/keymaps.vim49
-rw-r--r--.vim/vimrc_files/plugin_config.vim5
-rw-r--r--.vim/vimrc_files/vundle.vim3
-rw-r--r--.vimrc4
6 files changed, 64 insertions, 24 deletions
diff --git a/.bashrc.files/colors b/.bashrc.files/colors
index 1649895..1b5b1e7 100644
--- a/.bashrc.files/colors
+++ b/.bashrc.files/colors
@@ -24,7 +24,8 @@
#ec ENDCODE Non-filename text
#*.extension Every file using this extension e.g. *.jpg
# mostly unix file types
-export LS_COLORS="rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32"
+#export LS_COLORS="rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32"
+export LS_COLORS="di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43::tw=30;42:ow=34;42:st=37;44:ex=01;32"
# archives
export LS_COLORS="*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:$LS_COLORS"
# image and video
diff --git a/.tmux.conf b/.tmux.conf
new file mode 100644
index 0000000..1ebfc7a
--- /dev/null
+++ b/.tmux.conf
@@ -0,0 +1,24 @@
+set -g prefix C-x
+bind-key a send-prefix # for nested tmux sessions
+
+# use support - set to on if you want to use the mouse
+setw -g mouse on
+#setw -g mouse-resize-pane on
+#set -g mouse-select-window on
+#set -g mouse-select-pane on
+
+
+# Set the default terminal mode to 256color mode
+set -g default-terminal "screen-256color"
+
+# enable activity alerts
+#setw -g monitor-activity on
+#set -g visual-activity on
+
+# Center the window list
+#set -g status-justify centre
+
+# Maximize and restore a pane
+#unbind Up bind Up new-window -d -n tmp \; swap-pane -s tmp.1 \; select-window -t tmp
+#unbind Down
+#bind Down last-window \; swap-pane -s tmp.1 \; kill-window -t tmp
diff --git a/.vim/vimrc_files/keymaps.vim b/.vim/vimrc_files/keymaps.vim
index c5dfaed..f7cb026 100644
--- a/.vim/vimrc_files/keymaps.vim
+++ b/.vim/vimrc_files/keymaps.vim
@@ -4,17 +4,20 @@
" set leader key
let mapleader=","
+" re-source .vimrc
+map <leader>v :source ~/.vimrc<CR>
+
"remap esc button
imap jj <Esc>
" prevent quit accidentlty
-map :q :close
-map :wq :w
-noremap :qq :q
-noremap <leader>d :bd<CR>
+map :q :bd
+map :qa :bd
+map :wq :w<CR>:bd
+noremap <leader>q :q<CR>
" re-adjust indentation
-map <fi> mzgg=G`z
+map <leader>f mzgg=G`z
"let ArrowDisableMessage = "Arrow Keys disabled! Better learn hjkl ;)"
@@ -50,30 +53,31 @@ cnoremap <c-l> <Right>
" navigate between different splits
-map <c-Down> <c-w>j
-map <c-Up> <c-w>k
-map <c-Right> <c-w>l
-map <c-Left> <c-w>h
-map <c-j> <c-w>j
-map <c-k> <c-w>k
-map <c-l> <c-w>l
-map <c-h> <c-w>h
+map <C-Down> <c-w>j
+map <C-Up> <c-w>k
+map <C-Right> <c-w>l
+map <C-Left> <c-w>h
+
+
+" resize splits
+map <C-j> <C-w>5-
+map <C-k> <C-w>5+
+map <C-l> <C-w>5<
+map <C-h> <C-w>5>
" navigate between different buffers
nnoremap <S-Left> :bprevious<CR>
nnoremap <S-Right> :bnext<CR>
-nnoremap <S-h> :bprevious<CR>
-nnoremap <S-l> :bnext<CR>
" ctrl-ae jump to line start/end
-nnoremap <c-a> 0
-nnoremap <c-e> $
-inoremap <c-a> <c-o>0
-inoremap <c-e> <c-o>$
-vnoremap <c-a> 0
-vnoremap <c-e> $
+nnoremap <C-a> 0
+nnoremap <C-e> $
+inoremap <C-a> <c-o>0
+inoremap <C-e> <c-o>$
+vnoremap <C-a> 0
+vnoremap <C-e> $
" Shortcut to toggle relative numbering mode
@@ -83,6 +87,9 @@ nnoremap <c-n> :call ToggleRelativeNumber()<CR>
" Open BufferExplorer
nnoremap <C-b> :call BufExplorer()<CR>
+" Toggle Tagbar
+nnoremap <leader>t :TagbarToggle<CR>
+
" invoke grep and print output into current buffer
nnoremap <C-g> :read !grep -nI
diff --git a/.vim/vimrc_files/plugin_config.vim b/.vim/vimrc_files/plugin_config.vim
index 844aa65..ec61660 100644
--- a/.vim/vimrc_files/plugin_config.vim
+++ b/.vim/vimrc_files/plugin_config.vim
@@ -17,3 +17,8 @@ if !exists('g:airline_symbols')
let g:airline_symbols = {}
endif
+
+" +----------------------------+
+" | Tagbar |
+" +----------------------------+
+let g:tagbar_ctags_bin='/u/jstolp/bin/ctags'
diff --git a/.vim/vimrc_files/vundle.vim b/.vim/vimrc_files/vundle.vim
index 4e7092e..17d5786 100644
--- a/.vim/vimrc_files/vundle.vim
+++ b/.vim/vimrc_files/vundle.vim
@@ -15,4 +15,7 @@ Plugin 'jlanzarotta/bufexplorer'
Plugin 'vim-airline/vim-airline'
Plugin 'vim-airline/vim-airline-themes'
+Plugin 'majutsushi/tagbar'
+
+
call vundle#end()
diff --git a/.vimrc b/.vimrc
index 0069d2b..100c241 100644
--- a/.vimrc
+++ b/.vimrc
@@ -3,7 +3,6 @@
set nocompatible " make Vim less Vi
-
source ~/.vim/vimrc_files/vundle.vim
source ~/.vim/vimrc_files/plugin_config.vim
@@ -21,6 +20,8 @@ colorscheme buddy
" +----------------------------+
" | Basic Settings |
" +----------------------------+
+set timeoutlen=1234 " time in ms until command are interpreted
+
filetype plugin indent on " enable loading indent file for filetype
set ffs=unix,dos,mac " Try recognizing dos, unix, and mac line endings.
@@ -76,7 +77,6 @@ set wildignore+=*.o,*.obj,.git,*.pyc,*~
" No annoying sound on errors
set noerrorbells
set novisualbell
-set tm=500
" +----------------------------+
" | Source Extrenal Files |