diff options
-rw-r--r-- | vim/init/keymaps.vim | 4 | ||||
-rw-r--r-- | vim/lua/configs/conform.lua | 6 | ||||
-rw-r--r-- | vim/lua/mappings.lua | 8 | ||||
-rw-r--r-- | vim/lua/plugins/init.lua | 8 |
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> | |||
261 | " noremap <Tab> :exe 'buffer '.g:lastbuffer<CR> | 261 | " noremap <Tab> :exe 'buffer '.g:lastbuffer<CR> |
262 | 262 | ||
263 | " set filetype | 263 | " set filetype |
264 | noremap <leader><leader>ft :set filetype= | 264 | noremap <leader><leader>ft :let @f=&filetype<CR>:set filetype=<C-R>f |
265 | 265 | ||
266 | " Let <leader>l toggle between this and the last accessed buffer | 266 | " Let <leader>l toggle between this and the last accessed buffer |
267 | augroup SaveLastBuffer | 267 | augroup SaveLastBuffer |
@@ -280,7 +280,7 @@ nnoremap <leader><leader>sb :windo set scrollbind!<CR> | |||
280 | "---------------------------------------------------------------------- | 280 | "---------------------------------------------------------------------- |
281 | 281 | ||
282 | " Set foldmethod | 282 | " Set foldmethod |
283 | noremap <leader><leader>fm :set foldmethod= | 283 | noremap <leader><leader>fm :let @f=&foldmethod<CR>:set foldmethod=<C-R>f |
284 | 284 | ||
285 | " Show fold level when it changes | 285 | " Show fold level when it changes |
286 | nnoremap zm zm:set foldlevel<CR> | 286 | 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 @@ | |||
1 | local options = { | 1 | local options = { |
2 | formatters_by_ft = { | 2 | formatters_by_ft = { |
3 | lua = { "stylua" }, | 3 | lua = { "stylua" }, |
4 | sh = {"shfmt"}, | 4 | sh = { "shfmt" }, |
5 | bash = {"shfmt"}, | 5 | bash = { "shfmt" }, |
6 | zsh = {"shfmt"}, | 6 | zsh = { "shfmt" }, |
7 | markdown = { "prettier" }, | 7 | markdown = { "prettier" }, |
8 | css = { "prettier" }, | 8 | css = { "prettier" }, |
9 | html = { "prettier" }, | 9 | 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() | |||
154 | end | 154 | end |
155 | end, { desc = "blankline jump to current context" }) | 155 | end, { desc = "blankline jump to current context" }) |
156 | 156 | ||
157 | -- [[ Configure Obsidian.nvim ]] | ||
158 | vim.keymap.set('n', "<leader>oo", ':Obsidian') | ||
159 | vim.keymap.set('n', "<leader>ot", ':ObsidianTags<CR>') | ||
160 | vim.keymap.set('n', "<leader>os", ':ObsidianSearch<CR>') | ||
161 | vim.keymap.set('n', "<leader>oq", ':ObsidianQuickSwitch<CR>') | ||
162 | vim.keymap.set('v', "<leader>on", ':ObsidianLinkNew<CR>') | ||
163 | vim.keymap.set('n', "<leader>ol", ':ObsidianLinks<CR>') | ||
164 | |||
165 | -- vim.cmd("let g:mkdp_browser = 'surf'") | 157 | -- vim.cmd("let g:mkdp_browser = 'surf'") |
166 | vim.cmd("let g:mkdp_browser = 'firefox'") | 158 | vim.cmd("let g:mkdp_browser = 'firefox'") |
167 | vim.g.mkdp_preview_options = { | 159 | 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 { | |||
152 | substitutions = {}, | 152 | substitutions = {}, |
153 | }, | 153 | }, |
154 | }, | 154 | }, |
155 | config = function() | ||
156 | vim.keymap.set('n', "<leader>oo", ':Obsidian', { buffer = true }) | ||
157 | vim.keymap.set('n', "<leader>ot", ':ObsidianTags<CR>', { buffer = true }) | ||
158 | vim.keymap.set('n', "<leader>os", ':ObsidianSearch<CR>', { buffer = true }) | ||
159 | vim.keymap.set('n', "<leader>oq", ':ObsidianQuickSwitch<CR>', { buffer = true }) | ||
160 | vim.keymap.set('v', "<leader>on", ':ObsidianLinkNew<CR>', { buffer = true }) | ||
161 | vim.keymap.set('n', "<leader>ol", ':ObsidianLinks<CR>', { buffer = true }) | ||
162 | end | ||
155 | }, | 163 | }, |
156 | 164 | ||
157 | { | 165 | { |