4 files changed, 13 insertions, 13 deletions

diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index 9128b8d..c66e002 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -261,7 +261,7 @@ noremap <leader>l :exe "buffer ".g:lastbuffer<CR>
 " noremap <Tab> :exe 'buffer '.g:lastbuffer<CR>
 
 " set filetype
-noremap <leader><leader>ft :set filetype=
+noremap <leader><leader>ft :let @f=&filetype<CR>:set filetype=<C-R>f
 
 " Let <leader>l toggle between this and the last accessed buffer
 augroup SaveLastBuffer
@@ -280,7 +280,7 @@ nnoremap <leader><leader>sb :windo set scrollbind!<CR>
 "----------------------------------------------------------------------
 
 " Set foldmethod
-noremap <leader><leader>fm :set foldmethod=
+noremap <leader><leader>fm :let @f=&foldmethod<CR>:set foldmethod=<C-R>f
 
 " Show fold level when it changes
 nnoremap zm zm:set foldlevel<CR>
diff --git a/vim/lua/configs/conform.lua b/vim/lua/configs/conform.lua
index b6fa6bb..b607d46 100644
--- a/vim/lua/configs/conform.lua
+++ b/vim/lua/configs/conform.lua
@@ -1,9 +1,9 @@
 local options = {
   formatters_by_ft = {
     lua = { "stylua" },
-    sh = {"shfmt"},
-    bash = {"shfmt"},
-    zsh = {"shfmt"},
+    sh = { "shfmt" },
+    bash = { "shfmt" },
+    zsh = { "shfmt" },
     markdown = { "prettier" },
     css = { "prettier" },
     html = { "prettier" },
diff --git a/vim/lua/mappings.lua b/vim/lua/mappings.lua
index 4ae28c1..ed4c72f 100644
--- a/vim/lua/mappings.lua
+++ b/vim/lua/mappings.lua
@@ -154,14 +154,6 @@ vim.keymap.set("n", "<leader>cc", function()
   end
 end, { desc = "blankline jump to current context" })
 
--- [[ Configure Obsidian.nvim ]]
-vim.keymap.set('n', "<leader>oo", ':Obsidian')
-vim.keymap.set('n', "<leader>ot", ':ObsidianTags<CR>')
-vim.keymap.set('n', "<leader>os", ':ObsidianSearch<CR>')
-vim.keymap.set('n', "<leader>oq", ':ObsidianQuickSwitch<CR>')
-vim.keymap.set('v', "<leader>on", ':ObsidianLinkNew<CR>')
-vim.keymap.set('n', "<leader>ol", ':ObsidianLinks<CR>')
-
 -- vim.cmd("let g:mkdp_browser = 'surf'")
 vim.cmd("let g:mkdp_browser = 'firefox'")
 vim.g.mkdp_preview_options = {
diff --git a/vim/lua/plugins/init.lua b/vim/lua/plugins/init.lua
index adcff9b..e2c7c58 100644
--- a/vim/lua/plugins/init.lua
+++ b/vim/lua/plugins/init.lua
@@ -152,6 +152,14 @@ return {
         substitutions = {},
       },
     },
+    config = function()
+      vim.keymap.set('n', "<leader>oo", ':Obsidian', { buffer = true })
+      vim.keymap.set('n', "<leader>ot", ':ObsidianTags<CR>', { buffer = true })
+      vim.keymap.set('n', "<leader>os", ':ObsidianSearch<CR>', { buffer = true })
+      vim.keymap.set('n', "<leader>oq", ':ObsidianQuickSwitch<CR>', { buffer = true })
+      vim.keymap.set('v', "<leader>on", ':ObsidianLinkNew<CR>', { buffer = true })
+      vim.keymap.set('n', "<leader>ol", ':ObsidianLinks<CR>', { buffer = true })
+    end
   },
 
   {