Further mapping changes

nvim/lazy-lock.json

@@ -5,6 +5,7 @@
   "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "cmp-snippy": { "branch": "master", "commit": "c4dc31232c510cd32d4708701e6f06746d46df90" },
   "diffview.nvim": { "branch": "main", "commit": "db97e667e03294bfa9f15e544e78f3082247bf79" },
   "formatter.nvim": { "branch": "master", "commit": "44c89f09dcc220dc2a9b056e93c3a87c86e79804" },
   "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" },
@@ -17,6 +18,7 @@
   "nvim-autopairs": { "branch": "master", "commit": "ae5b41ce880a6d850055e262d6dfebd362bb276e" },
   "nvim-cmp": { "branch": "main", "commit": "51f1e11a89ec701221877532ee1a23557d291dd5" },
   "nvim-lspconfig": { "branch": "master", "commit": "0d29cad8de3b2c654315203fc1fe12fde722a18a" },
+  "nvim-snippy": { "branch": "master", "commit": "ee3b830787538f259b84867c8971c4284abc4a8d" },
   "nvim-tree.lua": { "branch": "master", "commit": "59e65d88db177ad1e6a8cffaafd4738420ad20b6" },
   "nvim-treesitter": { "branch": "master", "commit": "add1864bbf2d3b8e789ec6b4715bb5a4073e3b60" },
   "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" },
@@ -28,8 +30,7 @@
   "trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" },
   "vim-bracketed-paste": { "branch": "master", "commit": "45411da73cc159e4fc2138d930553d247bbfbcdc" },
   "vim-rooter": { "branch": "master", "commit": "4f52ca556a0b9e257bf920658714470ea0320b7a" },
-  "vim-vsnip": { "branch": "master", "commit": "7753ba9c10429c29d25abfd11b4c60b76718c438" },
-  "vim-vsnip-integ": { "branch": "master", "commit": "1914e72cf3de70df7f5dde476cd299aba2440aef" },
+  "vim-snippets": { "branch": "master", "commit": "d37486881a0a771b844a235bc3e025046088690d" },
   "vimtex": { "branch": "master", "commit": "e3d0bea39dbcb6e064db751b646c958342a3460f" },
   "vimwiki": { "branch": "dev", "commit": "f0fe154ede6b11e3db9b058b930005a056a3d1c6" }
 }

nvim/lua/mappings.lua

@@ -2,8 +2,6 @@ vim.keymap.set("i", "jj", "<Esc>", {})
 vim.keymap.set("n", "j", "gj", {})
 vim.keymap.set("n", "k", "gk", {})
 vim.keymap.set("n", "<S-k>", "<Nop>", {})
--- vim.keymap.set("n", "<S-p>", "\"+p", { noremap = true })
--- vim.keymap.set("v", "<S-p>", "\"+p", { noremap = true })
 vim.keymap.set("t", "jj", "<C-\\><C-n>", { noremap = true, silent = true })
 vim.keymap.set("n", "<Backspace>", ":q<cr>", { noremap = true, silent = true })
 vim.keymap.set("n", "<C-U>", "<C-O>", { noremap = true })
