Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

sway: fix workspace 10 missing from default config (#4636)

Browse source 
workspace 10 is part of upstream's default config, but was missing in home-manager.

The initial "sway: add module" PR (02d6040003) went through multiple iterations and had workspace 10 included for a brief moment.
Until the author removed it in a force-push commenting

> Have removed the last change which added bound ${modifer}+0 to workspace number 10 as this messed up workspace numbering in sway.

The reason might have been, that sway used to sort the workspaces in the order they appeared in the config.

Attribute sets in nix are sorted, but not "naturally sorted", meaning `bindsym Mod1+0 workspace number 10` comes before `bindsym Mod1+0 workspace number 1`.

It's unclear if that's what really happened. A workaround would have been to use `lib.lists.naturalSort` in `keybindingsStr`.

But I cannot reproduce this anymore in any way.
I assume this has been fixed many years ago by now.

upstream config: 020a572ed6/config.in (L113-L134)
This commit is contained in:
Emily 2024-02-10 19:59:52 +01:00 committed by GitHub
parent 5b9156fa9a
commit 4c0357ff87
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/services/window-managers/i3-sway/sway.nix
View file

@ -91,6 +91,7 @@ let
"${cfg.config.modifier}+7" = "workspace number 7"; "${cfg.config.modifier}+7" = "workspace number 7";
"${cfg.config.modifier}+8" = "workspace number 8"; "${cfg.config.modifier}+8" = "workspace number 8";
"${cfg.config.modifier}+9" = "workspace number 9"; "${cfg.config.modifier}+9" = "workspace number 9";
"${cfg.config.modifier}+0" = "workspace number 10";
"${cfg.config.modifier}+Shift+1" = "${cfg.config.modifier}+Shift+1" =
"move container to workspace number 1"; "move container to workspace number 1";
@ -110,6 +111,8 @@ let
"move container to workspace number 8"; "move container to workspace number 8";
"${cfg.config.modifier}+Shift+9" = "${cfg.config.modifier}+Shift+9" =
"move container to workspace number 9"; "move container to workspace number 9";
"${cfg.config.modifier}+Shift+0" =
"move container to workspace number 10";
"${cfg.config.modifier}+Shift+minus" = "move scratchpad"; "${cfg.config.modifier}+Shift+minus" = "move scratchpad";
"${cfg.config.modifier}+minus" = "scratchpad show"; "${cfg.config.modifier}+minus" = "scratchpad show";

2
tests/modules/services/window-managers/sway/sway-bar-focused-colors.conf
View file

@ -16,6 +16,7 @@ client.urgent #2f343a #900000 #ffffff #900000 #900000
client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c
client.background #ffffff client.background #ffffff
bindsym Mod1+0 workspace number 10
bindsym Mod1+1 workspace number 1 bindsym Mod1+1 workspace number 1
bindsym Mod1+2 workspace number 2 bindsym Mod1+2 workspace number 2
bindsym Mod1+3 workspace number 3 bindsym Mod1+3 workspace number 3
@ -29,6 +30,7 @@ bindsym Mod1+Down focus down
bindsym Mod1+Left focus left bindsym Mod1+Left focus left
bindsym Mod1+Return exec @foot@/bin/foot bindsym Mod1+Return exec @foot@/bin/foot
bindsym Mod1+Right focus right bindsym Mod1+Right focus right
bindsym Mod1+Shift+0 move container to workspace number 10
bindsym Mod1+Shift+1 move container to workspace number 1 bindsym Mod1+Shift+1 move container to workspace number 1
bindsym Mod1+Shift+2 move container to workspace number 2 bindsym Mod1+Shift+2 move container to workspace number 2
bindsym Mod1+Shift+3 move container to workspace number 3 bindsym Mod1+Shift+3 move container to workspace number 3

2
tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.conf
View file

@ -18,6 +18,7 @@ client.urgent #2f343a #900000 #ffffff #900000 #900000
client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c
client.background #ffffff client.background #ffffff
bindsym --to-code Mod1+0 workspace number 10
bindsym --to-code Mod1+1 workspace number 1 bindsym --to-code Mod1+1 workspace number 1
bindsym --to-code Mod1+2 workspace number 2 bindsym --to-code Mod1+2 workspace number 2
bindsym --to-code Mod1+3 workspace number 3 bindsym --to-code Mod1+3 workspace number 3
@ -31,6 +32,7 @@ bindsym --to-code Mod1+Down focus down
bindsym --to-code Mod1+Left focus left bindsym --to-code Mod1+Left focus left
bindsym --to-code Mod1+Return exec @foot@/bin/foot bindsym --to-code Mod1+Return exec @foot@/bin/foot
bindsym --to-code Mod1+Right focus right bindsym --to-code Mod1+Right focus right
bindsym --to-code Mod1+Shift+0 move container to workspace number 10
bindsym --to-code Mod1+Shift+1 move container to workspace number 1 bindsym --to-code Mod1+Shift+1 move container to workspace number 1
bindsym --to-code Mod1+Shift+2 move container to workspace number 2 bindsym --to-code Mod1+Shift+2 move container to workspace number 2
bindsym --to-code Mod1+Shift+3 move container to workspace number 3 bindsym --to-code Mod1+Shift+3 move container to workspace number 3

2
tests/modules/services/window-managers/sway/sway-default.conf
View file

@ -16,6 +16,7 @@ client.urgent #2f343a #900000 #ffffff #900000 #900000
client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c
client.background #ffffff client.background #ffffff
bindsym Mod1+0 workspace number 10
bindsym Mod1+1 workspace number 1 bindsym Mod1+1 workspace number 1
bindsym Mod1+2 workspace number 2 bindsym Mod1+2 workspace number 2
bindsym Mod1+3 workspace number 3 bindsym Mod1+3 workspace number 3
@ -29,6 +30,7 @@ bindsym Mod1+Down focus down
bindsym Mod1+Left focus left bindsym Mod1+Left focus left
bindsym Mod1+Return exec @foot@/bin/foot bindsym Mod1+Return exec @foot@/bin/foot
bindsym Mod1+Right focus right bindsym Mod1+Right focus right
bindsym Mod1+Shift+0 move container to workspace number 10
bindsym Mod1+Shift+1 move container to workspace number 1 bindsym Mod1+Shift+1 move container to workspace number 1
bindsym Mod1+Shift+2 move container to workspace number 2 bindsym Mod1+Shift+2 move container to workspace number 2
bindsym Mod1+Shift+3 move container to workspace number 3 bindsym Mod1+Shift+3 move container to workspace number 3

2
tests/modules/services/window-managers/sway/sway-followmouse-expected.conf
View file

@ -16,6 +16,7 @@ client.urgent #2f343a #900000 #ffffff #900000 #900000
client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c
client.background #ffffff client.background #ffffff
bindsym Mod1+0 workspace number 10
bindsym Mod1+1 workspace number 1 bindsym Mod1+1 workspace number 1
bindsym Mod1+2 workspace number 2 bindsym Mod1+2 workspace number 2
bindsym Mod1+3 workspace number 3 bindsym Mod1+3 workspace number 3
@ -29,6 +30,7 @@ bindsym Mod1+Down focus down
bindsym Mod1+Left focus left bindsym Mod1+Left focus left
bindsym Mod1+Return exec @foot@/bin/foot bindsym Mod1+Return exec @foot@/bin/foot
bindsym Mod1+Right focus right bindsym Mod1+Right focus right
bindsym Mod1+Shift+0 move container to workspace number 10
bindsym Mod1+Shift+1 move container to workspace number 1 bindsym Mod1+Shift+1 move container to workspace number 1
bindsym Mod1+Shift+2 move container to workspace number 2 bindsym Mod1+Shift+2 move container to workspace number 2
bindsym Mod1+Shift+3 move container to workspace number 3 bindsym Mod1+Shift+3 move container to workspace number 3

2
tests/modules/services/window-managers/sway/sway-followmouse-legacy-expected.conf
View file

@ -16,6 +16,7 @@ client.urgent #2f343a #900000 #ffffff #900000 #900000
client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c
client.background #ffffff client.background #ffffff
bindsym Mod1+0 workspace number 10
bindsym Mod1+1 workspace number 1 bindsym Mod1+1 workspace number 1
bindsym Mod1+2 workspace number 2 bindsym Mod1+2 workspace number 2
bindsym Mod1+3 workspace number 3 bindsym Mod1+3 workspace number 3
@ -29,6 +30,7 @@ bindsym Mod1+Down focus down
bindsym Mod1+Left focus left bindsym Mod1+Left focus left
bindsym Mod1+Return exec @foot@/bin/foot bindsym Mod1+Return exec @foot@/bin/foot
bindsym Mod1+Right focus right bindsym Mod1+Right focus right
bindsym Mod1+Shift+0 move container to workspace number 10
bindsym Mod1+Shift+1 move container to workspace number 1 bindsym Mod1+Shift+1 move container to workspace number 1
bindsym Mod1+Shift+2 move container to workspace number 2 bindsym Mod1+Shift+2 move container to workspace number 2
bindsym Mod1+Shift+3 move container to workspace number 3 bindsym Mod1+Shift+3 move container to workspace number 3

2
tests/modules/services/window-managers/sway/sway-modules.conf
View file

@ -16,6 +16,7 @@ client.urgent #2f343a #900000 #ffffff #900000 #900000
client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c
client.background #ffffff client.background #ffffff
bindsym Mod1+0 workspace number 10
bindsym Mod1+1 workspace number 1 bindsym Mod1+1 workspace number 1
bindsym Mod1+2 workspace number 2 bindsym Mod1+2 workspace number 2
bindsym Mod1+3 workspace number 3 bindsym Mod1+3 workspace number 3
@ -29,6 +30,7 @@ bindsym Mod1+Down focus down
bindsym Mod1+Left focus left bindsym Mod1+Left focus left
bindsym Mod1+Return exec @foot@/bin/foot bindsym Mod1+Return exec @foot@/bin/foot
bindsym Mod1+Right focus right bindsym Mod1+Right focus right
bindsym Mod1+Shift+0 move container to workspace number 10
bindsym Mod1+Shift+1 move container to workspace number 1 bindsym Mod1+Shift+1 move container to workspace number 1
bindsym Mod1+Shift+2 move container to workspace number 2 bindsym Mod1+Shift+2 move container to workspace number 2
bindsym Mod1+Shift+3 move container to workspace number 3 bindsym Mod1+Shift+3 move container to workspace number 3

2
tests/modules/services/window-managers/sway/sway-null-package.conf
View file

@ -16,6 +16,7 @@ client.urgent #2f343a #900000 #ffffff #900000 #900000
client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c
client.background #ffffff client.background #ffffff
bindsym Mod1+0 workspace number 10
bindsym Mod1+1 workspace number 1 bindsym Mod1+1 workspace number 1
bindsym Mod1+2 workspace number 2 bindsym Mod1+2 workspace number 2
bindsym Mod1+3 workspace number 3 bindsym Mod1+3 workspace number 3
@ -29,6 +30,7 @@ bindsym Mod1+Down focus down
bindsym Mod1+Left focus left bindsym Mod1+Left focus left
bindsym Mod1+Return exec @foot@/bin/foot bindsym Mod1+Return exec @foot@/bin/foot
bindsym Mod1+Right focus right bindsym Mod1+Right focus right
bindsym Mod1+Shift+0 move container to workspace number 10
bindsym Mod1+Shift+1 move container to workspace number 1 bindsym Mod1+Shift+1 move container to workspace number 1
bindsym Mod1+Shift+2 move container to workspace number 2 bindsym Mod1+Shift+2 move container to workspace number 2
bindsym Mod1+Shift+3 move container to workspace number 3 bindsym Mod1+Shift+3 move container to workspace number 3

2
tests/modules/services/window-managers/sway/sway-post-2003.conf
View file

@ -16,6 +16,7 @@ client.urgent #2f343a #900000 #ffffff #900000 #900000
client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c
client.background #ffffff client.background #ffffff
bindsym Mod1+0 workspace number 10
bindsym Mod1+1 workspace number 1 bindsym Mod1+1 workspace number 1
bindsym Mod1+2 workspace number 2 bindsym Mod1+2 workspace number 2
bindsym Mod1+3 workspace number 3 bindsym Mod1+3 workspace number 3
@ -29,6 +30,7 @@ bindsym Mod1+Down focus down
bindsym Mod1+Left focus left bindsym Mod1+Left focus left
bindsym Mod1+Return exec @foot@/bin/foot bindsym Mod1+Return exec @foot@/bin/foot
bindsym Mod1+Right focus right bindsym Mod1+Right focus right
bindsym Mod1+Shift+0 move container to workspace number 10
bindsym Mod1+Shift+1 move container to workspace number 1 bindsym Mod1+Shift+1 move container to workspace number 1
bindsym Mod1+Shift+2 move container to workspace number 2 bindsym Mod1+Shift+2 move container to workspace number 2
bindsym Mod1+Shift+3 move container to workspace number 3 bindsym Mod1+Shift+3 move container to workspace number 3

2
tests/modules/services/window-managers/sway/sway-workspace-default-expected.conf
View file

@ -16,6 +16,7 @@ client.urgent #2f343a #900000 #ffffff #900000 #900000
client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c
client.background #ffffff client.background #ffffff
bindsym Mod1+9 workspace number 9 bindsym Mod1+9 workspace number 9
bindsym Mod1+0 workspace number 10
bindsym Mod1+1 workspace number 1 bindsym Mod1+1 workspace number 1
bindsym Mod1+2 workspace number 2 bindsym Mod1+2 workspace number 2
bindsym Mod1+3 workspace number 3 bindsym Mod1+3 workspace number 3
@ -28,6 +29,7 @@ bindsym Mod1+Down focus down
bindsym Mod1+Left focus left bindsym Mod1+Left focus left
bindsym Mod1+Return exec @foot@/bin/foot bindsym Mod1+Return exec @foot@/bin/foot
bindsym Mod1+Right focus right bindsym Mod1+Right focus right
bindsym Mod1+Shift+0 move container to workspace number 10
bindsym Mod1+Shift+1 move container to workspace number 1 bindsym Mod1+Shift+1 move container to workspace number 1
bindsym Mod1+Shift+2 move container to workspace number 2 bindsym Mod1+Shift+2 move container to workspace number 2
bindsym Mod1+Shift+3 move container to workspace number 3 bindsym Mod1+Shift+3 move container to workspace number 3

2
tests/modules/services/window-managers/sway/sway-workspace-output-expected.conf
View file

@ -16,6 +16,7 @@ client.urgent #2f343a #900000 #ffffff #900000 #900000
client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c
client.background #ffffff client.background #ffffff
bindsym Mod1+0 workspace number 10
bindsym Mod1+1 workspace number 1 bindsym Mod1+1 workspace number 1
bindsym Mod1+2 workspace number 2 bindsym Mod1+2 workspace number 2
bindsym Mod1+3 workspace number 3 bindsym Mod1+3 workspace number 3
@ -29,6 +30,7 @@ bindsym Mod1+Down focus down
bindsym Mod1+Left focus left bindsym Mod1+Left focus left
bindsym Mod1+Return exec @foot@/bin/foot bindsym Mod1+Return exec @foot@/bin/foot
bindsym Mod1+Right focus right bindsym Mod1+Right focus right
bindsym Mod1+Shift+0 move container to workspace number 10
bindsym Mod1+Shift+1 move container to workspace number 1 bindsym Mod1+Shift+1 move container to workspace number 1
bindsym Mod1+Shift+2 move container to workspace number 2 bindsym Mod1+Shift+2 move container to workspace number 2
bindsym Mod1+Shift+3 move container to workspace number 3 bindsym Mod1+Shift+3 move container to workspace number 3