From 334890dcc5d42b4630e3f257e79d3eafd07ea887 Mon Sep 17 00:00:00 2001
From: Adrien Luxey <adrien.luxey@irisa.fr>
Date: Tue, 19 Feb 2019 18:19:23 +0100
Subject: [PATCH] cleanup tmux and vim conf files

---
 tmux.conf | 33 ++++++++++++++-------------------
 vimrc     | 51 ++++++++++++++++++++-------------------------------
 2 files changed, 34 insertions(+), 50 deletions(-)

diff --git a/tmux.conf b/tmux.conf
index 52c0f91..dd7a9e2 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -39,6 +39,20 @@ set -g @plugin 'tmux-plugins/tmux-yank'
 
 # There seems to be cool things to make Vim and Tmux play well together too
 
+
+#######################
+### Adrien's stuff  ###
+#######################
+
+# Make tmux display true colors
+set -g default-terminal "xterm-256color"
+set -ga terminal-overrides ",*256col*:Tc"
+
+# Remember my path when splitting windows
+bind % split-window -h -c '#{pane_current_path}'  # Split panes horizontally
+bind '"' split-window -v -c '#{pane_current_path}'  # Split panes vertically
+
+
 #####################
 ### Alex's stuff  ###
 #####################
@@ -88,24 +102,5 @@ set -g escape-time 0
 # don't rename windows automatically
 set-option -g allow-rename off
 
-
-######################
-### DESIGN CHANGES ###
-######################
-
-# set -g status-bg colour6
-
-
-##########################
-### Adrien's additions ###
-##########################
-
-set -g default-terminal "xterm-256color"
-set -ga terminal-overrides ",*256col*:Tc"
-
-# Remember my path when splitting windows
-bind % split-window -h -c '#{pane_current_path}'  # Split panes horizontally
-bind '"' split-window -v -c '#{pane_current_path}'  # Split panes vertically
-
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
 run -b '~/.tmux/plugins/tpm/tpm'
diff --git a/vimrc b/vimrc
index f6dbcec..ddf41eb 100644
--- a/vimrc
+++ b/vimrc
@@ -1,4 +1,7 @@
-" Vundle config
+"""""""""""""""""
+" Vundle config "
+"""""""""""""""""
+
 set nocompatible              " be iMproved, required
 filetype off                  " required
 
@@ -14,19 +17,13 @@ Plugin 'vim-airline/vim-airline-themes' " Airline themes
 " Themes
 " Plugin 'arcticicestudio/nord-vim'
 
-
-
-
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
 filetype plugin indent on    " required
 
-
-" I wanna suffer: disable arrow keys
-" noremap <Up> <NOP>
-" noremap <Down> <NOP>
-" noremap <Left> <NOP>
-" noremap <Right> <NOP>
+"""""""""""""""""""""
+" End Vundle config "
+"""""""""""""""""""""
 
 
 " Styling
@@ -36,20 +33,6 @@ colorscheme blues
 let g:airline_theme='minimalist' " The airline theme
 let g:airline_powerline_fonts=1 " Make airline use powerline fonts (pretty arrows)
 
-
-"if has('gui_running')
-"  set transparency=3
-  " fix js regex syntax
-"  set regexpengine=1
-"  syntax enable
-"endif
-" colorscheme solarized
-" let g:solarized_termtrans=1
-"let g:hybrid_use_Xresources = 1
-" let g:rehash256 = 1
-" set guifont=Inconsolata:h15
-" set guioptions-=L
-
 " Do not create swap files
 set nobackup
 set noswapfile
@@ -63,9 +46,16 @@ augroup numbertoggle
   autocmd BufLeave,FocusLost,InsertEnter   * set norelativenumber
 augroup END
 
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" From https://github.com/jessfraz/.vim/blob/master/vimrc "
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" You wanna suffer? Disable arrow keys
+" noremap <Up> <NOP>
+" noremap <Down> <NOP>
+" noremap <Left> <NOP>
+" noremap <Right> <NOP>
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Adapted from https://github.com/jessfraz/.vim/blob/master/vimrc "
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
 set splitright                  " Split vertical windows right to the current windows
 set splitbelow                  " Split horizontal windows below to the current windows
@@ -178,8 +168,7 @@ autocmd FileType gitconfig,sh,toml set noexpandtab
 autocmd BufNewFile,BufRead *.py setlocal tabstop=4 softtabstop=4 shiftwidth=4 textwidth=80 smarttab expandtab
 
 
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" / From https://github.com/jessfraz/.vim/blob/master/vimrc "
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" End https://github.com/jessfraz/.vim/blob/master/vimrc "
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""