@@ -13,8 +11,8 @@ vim.keymap.set("n", "<C-I>", "<C-I>", { noremap = true })
 vim.keymap.set("n", "n", "nzz", { noremap = true })
 vim.keymap.set("n", "N", "Nzz", { noremap = true })
 vim.keymap.set("x", "<leader>p", [["_dP]], { noremap = true })
-vim.keymap.set("v", "<leader>y", [["+y]])
-vim.keymap.set("v", "<leader>Y", [["+Y]])
+vim.keymap.set({"n", "v"}, "<leader>y", [["+y]])
+vim.keymap.set({"n", "v"}, "<leader>Y", [["+Y]])
 vim.keymap.set("n", "<Tab>", "<Nop>", { noremap = true })
 vim.keymap.set("n", "<leader><space>", ":noh<cr>", { noremap = true, silent = true })
 vim.keymap.set("n", "gn", ":n<cr>", { noremap = true, silent = true })
@@ -25,7 +23,5 @@ vim.keymap.set("x", "<leader>a", "<C-A>", { noremap = true, silent = true })
 vim.keymap.set("x", "<leader>x", "<C-X>", { noremap = true, silent = true })
 vim.keymap.set("x", "<leader>ga", "g<C-A>", { noremap = true, silent = true })
 vim.keymap.set("x", "<leader>gx", "g<C-X>", { noremap = true, silent = true })
--- vim.keymap.set("n", "<S-h>x", "<C-h>", { noremap = true, silent = true })
--- vim.keymap.set("n", "<S-j>x", "<C-j>", { noremap = true, silent = true })
--- vim.keymap.set("n", "<S-k>x", "<C-k>", { noremap = true, silent = true })
--- vim.keymap.set("n", "<S-l>x", "<C-l>", { noremap = true, silent = true })
+vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
+vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")

nvim/lua/telescope_config.lua

@@ -7,7 +7,7 @@ if not hastelescope then
 end
 
 M.project_files = function()
-    local opts = require('telescope.themes').get_ivy({}) -- define here if you want to define something
+    local opts = require('telescope.themes').get_ivy({})
     opts["show_untracked"] = true
     opts["layout_config"] = {height=0.2}
     if not pcall(require"telescope.builtin".git_files, opts) then
@@ -16,7 +16,7 @@ M.project_files = function()
 end
 
 M.buffers = function()
-    local opts = require('telescope.themes').get_ivy({}) -- define here if you want to define something
+    local opts = require('telescope.themes').get_ivy({})
     opts["layout_config"] = {height=0.2}
     require"telescope.builtin".buffers(opts)
 end
@@ -31,7 +31,8 @@ require("telescope").setup{
             "Venv/.*",
             "venv/.*",
             "wandb/.*",
-            "Resources/.*"
+            "Resources/.*",
+            "build/.*"
         },
         mappings = {
             i = {
@@ -50,11 +51,6 @@ require("telescope").setup{
             },
             mappings = {
                 i = {
-                    -- IMPORTANT: Note that telescope-undo must be available when telescope is configured if
-                    -- you want to replicate these defaults and use the following actions. This means
-                    -- installing as a dependency of telescope in it's `requirements` and loading this
-                    -- extension from there instead of having the separate plugin definition as outlined
-                    -- above.
                     ["<cr>"] = require("telescope-undo.actions").restore,
                     ["<S-y>"] = require("telescope-undo.actions").yank_additions,
                 },
@@ -68,8 +64,9 @@ telescope.load_extension("undo")
 telescope.load_extension('fzf')
 
 
-vim.api.nvim_set_keymap("n", "<C-p>", "<CMD>lua require'telescope_config'.project_files()<CR>", {noremap = true, silent = true})
-vim.api.nvim_set_keymap("n", "<C-O>", "<cmd>lua require('telescope_config').buffers()<cr>", { silent = true, noremap = true })
-vim.api.nvim_set_keymap("n", "<C-f>", "<cmd>lua require('telescope.builtin').live_grep{ cwd = vim.fn.systemlist(\"git rev-parse --show-toplevel 2> /dev/null || pwd\")[1] }<cr>", { silent = true, noremap = true })
+vim.keymap.set("n", "<leader>u", function() require("telescope").extensions.undo.undo()  end, {noremap = true, silent = true})
+vim.keymap.set("n", "<C-p>", function() require('telescope_config').project_files() end, {noremap = true, silent = true})
+vim.keymap.set("n", "<C-O>", function() require('telescope_config').buffers() end, { silent = true, noremap = true })
+vim.keymap.set("n", "<C-f>", function() require('telescope.builtin').live_grep{ cwd = vim.fn.systemlist("git rev-parse --show-toplevel 2> /dev/null || pwd")[1] } end, { silent = true, noremap = true })
 
 return M