summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/i3/config16
l---------.config/keyd/default.conf1
-rw-r--r--.config/nvim/lua/binds.lua2
-rw-r--r--.config/zsh/.zshrc4
-rw-r--r--.vim/vimrc2
5 files changed, 19 insertions, 6 deletions
diff --git a/.config/i3/config b/.config/i3/config
index 53aaefb..b33ba53 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -37,12 +37,20 @@ bindsym $mod+h focus left
bindsym $mod+j focus down
bindsym $mod+k focus up
bindsym $mod+l focus right
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
# Move focused window
bindsym $mod+Shift+h move left
bindsym $mod+Shift+j move down
bindsym $mod+Shift+k move up
bindsym $mod+Shift+l move right
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
# Focus the parent container
bindsym $mod+a focus parent
# Focus tiled / floating windows
@@ -97,11 +105,19 @@ mode "Resize Mode" {
bindsym j resize shrink height 6 px or 6 ppt
bindsym k resize grow height 6 px or 6 ppt
bindsym l resize grow width 6 px or 6 ppt
+ bindsym Left resize shrink width 6 px or 6 ppt
+ bindsym Down resize shrink height 6 px or 6 ppt
+ bindsym Up resize grow height 6 px or 6 ppt
+ bindsym Right resize grow width 6 px or 6 ppt
bindsym Shift+h resize shrink width 12 px or 12 ppt
bindsym Shift+j resize shrink height 12 px or 12 ppt
bindsym Shift+k resize grow height 12 px or 12 ppt
bindsym Shift+l resize grow width 12 px or 12 ppt
+ bindsym Shift+Left resize shrink width 12 px or 12 ppt
+ bindsym Shift+Down resize shrink height 12 px or 12 ppt
+ bindsym Shift+Up resize grow height 12 px or 12 ppt
+ bindsym Shift+Right resize grow width 12 px or 12 ppt
bindsym minus gaps inner current minus 5
bindsym plus gaps inner current plus 5
diff --git a/.config/keyd/default.conf b/.config/keyd/default.conf
new file mode 120000
index 0000000..37df45e
--- /dev/null
+++ b/.config/keyd/default.conf
@@ -0,0 +1 @@
+/etc/keyd/default.conf \ No newline at end of file
diff --git a/.config/nvim/lua/binds.lua b/.config/nvim/lua/binds.lua
index 2bbaa69..0e7ae96 100644
--- a/.config/nvim/lua/binds.lua
+++ b/.config/nvim/lua/binds.lua
@@ -8,7 +8,7 @@ map('', 'Y', 'y$', opts)
map('n', '<C-L>', ':nohl<CR><C-L>', opts)
map('n', 'n', 'nzzzv', opts)
map('n', 'N', 'Nzzzv', opts)
-map('i', 'kj', '<Esc>', opts)
+-- map('i', 'kj', '<Esc>', opts)
map('t', 'kj', '<C-\\><C-n>', { noremap = true })
map('i', ',', ',<c-g>u', opts)
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index c9fe57c..2c5102a 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -84,10 +84,6 @@ alias nova='ssh -p 2080 192.168.0.156'
alias luamake=/home/adam/Documents/github/lua-language-server/3rd/luamake/luamake
-function zvm_config() {
- ZVM_VI_INSERT_ESCAPE_BINDKEY=kj
-}
-
function zvm_after_init() {
source '/usr/share/fzf/key-bindings.zsh'
source '/usr/share/fzf/completion.zsh'
diff --git a/.vim/vimrc b/.vim/vimrc
index 2385007..18fe768 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -42,7 +42,7 @@ map Y y$
nnoremap <C-L> :nohl<CR><C-L>
nnoremap n nzzzv
nnoremap N Nzzzv
-inoremap kj <Esc>
+" inoremap kj <Esc>
tnoremap kj <C-\><C-n>
inoremap , ,<c-g>u