diff options
| -rw-r--r-- | modules/services/window-managers/i3.nix | 45 | ||||
| -rw-r--r-- | tests/modules/services/window-managers/i3-keybindings-expected.conf | 41 |
2 files changed, 49 insertions, 37 deletions
diff --git a/modules/services/window-managers/i3.nix b/modules/services/window-managers/i3.nix index 412f5cc0298..7a4ec90b1cd 100644 --- a/modules/services/window-managers/i3.nix +++ b/modules/services/window-managers/i3.nix @@ -456,25 +456,32 @@ let "${cfg.config.modifier}+Shift+space" = "floating toggle"; "${cfg.config.modifier}+space" = "focus mode_toggle"; - "${cfg.config.modifier}+1" = "workspace 1"; - "${cfg.config.modifier}+2" = "workspace 2"; - "${cfg.config.modifier}+3" = "workspace 3"; - "${cfg.config.modifier}+4" = "workspace 4"; - "${cfg.config.modifier}+5" = "workspace 5"; - "${cfg.config.modifier}+6" = "workspace 6"; - "${cfg.config.modifier}+7" = "workspace 7"; - "${cfg.config.modifier}+8" = "workspace 8"; - "${cfg.config.modifier}+9" = "workspace 9"; - - "${cfg.config.modifier}+Shift+1" = "move container to workspace 1"; - "${cfg.config.modifier}+Shift+2" = "move container to workspace 2"; - "${cfg.config.modifier}+Shift+3" = "move container to workspace 3"; - "${cfg.config.modifier}+Shift+4" = "move container to workspace 4"; - "${cfg.config.modifier}+Shift+5" = "move container to workspace 5"; - "${cfg.config.modifier}+Shift+6" = "move container to workspace 6"; - "${cfg.config.modifier}+Shift+7" = "move container to workspace 7"; - "${cfg.config.modifier}+Shift+8" = "move container to workspace 8"; - "${cfg.config.modifier}+Shift+9" = "move container to workspace 9"; + "${cfg.config.modifier}+a" = "focus parent"; + + "${cfg.config.modifier}+Shift+minus" = "move scratchpad"; + "${cfg.config.modifier}+minus" = "scratchpad show"; + + "${cfg.config.modifier}+1" = "workspace number 1"; + "${cfg.config.modifier}+2" = "workspace number 2"; + "${cfg.config.modifier}+3" = "workspace number 3"; + "${cfg.config.modifier}+4" = "workspace number 4"; + "${cfg.config.modifier}+5" = "workspace number 5"; + "${cfg.config.modifier}+6" = "workspace number 6"; + "${cfg.config.modifier}+7" = "workspace number 7"; + "${cfg.config.modifier}+8" = "workspace number 8"; + "${cfg.config.modifier}+9" = "workspace number 9"; + "${cfg.config.modifier}+0" = "workspace number 10"; + + "${cfg.config.modifier}+Shift+1" = "move container to workspace number 1"; + "${cfg.config.modifier}+Shift+2" = "move container to workspace number 2"; + "${cfg.config.modifier}+Shift+3" = "move container to workspace number 3"; + "${cfg.config.modifier}+Shift+4" = "move container to workspace number 4"; + "${cfg.config.modifier}+Shift+5" = "move container to workspace number 5"; + "${cfg.config.modifier}+Shift+6" = "move container to workspace number 6"; + "${cfg.config.modifier}+Shift+7" = "move container to workspace number 7"; + "${cfg.config.modifier}+Shift+8" = "move container to workspace number 8"; + "${cfg.config.modifier}+Shift+9" = "move container to workspace number 9"; + "${cfg.config.modifier}+Shift+0" = "move container to workspace number 10"; "${cfg.config.modifier}+Shift+c" = "reload"; "${cfg.config.modifier}+Shift+r" = "restart"; diff --git a/tests/modules/services/window-managers/i3-keybindings-expected.conf b/tests/modules/services/window-managers/i3-keybindings-expected.conf index f044f2584b5..1e385e8c734 100644 --- a/tests/modules/services/window-managers/i3-keybindings-expected.conf +++ b/tests/modules/services/window-managers/i3-keybindings-expected.conf @@ -17,43 +17,48 @@ client.urgent #2f343a #900000 #ffffff #900000 #900000 client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c client.background #ffffff -bindsym Mod1+1 workspace 1 -bindsym Mod1+2 workspace 2 -bindsym Mod1+3 workspace 3 -bindsym Mod1+4 workspace 4 -bindsym Mod1+5 workspace 5 -bindsym Mod1+6 workspace 6 -bindsym Mod1+7 workspace 7 -bindsym Mod1+8 workspace 8 -bindsym Mod1+9 workspace 9 +bindsym Mod1+0 workspace number 10 +bindsym Mod1+1 workspace number 1 +bindsym Mod1+2 workspace number 2 +bindsym Mod1+3 workspace number 3 +bindsym Mod1+4 workspace number 4 +bindsym Mod1+5 workspace number 5 +bindsym Mod1+6 workspace number 6 +bindsym Mod1+7 workspace number 7 +bindsym Mod1+8 workspace number 8 +bindsym Mod1+9 workspace number 9 bindsym Mod1+Down focus down bindsym Mod1+Invented invented-key-command bindsym Mod1+Left overridden-command bindsym Mod1+Return exec i3-sensible-terminal -bindsym Mod1+Shift+1 move container to workspace 1 -bindsym Mod1+Shift+2 move container to workspace 2 -bindsym Mod1+Shift+3 move container to workspace 3 -bindsym Mod1+Shift+4 move container to workspace 4 -bindsym Mod1+Shift+5 move container to workspace 5 -bindsym Mod1+Shift+6 move container to workspace 6 -bindsym Mod1+Shift+7 move container to workspace 7 -bindsym Mod1+Shift+8 move container to workspace 8 -bindsym Mod1+Shift+9 move container to workspace 9 +bindsym Mod1+Shift+0 move container to workspace number 10 +bindsym Mod1+Shift+1 move container to workspace number 1 +bindsym Mod1+Shift+2 move container to workspace number 2 +bindsym Mod1+Shift+3 move container to workspace number 3 +bindsym Mod1+Shift+4 move container to workspace number 4 +bindsym Mod1+Shift+5 move container to workspace number 5 +bindsym Mod1+Shift+6 move container to workspace number 6 +bindsym Mod1+Shift+7 move container to workspace number 7 +bindsym Mod1+Shift+8 move container to workspace number 8 +bindsym Mod1+Shift+9 move container to workspace number 9 bindsym Mod1+Shift+Down move down bindsym Mod1+Shift+Left move left bindsym Mod1+Shift+Right move right bindsym Mod1+Shift+Up move up bindsym Mod1+Shift+c reload bindsym Mod1+Shift+e exec i3-nagbar -t warning -m 'Do you want to exit i3?' -b 'Yes' 'i3-msg exit' +bindsym Mod1+Shift+minus move scratchpad bindsym Mod1+Shift+q kill bindsym Mod1+Shift+r restart bindsym Mod1+Shift+space floating toggle bindsym Mod1+Up focus up +bindsym Mod1+a focus parent bindsym Mod1+d exec @dmenu@/bin/dmenu_run bindsym Mod1+e layout toggle split bindsym Mod1+f fullscreen toggle bindsym Mod1+h split h +bindsym Mod1+minus scratchpad show bindsym Mod1+r mode resize bindsym Mod1+s layout stacking bindsym Mod1+space focus mode_toggle |