nvim: nvim-ufo, bunch of fixes

2 files changed, 59 insertions, 57 deletions

diff --git a/.config/nvim/lua/core/keymaps.lua b/.config/nvim/lua/core/keymaps.lua
index b63156d..95e5fcd 100644
--- a/.config/nvim/lua/core/keymaps.lua
+++ b/.config/nvim/lua/core/keymaps.lua
@@ -12,12 +12,11 @@ map("c", "w!!", 'execute "silent! write !sudo tee % >/dev/null" <bar> edit!<CR>'
 map("n", "Q", "gq", "format lines")
 
 -- set formatprg to sentences, for prose
--- TODO: can we do this with vim.o.formatprg?
-map("n", "<Leader>fp", "<cmd>set formatprg=~/.local/bin/sentences<CR>", "switch to sentences view", { silent = false })
+map("n", "<Leader>fp", ":set formatprg=~/.local/bin/sentences<CR>", "switch to sentences formatprg", { silent = false })
 
 -- replace all is aliased to S.
-map("n", "S", ":s//g<Left><Left>", "replace all", { silent = false })
-map("v", "S", ":s//g<Left><Left>", "replace all selection", { silent = false })
+map("n", "<leader>S", ":%s//g<Left><Left>", "replace all", { silent = false })
+map("v", "<leader>S", ":s//g<Left><Left>", "replace all", { silent = false })
 
 -- jump to buffer
 map("n", "<Leader>b", "<cmd>ls<cr>:b<space>", "jump to buffer")
@@ -42,16 +41,16 @@ map("n", "<Leader>cd", "<cmd>lcd %:p:h<CR>:pwd<CR>", "cd to current buffer's pwd
 
 -- call CreatePaper on word below cursor
 map("n", "<leader>np", 'gewi[[/papers/<ESC>Ea]]<ESC>bb:call CreatePaper(expand("<cword>"))<CR>',
-    "vimwiki new paper on word under cursor")
+    "vimwiki: new paper on word under cursor")
 
 -- link paper
-map("n", "<leader>lp", "gewi[[/papers/<ESC>Ea]]<ESC>", "vimwiki link wrap word under cursor")
+map("n", "<leader>lp", "gewi[[/papers/<ESC>Ea]]<ESC>", "vimwiki: link wrap word under cursor")
 
 -- call CreateReference on word below cursor
-map("n", "<leader>nr", '<cmd>call CreateReference(expand("<cword>"))<CR>', "vimwiki new reference word under cursor")
+map("n", "<leader>nr", '<cmd>call CreateReference(expand("<cword>"))<CR>', "vimwiki: new reference word under cursor")
 
 -- create a new note
-map("n", "<leader>nn", "<cmd>call CreateNote()<CR>", "vimwiki new note for slipbox")
+map("n", "<leader>nn", "<cmd>call CreateNote()<CR>", "vimwiki: new note for slipbox")
 
 -- :%% to get current file path
 map('c', '%%', "getcmdtype() == ':' ? expand('%:h').'/' : '%%'", "get current file path", { expr = true, silent = false })
@@ -67,6 +66,10 @@ map('v', 'Y', 'myY`y')
 -- ` is more useful than '
 map('n', "'", '`')
 
+-- keep cursor in the middle while doing search
+map("n", "n", "nzzzv")
+map("n", "N", "Nzzzv")
+
 -- switch between light and dark modes
 map("n", "<leader>ut", function()
     if vim.o.background == "dark" then
diff --git a/.config/nvim/lua/core/options.lua b/.config/nvim/lua/core/options.lua
index 3299e83..1a45b8f 100644
--- a/.config/nvim/lua/core/options.lua
+++ b/.config/nvim/lua/core/options.lua
@@ -1,75 +1,74 @@
 local opts = {
-        -- this might not be needed anymore
-        termguicolors = true,
+    -- this might not be needed anymore
+    termguicolors = true,
 
-        -- copy indent on a new line
-        autoindent = true,
+    -- copy indent on a new line
+    autoindent = true,
 
-        -- :h tabstop, 2. point
-        -- use appropriate number of spaces to insert a <Tab>
-        expandtab = true,
-        shiftwidth = 4,
-        softtabstop = 4,
-        tabstop = 8,
+    -- :h tabstop, 2. point
+    -- use appropriate number of spaces to insert a <Tab>
+    expandtab = true,
+    shiftwidth = 4,
+    softtabstop = 4,
+    tabstop = 8,
 
-        -- use english for spellchecking
-        spelllang = "en_gb",
+    -- use english for spellchecking
+    spelllang = "en_gb",
 
-        -- tab completion, zsh style
-        wildmode = "longest:full,full",
+    -- tab completion, zsh style
+    wildmode = "longest:full,full",
 
-        -- put one space for join (not two)
-        joinspaces = false,
+    -- put one space for join (not two)
+    joinspaces = false,
 
-        -- keep n lines above/below cursor while scrolling
-        scrolloff = 4,
+    -- keep n lines above/below cursor while scrolling
+    scrolloff = 4,
 
-        -- line numbers
-        number = true,
+    -- line numbers
+    number = true,
 
-        -- manual folding
-        foldmethod = "marker",
+    -- manual folding
+    foldcolumn = "0",
+    foldlevel = 99,
+    foldlevelstart = 99,
+    foldenable = true,
 
-        -- set the terminal title
-        title = true,
+    -- set the terminal title
+    title = true,
 
-        -- wrap using 'breakat' character
-        linebreak = true,
+    -- wrap using 'breakat' character
+    linebreak = true,
 
-        -- new split panes will split to below and right
-        splitbelow = true,
-        splitright = true,
+    -- new split panes will split to below and right
+    splitbelow = true,
+    splitright = true,
 
-        -- use relative line numbers
-        relativenumber = true,
+    -- use relative line numbers
+    relativenumber = true,
 
-        -- we are already using a cursorline, don't clobber linter messages
-        showmode = false,
+    -- we are already using a cursorline, don't clobber linter messages
+    showmode = false,
 
-        -- jump to the matching bracket briefly
-        showmatch = true,
+    -- jump to the matching bracket briefly
+    showmatch = true,
 
-        -- persistent undo
-        undofile = true,
+    -- persistent undo
+    undofile = true,
 
-        -- lower case searches ignore case, upper case searches do not
-        ignorecase = true,
-        smartcase = true,
+    -- lower case searches ignore case, upper case searches do not
+    ignorecase = true,
+    smartcase = true,
 
-        -- https://stackoverflow.com/a/3445040/
-        -- switch case labels
-        cinoptions = "l1",
+    -- https://stackoverflow.com/a/3445040/
+    -- switch case labels
+    cinoptions = "l1",
 
 }
 
 for opt, val in pairs(opts) do
-        vim.o[opt] = val
+    vim.o[opt] = val
 end
 
--- set other options
--- local colorscheme = require("helpers.colorscheme")
--- vim.cmd.colorscheme(colorscheme)
-
 -- interact with system clipboard
 vim.opt.clipboard:append('unnamedplus')
 
@@ -90,7 +89,7 @@ vim.opt.diffopt = {
 
 -- menu: use a popup menu to show the possible completions
 -- preview: show extra information
-vim.opt.completeopt = {"menu", "menuone", "noselect"}
+vim.opt.completeopt = { "menu", "menuone", "noselect" }
 
 if vim.fn.executable("rg") then
     vim.o.grepprg = "rg --vimgrep --no-heading --smart-case"