neovim: tons of misc changes

13 files changed, 43 insertions, 126 deletions

diff --git a/pkgs/custom-neovim/config/lua/keymaps.lua b/pkgs/custom-neovim/config/lua/keymaps.lua
index 67d61cf..3fc39b2 100644
--- a/pkgs/custom-neovim/config/lua/keymaps.lua
+++ b/pkgs/custom-neovim/config/lua/keymaps.lua
@@ -43,7 +43,6 @@ mapkey("n", "<leader>tt", "Go to next tab", ":tabn<cr>")
 mapkey("n", "<leader>tT", "Go to previous tab", ":tabp<cr>")
 mapkey("n", "<leader>to", "Open new tab", ":tabnew<cr>")
 mapkey("n", "<leader>tc", "Close current tab", ":tabclose<cr>")
--- mapkey("n", "<leader>tp", "Pick tabs", ":FzfLua tabs", "fzf-lua")
 
 -- Buffers
 mapkey("n", "<leader>b", "Manage buffers", "")
@@ -59,12 +58,17 @@ mapkey("n", "<leader>bc", "Clear invisible buffers", function ()
 end)
 
 -- Comment box
-mapkey("n", "<leader>j", "Manage comment graphics", "")
-mapkey("n", "<leader>jb", "Create comment box", ":CB")
+mapkey({"n", "v"}, "<leader>j", "Manage comment graphics", "")
+mapkey({"n", "v"}, "<leader>jd", "Remove comment graphics", ":CBd<cr>")
+mapkey({"n", "v"}, "<leader>jb", "Create simple comment box", ":CBccbox<cr>")
+mapkey({"n", "v"}, "<leader>jh", "Create heavy comment box", ":CBccbox3<cr>")
+mapkey({"n", "v"}, "<leader>jq", "Create quote comment box", ":CBccbox12<cr>")
+mapkey({"n", "v"}, "<leader>jl", "Create simple comment line", ":CBccline<cr>")
 
 -- Session
 mapkey("n", "<leader>w", "Manage sessions", "")
-mapkey("n", "<leader>ww", "Manage Sessions", ":AutoSession search<cr>", "mini.pick")
+mapkey("n", "<leader>ww", "Search sessions", ":AutoSession search<cr>", "mini.pick")
+mapkey("n", "<leader>wd", "Delete a session", ":AutoSession deletePicker<cr>", "mini.pick")
 mapkey("n", "<leader>ws", "Save current session", ":AutoSession save<cr>")
 mapkey("n", "<leader>wr", "Open last session", ":AutoSession restore<cr>")
 mapkey("n", "<leader>wp", "Purge orphaned sessions", ":AutoSession purgeOrphaned<cr>")
diff --git a/pkgs/custom-neovim/config/lua/options.lua b/pkgs/custom-neovim/config/lua/options.lua
index 76a6c8b..a41f904 100644
--- a/pkgs/custom-neovim/config/lua/options.lua
+++ b/pkgs/custom-neovim/config/lua/options.lua
@@ -60,4 +60,4 @@ vim.o.undofile = true
 
 -- Prevent Comments on Newlines
 -- c: wrap text to textwidth, r: add comment when pressing enter in insert mode, o: add comment when pressing o
