join fixes

lua/custom/mappings.lua

@@ -1,4 +1,5 @@
 ---@type MappingsTable
+
 local M = {}
 
 -- NOTE: The mappings here are case sensitive!!! Removing a specific default
@@ -388,8 +389,9 @@ M.edit = {
     ["<leader>s"] = { "s", "replace with insert mode" },
 
     -- split and join lines
-    ["<C-J>"] = { "<cmd>join<cr>", "join lines" },
-    ["<C-S>"] = { "i<cr><esc>l", "split line" },
+    ["J"] = { "j" },
+    ["<C-s-j>"] = { "<cmd>join<cr>", "join lines" },
+    ["<C-s-s>"] = { "i<cr><esc>l", "split line" },
 
     -- do something useful with the arrows
     ["<Up>"] = { "<cmd> move-2<cr>", "Move line up" },

lua/custom/plugins.lua

@@ -627,8 +627,8 @@ local plugins = {
     lazy = false,
     cmd = { "TSJJoin", "TSJSplit" },
     keys = {
-      { "<C-J>", "<cmd>TSJJoin<CR>" },
-      { "<C-S>", "<cmd>TSJSplit<CR>" },
+      { "<C-s-J>", "<cmd>TSJJoin<CR>" },
+      { "<C-s-S>", "<cmd>TSJSplit<CR>" },
     },
   },
   {