diff --git a/shared/home/gui/sway.nix b/shared/home/gui/sway.nix index 346cd73..3c6cb85 100644 --- a/shared/home/gui/sway.nix +++ b/shared/home/gui/sway.nix @@ -63,30 +63,33 @@ in with lib; { size = 8.0; }; - keybindings = (genWorkspaces { inherit (cfg.workspaces) numbered named; }) // { - "${mod}+h" = "focus left"; - "${mod}+j" = "focus down"; - "${mod}+k" = "focus up"; - "${mod}+l" = "focus right"; + keybindings = mkMerge [ + (genWorkspaces { inherit (cfg.workspaces) numbered named; }) + { + "${mod}+h" = "focus left"; + "${mod}+j" = "focus down"; + "${mod}+k" = "focus up"; + "${mod}+l" = "focus right"; - "${mod}+Shift+h" = "move left"; - "${mod}+Shift+j" = "move down"; - "${mod}+Shift+k" = "move up"; - "${mod}+Shift+l" = "move right"; + "${mod}+Shift+h" = "move left"; + "${mod}+Shift+j" = "move down"; + "${mod}+Shift+k" = "move up"; + "${mod}+Shift+l" = "move right"; - "${mod}+a" = "split v"; - "${mod}+s" = "split h"; - "${mod}+f" = "fullscreen toggle"; + "${mod}+a" = "split v"; + "${mod}+s" = "split h"; + "${mod}+f" = "fullscreen toggle"; - "${mod}+Alt+a" = "layout toggle stacking splitv"; - "${mod}+Alt+s" = "layout toggle tabbed splith"; + "${mod}+Alt+a" = "layout toggle stacking splitv"; + "${mod}+Alt+s" = "layout toggle tabbed splith"; - "${mod}+Return" = "exec ${terminal}"; - "${mod}+Escape" = "exec ${pkgs.swaylock}/bin/swaylock"; - "${mod}+Tab" = "exec ${pkgs.firefox}/bin/firefox"; + "${mod}+Return" = "exec ${terminal}"; + "${mod}+Escape" = "exec ${pkgs.swaylock}/bin/swaylock"; + "${mod}+Tab" = "exec ${pkgs.firefox}/bin/firefox"; - "${mod}+Backspace" = "mode kill"; - }; + "${mod}+Backspace" = "mode kill"; + } + ]; modes."kill" = { Backspace = "kill; mode default";