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

i3-sway: Use foot as default terminal on sway (#3490)

Browse source
This commit is contained in:
Martin Weinelt 2023-01-03 19:26:08 +01:00 committed by GitHub
parent c1a830c8fa
commit d01e7280ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/services/window-managers/i3-sway/lib/options.nix
View file

@ -835,10 +835,7 @@ in {
terminal = mkOption { terminal = mkOption {
type = types.str; type = types.str;
default = if isI3 then default = if isI3 then "i3-sensible-terminal" else "${pkgs.foot}/bin/foot";
"i3-sensible-terminal"
else
"${pkgs.rxvt-unicode-unwrapped}/bin/urxvt";
description = "Default terminal to run."; description = "Default terminal to run.";
example = "alacritty"; example = "alacritty";
}; };

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

@ -27,7 +27,7 @@ bindsym Mod1+8 workspace number 8
bindsym Mod1+9 workspace number 9 bindsym Mod1+9 workspace number 9
bindsym Mod1+Down focus down bindsym Mod1+Down focus down
bindsym Mod1+Left focus left bindsym Mod1+Left focus left
bindsym Mod1+Return exec @rxvt-unicode-unwrapped@/bin/urxvt bindsym Mod1+Return exec @foot@/bin/foot
bindsym Mod1+Right focus right bindsym Mod1+Right focus right
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

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

@ -29,7 +29,7 @@ bindsym --to-code Mod1+8 workspace number 8
bindsym --to-code Mod1+9 workspace number 9 bindsym --to-code Mod1+9 workspace number 9
bindsym --to-code Mod1+Down focus down 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 @rxvt-unicode-unwrapped@/bin/urxvt 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+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

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

@ -27,7 +27,7 @@ bindsym Mod1+8 workspace number 8
bindsym Mod1+9 workspace number 9 bindsym Mod1+9 workspace number 9
bindsym Mod1+Down focus down bindsym Mod1+Down focus down
bindsym Mod1+Left focus left bindsym Mod1+Left focus left
bindsym Mod1+Return exec @rxvt-unicode-unwrapped@/bin/urxvt bindsym Mod1+Return exec @foot@/bin/foot
bindsym Mod1+Right focus right bindsym Mod1+Right focus right
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

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

@ -27,7 +27,7 @@ bindsym Mod1+8 workspace number 8
bindsym Mod1+9 workspace number 9 bindsym Mod1+9 workspace number 9
bindsym Mod1+Down focus down bindsym Mod1+Down focus down
bindsym Mod1+Left focus left bindsym Mod1+Left focus left
bindsym Mod1+Return exec @rxvt-unicode-unwrapped@/bin/urxvt bindsym Mod1+Return exec @foot@/bin/foot
bindsym Mod1+Right focus right bindsym Mod1+Right focus right
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

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

@ -27,7 +27,7 @@ bindsym Mod1+8 workspace number 8
bindsym Mod1+9 workspace number 9 bindsym Mod1+9 workspace number 9
bindsym Mod1+Down focus down bindsym Mod1+Down focus down
bindsym Mod1+Left focus left bindsym Mod1+Left focus left
bindsym Mod1+Return exec @rxvt-unicode-unwrapped@/bin/urxvt bindsym Mod1+Return exec @foot@/bin/foot
bindsym Mod1+Right focus right bindsym Mod1+Right focus right
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

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

@ -27,7 +27,7 @@ bindsym Mod1+8 workspace number 8
bindsym Mod1+9 workspace number 9 bindsym Mod1+9 workspace number 9
bindsym Mod1+Down focus down bindsym Mod1+Down focus down
bindsym Mod1+Left focus left bindsym Mod1+Left focus left
bindsym Mod1+Return exec @rxvt-unicode-unwrapped@/bin/urxvt bindsym Mod1+Return exec @foot@/bin/foot
bindsym Mod1+Right focus right bindsym Mod1+Right focus right
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

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

@ -27,7 +27,7 @@ bindsym Mod1+8 workspace number 8
bindsym Mod1+9 workspace number 9 bindsym Mod1+9 workspace number 9
bindsym Mod1+Down focus down bindsym Mod1+Down focus down
bindsym Mod1+Left focus left bindsym Mod1+Left focus left
bindsym Mod1+Return exec @rxvt-unicode-unwrapped@/bin/urxvt bindsym Mod1+Return exec @foot@/bin/foot
bindsym Mod1+Right focus right bindsym Mod1+Right focus right
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

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

@ -3,7 +3,7 @@
# not containing hashes, version numbers etc. # not containing hashes, version numbers etc.
test.stubs = { test.stubs = {
dmenu = { }; dmenu = { };
rxvt-unicode-unwrapped = { }; foot = { };
i3status = { }; i3status = { };
sway = { }; sway = { };
sway-unwrapped = { version = "1"; }; sway-unwrapped = { version = "1"; };

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

@ -26,7 +26,7 @@ bindsym Mod1+7 workspace number 7
bindsym Mod1+8 workspace number 8 bindsym Mod1+8 workspace number 8
bindsym Mod1+Down focus down bindsym Mod1+Down focus down
bindsym Mod1+Left focus left bindsym Mod1+Left focus left
bindsym Mod1+Return exec @rxvt-unicode-unwrapped@/bin/urxvt bindsym Mod1+Return exec @foot@/bin/foot
bindsym Mod1+Right focus right bindsym Mod1+Right focus right
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

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

@ -27,7 +27,7 @@ bindsym Mod1+8 workspace number 8
bindsym Mod1+9 workspace number 9 bindsym Mod1+9 workspace number 9
bindsym Mod1+Down focus down bindsym Mod1+Down focus down
bindsym Mod1+Left focus left bindsym Mod1+Left focus left
bindsym Mod1+Return exec @rxvt-unicode-unwrapped@/bin/urxvt bindsym Mod1+Return exec @foot@/bin/foot
bindsym Mod1+Right focus right bindsym Mod1+Right focus right
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