Merge remote-tracking branch 'Jidbo/master'

.vim/snipps/markdown.snippets

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

.vim/snipps/tex.snippets

@@ -38,6 +38,14 @@ snippet sum "Sum character"
 \sum_\{${1:lower}\}^\{${2:upper}\} $0
 endsnippet
 
+snippet int "integral character"
+\int_\{${1:lower}\}^\{${2:upper}\} $0
+endsnippet
+
+snippet dx "dx sign" i
+\mathrm{d}x$0
+endsnippet
+
 snippet ^ "Superscript" i
 ^{$1}$0
 endsnippet
@@ -60,6 +68,12 @@ snippet beg "Begin"
 \end{$1}
 endsnippet
 
+snippet ali "align"
+\begin{align*}
+	$0
+\end{align*}
+endsnippet
+
 snippet sec "Section"
 \section{$1}
 $0
@@ -70,10 +84,14 @@ snippet secs "Subsection"
 $0
 endsnippet
 
-snippet fat "Emphasize Text"
+snippet emp "Emphasize Text"
 \emph{$1}$0
 endsnippet
 
+snippet fat "Fat Print Text"
+\textbf{$1}$0
+endsnippet
+
 snippet secss "Subsubsection"
 \subsubsection{$1}
 $0
@@ -99,3 +117,21 @@ $0
 
 \end{document}
 endsnippet
+
+# Sqeuenzkalküle
+
+snippet axi "Axiome"
+\AxiomC{\$ $1 \$}$0
+endsnippet
+
+snippet rla "Right Label"
+\RightLabel{\$ $1 \$}$0
+endsnippet
+
+snippet uin "Unary Inf"
+\UnaryInfC{\$ $1 \$}$0
+endsnippet
+
+snippet bin "Binary Inf"
+\BinaryInfC{\$ $1 \$}$0
+endsnippet

.vimrc

@@ -6,7 +6,7 @@ set rtp+=~/.vim/bundle/Vundle.vim
 call vundle#begin()
 
 " let Vundle manage Vundle, required
-Plugin 'gmarik/Vundle.vim'
+Plugin 'VundleVim/Vundle.vim'
 
 " add all your plugins here (note older versions of Vundle
 " used Bundle instead of Plugin)
@@ -54,6 +54,9 @@ Plugin 'vim-airline/vim-airline-themes'
 " vim ale for interaction with language servers
 Plugin 'w0rp/ale'
 
+" editorconfig plugin
+Plugin 'editorconfig/editorconfig-vim'
+
 " language packs
 Plugin 'sheerun/vim-polyglot'
 
@@ -140,11 +143,13 @@ noremap <Down> <Nop>
 noremap <Left> <Nop>
 noremap <Right> <Nop>
 
-" html css js indents
+" auto expand brackets
-au BufNewFile,BufRead *.js, *.html, *.css
+inoremap (; (<CR>)<C-c>O
-	\ set tabstop=4 |
+inoremap (, (<CR>),<C-c>O
-	\ set softtabstop=4 |
+inoremap {; {<CR>}<C-c>O
-	\ set shiftwidth=4
+inoremap {, {<CR>},<C-c>O
+inoremap [; [<CR>]<C-c>O
+inoremap [, [<CR>],<C-c>O
 
 " Delete buffer while keeping window layout (don't close buffer's windows).
 " Version 2008-11-18 from http://vim.wikia.com/wiki/VimTip165
@@ -253,7 +258,7 @@ augroup VimDiff
 augroup END
 
 " fzf setup
-nmap <C-z> :Buffers<CR>
+nmap <C-y> :Buffers<CR>
 nmap <Leader>f :Files<CR>
 let g:fzf_buffers_jump = 1
 

tmux.conf

@@ -54,6 +54,9 @@ set -g window-status-current-format "#[fg=colour8]#[bg=colour1]#[fg=colour7]#
 # normal window status
 set -g window-status-format "#[fg=colour244]#[bg=colour8]#I #[fg=colour240] #W"
 
+# escape time
+set-option -sg escape-time 10
+
 # COLOURS
 #colour0 (black)
 #colour1 (red)