Merge branch 'dev' into thesis

nvim: add map to escape Terminal-mode

.config/nvim/lua/maps.lua

@@ -27,6 +27,12 @@ vim.keymap.set("n", "j",
         desc = "Smart down motion"
     })
 
+-- terminal-mode
+vim.keymap.set({ "t" }, "<leader><Esc>",
+    "<C-\\><C-n>",
+    { desc = "Escape terminal-mode" }
+)
+
 -- yank and pasting
 vim.keymap.set({ "n", "x" }, "<leader>y",
     "\"+y",

.local/bin/remaps

@@ -18,6 +18,6 @@ setxkbmap -option ctrl:nocaps
 # But when it is pressed only once, treat it as escape.
 killall xcape 2>/dev/null ; xcape -e 'Control_L=Escape'
 # Map the menu button to right super as well.
-xmodmap -e 'keycode 107 = Super_R'
+xmodmap -e 'keycode 135 = Super_R'
 # Turn off the caps lock if on since there is no longer a key for it.
 #xset -q | grep "Caps Lock:\s*on" && xdotool key Caps_Lock