The Blue Update #1

Merged
Jimbo merged 101 commits from Refactor into main 2024-10-25 21:26:22 -04:00
2 changed files with 44 additions and 33 deletions
Showing only changes of commit e763ff8c1d - Show all commits

View file

@ -95,15 +95,15 @@
## Media keys ## Media keys
# Volume control # Volume control
"${secMod}+Up" = ''exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+''; "${secMod}+j" = ''exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-'';
"${secMod}+Down" = ''exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-''; "${secMod}+k" = ''exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+'';
# MPD Controls # MPD Controls
"${primeMod}+Backslash" = ''exec mpc toggle''; "${primeMod}+Backslash" = ''exec mpc toggle'';
"${secMod}+Shift+Up" = ''exec mpc volume +3''; "${secMod}+Shift+h" = ''exec mpc prev'';
"${secMod}+Shift+Down" = ''exec mpc volume -3''; "${secMod}+Shift+j" = ''exec mpc volume -3'';
"${secMod}+Shift+Right" = ''exec mpc next''; "${secMod}+Shift+k" = ''exec mpc volume +3'';
"${secMod}+Shift+Left" = ''exec mpc prev''; "${secMod}+Shift+l" = ''exec mpc next'';
## Notification keys ## Notification keys
@ -180,26 +180,32 @@
"${secMod}+Shift+F9" = ''move container to workspace ${config.ws.w9a}; workspace ${config.ws.w9a}''; "${secMod}+Shift+F9" = ''move container to workspace ${config.ws.w9a}; workspace ${config.ws.w9a}'';
# Change focus across windows # Change focus across windows
"${primeMod}+Up" = ''focus up''; "${primeMod}+h" = ''focus left'';
"${primeMod}+Down" = ''focus down''; "${primeMod}+j" = ''focus down'';
"${primeMod}+Left" = ''focus left''; "${primeMod}+k" = ''focus up'';
"${primeMod}+Right" = ''focus right''; "${primeMod}+l" = ''focus right'';
# Switch focus across config # Resize windows
"${primeMod}+j" = ''focus output ${config.displays.d2}''; "${primeMod}+${secMod}+h" = ''resize shrink width ${resizeAmount} px or 5 ppt'';
"${primeMod}+k" = ''focus output ${config.displays.d1}''; "${primeMod}+${secMod}+j" = ''resize shrink height ${resizeAmount} px or 5 ppt'';
"${primeMod}+l" = ''focus output ${config.displays.d3}''; "${primeMod}+${secMod}+k" = ''resize grow height ${resizeAmount} px or 5 ppt'';
"${primeMod}+${secMod}+l" = ''resize grow width ${resizeAmount} px or 5 ppt'';
# Move focused window # Move focused window
"${primeMod}+Shift+Up" = ''move up ${resizeAmount} px''; "${primeMod}+Shift+h" = ''move left ${resizeAmount} px'';
"${primeMod}+Shift+Down" = ''move down ${resizeAmount} px''; "${primeMod}+Shift+j" = ''move down ${resizeAmount} px'';
"${primeMod}+Shift+Left" = ''move left ${resizeAmount} px''; "${primeMod}+Shift+k" = ''move up ${resizeAmount} px'';
"${primeMod}+Shift+Right" = ''move right ${resizeAmount} px''; "${primeMod}+Shift+l" = ''move right ${resizeAmount} px'';
# Switch focus across config
"${primeMod}+i" = ''focus output ${config.displays.d2}'';
"${primeMod}+o" = ''focus output ${config.displays.d1}'';
"${primeMod}+p" = ''focus output ${config.displays.d3}'';
# Move window across config # Move window across config
"${primeMod}+Shift+j" = ''move output ${config.displays.d2}; focus output ${config.displays.d2}''; "${primeMod}+Shift+i" = ''move output ${config.displays.d2}; focus output ${config.displays.d2}'';
"${primeMod}+Shift+k" = ''move output ${config.displays.d1}; focus output ${config.displays.d1}''; "${primeMod}+Shift+o" = ''move output ${config.displays.d1}; focus output ${config.displays.d1}'';
"${primeMod}+Shift+l" = ''move output ${config.displays.d3}; focus output ${config.displays.d3}''; "${primeMod}+Shift+p" = ''move output ${config.displays.d3}; focus output ${config.displays.d3}'';
# Change focus between floating/tiled, toggle floating # Change focus between floating/tiled, toggle floating
"${primeMod}+space" = ''focus mode_toggle''; "${primeMod}+space" = ''focus mode_toggle'';
@ -217,19 +223,12 @@
"${primeMod}+e" = ''layout toggle tabbed stacking''; "${primeMod}+e" = ''layout toggle tabbed stacking'';
# Change split direction # Change split direction
"${primeMod}+h" = ''split h'';
"${primeMod}+v" = ''split v''; "${primeMod}+v" = ''split v'';
# Focus parent / child # Focus parent / child
"${primeMod}+a" = ''focus parent''; "${primeMod}+a" = ''focus parent'';
"${primeMod}+shift+a" = ''focus child''; "${primeMod}+shift+a" = ''focus child'';
# Resize windows
"${primeMod}+${secMod}+Up" = ''resize grow height ${resizeAmount} px or 5 ppt'';
"${primeMod}+${secMod}+Down" = ''resize shrink height ${resizeAmount} px or 5 ppt'';
"${primeMod}+${secMod}+Left" = ''resize shrink width ${resizeAmount} px or 5 ppt'';
"${primeMod}+${secMod}+Right" = ''resize grow width ${resizeAmount} px or 5 ppt'';
# Scratchpads # Scratchpads
"Shift+Ctrl+Delete" = ''[app_id="gotop"] scratchpad show, move position center, resize set 1216 888''; "Shift+Ctrl+Delete" = ''[app_id="gotop"] scratchpad show, move position center, resize set 1216 888'';
"${primeMod}+Shift+m" = ''[app_id="music"] scratchpad show, move position center, resize set 1006 657''; "${primeMod}+Shift+m" = ''[app_id="music"] scratchpad show, move position center, resize set 1006 657'';

View file

@ -4,11 +4,23 @@
enable = true; enable = true;
keyboards.default = { keyboards.default = {
ids = [ "*" ]; ids = [ "*" ];
settings.main = { settings = {
main = {
capslock = "overload(control,esc)"; capslock = "overload(control,esc)";
esc = "capslock"; esc = "capslock";
control = "f14"; rightcontrol = "esc";
scrolllock = "esc"; leftcontrol = "noop";
left = "noop";
down = "noop";
up = "noop";
right = "noop";
};
control = {
h = "left";
j = "down";
k = "up";
l = "right";
};
}; };
}; };
}; };