From 50668b54d7c831c0694744a7c0293b8dedb738a6 Mon Sep 17 00:00:00 2001
From: Matei Adriel <rafaeladriel11@gmail.com>
Date: Mon, 27 Feb 2023 19:47:06 +0100
Subject: [PATCH] Tmux and fish keybind changes/additions
---
home/adrielus/features/cli/fish/config.fish | 12 +++++++++++-
home/adrielus/features/cli/tmux/tmux.conf | 5 ++---
hosts/nixos/common/optional/slambda.nix | 15 ++++++++++-----
3 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/home/adrielus/features/cli/fish/config.fish b/home/adrielus/features/cli/fish/config.fish
index d7e62e4..ffd8955 100644
--- a/home/adrielus/features/cli/fish/config.fish
+++ b/home/adrielus/features/cli/fish/config.fish
@@ -16,12 +16,22 @@ set fish_vi_force_cursor
# {{{ Disable greeting
set fish_greeting
# }}}
-# {{{ Use vim-style keybinds
+# {{{ Keybinds
function fish_user_key_bindings
+ # {{{ Use vim-style keybinds
# Use the vim keybinds
fish_vi_key_bindings
bind -e -M insert -k f10 # unbinds f10
bind -M insert -m default -k f10 'commandline -f repaint' # Exit insert mode with <f10>
+ # }}}
+ # {{{ C-x to clear screen
+ bind -M default \cx "clear && commandline -f repaint"
+ bind -M insert \cx "clear && commandline -f repaint"
+ # }}}
+ # {{{ C-g to open neogit
+ bind -M default \cg "nvim +Neogit"
+ bind -M insert \cg "nvim +Neogit"
+ # }}}
end
# }}}
diff --git a/home/adrielus/features/cli/tmux/tmux.conf b/home/adrielus/features/cli/tmux/tmux.conf
index 028e0cf..a55b2bf 100644
--- a/home/adrielus/features/cli/tmux/tmux.conf
+++ b/home/adrielus/features/cli/tmux/tmux.conf
@@ -23,9 +23,8 @@ bind - split-window -v
unbind '"'
unbind %
# }}}
-# {{{ Zoom with C-z
-unbind C-z
-bind -n C-z resize-pane -Z
+# {{{ Zoom with M-z
+bind -n M-z resize-pane -Z
# }}}
# {{{ Vim-mode
set-window-option -g mode-keys vi
diff --git a/hosts/nixos/common/optional/slambda.nix b/hosts/nixos/common/optional/slambda.nix
index 2c55a72..c8e481c 100644
--- a/hosts/nixos/common/optional/slambda.nix
+++ b/hosts/nixos/common/optional/slambda.nix
@@ -1,20 +1,25 @@
+{ lib, ... }:
let
chord = from: to: { inherit from to; };
unmap = from: chord from [ ];
commonChords = [
# {{{ Modifiers
(chord [ "s" "d" ] [ "leftshift" ])
- (chord [ "k" "l" ] [ "rightshift" ])
(chord [ "s" "f" ] [ "leftctrl" ])
- (chord [ "j" "l" ] [ "rightctrl" ])
+ (chord [ "s" "a" ] [ "leftalt" ])
+ (chord [ "l" "k" ] [ "rightshift" ])
+ (chord [ "l" "j" ] [ "rightctrl" ])
+ (chord [ "l" "semicolon" ] [ "rightalt" ])
+ (chord [ "l" "n" ] [ "rightmeta" ])
(chord [ "j" "k" "l" ] [ "rightctrl" "rightshift" ])
(chord [ "s" "d" "f" ] [ "leftctrl" "leftshift" ])
- (chord [ "n" "l" ] [ "leftmeta" ])
- (unmap [ "leftmeta" ])
+ (unmap [ "leftalt" ])
(unmap [ "leftshift" ])
- (unmap [ "rightshift" ])
(unmap [ "leftctrl" ])
+ (unmap [ "rightshift" ])
(unmap [ "rightctrl" ])
+ (unmap [ "rightalt" ])
+ (unmap [ "rightmeta" ])
# }}}
# {{{ Other special keys
(chord [ "g" "h" ] [ "backspace" ])