-vim.api.nvim_create_autocmd("BufEnter", { callback = function() vim.opt.formatoptions = vim.opt.formatoptions - { "c","r","o" } end, }) 
+vim.api.nvim_create_autocmd("BufEnter", { callback = function() vim.opt.formatoptions = vim.opt.formatoptions - { "c","r","o" } end, })
diff --git a/pkgs/custom-neovim/config/lua/plugins/comment-box.lua b/pkgs/custom-neovim/config/lua/plugins/comment-box.lua
index b5dc306..4f2381e 100644
--- a/pkgs/custom-neovim/config/lua/plugins/comment-box.lua
+++ b/pkgs/custom-neovim/config/lua/plugins/comment-box.lua
@@ -1,7 +1,7 @@
 return {
   "comment-box.nvim",
-  lazy = true,
-  enabled = false,
+  lazy = false,
+  enabled = true,
   after = function ()
     require("comment-box").setup {}
   end
diff --git a/pkgs/custom-neovim/config/lua/plugins/early-retirement.lua b/pkgs/custom-neovim/config/lua/plugins/early-retirement.lua
new file mode 100644
index 0000000..382c14e
--- /dev/null
+++ b/pkgs/custom-neovim/config/lua/plugins/early-retirement.lua
@@ -0,0 +1,6 @@
+return {
+  "nvim-early-returement",
+  after = function ()
+    require("early-retirement").setup {}
+  end
+}
diff --git a/pkgs/custom-neovim/config/lua/plugins/fzf.lua b/pkgs/custom-neovim/config/lua/plugins/fzf.lua
deleted file mode 100644
index 984a2ca..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/fzf.lua
+++ /dev/null
@@ -1,63 +0,0 @@
-return {
-  "fzf-lua",
-  enabled = false,
-  cmd = "FzfLua",
-  after = function ()
-    require("fzf-lua").setup {
-      "default-title",
-      files = {
-        cwd_prompt = false,
-      },
-    }
-
-    require("fzf-lua").register_ui_select()
-
-    local multiline_string_to_table = function (input_str)
-      local lines = {}
-      for line in input_str:gmatch("[^\r\n]+") do
-        table.insert(lines, line)
-      end
-      return lines
-    end
-
-    Custom_pickers = {}
-
-    Custom_pickers.fzf_dir_cd = function()
-      local dirs = {}
-      for i, name in ipairs(multiline_string_to_table(vim.fn.system("fd -t d"))) do
-        table.insert(dirs, name)
-      end
-
-      require("fzf-lua").fzf_exec( dirs, {
-        winopts = {
-          title = " Directories ",
-        },
-        prompt = "❯ ",
-        actions = {
-          ["enter"] = function(selected)
-            vim.cmd.cd(selected)
-          end
-        }
-      })
-    end
-
-    Custom_pickers.fzf_dir_tcd = function()
-      local dirs = {}
-      for i, name in ipairs(multiline_string_to_table(vim.fn.system("fd -t d"))) do
-        table.insert(dirs, name)
-      end
-
-      require("fzf-lua").fzf_exec( dirs, {
-        winopts = {
-          title = " Directories ",
-        },
-        prompt = "❯ ",
-        actions = {
-          ["enter"] = function(selected)
-            vim.cmd.tcd(selected)
-          end
-        }
-      })
-    end
-  end
-}
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini-ai.lua b/pkgs/custom-neovim/config/lua/plugins/mini-ai.lua
deleted file mode 100644
index ad54e1a..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/mini-ai.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
-  "mini.ai",
-  -- enabled = false,
-  lazy = false,
-  after = function ()
-    require("mini.ai").setup()
-  end
-}
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini-bracketed.lua b/pkgs/custom-neovim/config/lua/plugins/mini-bracketed.lua
deleted file mode 100644
index 4ee3d3f..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/mini-bracketed.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
-  "mini.bracketed",
-  -- enabled = false,
-  lazy = false,
-  after = function ()
-    require("mini.bracketed").setup()
-  end
-}
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini-jump.lua b/pkgs/custom-neovim/config/lua/plugins/mini-jump.lua
deleted file mode 100644
index b796e15..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/mini-jump.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
-  "mini.jump",
-  -- enabled = false,
-  lazy = false,
-  after = function ()
-    require("mini.jump").setup()
-  end
-}
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini-jump2d.lua b/pkgs/custom-neovim/config/lua/plugins/mini-jump2d.lua
new file mode 100644
index 0000000..240361d
--- /dev/null
+++ b/pkgs/custom-neovim/config/lua/plugins/mini-jump2d.lua
@@ -0,0 +1,7 @@
+return {
+  "mini.jump2d",
+  lazy = false,
+  after = function ()
+    require("mini.jump2d").setup()
+  end
+}
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini-splitjoin.lua b/pkgs/custom-neovim/config/lua/plugins/mini-splitjoin.lua
deleted file mode 100644
index 7118a0a..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/mini-splitjoin.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
-  "mini.splitjoin",
-  -- enabled = false,
-  lazy = false,
-  after = function ()
-    require("mini.splitjoin").setup()
-  end
-}
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini-surround.lua b/pkgs/custom-neovim/config/lua/plugins/mini-surround.lua
deleted file mode 100644
index 61ec7e8..0000000
--- a/pkgs/custom-neovim/config/lua/plugins/mini-surround.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
-  "mini.surround",
-  -- enabled = false,
-  lazy = false,
-  after = function ()
-    require("mini.surround").setup()
-  end
-}
diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix
index 5fd6050..4ea9daa 100644
--- a/pkgs/custom-neovim/default.nix
+++ b/pkgs/custom-neovim/default.nix
@@ -37,23 +37,19 @@ in
         mini-icons
         mini-base16
         mini-indentscope
-        mini-completion
-        blink-cmp
 
         # Completion Plugins
+        blink-cmp
         luasnip
         friendly-snippets
 
         # Utility Plugins
         mini-pairs
-        mini-bracketed
-        mini-jump
-        mini-ai
-        mini-splitjoin
-        mini-surround
+        mini-jump2d
         vim-nix # Indentation for nix files
         comment-box-nvim
         auto-session
+        nvim-early-retirement
 
         # Git Plugins
         mini-git
diff --git a/pkgs/custom-neovim/todo.md b/pkgs/custom-neovim/todo.md
index a97a69f..1403fab 100644
--- a/pkgs/custom-neovim/todo.md
+++ b/pkgs/custom-neovim/todo.md
@@ -1,19 +1,26 @@
 # Todo
 
-- Overhaul markdown workflow
-    - Add image viewing keybind to open imv
-    - Add image pasting
-    - remove previewer
-    - add nabla for math
+- add automatic old buffer deletion
 - Make mini files focus on current file when session loads?
 - Make <space>E open mini files focused on current file
 - make picker for directories to open mini files in
-- replace fzf-lua with faster picker
 - add key to change what direction a split is in
-- add automatic old buffer deletion
 - change mini files addon keybinds to be better
 - make file search obey gitignore
-- fix bug with <leader>s not showing up on display and overriding symbol search
-- fix comment graphics
+- create cd and tcd picker
+- create git stage picker with stage and unstage keys
+- add mini notifications
+
+- Overhaul markdown workflow
+    - Add image viewing keybind to open imv
+    - Add image pasting
+    - remove previewer
+    - add nabla for math
+
+- Make neovim config with xournal integration for advanced drawn note taking
+    - link .xopp files in md doc
+    - track changes
+    - each time saved export to svg and link svg below xpp
+    - add render key to see full note rendered in html with images
 
 ![](assets/neovim.png)