Merge remote-tracking branch 'Jidbo/master'

.vim/snipps/blade.snippets

@@ -0,0 +1,21 @@
+extends php, html
+snippet var "Display Variable"
+{{ $1 }} $0
+endsnippet
+
+snippet each "For Each Loop"
+@foreach ($1 as $2)
+	$0
+@endforeach
+endsnippet
+
+snippet sec "Section"
+@section('$1')
+$0
+@endsection
+endsnippet
+
+snippet ext "extends statement"
+@extends('$1')
+$0
+endsnippet

.vim/snipps/css.snippets

@@ -0,0 +1,5 @@
+snippet id "rule for id"
+#$1 {
+	$0
+}
+endsnippet

.vim/snipps/html.snippets

@@ -0,0 +1,26 @@
+extends css
+snippet div "Div container"
+<div class="$1">
+	$0
+</div>
+endsnippet
+
+snippet tag "generic Element"
+<${1:tag}${2: class="$3"}>
+	$0
+</$1>
+endsnippet
+
+snippet tagi "generic inline Element"
+<${1:tag}${2: class="$3"}>$4</$1>$0
+endsnippet
+
+snippet com "Comment"
+<!-- $1 -->$0
+endsnippet
+
+snippet lin "link element"
+<a href="$1"${2: class="$3"}>
+	$0
+</a>
+endsnippet

.vim/snipps/liquid.snippets

@@ -0,0 +1 @@
+extends markdown

.vim/snipps/markdown.snippets

