From 94c8aa2189bf3397291414182daf8f4bbdebefd9 Mon Sep 17 00:00:00 2001
From: Matei Adriel <rafaeladriel11@gmail.com>
Date: Wed, 6 Apr 2022 23:19:19 +0300
Subject: [PATCH] feat: random push
---
dotfiles/kmonad/keymap.kbd | 16 ++++++++++++----
dotfiles/neovim/lua/my/keymaps.lua | 2 +-
dotfiles/neovim/lua/my/plugins/arpeggio.lua | 2 +-
dotfiles/neovim/lua/my/plugins/idris.lua | 2 +-
dotfiles/neovim/lua/my/plugins/lh-brackets.lua | 10 +++++-----
5 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/dotfiles/kmonad/keymap.kbd b/dotfiles/kmonad/keymap.kbd
index 9c693da..289251e 100644
--- a/dotfiles/kmonad/keymap.kbd
+++ b/dotfiles/kmonad/keymap.kbd
@@ -5,7 +5,7 @@
output (uinput-sink "My KMonad output"
;; To understand the importance of the following line, see the section on
;; Compose-key sequences at the near-bottom of this file.
- "/run/current-system/sw/bin/sleep 1 && /run/current-system/sw/bin/setxkbmap" -option compose:ralt")
+ "/run/current-system/sw/bin/sleep 1 && /run/current-system/sw/bin/setxkbmap -option compose:ralt")
cmp-seq ralt ;; Set the compose key to `RightAlt'
cmp-seq-delay 5 ;; 5ms delay between each compose-key sequence press
@@ -73,6 +73,7 @@
(defalias
mth (layer-toggle math)
Mth (layer-toggle capital-math)
+ mov (layer-toggle movement)
mathExtra (layer-toggle math-extra)
)
@@ -81,7 +82,6 @@
shr #(@topBar \ \_ \_ \( @shrugFace \) \_ / @topBar) ;; ¯\_(ツ)_/¯
ml (tap-hold-next-release 200 @gl @mathExtra)
- mll l
)
(defsrc
@@ -99,7 +99,16 @@
tab q w e r t y u i o p [ ] \
@mth a s d f g h j k l ; ' ret
lsft z x c v b n m , . / rsft
- lctl lsgt lmet lalt spc ralt rctl
+ @mov lsgt lmet lalt spc ralt rctl
+)
+
+(deflayer movement
+ _ _ _ _ _ _ _ _ _ _ _ _ _ _
+ _ _ _ _ _ _ _ _ _ _ _ _ _ _
+ _ _ _ _ _ _ _ _ _ _ _ _ _ _
+ _ _ _ _ _ _ lft down up rght _ _ _
+ _ _ _ _ _ _ _ _ _ _ _ _
+ _ _ _ _ _ _ _
)
(deflayer math
@@ -128,4 +137,3 @@
_ _ @Gx _ _ _ _ _ _ _ _ _
_ _ _ _ _ _ _
)
-
diff --git a/dotfiles/neovim/lua/my/keymaps.lua b/dotfiles/neovim/lua/my/keymaps.lua
index bfedaa2..11b0322 100644
--- a/dotfiles/neovim/lua/my/keymaps.lua
+++ b/dotfiles/neovim/lua/my/keymaps.lua
@@ -25,7 +25,7 @@ function M.setup()
if arpeggio ~= nil then
-- Create chords
- arpeggio.chord("n", "jl", ":w<cr>") -- Double space to sace
+ arpeggio.chord("n", "ji", ":w<cr>") -- Saving
arpeggio.chord("i", "jk", "<Esc>") -- Remap Esc to jk
arpeggio.chord("i", "<Leader>k", "<C-k><cr>") -- Rebind digraph insertion to leader+k
arpeggio.chord("inv", "<Leader>a", "<C-6><cr>") -- Rebind switching to the last pane using leader+a
diff --git a/dotfiles/neovim/lua/my/plugins/arpeggio.lua b/dotfiles/neovim/lua/my/plugins/arpeggio.lua
index 6b5a33e..06d2336 100644
--- a/dotfiles/neovim/lua/my/plugins/arpeggio.lua
+++ b/dotfiles/neovim/lua/my/plugins/arpeggio.lua
@@ -11,7 +11,7 @@ function M.chord(mode, lhs, rhs, opts)
end
else
local options = helpers.mergeTables(opts, {noremap = true})
- local settings = ""
+ local settings = options.settings or ""
if options.silent then settings = settings .. "s" end
diff --git a/dotfiles/neovim/lua/my/plugins/idris.lua b/dotfiles/neovim/lua/my/plugins/idris.lua
index 5799d09..7251fb5 100644
--- a/dotfiles/neovim/lua/my/plugins/idris.lua
+++ b/dotfiles/neovim/lua/my/plugins/idris.lua
@@ -22,7 +22,7 @@ function M.setup()
for key, value in pairs(idrisChords) do
arpeggio.chord("n", "i" .. key,
":lua require('idris2.code_action')." ..
- value .. "()<CR>")
+ value .. "()<CR>", {settings = "b"})
end
end
},
diff --git a/dotfiles/neovim/lua/my/plugins/lh-brackets.lua b/dotfiles/neovim/lua/my/plugins/lh-brackets.lua
index 85c3cfb..2edcd43 100644
--- a/dotfiles/neovim/lua/my/plugins/lh-brackets.lua
+++ b/dotfiles/neovim/lua/my/plugins/lh-brackets.lua
@@ -28,11 +28,11 @@ function M.setup()
vim.g.marker_define_jump_mappings = 0 -- disable automatic binding of marker jumping (conflicts with tmux-vim-navigator)
- arpeggio.chord("inv", "sj", '<Plug>MarkersJumpF')
- arpeggio.chord("inv", "sk", '<Plug>MarkersJumpB')
- arpeggio.chord("inv", "mi", '<Plug>MarkersMark')
- arpeggio.chord("inv", "ml", '<Plug>MarkersCloseAllAndJumpToLast')
- arpeggio.chord("inv", "mo", '<Plug>MarkersJumpOutside')
+ arpeggio.chord("nv", "sj", '<Plug>MarkersJumpF')
+ arpeggio.chord("nv", "sk", '<Plug>MarkersJumpB')
+ arpeggio.chord("nv", "mi", '<Plug>MarkersMark')
+ arpeggio.chord("nv", "ml", '<Plug>MarkersCloseAllAndJumpToLast')
+ arpeggio.chord("nv", "mo", '<Plug>MarkersJumpOutside')
for key, brackets in pairs(extraBrackets) do
A.augroup('custom-brackets' .. key, function()