Remove Atom, add tmux-vim integration

.atom/config.cson

@@ -1,16 +0,0 @@
-"*":
-  "exception-reporting":
-    userId: "69378063-597c-7e9a-9aca-e1a0dd559698"
-  welcome:
-    showOnStartup: false
-  core: {}
-  "go-plus": {}
-  "go-playground": {}
-  "autocomplete-plus":
-    backspaceTriggersAutocomplete: true
-  "go-rename": {}
-  editor:
-    invisibles: {}
-    fontSize: 15
-  "vim-mode": {}
-  "vim-surround": {}

.atom/keymap.cson

@@ -1,16 +0,0 @@
-'atom-text-editor:not(mini).autocomplete-active':
-  'ctrl-p': 'core:move-up'
-  'ctrl-n': 'core:move-down'
-
-'.vim-mode.command-mode:not(.mini)':
-  'ctrl-f': 'core:page-down'
-  '/': 'find-and-replace:show'
-
-'atom-workspace':
-  'ctrl-o': 'last-cursor-position:previous'
-  'ctrl-i': 'last-cursor-position:next'
-  '': 'application:open-file'
-
-'atom-text-editor.vim-mode':
-  'ctrl-h': 'window:focus-pane-on-left'
-  'ctrl-l': 'window:focus-pane-on-right'

.i3/config

@@ -16,8 +16,7 @@ workspace 2 output DVI-I-1
 workspace 3 output DVI-I-1
 workspace 9 output DVI-I-1
 
-exec --no-startup-id i3-msg 'workspace 2; exec firefox'
-exec --no-startup-id i3-msg 'workspace 3; exec google-chrome'
+exec --no-startup-id i3-msg 'workspace 2; exec google-chrome'
 #exec --no-startup-id i3-msg 'workspace 9; exec virtualbox; exec gnome-terminal; workspace 2'
 exec --no-startup-id i3-msg 'workspace 1; exec gnome-terminal'
 exec --no-startup-id i3-msg 'exec workrave'

.tmux.conf

@@ -1,6 +1,7 @@
 set-option -g status on
 set-option -g status-interval 2
 set-option -g status-utf8 on
+set-option -g renumber-windows on
 set-option -g status-justify "centre"
 set-option -g status-left-length 60
 set-option -g status-right-length 90
@@ -19,6 +20,18 @@ set-option -g status-bg black #base02
 set-option -g status-fg yellow #yellow
 set-option -g status-attr default
 
+# vim/tmux navigation
+set -g focus-events on
+is_vim='echo "#{pane_current_command}" | grep -iqE "(^|\/)g?(view|n?vim?)(diff)?$"'
+bind -n C-Left if-shell "$is_vim" "send-keys C-h" "select-pane -L"
+bind -n C-Down if-shell "$is_vim" "send-keys C-j" "select-pane -D"
+bind -n C-Up if-shell "$is_vim" "send-keys C-k" "select-pane -U"
+bind -n C-Right if-shell "$is_vim" "send-keys C-l" "select-pane -R"
+
+# change windows
+bind -n S-Right next-window
+bind -n S-Left previous-window
+
 # default window title colors
 set-window-option -g window-status-fg brightblue #base0
 set-window-option -g window-status-bg default

.vimrc

@@ -29,9 +29,19 @@ NeoBundle 'godlygeek/tabular'
 NeoBundle 'Valloric/YouCompleteMe'
 NeoBundle 'tpope/vim-fugitive'
 NeoBundle 'airblade/vim-gitgutter'
-NeoBundle 'Raimondi/delimitMate'
 NeoBundle 'justinmk/vim-sneak'
 
+" JSON Support {{{1
+NeoBundle 'elzr/vim-json'
+let g:vim_json_syntax_conceal = 0
+
+" Tmux Integration {{{1
+NeoBundle 'christoomey/vim-tmux-navigator'
+nnoremap <silent> <C-Left> :TmuxNavigateLeft<cr>
+nnoremap <silent> <C-Down> :TmuxNavigateDown<cr>
+nnoremap <silent> <C-Up> :TmuxNavigateUp<cr>
+nnoremap <silent> <C-Right> :TmuxNavigateRight<cr>
+
 " Tab Completion {{{1
 NeoBundle 'ervandew/supertab'
 NeoBundle 'sirver/ultisnips'
@@ -53,11 +63,15 @@ NeoBundle 'altercation/vim-colors-solarized'
 NeoBundle 'majutsushi/tagbar'
 nnoremap <F8> :TagbarToggle<cr> " Toggle the tagbar
 
+" DelimitMate {{{1
+NeoBundle 'Raimondi/delimitMate'
+let delimitMate_expand_cr = 1
+
 " Nerdtree {{{1
 NeoBundle 'scrooloose/nerdtree'
 NeoBundle 'jistr/vim-nerdtree-tabs'
 "let g:nerdtree_tabs_open_on_console_startup=1
-nnoremap <F7> :NERDTreeTabsToggle<cr> " Toggle the NERDTree
+nnoremap <C-T> :NERDTreeTabsToggle<cr> " Toggle the NERDTree
 
 " Airline {{{1
 NeoBundle 'bling/vim-airline'
@@ -87,10 +101,10 @@ let g:go_auto_type_info = 0
 let g:go_fmt_command = "goimports"
 
 " Python Support {{{1
-NeoBundle 'klen/python-mode'
-au FileType python let g:pymode_doc_bind = "<Leader>gb"
-au FileType python let g:pymode_rope_goto_definition_bind = "<Leader>gd"
-au FileType python let g:pymode_folding = 0
+"NeoBundle 'klen/python-mode'
+"au FileType python let g:pymode_doc_bind = "<Leader>gb"
+"au FileType python let g:pymode_rope_goto_definition_bind = "<Leader>gd"
+"au FileType python let g:pymode_folding = 0
 
 " Ctrl+P {{{1
 NeoBundle 'kien/ctrlp.vim'
@@ -207,11 +221,6 @@ let g:clang_user_options='|| exit 0'
 
 cmap w!! w !sudo tee % >/dev/null
 
-" JSON Support
-nmap <leader>jt <Esc>:%!python -m json.tool<CR><Esc>:set filetype=json<CR>
-autocmd BufNewFile,BufRead *.json set ft=javascript
-
-
 " Instead of reverting the cursor to the last position in the buffer, we
 " set it to the first line when editing a git commit message
 au FileType gitcommit au! BufEnter COMMIT_EDITMSG call setpos('.', [0, 1, 1, 0])

install.sh

@@ -98,11 +98,6 @@ function performSetup() {
     linkFile ".i3status.conf"
     linkFile ".i3/config"
 
-    echo  "Linking atom..."
-    createDirectory ".atom"
-    linkFile ".atom/config.cson"
-    linkFile ".atom/keymap.cson"
-
     popd > /dev/null
 }