@@ -0,0 +1,4 @@
+extends html
+snippet ref "Markdown Link"
+[$1]({${2:https://$3}${4: "$5"})$0
+endsnippet

.vim/snipps/markwdown.snippets

@@ -0,0 +1,4 @@
+extends html
+snippet ref "Markdown Link"
+[$1]({${2:https://$3}${4: "$5"})$0
+endsnippet

.vim/snipps/php.snippets

@@ -0,0 +1,13 @@
+extends html
+snippet pubf "Public Function"
+public function $1($2) {
+	$0
+}
+endsnippet
+
+snippet prif "Private Function"
+private function $1($2) {
+	$0
+}
+endsnippet
+

.vim/snipps/plaintex.snippets

@@ -0,0 +1 @@
+extends tex

.vim/snipps/tex.snippets

@@ -0,0 +1,101 @@
+snippet s "symbol"
+\\$0
+endsnippet
+
+snippet mb "Math Braces"
+\\{ $1 \\}$0
+endsnippet
+
+snippet mal "Math inline"
+$ $1 $$0
+endsnippet
+
+snippet mab "Mathbb character"
+\mathbb{$1}$0
+endsnippet
+
+snippet inf "Infity symbol" i
+\infty
+endsnippet
+
+snippet sqrt "Square Root" i
+\\sqrt\{$1\}$0
+endsnippet
+
+snippet lim "Limit sign" i
+\\lim_\{${1:n} \to ${2:\\infty}\} $0
+endsnippet
+
+snippet abs "Absolute" i
+\\lvert $1 \\rvert$0
+endsnippet
+
+snippet fra "Fraction" i
+\frac\{${1:numerator}\}\{${2:demoninator}\}$0
+endsnippet
+
+snippet sum "Sum character"
+\sum_\{${1:lower}\}^\{${2:upper}\} $0
+endsnippet
+
+snippet ^ "Superscript" i
+^{$1}$0
+endsnippet
+
+snippet _ "Superlowscript" i
+_{$1}$0
+endsnippet
+
+snippet ove "Overline"
+\overline{$1}$0
+endsnippet
+
+snippet ma "Math in own line"
+\[ $1 \]$0
+endsnippet
+
+snippet beg "Begin"
+\begin{$1}
+	$0
+\end{$1}
+endsnippet
+
+snippet sec "Section"
+\section{$1}
+$0
+endsnippet
+
+snippet secs "Subsection"
+\subsection{$1}
+$0
+endsnippet
+
+snippet fat "Emphasize Text"
+\emph{$1}$0
+endsnippet
+
+snippet secss "Subsubsection"
+\subsubsection{$1}
+$0
+endsnippet
+
+snippet doc "Basic Document"
+\documentclass[11pt,a4paper]{article}
+\usepackage[utf8]{inputenc}
+\usepackage[german]{babel}
+\usepackage[T1]{fontenc}
+\usepackage{amsmath}
+\usepackage{amsfonts}
+\usepackage{amssymb}
+\usepackage{enumitem}
+\usepackage[left=3cm,right=3cm,top=2cm,bottom=2cm]{geometry}
+\author{${1:author}}
+\title{${2:title}}
+\begin{document}
+
+\maketitle
+
+$0
+
+\end{document}
+endsnippet

.vim/snipps/vim.snippets

@@ -0,0 +1,4 @@
+snippet plug "Plugin Snippet"
+" $1
+Plugin '$0'
+endsnippet

.vimrc

@@ -15,8 +15,11 @@ Plugin 'gmarik/Vundle.vim'
 " comment plugin
 Plugin 'tpope/vim-commentary'
 
-" close xml/html tags
-Plugin 'docunext/closetag.vim'
+" brackets management
+Plugin 'machakann/vim-sandwich'
+
+" snippets
+Plugin 'SirVer/ultisnips'
 
 " WINDOW MANAGEMENT
 " tmux navigator
@@ -78,6 +81,7 @@ set wildmenu
 set term=screen-256color
 set autoread
 set lazyredraw
+set history=250
 
 " tabs and line wrap
 set tabstop=4
@@ -118,6 +122,10 @@ nnoremap <leader>g za
 " auto reload .vimrc on write
 autocmd BufWritePost .vimrc source %
 
+" ex command 
+cnoremap <C-p> <Up>
+cnoremap <C-n> <Down>
+
 " toggle hybrid number mode
 nnoremap <leader>h :set rnu!<CR>
 :augroup numbertoggle
@@ -239,8 +247,6 @@ let g:gitgutter_sign_added = '∙'
 let g:gitgutter_sign_modified = '∙'
 let g:gitgutter_sign_removed = '∙'
 let g:gitgutter_sign_modified_removed = '∙'
-nmap ]g :GitGutterNextHunk<CR>
-nmap [g :GitGutterPrevHunk<CR>
 augroup VimDiff
 	autocmd!
 	autocmd VimEnter,FilterWritePre * if &diff | GitGutterDisable | endif
@@ -264,3 +270,13 @@ nmap <Leader>b :ALEFix<CR>
 nnoremap <space>l :lnext<CR>
 nnoremap <space>p :lprevious<CR>
 
+" UltiSnip setup
+
+" Trigger configuration
+let g:UltiSnipsExpandTrigger="<tab>"
+let g:UltiSnipsJumpForwardTrigger="<tab>"
+let g:UltiSnipsJumpBackwardTrigger="<C-tab>"
+
+" If you want :UltiSnipsEdit to split your window.
+let g:UltiSnipsEditSplit="vertical"
+let g:UltiSnipsSnippetDirectories=[$HOME."/.vim/snipps"]

tmux.conf

@@ -14,32 +14,25 @@ bind-key -T copy-mode-vi C-k select-pane -U
 bind-key -T copy-mode-vi C-l select-pane -R
 
 # default statusbar colors
-set-option -g status-bg black #base02
-set-option -g status-fg yellow #yellow
-set-option -g status-attr default
+set-option -g status-bg black
 
-# default window title colors
-set-window-option -g window-status-fg brightblue #base0
-set-window-option -g window-status-bg default
-#set-window-option -g window-status-attr dim
-
-# active window title colors
-set-window-option -g window-status-current-fg brightred #orange
-set-window-option -g window-status-current-bg default
-#set-window-option -g window-status-current-attr bright
-
-# pane border
-set-option -g pane-border-fg black #base02
-set-option -g pane-active-border-fg brightgreen #base01
-
-# message text
-set-option -g message-bg black #base02
-set-option -g message-fg brightred #orange
+# reload tmux.conf with <prefix>-r
+unbind r
+bind r \
+	source-file ~/.tmux.conf \;\
+	display 'Reloaded tmux config'
 
 # pane number display
 set-option -g display-panes-active-colour blue #blue
 set-option -g display-panes-colour brightred #orange
 
+# start numbering at 1
+set -g base-index 1
+set -g pane-base-index 1
+
+# renew statusline every 10 seconds
+set -g status-interval 10
+
 # clock
 set-window-option -g clock-mode-colour green #green
 
@@ -48,3 +41,23 @@ set-window-option -g window-status-bell-style fg=black,bg=red #base02, red
 
 # term color
 set -g default-terminal "screen-256color"
+
+# right status
+set -g status-right '#[fg=colour3]#[fg=colour1]#[bg=colour1]#[fg=colour7] %H:%M %d-%b '
+
+# left status
+set -g status-left '#[bg=colour1]#[fg=colour0]#{?client_prefix,#[bg=colour2],} ❐ #[bg=colour8]#[fg=colour1]#{?client_prefix,#[fg=colour2],}#{?window_zoomed_flag, 🔍 ,}#[fg=colour1] '
+
+# current window status
+set -g window-status-current-format "#[fg=colour8]#[bg=colour1]#[fg=colour7]#[bg=colour1] #I #[fg=colour7] #W #[fg=colour1]#[bg=colour8]"
+
+# normal window status
+set -g window-status-format "#[fg=colour244]#[bg=colour8]#I #[fg=colour240] #W"
+
+# COLOURS
+#colour0 (black)
+#colour1 (red)
+#colour2 (green)
+#colour3 (yellow)
+#colour4 (blue)
+#colour7 (white)