From e1ef4f14fb46f0564e362cfa539c0ca8675c5853 Mon Sep 17 00:00:00 2001
From: The Magician <themagician@engineer.com>
Date: Sun, 10 Dec 2023 16:14:28 +0000
Subject: [PATCH] Make improvements to .vimrc

---
 vim/.vimrc | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/vim/.vimrc b/vim/.vimrc
index c31cfd1..33ff5a8 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -1,23 +1,53 @@
 set nocompatible
 
 if filereadable(expand('~/.vim/autoload/plug.vim'))
-  "let g:polyglot_disabled = ['markdown.plugin'] " Disable vim-polyglot's Markdown so we can use vim-pandoc instead
-
   call plug#begin('~/.local/share/vim/plugins')
+    " Syntax highlighting and language-specific rules
     Plug 'sheerun/vim-polyglot'
-    Plug 'vim-pandoc/vim-pandoc'
+
+    " Snippets
+    Plug 'SirVer/ultisnips'
     
+    " Web development
     Plug 'mattn/emmet-vim'
 
+    " Go programming
     Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries' }
 
+    " Zettelkasten support
     Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
     Plug 'junegunn/fzf.vim'
     Plug '~/code/zk.vim/'
   call plug#end()
 
-  autocmd BufEnter ~/dox/zettelkasten/* set filetype=markdown
+  " Ultisnips config
+  let g:UltiSnipsSnippetsDir='~/.local/share/ultisnips'
+  let g:UltiSnipsSnippetDirectories=['~/.local/share/ultisnips']
+  let g:UltiSnipsExpandTrigger="<tab>"
+  let g:UltiSnipsJumpForwardTrigger="<tab>"
+  let g:UltiSnipsJumpBackwardTrigger="<s-tab>"
+  let g:UltiSnipsEditSplit="context"
+else
+    " Make tab = 4 spaces if vim-polyglot can't be loaded
+    set tabstop=4
+    set softtabstop=4
+    set shiftwidth=4
 endif
 
+" Autocommands
+autocmd BufEnter ~/.local/share/zk/* set filetype=markdown
+
+" Enable line-numbering
 set number
 set relativenumber
+
+" Use swap directory instead of cluttering source directories with swapfiles
+set directory^=$HOME/.vim/swap//
+
+" Use system clipboard by default
+set clipboard=unnamedplus
+
+" Make file searching better
+set wildmenu
+set wildmode=list:full
+set path+=**