aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorAkshay Nair <phenax5@gmail.com>2024-06-21 21:43:39 +0530
committerAkshay Nair <phenax5@gmail.com>2024-06-21 21:43:39 +0530
commitb8e687924cdea281c574cd73bf79e460e7d48960 (patch)
tree02a44bbe723ad4ba80d3b14a4f2d653c77420c64 /modules
parent8278d985c1f0efbd8e4eb132503c800044e2d531 (diff)
downloadnixos-config-b8e687924cdea281c574cd73bf79e460e7d48960.tar.gz
nixos-config-b8e687924cdea281c574cd73bf79e460e7d48960.zip
config sync
Diffstat (limited to 'modules')
-rw-r--r--modules/git.home.nix4
-rw-r--r--modules/keyboard/default.nix2
-rw-r--r--modules/keyboard/kmonad.k2.kbd16
3 files changed, 18 insertions, 4 deletions
diff --git a/modules/git.home.nix b/modules/git.home.nix
index a304423..68094cc 100644
--- a/modules/git.home.nix
+++ b/modules/git.home.nix
@@ -57,6 +57,7 @@
};
delta = {
enable = true;
+ # package = pkgs.delta;
options = {
navigate = true;
side-by-side = true;
@@ -87,6 +88,9 @@
pull = {
rebase = false;
};
+ # pager = {
+ # diff = "${pkgs.delta}/bin/delta --color-only";
+ # };
};
signing.key = "AAAB13AE8B82A5267C1A35D7E1B701723EA37849";
signing.signByDefault = true;
diff --git a/modules/keyboard/default.nix b/modules/keyboard/default.nix
index 92f29b0..6d68e0c 100644
--- a/modules/keyboard/default.nix
+++ b/modules/keyboard/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
{
imports = [ ./kmonad.nix ];
diff --git a/modules/keyboard/kmonad.k2.kbd b/modules/keyboard/kmonad.k2.kbd
index 094224b..813b5f5 100644
--- a/modules/keyboard/kmonad.k2.kbd
+++ b/modules/keyboard/kmonad.k2.kbd
@@ -29,8 +29,9 @@
(defalias
- navf (tap-hold 180 f (layer-toggle navigation))
esc (tap-hold 180 esc lctl)
+ navf (tap-hold-next-release 180 f (tap-next f (layer-toggle navigation)))
+ leadf (tap-hold-next-release 180 ralt (tap-next ralt (layer-toggle leadlayer)))
)
(deflayer default
@@ -39,14 +40,23 @@
tab q w e r t y u i o p [ ] \
@esc a s d @navf g h j k l ; ' ret
lsft z x c v b n m , . / rsft
- lctl lmet lalt spc ralt rmet rctl left down up right
+ lctl lmet lalt spc @leadf rmet rctl left down up right
)
(deflayer navigation
_
_ 1 2 3 4 5 6 7 8 9 0 _ _ _
- _ _ _ _ _ _ _ _ _ _ _ _ _ _
+ _ _ _ _ _ _ ret _ _ _ _ _ _ _
_ _ _ _ _ _ left down up right _ _ _
_ _ _ _ _ _ _ _ _ _ _ _
_ _ _ ret _ _ _ _ _ _ _
)
+
+(deflayer leadlayer
+ _
+ _ 1 2 3 4 5 6 7 8 9 0 _ _ _
+ _ 4 5 6 _ _ _ _ _ _ _ _ _ _
+ _ 7 8 9 _ _ _ _ _ _ _ _ _
+ _ 0 0 0 _ _ _ _ _ _ _ _
+ _ _ _ _ _ _ _ _ _ _ _
+)