From 57b4f7048ff3fd34688b79d32266840b203ca09b Mon Sep 17 00:00:00 2001
From: Max Bucknell <me@maxbucknell.com>
Date: Sun, 19 Jan 2025 11:41:20 +0000
Subject: [PATCH] Vim config updates

---
 vim/vim.xdg.symlink/Ultisnips/vim.snippets |  5 +++++
 vim/vim.xdg.symlink/vimrc                  | 19 ++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 vim/vim.xdg.symlink/Ultisnips/vim.snippets

diff --git a/vim/vim.xdg.symlink/Ultisnips/vim.snippets b/vim/vim.xdg.symlink/Ultisnips/vim.snippets
new file mode 100644
index 0000000..4b3c1f2
--- /dev/null
+++ b/vim/vim.xdg.symlink/Ultisnips/vim.snippets
@@ -0,0 +1,5 @@
+snippet gdef "Default global variable"
+if !exists("g:${1:...}")
+    g:$1 = $2
+endif$0
+endsnippet
diff --git a/vim/vim.xdg.symlink/vimrc b/vim/vim.xdg.symlink/vimrc
index 4ecce93..32adba9 100644
--- a/vim/vim.xdg.symlink/vimrc
+++ b/vim/vim.xdg.symlink/vimrc
@@ -115,34 +115,33 @@ matchadd('ColorColumn', '\%82v', 100)
 
 # Mappings etc
 g:mapleader = "\<space>"
-g:localmapleader = "\\"
+g:maplocalleader = ","
 
 # Use jk to escape back to normal
 inoremap jk <esc>
 inoremap <esc> <nop>
 
 # Hide search highlights
-nnoremap <esc> :noh<cr>
-nnoremap <leader>/ :noh<cr>
+nnoremap <bs> :noh<cr>
 
 # Switch between recent buffers
 nnoremap <leader><leader> <c-^>
 
-# Fix shift-semicolon to write
+# Fix shift-semicolon to colon
 noremap ; :
 
-# Make it easier to use registers
-nnoremap ' "
-
 # I should map these to something useful
 inoremap <up> <nop>
 inoremap <down> <nop>
 inoremap <left> <nop>
 inoremap <right> <nop>
+
 noremap <up> <nop>
 noremap <down> <nop>
-noremap <left> <nop>
-noremap <right> <nop>
+
+# Update almost a decade later: I mapped these to something useful!
+noremap <left> :cprev<cr>
+noremap <right> :cnext<cr>
 
 # Case control
 nnoremap <leader>u viwU
@@ -240,6 +239,8 @@ augroup END
 # Use tab for UltiSnips expansion, navigation, and 
 g:ulti_expand_or_jump_res = 0
 g:UltiSnipsExpandOrJumpTrigger = '<tab>'
+g:UltiSnipsSnippetStorageDirectoryForUltiSnipsEdit = $DOTFILES_PATH .. "/vim/vim.xdg.symlink/Ultisnips"
+
 
 def g:Ultisnips_expand(default: string): string
     UltiSnips#ExpandSnippetOrJump()