1 files changed, 34 insertions, 15 deletions

diff --git a/dotfiles/vim.lua b/dotfiles/vim.lua
index d380ec0..39e4d11 100644
--- a/dotfiles/vim.lua
+++ b/dotfiles/vim.lua
@@ -73,12 +73,18 @@ vim.cmd "colorscheme gruvbox"
 -- Mappings
 -----------
 
-local map = vim.api.nvim_set_keymap
 local mapopts = { noremap = true, silent = true }
 
 vim.fn["camelcasemotion#CreateMotionMappings"] "<LocalLeader>"
 
-map("n", "=of", [[:set <C-R>=(&formatoptions =~ "a") ? 'formatoptions-=a' : 'formatoptions+=a'<CR><CR>]], mapopts)
+vim.keymap.set("n", "yof", function()
+        if vim.bo.formatoptions:match "a" then
+                vim.bo.formatoptions = vim.bo.format:gsub("a", "")
+        else
+                vim.bo.formatoptions = vim.bo.format .. "a"
+        end
+        print(":setlocal formatoptions=" .. vim.bo.formatoptions)
+end, mapopts)
 
 -- Plugins
 ----------
@@ -274,14 +280,17 @@ require("telescope").setup {
 require("telescope").load_extension "file_browser"
 require("telescope").load_extension "ui-select"
 
-map("n", "<leader>fb", "<cmd>Telescope buffers<cr>", mapopts)
-map("n", "<leader>ff", "<cmd>Telescope find_files<cr>", mapopts)
-map("n", "<leader>fg", "<cmd>Telescope live_grep<cr>", mapopts)
-map("n", "<leader>fh", "<cmd>Telescope help_tags<cr>", mapopts)
-map("n", "<leader>fo", "<cmd>Telescope oldfiles<cr>", mapopts)
-map("n", "<leader>fs", "<cmd>Telescope spell_suggest<cr>", mapopts)
-map("n", "<leader>ft", "<cmd>Telescope treesitter<cr>", mapopts)
-map("n", "-", "<cmd>lua require('telescope').extensions.file_browser.file_browser()<cr>", mapopts)
+telescope_builtin = require "telescope.builtin"
+telescope_extensions = require("telescope").extensions
+
+vim.keymap.set("n", "<leader>fb", telescope_builtin.buffers, mapopts)
+vim.keymap.set("n", "<leader>ff", telescope_builtin.find_files, mapopts)
+vim.keymap.set("n", "<leader>fg", telescope_builtin.live_grep, mapopts)
+vim.keymap.set("n", "<leader>fh", telescope_builtin.help_tags, mapopts)
+vim.keymap.set("n", "<leader>fo", telescope_builtin.oldfiles, mapopts)
+vim.keymap.set("n", "<leader>fs", telescope_builtin.spell_suggest, mapopts)
+vim.keymap.set("n", "<leader>ft", telescope_builtin.treesitter, mapopts)
+vim.keymap.set("n", "-", telescope_extensions.file_browser.file_browser, mapopts)
 
 -- Lualine
 
@@ -304,11 +313,21 @@ require("lualine").setup {
 
 -- VSnip
 
-map("i", "<Tab>", "vsnip#jumpable(1) ? '<Plug>(vsnip-jump-next)' : '<Tab>'", { silent = true, expr = true })
-map("s", "<Tab>", "vsnip#jumpable(1) ? '<Plug>(vsnip-jump-next)' : '<Tab>'", { silent = true, expr = true })
-
-map("i", "<S-Tab>", "vsnip#jumpable(-1) ? '<Plug>(vsnip-jump-prev)' : '<Tab>'", { silent = true, expr = true })
-map("s", "<S-Tab>", "vsnip#jumpable(-1) ? '<Plug>(vsnip-jump-prev)' : '<Tab>'", { silent = true, expr = true })
+vim.keymap.set("i", "<Tab>", "vsnip#jumpable(1) ? '<Plug>(vsnip-jump-next)' : '<Tab>'", { silent = true, expr = true })
+vim.keymap.set("s", "<Tab>", "vsnip#jumpable(1) ? '<Plug>(vsnip-jump-next)' : '<Tab>'", { silent = true, expr = true })
+
+vim.keymap.set(
+        "i",
+        "<S-Tab>",
+        "vsnip#jumpable(-1) ? '<Plug>(vsnip-jump-prev)' : '<Tab>'",
+        { silent = true, expr = true }
+)
+vim.keymap.set(
+        "s",
+        "<S-Tab>",
+        "vsnip#jumpable(-1) ? '<Plug>(vsnip-jump-prev)' : '<Tab>'",
+        { silent = true, expr = true }
+)
 
 -- OSCyank