4 files changed, 17 insertions, 11 deletions

diff --git a/snippets/lua_nvim_floating_window b/snippets/lua_nvim_floating_window
new file mode 100644
index 0000000..c37847d
--- /dev/null
+++ b/snippets/lua_nvim_floating_window
@@ -0,0 +1 @@
+vim.api.nvim_open_win(0, false, {relative='win', row=20, col=20, width=30, height=15})
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index c66e002..7cc2233 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 :let @f=&filetype<CR>:set filetype=<C-R>f
+noremap <leader><leader>ft :<C-\>e'set filetype='..&filetype<CR>
 
 " 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 :let @f=&foldmethod<CR>:set foldmethod=<C-R>f
+noremap <leader><leader>fm :<C-\>e'set foldmethod='..&foldmethod<CR>
 
 " Show fold level when it changes
 nnoremap zm zm:set foldlevel<CR>
diff --git a/vim/lua/mappings.lua b/vim/lua/mappings.lua
index ed4c72f..c417ea4 100644
--- a/vim/lua/mappings.lua
+++ b/vim/lua/mappings.lua
@@ -16,10 +16,6 @@ vim.keymap.set("n", "<Esc>", "<cmd>noh<CR>", { desc = "general clear highlights"
 -- map("n", "<leader>rn", "<cmd>set rnu!<CR>", { desc = "toggle relative number" })
 vim.keymap.set("n", "<leader>ch", "<cmd>NvCheatsheet<CR>", { desc = "toggle nvcheatsheet" })
 
-vim.keymap.set("n", "<leader>F", function()
-  require("conform").format { lsp_fallback = true }
-end, { desc = "format files" })
-
 -- global lsp mappings
 vim.keymap.set("n", "<leader>ds", vim.diagnostic.setloclist, { desc = "lsp diagnostic loclist" })
 
@@ -121,14 +117,19 @@ end, { desc = 'Search Directory' })
 -- map("t", "<C-x>", "<C-\\><C-N>", { desc = "terminal escape terminal mode" })
 
 -- new terminals
-vim.keymap.set("n", "<leader><leader>h", function() require("nvchad.term").new { pos = "sp" } end, { desc = "terminal new horizontal term" })
-vim.keymap.set("n", "<leader>v", function() require("nvchad.term").new { pos = "vsp" } end, { desc = "terminal new vertical window" })
+vim.keymap.set("n", "<leader><leader>h", function() require("nvchad.term").new { pos = "sp" } end,
+  { desc = "terminal new horizontal term" })
+vim.keymap.set("n", "<leader>v", function() require("nvchad.term").new { pos = "vsp" } end,
+  { desc = "terminal new vertical window" })
 -- toggleable
-vim.keymap.set({ "n", "t" }, "<A-v>", function() require("nvchad.term").toggle { pos = "vsp", id = "vtoggleTerm" } end, { desc = "terminal toggleable vertical term" })
+vim.keymap.set({ "n", "t" }, "<A-v>", function() require("nvchad.term").toggle { pos = "vsp", id = "vtoggleTerm" } end,
+  { desc = "terminal toggleable vertical term" })
 vim.keymap.set("t", "<C-x>", "<C-\\><C-N>", { desc = "terminal escape terminal mode" })
 vim.keymap.set({ "t" }, "<A-e>", "<C-\\><C-N><C-W>|<C-W>_i", { desc = "terminal toggleable vertical term" })
-vim.keymap.set({ "n", "t" }, "<A-t>", function() require("nvchad.term").toggle { pos = "sp", id = "htoggleTerm" } end, { desc = "terminal new horizontal term" })
-vim.keymap.set({ "n", "t" }, "<A-i>", function() require("nvchad.term").toggle { pos = "float", id = "floatTerm" } end, { desc = "terminal toggle floating term" })
+vim.keymap.set({ "n", "t" }, "<A-t>", function() require("nvchad.term").toggle { pos = "sp", id = "htoggleTerm" } end,
+  { desc = "terminal new horizontal term" })
+vim.keymap.set({ "n", "t" }, "<A-i>", function() require("nvchad.term").toggle { pos = "float", id = "floatTerm" } end,
+  { desc = "terminal toggle floating term" })
 vim.keymap.set("n", "<leader>th", "<cmd>Telescope themes<CR>", { desc = "telescope nvchad themes" })
 
 -- whichkey
diff --git a/vim/lua/plugins/init.lua b/vim/lua/plugins/init.lua
index e2c7c58..e510475 100644
--- a/vim/lua/plugins/init.lua
+++ b/vim/lua/plugins/init.lua
@@ -35,6 +35,10 @@ return {
     -- event = 'BufWritePre', -- uncomment for format on save
     config = function()
       require "configs.conform"
+
+      vim.keymap.set("n", "<leader>F", function()
+        require("conform").format { lsp_fallback = true }
+      end, { desc = "format files" })
     end,
   },