Big backup I guess

dotfiles/neovim/lua/my/keymaps.lua

@@ -26,6 +26,13 @@ function M.move(from, to, opts)
   vim.keymap.set("n", from, "<Nop>")
 end
 
+function M.delimitedTextobject(from, to, name, perhapsOpts)
+  local opts = helpers.mergeTables(perhapsOpts or {}, { desc = name })
+
+  vim.keymap.set({ "v", "o" }, "i" .. from, "i" .. to, opts)
+  vim.keymap.set({ "v", "o" }, "a" .. from, "a" .. to, opts)
+end
+
 function M.setup()
   M.move("q", "yq", { desc = "Record macro" })
   M.move("Q", "yQ")
@@ -36,6 +43,10 @@ function M.setup()
     desc = "Replace word in file"
   })
 
+  M.delimitedTextobject("q", '"', "quotes")
+  M.delimitedTextobject("a", "'", "'")
+  M.delimitedTextobject("r", "[", "square brackets")
+
   -- Create chords
   if arpeggio ~= nil then
     arpeggio.chordSilent("n", "ji", ":silent :write<cr>") -- Saving

dotfiles/neovim/lua/my/paq.lua

@@ -59,10 +59,13 @@ function M.setup()
     "lewis6991/impatient.nvim", -- faster startup times
     "tpope/vim-abolish", -- abbreviations on steroids
     "mrjones2014/smart-splits.nvim", -- the name says it all
+    "phaazon/mind.nvim", -- Organize shit as trees
+    "bfredl/nvim-luadev", -- lua repl thingy
+    "akinsho/toggleterm.nvim", -- cool terminal thingy
 
     -- Git stuff
     "ruifm/gitlinker.nvim", -- generate permalinks for code
-    -- "TimUntersberger/neogit" -- magit clone
+    { "TimUntersberger/neogit", opt = true } -- magit clone
   }
 
   table.insert(base, 2, { "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" })

dotfiles/neovim/lua/my/plugins/cmp.lua

@@ -11,7 +11,7 @@ end
 function M.setup()
   local cmp = require("cmp")
   local lspkind = require('lspkind')
-  local luasnip = require("luasnip")
+  -- local luasnip = require("luasnip")
 
   local options = {
     window = {
@@ -44,22 +44,18 @@ function M.setup()
       end
     },
     mapping = {
-      ["<Tab>"] = cmp.mapping(function(fallback)
+      ["<C-d>"] = cmp.mapping(function(fallback)
         if cmp.visible() then
           cmp.select_next_item()
-        elseif luasnip.expand_or_jumpable() then
-          luasnip.expand_or_jump()
         elseif has_words_before() then
           cmp.complete()
         else
           fallback()
         end
       end, { "i", "s" }),
-      ["<S-Tab>"] = cmp.mapping(function(fallback)
+      ["<C-s>"] = cmp.mapping(function(fallback)
         if cmp.visible() then
           cmp.select_prev_item()
-        elseif luasnip.jumpable(-1) then
-          luasnip.jump(-1)
         else
           fallback()
         end
@@ -73,8 +69,6 @@ function M.setup()
     }, { { name = 'buffer' } })
   }
 
-  cmp.setup(options)
-
   -- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore).
   cmp.setup.cmdline('/', {
     mapping = cmp.mapping.preset.cmdline(),

dotfiles/neovim/lua/my/plugins/easymotion.lua

@@ -7,11 +7,10 @@ function M.setup()
       silent = true
     }
   end
-  -- vim.keymap.set("n", "q", "<Plug>(easymotion-prefix)")
-  vim.keymap.set("n", "qf", "<Plug>(easymotion-bd-f)", opts("Hop to char"))
-  vim.keymap.set("n", "qj", "<Plug>(easymotion-overwin-f2)", opts("Hop to char pair"))
-  vim.keymap.set("n", "qw", ":silent <Plug>(easymotion-bd-w)", opts("Hop to word"))
-  vim.keymap.set("n", "qL", "silent <Plug>(easymotion-bd-L)", opts("Hop to line (?)"))
+  vim.keymap.set({ "n", "v", "o" }, "qf", "<Plug>(easymotion-bd-f)", opts("Hop to char"))
+  vim.keymap.set({ "n", "v", "o" }, "qj", "<Plug>(easymotion-overwin-f2)", opts("Hop to char pair"))
+  vim.keymap.set({ "n", "v", "o" }, "qw", ":silent <Plug>(easymotion-bd-w)", opts("Hop to word"))
+  vim.keymap.set({ "n", "v", "o" }, "qL", "silent <Plug>(easymotion-bd-L)", opts("Hop to line (?)"))
 
   local status, wk = pcall(require, "which-key")
 

dotfiles/neovim/lua/my/plugins/init.lua

@@ -13,11 +13,15 @@ function M.setup()
       require("my.plugins.lualine").setup()
       require("my.plugins.vimux").setup()
       require("my.plugins.whichkey").setup()
+      require("toggleterm").setup()
+
+      require("my.plugins.neogit").setup()
     end)
 
     require("my.plugins.dashboard").setup()
     require("my.plugins.treesitter").setup()
     require("my.plugins.cmp").setup()
+    require("my.plugins.luasnip").setup()
     require("my.plugins.lspconfig").setup()
     require("my.plugins.null-ls").setup()
     require("my.plugins.vimtex").setup()
@@ -28,16 +32,22 @@ function M.setup()
     require("my.plugins.firevim").setup()
   else
     require("gitlinker").setup()
-    -- require("my.plugins.neogit").setup()
     require("my.plugins.paperplanes").setup()
   end
 
   require("my.plugins.easymotion").setup()
   require("my.plugins.autopairs").setup()
   require("my.plugins.telescope").setup()
+  require("my.plugins.surround").setup()
 
   require("my.plugins.hydra").setup()
   require("my.plugins.clipboard-image").setup()
+  require("mind").setup({
+    persistence = {
+      state_path = "~/Mind/mind.json",
+      data_dir = "~/Mind/data"
+    }
+  })
 
   -- require("my.plugins.slam").setup()
 end

dotfiles/neovim/lua/my/plugins/luasnip.lua

@@ -0,0 +1,17 @@
+local M = {}
+local luasnip = require("luasnip")
+
+function M.setup()
+  vim.keymap.set("i", "<Tab>", function()
+    if luasnip.jumpable(1) then
+      return "<cmd>lua require('luasnip').jump(1)<cr>"
+    else
+      return "<Tab>"
+    end
+  end, { expr = true })
+  vim.keymap.set("i", "<S-Tab>", function()
+    luasnip.jump(-1)
+  end)
+end
+
+return M

dotfiles/neovim/lua/my/plugins/neogit.lua

@@ -1,6 +1,9 @@
 local M = {}
 
 function M.setup()
+  -- This is here because we do not want to use neogit inside firenvim or vscode!
+  vim.cmd [[packadd! neogit]]
+
   local neogit = require("neogit")
 
   neogit.setup()

dotfiles/neovim/lua/my/plugins/surround.lua

@@ -0,0 +1,8 @@
+local M = {}
+
+function M.setup()
+  vim.g.surround_113 = '"\r"'
+  vim.g.surround_97 = "'\r'"
+end
+
+return M