♻️ refactor(nvim): moved cinammon plugin keymaps to their config function instead of having them on the keymaps file

.config/nvim/lazy-lock.json

@@ -86,7 +86,7 @@
   "nvim-numbertoggle": { "branch": "main", "commit": "9ab95e60ea5ec138e1b2332e0fc18b8e5de464c6" },
   "nvim-puppeteer": { "branch": "main", "commit": "d7e1b2d67c89d32b6ecada88ff67b539ba09f2d7" },
   "nvim-recorder": { "branch": "main", "commit": "daaae505862e816a7efe578e22d6f3d10cd7a2e6" },
-  "nvim-scissors": { "branch": "main", "commit": "7e3f33ad7495a0d8632a690d35c74e1b38d85ba1" },
+  "nvim-scissors": { "branch": "main", "commit": "2f4ca88c410ee069dedd40e338e3f1147a3f44b0" },
   "nvim-spectre": { "branch": "master", "commit": "d8906855f1949ac97b1e77aaf8d3fe12ed158ddc" },
   "nvim-treesitter": { "branch": "master", "commit": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e" },
   "nvim-treesitter-context": { "branch": "master", "commit": "652ec514d6ba8bc4a3c2de76c855fe668e2c7196" },

.config/nvim/lua/config/keymaps.lua

@@ -42,8 +42,6 @@ map("n", "<leader>bf", "<cmd>bfirst<cr>", { desc = "First Buffer" })
 map("n", "<leader>ba", "<cmd>blast<cr>", { desc = "Last Buffer" })
 
 -- Center the screen automatically
-map("n", "<C-d>", "<C-d>zz")
-map("n", "<C-u>", "<C-u>zz")
 map("n", "n", "nzzzv")
 map("n", "N", "Nzzzv")
 
@@ -105,78 +103,3 @@ map("x", "g/", "<esc>/\\%V", { silent = false, desc = "Search inside visual sele
 -- Search visually selected text (slightly better than builtins in Neovim>=0.8)
 map("x", "*", [[y/\V<C-R>=escape(@", '/\')<CR><CR>]])
 map("x", "#", [[y?\V<C-R>=escape(@", '?\')<CR><CR>]])
-
-if package.loaded["cinnamon"] then
-  -- DEFAULT_KEYMAPS:
-
-  -- Half-window movements:
-  map({ "n", "x" }, "<C-u>", "<Cmd>lua Scroll('<C-u>', 1, 1)<CR>")
-  map({ "n", "x" }, "<C-d>", "<Cmd>lua Scroll('<C-d>', 1, 1)<CR>")
-
-  -- Page movements:
-  map({ "n", "x" }, "<C-b>", "<Cmd>lua Scroll('<C-b>', 1, 1)<CR>")
-  map({ "n", "x" }, "<C-f>", "<Cmd>lua Scroll('<C-f>', 1, 1)<CR>")
-  map({ "n", "x" }, "<PageUp>", "<Cmd>lua Scroll('<C-b>', 1, 1)<CR>")
-  map({ "n", "x" }, "<PageDown>", "<Cmd>lua Scroll('<C-f>', 1, 1)<CR>")
-
-  -- EXTRA_KEYMAPS:
-
-  -- Start/end of file and line number movements:
-  map({ "n", "x" }, "gg", "<Cmd>lua Scroll('gg')<CR>")
-  map({ "n", "x" }, "G", "<Cmd>lua Scroll('G', 0, 1)<CR>")
-
-  -- Start/end of line:
-  map({ "n", "x" }, "0", "<Cmd>lua Scroll('0')<CR>")
-  map({ "n", "x" }, "^", "<Cmd>lua Scroll('^')<CR>")
-  map({ "n", "x" }, "$", "<Cmd>lua Scroll('$', 0, 1)<CR>")
-
-  -- Paragraph movements:
-  map({ "n", "x" }, "{", "<Cmd>lua Scroll('{')<CR>")
-  map({ "n", "x" }, "}", "<Cmd>lua Scroll('}')<CR>")
-
-  -- Previous/next search result:
-  map("n", "n", "<Cmd>lua Scroll('n', 1)<CR>")
-  map("n", "N", "<Cmd>lua Scroll('N', 1)<CR>")
-  map("n", "*", "<Cmd>lua Scroll('*', 1)<CR>")
-  map("n", "#", "<Cmd>lua Scroll('#', 1)<CR>")
-  map("n", "g*", "<Cmd>lua Scroll('g*', 1)<CR>")
-  map("n", "g#", "<Cmd>lua Scroll('g#', 1)<CR>")
-
-  -- Previous/next cursor location:
-  map("n", "<C-o>", "<Cmd>lua Scroll('<C-o>', 1)<CR>")
-  map("n", "<C-i>", "<Cmd>lua Scroll('1<C-i>', 1)<CR>")
-
-  -- Screen scrolling:
-  map("n", "zz", "<Cmd>lua Scroll('zz', 0, 1)<CR>")
-  map("n", "zt", "<Cmd>lua Scroll('zt', 0, 1)<CR>")
-  map("n", "zb", "<Cmd>lua Scroll('zb', 0, 1)<CR>")
-  map("n", "z.", "<Cmd>lua Scroll('z.', 0, 1)<CR>")
-  map("n", "z<CR>", "<Cmd>lua Scroll('zt^', 0, 1)<CR>")
-  map("n", "z-", "<Cmd>lua Scroll('z-', 0, 1)<CR>")
-  map("n", "z^", "<Cmd>lua Scroll('z^', 0, 1)<CR>")
-  map("n", "z+", "<Cmd>lua Scroll('z+', 0, 1)<CR>")
-  map("n", "<C-y>", "<Cmd>lua Scroll('<C-y>', 0, 1)<CR>")
-  map("n", "<C-e>", "<Cmd>lua Scroll('<C-e>', 0, 1)<CR>")
-
-  -- Horizontal screen scrolling:
-  map("n", "zH", "<Cmd>lua Scroll('zH')<CR>")
-  map("n", "zL", "<Cmd>lua Scroll('zL')<CR>")
-  map("n", "zs", "<Cmd>lua Scroll('zs')<CR>")
-  map("n", "ze", "<Cmd>lua Scroll('ze')<CR>")
-  map("n", "zh", "<Cmd>lua Scroll('zh', 0, 1)<CR>")
-  map("n", "zl", "<Cmd>lua Scroll('zl', 0, 1)<CR>")
-
-  -- EXTENDED_KEYMAPS:
-
-  -- Up/down movements:
-  map({ "n", "x" }, "k", "<Cmd>lua Scroll('k', 0, 1)<CR>")
-  map({ "n", "x" }, "j", "<Cmd>lua Scroll('j', 0, 1)<CR>")
-  map({ "n", "x" }, "<Up>", "<Cmd>lua Scroll('k', 0, 1)<CR>")
-  map({ "n", "x" }, "<Down>", "<Cmd>lua Scroll('j', 0, 1)<CR>")
-
-  -- Left/right movements:
-  map({ "n", "x" }, "h", "<Cmd>lua Scroll('h', 0, 1)<CR>")
-  map({ "n", "x" }, "l", "<Cmd>lua Scroll('l', 0, 1)<CR>")
-  map({ "n", "x" }, "<Left>", "<Cmd>lua Scroll('h', 0, 1)<CR>")
-  map({ "n", "x" }, "<Right>", "<Cmd>lua Scroll('l', 0, 1)<CR>")
-end

.config/nvim/lua/plugins/extras/ui/smooth-scrolling.lua

@@ -1,11 +1,88 @@
+local map = vim.keymap.set
+
 return {
   "declancm/cinnamon.nvim",
   event = "VeryLazy",
-  opts = {
+  config = function()
+    require("cinnamon").setup({
       default_keymaps = true,
       extra_keymaps = true,
       extended_keymaps = true,
       override_keymaps = true,
-    default_delay = 3,
+      default_delay = 2,
-  },
+    })
+
+    -- DEFAULT_KEYMAPS:
+
+    -- Half-window movements:
+    map({ "n", "x" }, "<C-u>", "<Cmd>lua Scroll('<C-u>', 1, 1)<CR>")
+    map({ "n", "x" }, "<C-d>", "<Cmd>lua Scroll('<C-d>', 1, 1)<CR>")
+
+    -- Page movements:
+    map({ "n", "x" }, "<C-b>", "<Cmd>lua Scroll('<C-b>', 1, 1)<CR>")
+    map({ "n", "x" }, "<C-f>", "<Cmd>lua Scroll('<C-f>', 1, 1)<CR>")
+    map({ "n", "x" }, "<PageUp>", "<Cmd>lua Scroll('<C-b>', 1, 1)<CR>")
+    map({ "n", "x" }, "<PageDown>", "<Cmd>lua Scroll('<C-f>', 1, 1)<CR>")
+
+    -- EXTRA_KEYMAPS:
+
+    -- Start/end of file and line number movements:
+    map({ "n", "x" }, "gg", "<Cmd>lua Scroll('gg')<CR>")
+    map({ "n", "x" }, "G", "<Cmd>lua Scroll('G', 0, 1)<CR>")
+
+    -- Start/end of line:
+    map({ "n", "x" }, "0", "<Cmd>lua Scroll('0')<CR>")
+    map({ "n", "x" }, "^", "<Cmd>lua Scroll('^')<CR>")
+    map({ "n", "x" }, "$", "<Cmd>lua Scroll('$', 0, 1)<CR>")
+
+    -- Paragraph movements:
+    map({ "n", "x" }, "{", "<Cmd>lua Scroll('{')<CR>")
+    map({ "n", "x" }, "}", "<Cmd>lua Scroll('}')<CR>")
+
+    -- Previous/next search result:
+    map("n", "n", "<Cmd>lua Scroll('n', 1)<CR>")
+    map("n", "N", "<Cmd>lua Scroll('N', 1)<CR>")
+    map("n", "*", "<Cmd>lua Scroll('*', 1)<CR>")
+    map("n", "#", "<Cmd>lua Scroll('#', 1)<CR>")
+    map("n", "g*", "<Cmd>lua Scroll('g*', 1)<CR>")
+    map("n", "g#", "<Cmd>lua Scroll('g#', 1)<CR>")
+
+    -- Previous/next cursor location:
+    map("n", "<C-o>", "<Cmd>lua Scroll('<C-o>', 1)<CR>")
+    map("n", "<C-i>", "<Cmd>lua Scroll('1<C-i>', 1)<CR>")
+
+    -- Screen scrolling:
+    map("n", "zz", "<Cmd>lua Scroll('zz', 0, 1)<CR>")
+    map("n", "zt", "<Cmd>lua Scroll('zt', 0, 1)<CR>")
+    map("n", "zb", "<Cmd>lua Scroll('zb', 0, 1)<CR>")
+    map("n", "z.", "<Cmd>lua Scroll('z.', 0, 1)<CR>")
+    map("n", "z<CR>", "<Cmd>lua Scroll('zt^', 0, 1)<CR>")
+    map("n", "z-", "<Cmd>lua Scroll('z-', 0, 1)<CR>")
+    map("n", "z^", "<Cmd>lua Scroll('z^', 0, 1)<CR>")
+    map("n", "z+", "<Cmd>lua Scroll('z+', 0, 1)<CR>")
+    map("n", "<C-y>", "<Cmd>lua Scroll('<C-y>', 0, 1)<CR>")
+    map("n", "<C-e>", "<Cmd>lua Scroll('<C-e>', 0, 1)<CR>")
+
+    -- Horizontal screen scrolling:
+    map("n", "zH", "<Cmd>lua Scroll('zH')<CR>")
+    map("n", "zL", "<Cmd>lua Scroll('zL')<CR>")
+    map("n", "zs", "<Cmd>lua Scroll('zs')<CR>")
+    map("n", "ze", "<Cmd>lua Scroll('ze')<CR>")
+    map("n", "zh", "<Cmd>lua Scroll('zh', 0, 1)<CR>")
+    map("n", "zl", "<Cmd>lua Scroll('zl', 0, 1)<CR>")
+
+    -- EXTENDED_KEYMAPS:
+
+    -- Up/down movements:
+    map({ "n", "x" }, "k", "<Cmd>lua Scroll('k', 0, 1)<CR>")
+    map({ "n", "x" }, "j", "<Cmd>lua Scroll('j', 0, 1)<CR>")
+    map({ "n", "x" }, "<Up>", "<Cmd>lua Scroll('k', 0, 1)<CR>")
+    map({ "n", "x" }, "<Down>", "<Cmd>lua Scroll('j', 0, 1)<CR>")
+
+    -- Left/right movements:
+    map({ "n", "x" }, "h", "<Cmd>lua Scroll('h', 0, 1)<CR>")
+    map({ "n", "x" }, "l", "<Cmd>lua Scroll('l', 0, 1)<CR>")
+    map({ "n", "x" }, "<Left>", "<Cmd>lua Scroll('h', 0, 1)<CR>")
+    map({ "n", "x" }, "<Right>", "<Cmd>lua Scroll('l', 0, 1)<CR>")
+  end,
 }