diff options
| -rw-r--r-- | dot_tmux.conf | 140 | ||||
| -rw-r--r-- | dot_vimrc | 98 |
2 files changed, 68 insertions, 170 deletions
diff --git a/dot_tmux.conf b/dot_tmux.conf index fe5de5b..012bb4f 100644 --- a/dot_tmux.conf +++ b/dot_tmux.conf @@ -1,20 +1,18 @@ -setw -g mode-keys vi -unbind C-s -bind-key C-s copy-mode -unbind q -bind-key q copy-mode -#bind-key -t vi-copy 'v' begin-selection -#bind-key -t vi-copy 'y' copy-selection -unbind p -bind p paste-buffer +# KEY BINDINGS -set -g escape-time 0 +setw -g mode-keys vi # remap prefix to Control + a set -g prefix C-q unbind C-b bind C-q send-prefix +unbind q +bind-key q copy-mode + +unbind p +bind p paste-buffer + # force a reload of the config file unbind r bind r source-file ~/.tmux.conf @@ -23,12 +21,6 @@ bind r source-file ~/.tmux.conf unbind ^A bind ^A select-pane -t :.+ -# Enable mouse control (clickable windows, panes, resizable panes) -set -g mouse on - -# don't rename windows automatically -set-option -g allow-rename off - # switch panes using vim-like bindings C-a hjkl unbind h unbind j @@ -44,117 +36,19 @@ unbind ^L bind ^H previous-window bind ^L next-window +# OTHER OPTIONS -###################### -### DESIGN CHANGES ### -###################### - -# Thank you http://www.hamvocke.com/blog/a-guide-to-customizing-your-tmux-conf/ - -# panes -set -g pane-border-fg black -set -g pane-active-border-fg brightred - -## Status bar design -# status line -#set -g status-utf8 on -set -g status-justify left -set -g status-bg default -set -g status-fg colour12 -set -g status-interval 2 - -# messaging -set -g message-fg black -set -g message-bg yellow -set -g message-command-fg blue -set -g message-command-bg black - -#window mode -setw -g mode-bg colour6 -setw -g mode-fg colour0 - -# window status -setw -g window-status-format " #F#I:#W#F " -setw -g window-status-current-format " #F#I:#W#F " -setw -g window-status-format "#[fg=magenta]#[bg=black] #I #[bg=cyan]#[fg=colour8] #W " -setw -g window-status-current-format "#[bg=brightmagenta]#[fg=colour8] #I #[fg=colour8]#[bg=colour14] #W " -setw -g window-status-current-bg colour0 -setw -g window-status-current-fg colour11 -setw -g window-status-current-attr dim -setw -g window-status-bg green -setw -g window-status-fg black -setw -g window-status-attr reverse - -# Info on left (I don't have a session display for now) -set -g status-left '' - -# loud or quiet? -set-option -g visual-activity off -set-option -g visual-bell off -set-option -g visual-silence off -set-window-option -g monitor-activity off -set-option -g bell-action none - -set -g default-terminal "screen-256color" - -# The modes { -setw -g clock-mode-colour colour135 -setw -g mode-attr bold -setw -g mode-fg colour196 -setw -g mode-bg colour238 - -# } -# The panes { - -set -g pane-border-bg colour235 -# set -g pane-border-bg colour255 -set -g pane-border-fg colour238 -set -g pane-active-border-bg colour236 -# set -g pane-active-border-bg colour255 -set -g pane-active-border-fg colour51 -# set -g pane-active-border-fg colour2 - -# } -# The statusbar { - -set -g status-position bottom -set -g status-bg colour234 -# set -g status-bg colour253 -set -g status-fg colour137 -set -g status-attr dim -set -g status-left '' -set -g status-right '#[fg=colour233,bg=colour241,bold] %d/%m #[fg=colour233,bg=colour245,bold] %H:%M:%S ' -# set -g status-right '#[fg=colour233,bg=colour249,bold] %d/%m #[fg=colour233,bg=colour249,bold] %H:%M:%S ' -set -g status-right-length 50 -set -g status-left-length 20 - -setw -g window-status-current-fg colour81 -# setw -g window-status-current-fg colour50 -setw -g window-status-current-bg colour238 -# setw -g window-status-current-bg colour235 -setw -g window-status-current-attr bold -setw -g window-status-current-format ' #I#[fg=colour250]:#[fg=colour255]#W#[fg=colour50]#F ' -# setw -g window-status-current-format ' #I#[fg=colour250]:#[fg=colour255]#W#[fg=colour50]#F ' - +set -g mouse on -setw -g window-status-fg colour138 -# setw -g window-status-fg colour233 -setw -g window-status-bg colour235 -# setw -g window-status-bg colour249 -setw -g window-status-attr none -setw -g window-status-format ' #I#[fg=colour237]:#[fg=colour250]#W#[fg=colour244]#F ' -# setw -g window-status-format ' #I#[fg=colour233]:#[fg=colour238]#W#[fg=colour233]#F ' +set -g escape-time 0 -setw -g window-status-bell-attr bold -setw -g window-status-bell-fg colour255 -setw -g window-status-bell-bg colour1 +# don't rename windows automatically +set-option -g allow-rename off -# } -# The messages { -set -g message-attr bold -set -g message-fg colour232 -set -g message-bg colour166 +###################### +### DESIGN CHANGES ### +###################### -# } +set -g status-bg colour6 @@ -1,6 +1,4 @@ -set ts=4 -set sw=4 -" autocmd FileType make setlocal noexpandtab +" ============== KEY MAPPINGS let mapleader="," @@ -9,50 +7,12 @@ map <leader>m <Esc>:set expandtab ts=2 sw=2 sts=2<CR> map <leader>t <Esc>:set noexpandtab ts=4 sw=4 sts=4<CR> map <leader>T <Esc>:set expandtab ts=4 sw=4 sts=4<CR> -au FileType python setl sw=4 sts=4 et -au FileType html setl sw=2 sts=2 et -au FileType htmldjango setl sw=2 sts=2 et -au FileType json setl sw=2 sts=2 et -au FileType yaml setl sw=2 sts=2 et -au FileType css setl sw=4 sts=4 et -au FileType lua setl ts=4 sw=4 noet - " Folds: map <leader>f <Esc>:set fen fdn=3 fdm=indent fml=1 fdc=3<CR> " H-L for next-prev buffer -nnoremap L :bnext<CR> -nnoremap H :bprev<CR> - - -set hlsearch -syntax on -set bg=dark - -set mouse=a -set number -set relativenumber -filetype plugin indent on -set term=xterm-256color - -set cursorline -hi CursorLine cterm=bold ctermbg=0 -hi Folded ctermfg=2 ctermbg=0 -hi FoldColumn ctermfg=2 ctermbg=0 - -let g:sclangTerm = "urxvt -e" - -autocmd FileType tex setlocal spell spelllang=en -highlight SpellBad ctermfg=red ctermbg=none - -let NERDTreeIgnore=['\.o$', '\.cmo$', '\.cmx$', '\.cmi$', '\.lib$', '\.pyc$', '^__pycache__$'] - -set wildmode=list:longest - -au BufRead,BufNewFile *.make set filetype=make -au BufRead,BufNewFile *.md set filetype=markdown -au BufRead,BufNewFile *.lus set filetype=lustre -au BufRead,BufNewFile *.scade set filetype=scade +nnoremap <leader>l :bnext<CR> +nnoremap <leader>k :bprev<CR> " Append modeline after last line in buffer. @@ -67,6 +27,29 @@ endfunction nnoremap <silent> <Leader>ml :call AppendModeline()<CR> +" =================== OPTIONS + +filetype plugin indent on +set autoindent +set ts=4 sw=4 + +" Controls +set mouse=a +set nostartofline +set wildmode=list:longest + +" Display +highlight SpellBad ctermfg=red ctermbg=none +set bg=dark +set hlsearch +set incsearch +syntax on +set lazyredraw +set number +set relativenumber +set showcmd +set shortmess=a +set display+=lastline " indentation for long line wraps set wrap @@ -74,15 +57,36 @@ set linebreak set breakindent let &showbreak = '> ' -set display+=lastline +" set cursorline +" hi CursorLine cterm=bold ctermbg=0 +" hi Folded ctermfg=2 ctermbg=0 +" hi FoldColumn ctermfg=2 ctermbg=0 -" set completeopt=menuone,menu,longest,preview +let g:sclangTerm = "urxvt -e" +let NERDTreeIgnore=['\.o$', '\.cmo$', '\.cmx$', '\.cmi$', '\.lib$', '\.pyc$', '^__pycache__$'] -set directory=~/.vim/swp -set backupdir=~/.vim/backup +" set completeopt=menuone,menu,longest,preview set undofile +set directory=~/.vim/swp +set backupdir=~/.vim/backup set undodir=~/.vim/undo +" =========== FILE TYPE SPECIFIC +au BufRead,BufNewFile *.make set filetype=make +au BufRead,BufNewFile *.md set filetype=markdown +au BufRead,BufNewFile *.lus set filetype=lustre +au BufRead,BufNewFile *.scade set filetype=scade + +au FileType make setl noexpandtab +au FileType python setl sw=4 sts=4 et +au FileType html setl sw=2 sts=2 et +au FileType htmldjango setl sw=2 sts=2 et +au FileType json setl sw=2 sts=2 et +au FileType yaml setl sw=2 sts=2 et +au FileType css setl sw=4 sts=4 et +au FileType lua setl ts=4 sw=4 noet + +autocmd FileType tex setlocal spell spelllang=en |