Merge branch 'master' of github.com:bixel/dotfiles

.gitmodules

@@ -6,7 +6,7 @@
 	url = https://github.com/junegunn/vim-plug.git
 [submodule "external/prezto"]
 	path = external/prezto
-	url = git@github.com:bixel/prezto.git
+	url = git@github.com:sorin-ionescu/prezto.git
 [submodule "external/tpm"]
 	path = external/tpm
 	url = https://github.com/tmux-plugins/tpm.git

external/prezto

@@ -1 +1 @@
-Subproject commit 282b478fd2eb6658c063d4f32b9856201e5b886c
+Subproject commit 1f4601e44c989b90dc7314b151891fa60a101251

nvim/UltiSnips/tex.snippets

@@ -39,20 +39,49 @@ snippet img
 \end{figure}
 endsnippet
 
+# PGF-Image
+snippet pgf
+\begin{figure}
+	\centering
+	\input{${1}}
+	\caption{${3}}
+	\label{fig:${4}}
+\end{figure}
+endsnippet
+
 # Subimages
 snippet subimg
 \begin{figure}
 	\centering
-    \begin{subfigure}{0.49\linewidth}
-        \includegraphics[width=1\linewidth]{${1}}
-        \caption{${3}}
-        \label{fig:${5}-1}
-    \end{subfigure}
-    \begin{subfigure}{0.49\linewidth}
-        \includegraphics[width=1\linewidth]{${2}}
-        \caption{${4}}
-        \label{fig:${5}-2}
-    \end{subfigure}
+	\begin{subfigure}{0.49\linewidth}
+		\includegraphics[width=1\linewidth]{${1}}
+		\caption{${3}}
+		\label{fig:${5}_1}
+	\end{subfigure}
+	\begin{subfigure}{0.49\linewidth}
+		\includegraphics[width=1\linewidth]{${2}}
+		\caption{${4}}
+		\label{fig:${5}_2}
+	\end{subfigure}
+	\caption{${3}}
+	\label{fig:${5}}
+\end{figure}
+endsnippet
+
+# Subimages of PGF Images
+snippet subpgf
+\begin{figure}
+	\centering
+	\begin{subfigure}{0.49\linewidth}
+		\input{${1}}
+		\caption{${3}}
+		\label{fig:${5}_1}
+	\end{subfigure}
+	\begin{subfigure}{0.49\linewidth}
+		\input{${2}}
+		\caption{${4}}
+		\label{fig:${5}_2}
+	\end{subfigure}
 	\caption{${3}}
 	\label{fig:${5}}
 \end{figure}

nvim/after/ftplugin/go.vim

@@ -0,0 +1,2 @@
+set listchars=tab:\ \ ,trail:~
+set list

nvimrc

@@ -40,6 +40,7 @@ Plug 'apple/swift', { 'rtp': 'utils/vim' }
 Plug 'https://bitbucket.org/johanneskoester/snakemake.git', {'rtp': 'misc/vim/'}
 Plug 'junegunn/vim-easy-align'
 Plug 'glench/vim-jinja2-syntax'
+Plug 'fatih/vim-go'
 
 " All of your Plugins must be added before the following line
 call plug#end()  " required
@@ -222,4 +223,7 @@ au BufNewFile,BufRead *.rules set syntax=snakemake
 au BufNewFile,BufRead *.snakefile set syntax=snakemake
 au BufNewFile,BufRead *.snake set syntax=snakemake
 
+" golang
+let g:go_fmt_command = "goimports"
+
 source $HOME/.config/nvim/local.vimrc

zpreztorc

@@ -18,9 +18,9 @@ zstyle ':prezto:load' pmodule \
   'spectrum' \
   'utility' \
   'completion' \
+  'syntax-highlighting' \
   'prompt' \
   'git' \
-  'syntax-highlighting' \
   'history-substring-search' \
   'archive'
 
@@ -65,3 +65,9 @@ zstyle ':prezto:module:syntax-highlighting' highlighters \
   'pattern' \
   'cursor' \
   'root'
+
+declare -a X_ZSH_HIGHLIGHT_DIRS_BLACKLIST
+X_ZSH_HIGHLIGHT_DIRS_BLACKLIST=(
+    "/net"
+    "/eos"
+)

zshrc

@@ -16,6 +16,8 @@ fi
 
 ### U S E R  C O N F I G ###
 
+export PATH="$HOME/go/bin:$PATH"
+
 # random string function
 random-string()
 {