Compare commits

...

3 commits

Author SHA1 Message Date
Evie Litherland-Smith 787435d7ce Remove media workspace, add documents workspace 2024-11-05 10:45:38 +00:00
Evie Litherland-Smith c47aa27321 Disable remapping caps to ctrl at xserver level
Use kanata to allow caps on tap and ctrl on hold.
2024-11-05 10:34:24 +00:00
Evie Litherland-Smith f16bd93df0 Rotate home row mods
Move shift to outer key (a/;), feels more natural. Rotate all other
keys by 1 inwards accordingly.
2024-11-05 10:00:23 +00:00
5 changed files with 20 additions and 23 deletions

View file

@ -87,11 +87,7 @@
}; };
xserver = { xserver = {
enable = true; enable = true;
xkb = { xkb.layout = "gb";
layout = "gb";
variant = "";
options = "ctrl:nocaps";
};
}; };
}; };
xdg.portal = { xdg.portal = {

View file

@ -2,6 +2,7 @@
config, config,
lib, lib,
pkgs, pkgs,
osConfig,
... ...
}: }:
{ {
@ -175,8 +176,7 @@
]; ];
gestures.workspace_swipe = true; gestures.workspace_swipe = true;
input = { input = {
kb_layout = "gb"; kb_layout = osConfig.services.xserver.xkb.layout;
kb_options = "ctrl:nocaps";
follow_mouse = 1; follow_mouse = 1;
touchpad.natural_scroll = "yes"; touchpad.natural_scroll = "yes";
}; };
@ -279,8 +279,8 @@
# Workspace rules # Workspace rules
"workspace 2, firefox" # Browser "workspace 2, firefox" # Browser
"workspace 3, (signal|whatsapp-for-linux|WebCord|teams-for-linux)" # Messaging "workspace 3, (libreoffice|soffice)(.*)" # Documents
"workspace 4, (com.github.neithern.g4music|com.github.rafostar.Clapper)" # Media "workspace 4, (signal|whatsapp-for-linux|WebCord|teams-for-linux)" # Messaging
"workspace 5, (org.remmina.Remmina|Nxplayer.bin)" # Remote Desktop "workspace 5, (org.remmina.Remmina|Nxplayer.bin)" # Remote Desktop
"workspace 6 silent, (steam|steam_app|lutris|page.kramo.Cartridges|org.prismlauncher.PrismLauncher)" # Gaming "workspace 6 silent, (steam|steam_app|lutris|page.kramo.Cartridges|org.prismlauncher.PrismLauncher)" # Gaming

View file

@ -2,6 +2,7 @@
config, config,
lib, lib,
pkgs, pkgs,
osConfig,
... ...
}: }:
{ {
@ -75,8 +76,7 @@
config = { config = {
input = { input = {
"*" = { "*" = {
xkb_layout = "gb"; xkb_layout = osConfig.services.xserver.xkb.layout;
xkb_options = "ctrl:nocaps";
}; };
"type:touchpad" = { "type:touchpad" = {
tap = "enabled"; tap = "enabled";

View file

@ -38,8 +38,8 @@
format-icons = { format-icons = {
"1" = "󰆍 "; "1" = "󰆍 ";
"2" = "󰈹 "; "2" = "󰈹 ";
"3" = "󰭹 "; "3" = "󰝰 ";
"4" = "󰝚 "; "4" = "󰭹 ";
"5" = "󰢹 "; "5" = "󰢹 ";
"6" = "󰓓 "; "6" = "󰓓 ";
default = "󰀻 "; default = "󰀻 ";

View file

@ -1,5 +1,5 @@
(defsrc (defsrc
a s d f j k l ; caps a s d f j k l ;
) )
(defvar (defvar
tap-time 150 tap-time 150
@ -7,18 +7,19 @@
) )
(defalias (defalias
a (tap-hold $tap-time $hold-time a lalt) capsctrl (tap-hold 100 100 caps lctl)
s (tap-hold $tap-time $hold-time s lmet) a (tap-hold $tap-time $hold-time a lsft)
d (tap-hold $tap-time $hold-time d lctl) s (tap-hold $tap-time $hold-time s lalt)
f (tap-hold $tap-time $hold-time f lsft) d (tap-hold $tap-time $hold-time d lmet)
j (tap-hold $tap-time $hold-time j lsft) f (tap-hold $tap-time $hold-time f lctl)
k (tap-hold $tap-time $hold-time k lctl) j (tap-hold $tap-time $hold-time j lctl)
l (tap-hold $tap-time $hold-time l lmet) k (tap-hold $tap-time $hold-time k lmet)
; (tap-hold $tap-time $hold-time ; lalt) l (tap-hold $tap-time $hold-time l lalt)
; (tap-hold $tap-time $hold-time ; lsft)
) )
(deflayer base (deflayer base
@a @s @d @f @j @k @l @; @capsctrl @a @s @d @f @j @k @l @;
) )
;; Local Variables: ;; Local Variables: