4 files changed, 22 insertions, 32 deletions

diff --git a/.config/nvim/after/ftplugin/rust.vim b/.config/nvim/after/ftplugin/rust.vim
deleted file mode 100644
index fb601d1..0000000
--- a/.config/nvim/after/ftplugin/rust.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-setlocal tags=./rusty-tags.vi;/
-
-autocmd BufWritePost *.rs :silent! exec "!rusty-tags vi --quiet --start-dir=" . expand('%:p:h') . "&" | redraw!
diff --git a/.config/nvim/after/ftplugin/tex.lua b/.config/nvim/after/ftplugin/tex.lua
index 2a79358..2cd03a7 100644
--- a/.config/nvim/after/ftplugin/tex.lua
+++ b/.config/nvim/after/ftplugin/tex.lua
@@ -1,24 +1,29 @@
 require("nvim-surround").buffer_setup({
     surrounds = {
-        ["B"] = {
-            add = function()
-                return { { '\\textbf{' }, { '}' } }
-            end
+        ["K"] = {
+            add = { "\\textbf{", "}" },
+            find = "\\textbf%b{}",
+            delete = "^(\\textbf{)().-(})()$",
         },
         ["E"] = {
-            add = function()
-                return { { '\\emph{' }, { '}' } }
-            end
+            add = { "\\emph{", "}" },
+            find = "\\emph%b{}",
+            delete = "^(\\emph{)().-(})()$",
         },
         ["T"] = {
-            add = function()
-                return { { '\\texttt{' }, { '}' } }
-            end
+            add = { "\\texttt{", "}" },
+            find = "\\texttt%b{}",
+            delete = "^(\\texttt{)().-(})()$",
         },
         ['"'] = {
-            add = function()
-                return { { '\\enquote{' }, { '}' } }
-            end,
+            add = { "\\enquote{", "}" },
+            find = "\\enquote%b{}",
+            delete = "^(\\enquote{)().-(})()$",
+        },
+        ['P'] = {
+            add = { "\\paragraph{", "}" },
+            find = "\\paragraph%b{}",
+            delete = "^(\\paragraph{)().-(})()$",
         },
     }
 })
diff --git a/.config/nvim/after/plugin/autocmds.vim b/.config/nvim/after/plugin/autocmds.vim
index d249bef..21c7bc4 100644
--- a/.config/nvim/after/plugin/autocmds.vim
+++ b/.config/nvim/after/plugin/autocmds.vim
@@ -1,19 +1,7 @@
 " I don't know how to port this yet
 autocmd BufRead,BufWrite * if ! &bin | silent! %s/\s\+$//ge | endif
 
-autocmd BufNewFile,BufRead /tmp/neomutt* set noautoindent filetype=mail wm=0 tw=80
-
-augroup bukugroup
-  au! BufRead,BufNewFile,BufEnter buku-edit-* set filetype=buku
-augroup END
-
-" Restore last position
-autocmd BufReadPost *
-  \ if line("'\"") >= 1 && line("'\"") <= line("$") && &ft !~# 'commit'
-  \ |   exe "normal! g`\""
-  \ | endif
-
-augroup pkgbuild
+augroup vimwiki
     autocmd!
-    autocmd BufRead,BufNewFile PKGBUILD set filetype=PKGBUILD
+    autocmd BufRead,BufNewFile *.wiki set filetype=vimwiki
 augroup END
diff --git a/.config/nvim/after/plugin/functions.vim b/.config/nvim/after/plugin/functions.vim
index 87a1072..415ad51 100644
--- a/.config/nvim/after/plugin/functions.vim
+++ b/.config/nvim/after/plugin/functions.vim
@@ -11,10 +11,10 @@ function! CreatePaper(citekey)
     exe "e! " . fnameescape("~/nextcloud/personal_wiki/text/papers/" . a:citekey . ".wiki")
 
     let l:timestap="%date " . strftime("%F")
-    let l:text="= Came From =\n\n= Takeaways =\n\n= Might Go To =\n\n"
+    let l:title="%title "
 
     put! =l:timestap
-    put  =l:text
+    put  =l:title
 endfunction
 
 function! CreateReference(citekey)