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

i3/sway: improve i3.nix to handle options as list like in sway, adjusted functions for less new-lines (#2314)

Browse source 
* i3/sway: Improve code to generate config to avoid new-line issues on code/config changes

* Maintainer: Add SebTM as maintainer
This commit is contained in:
Basti 2022-03-21 23:52:57 +01:00 committed by GitHub
parent bbc5e0c1e1
commit 80b4360678
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 313 additions and 447 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/CODEOWNERS vendored
View file

@ -407,13 +407,13 @@
/modules/services/window-managers/herbstluftwm @olmokramer /modules/services/window-managers/herbstluftwm @olmokramer
/tests/modules/services/window-managers/herbstluftwm @olmokramer /tests/modules/services/window-managers/herbstluftwm @olmokramer
/modules/services/window-managers/i3-sway/i3.nix @sumnerevans /modules/services/window-managers/i3-sway/i3.nix @sumnerevans @sebtm
/tests/modules/services/window-managers/i3 @sumnerevans /tests/modules/services/window-managers/i3 @sumnerevans @sebtm
/modules/services/window-managers/i3-sway/lib @sumnerevans /modules/services/window-managers/i3-sway/lib @sumnerevans @sebtm
/modules/services/window-managers/i3-sway/sway.nix @alexarice @sumnerevans /modules/services/window-managers/i3-sway/sway.nix @alexarice @sumnerevans @sebtm
/tests/modules/services/window-managers/sway @sumnerevans /tests/modules/services/window-managers/sway @sumnerevans @sebtm
/modules/services/window-managers/i3-sway/swaynag.nix @polykernel /modules/services/window-managers/i3-sway/swaynag.nix @polykernel

6
modules/lib/maintainers.nix
View file

@ -241,4 +241,10 @@
github = "kmaasrud"; github = "kmaasrud";
githubId = 54394333; githubId = 54394333;
}; };
sebtm = {
name = "Sebastian Sellmeier";
email = "sebtm@users.noreply.github.com";
github = "sebtm";
githubId = 17243347;
};
} }

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

@ -134,7 +134,7 @@ let
}; };
commonFunctions = import ./lib/functions.nix { commonFunctions = import ./lib/functions.nix {
inherit cfg lib; inherit config cfg lib;
moduleName = "i3"; moduleName = "i3";
}; };
@ -143,53 +143,49 @@ let
floatingCriteriaStr windowCommandsStr colorSetStr windowBorderString floatingCriteriaStr windowCommandsStr colorSetStr windowBorderString
fontConfigStr keybindingDefaultWorkspace keybindingsRest workspaceOutputStr; fontConfigStr keybindingDefaultWorkspace keybindingsRest workspaceOutputStr;
startupEntryStr = { command, always, notification, workspace, ... }: '' startupEntryStr = { command, always, notification, workspace, ... }:
${if always then "exec_always" else "exec"} ${ concatStringsSep " " [
if (notification && workspace == null) then "" else "--no-startup-id" (if always then "exec_always" else "exec")
} ${ (if (notification && workspace == null) then "" else "--no-startup-id")
if (workspace == null) then (if (workspace == null) then
command command
else else
"i3-msg 'workspace ${workspace}; exec ${command}'" "i3-msg 'workspace ${workspace}; exec ${command}'")
} ];
'';
configFile = pkgs.writeText "i3.conf" ((if cfg.config != null then configFile = pkgs.writeText "i3.conf" (concatStringsSep "\n"
with cfg.config; '' ((if cfg.config != null then
${fontConfigStr fonts} with cfg.config;
floating_modifier ${floating.modifier} ([
${windowBorderString window floating} (fontConfigStr fonts)
hide_edge_borders ${window.hideEdgeBorders} "floating_modifier ${floating.modifier}"
force_focus_wrapping ${if focus.forceWrapping then "yes" else "no"} (windowBorderString window floating)
focus_follows_mouse ${if focus.followMouse then "yes" else "no"} "hide_edge_borders ${window.hideEdgeBorders}"
focus_on_window_activation ${focus.newWindow} "force_focus_wrapping ${if focus.forceWrapping then "yes" else "no"}"
mouse_warping ${if focus.mouseWarping then "output" else "none"} "focus_follows_mouse ${if focus.followMouse then "yes" else "no"}"
workspace_layout ${workspaceLayout} "focus_on_window_activation ${focus.newWindow}"
workspace_auto_back_and_forth ${ "mouse_warping ${if focus.mouseWarping then "output" else "none"}"
if workspaceAutoBackAndForth then "yes" else "no" "workspace_layout ${workspaceLayout}"
} "workspace_auto_back_and_forth ${
if workspaceAutoBackAndForth then "yes" else "no"
client.focused ${colorSetStr colors.focused} }"
client.focused_inactive ${colorSetStr colors.focusedInactive} "client.focused ${colorSetStr colors.focused}"
client.unfocused ${colorSetStr colors.unfocused} "client.focused_inactive ${colorSetStr colors.focusedInactive}"
client.urgent ${colorSetStr colors.urgent} "client.unfocused ${colorSetStr colors.unfocused}"
client.placeholder ${colorSetStr colors.placeholder} "client.urgent ${colorSetStr colors.urgent}"
client.background ${colors.background} "client.placeholder ${colorSetStr colors.placeholder}"
"client.background ${colors.background}"
${keybindingsStr { keybindings = keybindingDefaultWorkspace; }} (keybindingsStr { keybindings = keybindingDefaultWorkspace; })
${keybindingsStr { keybindings = keybindingsRest; }} (keybindingsStr { keybindings = keybindingsRest; })
${keycodebindingsStr keycodebindings} (keycodebindingsStr keycodebindings)
${concatStringsSep "\n" (mapAttrsToList (modeStr false) modes)} ] ++ mapAttrsToList (modeStr false) modes
${concatStringsSep "\n" (mapAttrsToList assignStr assigns)} ++ mapAttrsToList assignStr assigns ++ map barStr bars
${concatStringsSep "\n" (map barStr bars)} ++ optional (gaps != null) gapsStr
${optionalString (gaps != null) gapsStr} ++ map floatingCriteriaStr floating.criteria
${concatStringsSep "\n" (map floatingCriteriaStr floating.criteria)} ++ map windowCommandsStr window.commands ++ map startupEntryStr startup
${concatStringsSep "\n" (map windowCommandsStr window.commands)} ++ map workspaceOutputStr workspaceOutputAssign)
${concatStringsSep "\n" (map startupEntryStr startup)} else
${concatStringsSep "\n" (map workspaceOutputStr workspaceOutputAssign)} [ ]) ++ [ cfg.extraConfig ]));
''
else
"") + "\n" + cfg.extraConfig);
# Validates the i3 configuration # Validates the i3 configuration
checkI3Config = checkI3Config =
@ -207,7 +203,7 @@ let
''; '';
in { in {
meta.maintainers = with maintainers; [ sumnerevans ]; meta.maintainers = with maintainers; [ sumnerevans sebtm ];
options = { options = {
xsession.windowManager.i3 = { xsession.windowManager.i3 = {

160
modules/services/window-managers/i3-sway/lib/functions.nix
View file

@ -1,4 +1,4 @@
{ cfg, lib, moduleName }: { cfg, config, lib, moduleName }:
with lib; with lib;
@ -20,9 +20,9 @@ rec {
cfg.config.defaultWorkspace == null || v != cfg.config.defaultWorkspace) cfg.config.defaultWorkspace == null || v != cfg.config.defaultWorkspace)
cfg.config.keybindings; cfg.config.keybindings;
keybindingsStr = { keybindings, bindsymArgs ? "" }: keybindingsStr = { keybindings, bindsymArgs ? "", indent ? "" }:
concatStringsSep "\n" (mapAttrsToList (keycomb: action: concatStringsSep "\n" (mapAttrsToList (keycomb: action:
optionalString (action != null) "bindsym ${ optionalString (action != null) "${indent}bindsym ${
lib.optionalString (bindsymArgs != "") "${bindsymArgs} " lib.optionalString (bindsymArgs != "") "${bindsymArgs} "
}${keycomb} ${action}") keybindings); }${keycomb} ${action}") keybindings);
@ -46,6 +46,7 @@ rec {
${keybindingsStr { ${keybindingsStr {
inherit keybindings; inherit keybindings;
bindsymArgs = lib.optionalString bindkeysToCode "--to-code"; bindsymArgs = lib.optionalString bindkeysToCode "--to-code";
indent = " ";
}} }}
} }
''; '';
@ -73,89 +74,76 @@ rec {
let colorsNotNull = lib.filterAttrs (n: v: v != null) colors != { }; let colorsNotNull = lib.filterAttrs (n: v: v != null) colors != { };
in '' in ''
bar { bar {
${optionalString (id != null) "id ${id}"}
${fontConfigStr fonts}
${optionalString (mode != null) "mode ${mode}"}
${optionalString (hiddenState != null) "hidden_state ${hiddenState}"}
${optionalString (position != null) "position ${position}"}
${ ${
optionalString (statusCommand != null) concatStringsSep "\n" (indent (lists.subtractLists [ "" null ]
"status_command ${statusCommand}" (flatten [
(optionalString (id != null) "id ${id}")
(fontConfigStr fonts)
(optionalString (mode != null) "mode ${mode}")
(optionalString (hiddenState != null)
"hidden_state ${hiddenState}")
(optionalString (position != null) "position ${position}")
(optionalString (statusCommand != null)
"status_command ${statusCommand}")
"${moduleName}bar_command ${command}"
(optionalString (workspaceButtons != null)
"workspace_buttons ${if workspaceButtons then "yes" else "no"}")
(optionalString (workspaceNumbers != null)
"strip_workspace_numbers ${
if !workspaceNumbers then "yes" else "no"
}")
(optionalString (trayOutput != null) "tray_output ${trayOutput}")
(optionals colorsNotNull (indent
(lists.subtractLists [ "" null ] [
"colors {"
(optionalString (colors.background != null)
"background ${colors.background}")
(optionalString (colors.statusline != null)
"statusline ${colors.statusline}")
(optionalString (colors.separator != null)
"separator ${colors.separator}")
(optionalString (colors.focusedBackground != null)
"focused_background ${colors.focusedBackground}")
(optionalString (colors.focusedStatusline != null)
"focused_statusline ${colors.focusedStatusline}")
(optionalString (colors.focusedSeparator != null)
"focused_separator ${colors.focusedSeparator}")
(optionalString (colors.focusedWorkspace != null)
"focused_workspace ${
barColorSetStr colors.focusedWorkspace
}")
(optionalString (colors.activeWorkspace != null)
"active_workspace ${barColorSetStr colors.activeWorkspace}")
(optionalString (colors.inactiveWorkspace != null)
"inactive_workspace ${
barColorSetStr colors.inactiveWorkspace
}")
(optionalString (colors.urgentWorkspace != null)
"urgent_workspace ${barColorSetStr colors.urgentWorkspace}")
(optionalString (colors.bindingMode != null)
"binding_mode ${barColorSetStr colors.bindingMode}")
"}"
])) { })
extraConfig
])) { })
} }
${moduleName}bar_command ${command}
${
optionalString (workspaceButtons != null)
"workspace_buttons ${if workspaceButtons then "yes" else "no"}"
}
${
optionalString (workspaceNumbers != null)
"strip_workspace_numbers ${if !workspaceNumbers then "yes" else "no"}"
}
${optionalString (trayOutput != null) "tray_output ${trayOutput}"}
${optionalString colorsNotNull "colors {"}
${
optionalString (colors.background != null)
"background ${colors.background}"
}
${
optionalString (colors.statusline != null)
"statusline ${colors.statusline}"
}
${
optionalString (colors.separator != null)
"separator ${colors.separator}"
}
${
optionalString (colors.focusedBackground != null)
"focused_background ${colors.focusedBackground}"
}
${
optionalString (colors.focusedStatusline != null)
"focused_statusline ${colors.focusedStatusline}"
}
${
optionalString (colors.focusedSeparator != null)
"focused_separator ${colors.focusedSeparator}"
}
${
optionalString (colors.focusedWorkspace != null)
"focused_workspace ${barColorSetStr colors.focusedWorkspace}"
}
${
optionalString (colors.activeWorkspace != null)
"active_workspace ${barColorSetStr colors.activeWorkspace}"
}
${
optionalString (colors.inactiveWorkspace != null)
"inactive_workspace ${barColorSetStr colors.inactiveWorkspace}"
}
${
optionalString (colors.urgentWorkspace != null)
"urgent_workspace ${barColorSetStr colors.urgentWorkspace}"
}
${
optionalString (colors.bindingMode != null)
"binding_mode ${barColorSetStr colors.bindingMode}"
}
${optionalString colorsNotNull "}"}
${extraConfig}
} }
''; '';
gapsStr = with cfg.config.gaps; '' gapsStr = with cfg.config.gaps;
${optionalString (inner != null) "gaps inner ${toString inner}"} concatStringsSep "\n" (lists.subtractLists [ "" null ] [
${optionalString (outer != null) "gaps outer ${toString outer}"} (optionalString (inner != null) "gaps inner ${toString inner}")
${optionalString (horizontal != null) (optionalString (outer != null) "gaps outer ${toString outer}")
"gaps horizontal ${toString horizontal}"} (optionalString (horizontal != null)
${optionalString (vertical != null) "gaps vertical ${toString vertical}"} "gaps horizontal ${toString horizontal}")
${optionalString (top != null) "gaps top ${toString top}"} (optionalString (vertical != null) "gaps vertical ${toString vertical}")
${optionalString (bottom != null) "gaps bottom ${toString bottom}"} (optionalString (top != null) "gaps top ${toString top}")
${optionalString (left != null) "gaps left ${toString left}"} (optionalString (bottom != null) "gaps bottom ${toString bottom}")
${optionalString (right != null) "gaps right ${toString right}"} (optionalString (left != null) "gaps left ${toString left}")
(optionalString (right != null) "gaps right ${toString right}")
${optionalString smartGaps "smart_gaps on"} (optionalString smartGaps "smart_gaps on")
${optionalString (smartBorders != "off") "smart_borders ${smartBorders}"} (optionalString (smartBorders != "off") "smart_borders ${smartBorders}")
''; ]);
windowBorderString = window: floating: windowBorderString = window: floating:
let let
@ -172,4 +160,14 @@ rec {
"for_window ${criteriaStr criteria} ${command}"; "for_window ${criteriaStr criteria} ${command}";
workspaceOutputStr = item: workspaceOutputStr = item:
''workspace "${item.workspace}" output ${item.output}''; ''workspace "${item.workspace}" output ${item.output}'';
indent = list:
{ includesWrapper ? true, level ? 1 }:
let prefix = concatStringsSep "" (lib.genList (x: " ") (level * 2));
in (lib.imap1 (i: v:
"${if includesWrapper && (i == 1 || i == (lib.length list)) then
v
else
"${prefix}${v}"}") list);
} }

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

@ -239,7 +239,7 @@ let
}; };
commonFunctions = import ./lib/functions.nix { commonFunctions = import ./lib/functions.nix {
inherit cfg lib; inherit config cfg lib;
moduleName = "sway"; moduleName = "sway";
}; };
@ -262,42 +262,40 @@ let
outputStr = moduleStr "output"; outputStr = moduleStr "output";
seatStr = moduleStr "seat"; seatStr = moduleStr "seat";
configFile = pkgs.writeText "sway.conf" ((if cfg.config != null then configFile = pkgs.writeText "sway.conf" (concatStringsSep "\n"
with cfg.config; '' ((if cfg.config != null then
${fontConfigStr fonts} with cfg.config;
floating_modifier ${floating.modifier} ([
${windowBorderString window floating} (fontConfigStr fonts)
hide_edge_borders ${window.hideEdgeBorders} "floating_modifier ${floating.modifier}"
focus_wrapping ${if focus.forceWrapping then "yes" else "no"} (windowBorderString window floating)
focus_follows_mouse ${focus.followMouse} "hide_edge_borders ${window.hideEdgeBorders}"
focus_on_window_activation ${focus.newWindow} "focus_wrapping ${if focus.forceWrapping then "yes" else "no"}"
mouse_warping ${if focus.mouseWarping then "output" else "none"} "focus_follows_mouse ${focus.followMouse}"
workspace_layout ${workspaceLayout} "focus_on_window_activation ${focus.newWindow}"
workspace_auto_back_and_forth ${ "mouse_warping ${if focus.mouseWarping then "output" else "none"}"
if workspaceAutoBackAndForth then "yes" else "no" "workspace_layout ${workspaceLayout}"
} "workspace_auto_back_and_forth ${
if workspaceAutoBackAndForth then "yes" else "no"
client.focused ${colorSetStr colors.focused} }"
client.focused_inactive ${colorSetStr colors.focusedInactive} "client.focused ${colorSetStr colors.focused}"
client.unfocused ${colorSetStr colors.unfocused} "client.focused_inactive ${colorSetStr colors.focusedInactive}"
client.urgent ${colorSetStr colors.urgent} "client.unfocused ${colorSetStr colors.unfocused}"
client.placeholder ${colorSetStr colors.placeholder} "client.urgent ${colorSetStr colors.urgent}"
client.background ${colors.background} "client.placeholder ${colorSetStr colors.placeholder}"
"client.background ${colors.background}"
${keybindingsStr { (keybindingsStr {
keybindings = keybindingDefaultWorkspace; keybindings = keybindingDefaultWorkspace;
bindsymArgs = bindsymArgs =
lib.optionalString (cfg.config.bindkeysToCode) "--to-code"; lib.optionalString (cfg.config.bindkeysToCode) "--to-code";
}} })
${keybindingsStr { (keybindingsStr {
keybindings = keybindingsRest; keybindings = keybindingsRest;
bindsymArgs = bindsymArgs =
lib.optionalString (cfg.config.bindkeysToCode) "--to-code"; lib.optionalString (cfg.config.bindkeysToCode) "--to-code";
}} })
${keycodebindingsStr keycodebindings} (keycodebindingsStr keycodebindings)
${concatStringsSep "\n" ( ] ++ mapAttrsToList inputStr input
# Append all of the lists together to avoid unnecessary whitespace.
mapAttrsToList inputStr input # inputs
++ mapAttrsToList outputStr output # outputs ++ mapAttrsToList outputStr output # outputs
++ mapAttrsToList seatStr seat # seats ++ mapAttrsToList seatStr seat # seats
++ mapAttrsToList (modeStr cfg.config.bindkeysToCode) modes # modes ++ mapAttrsToList (modeStr cfg.config.bindkeysToCode) modes # modes
@ -308,13 +306,11 @@ let
++ map windowCommandsStr window.commands # window commands ++ map windowCommandsStr window.commands # window commands
++ map startupEntryStr startup # startup ++ map startupEntryStr startup # startup
++ map workspaceOutputStr workspaceOutputAssign # custom mapping ++ map workspaceOutputStr workspaceOutputAssign # custom mapping
)} )
'' else
else [ ]) ++ (optional cfg.systemdIntegration ''
"") + (concatStringsSep "\n" ((optional cfg.systemdIntegration '' exec "systemctl --user import-environment; systemctl --user start sway-session.target"'')
exec "systemctl --user import-environment; systemctl --user start sway-session.target"'') ++ (optional (!cfg.xwayland) "xwayland disable") ++ [ cfg.extraConfig ]));
++ (optional (!cfg.xwayland) "xwayland disable")
++ [ cfg.extraConfig ])));
defaultSwayPackage = pkgs.sway.override { defaultSwayPackage = pkgs.sway.override {
extraSessionCommands = cfg.extraSessionCommands; extraSessionCommands = cfg.extraSessionCommands;
@ -324,7 +320,7 @@ let
}; };
in { in {
meta.maintainers = with maintainers; [ alexarice sumnerevans ]; meta.maintainers = with maintainers; [ alexarice sumnerevans sebtm ];
options.wayland.windowManager.sway = { options.wayland.windowManager.sway = {
enable = mkEnableOption "sway wayland compositor"; enable = mkEnableOption "sway wayland compositor";

25
tests/modules/services/window-managers/i3/i3-bar-focused-colors-expected.conf
View file

@ -9,7 +9,6 @@ focus_on_window_activation smart
mouse_warping output mouse_warping output
workspace_layout default workspace_layout default
workspace_auto_back_and_forth no workspace_auto_back_and_forth no
client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577 client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577
client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a
client.unfocused #333333 #222222 #888888 #292d2e #222222 client.unfocused #333333 #222222 #888888 #292d2e #222222
@ -17,7 +16,6 @@ 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+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
@ -66,17 +64,15 @@ bindsym Mod1+v split v
bindsym Mod1+w layout tabbed bindsym Mod1+w layout tabbed
mode "resize" { mode "resize" {
bindsym Down resize grow height 10 px or 10 ppt bindsym Down resize grow height 10 px or 10 ppt
bindsym Escape mode default bindsym Escape mode default
bindsym Left resize shrink width 10 px or 10 ppt bindsym Left resize shrink width 10 px or 10 ppt
bindsym Return mode default bindsym Return mode default
bindsym Right resize grow width 10 px or 10 ppt bindsym Right resize grow width 10 px or 10 ppt
bindsym Up resize shrink height 10 px or 10 ppt bindsym Up resize shrink height 10 px or 10 ppt
} }
bar { bar {
font pango:monospace 8.000000 font pango:monospace 8.000000
mode dock mode dock
hidden_state hide hidden_state hide
@ -98,13 +94,6 @@ bar {
inactive_workspace #333333 #222222 #888888 inactive_workspace #333333 #222222 #888888
urgent_workspace #2f343a #900000 #ffffff urgent_workspace #2f343a #900000 #ffffff
binding_mode #2f343a #900000 #ffffff binding_mode #2f343a #900000 #ffffff
} }
} }

28
tests/modules/services/window-managers/i3/i3-followmouse-expected.conf
View file

@ -9,7 +9,6 @@ focus_on_window_activation smart
mouse_warping output mouse_warping output
workspace_layout default workspace_layout default
workspace_auto_back_and_forth no workspace_auto_back_and_forth no
client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577 client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577
client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a
client.unfocused #333333 #222222 #888888 #292d2e #222222 client.unfocused #333333 #222222 #888888 #292d2e #222222
@ -17,7 +16,6 @@ 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+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
@ -66,17 +64,15 @@ bindsym Mod1+v split v
bindsym Mod1+w layout tabbed bindsym Mod1+w layout tabbed
mode "resize" { mode "resize" {
bindsym Down resize grow height 10 px or 10 ppt bindsym Down resize grow height 10 px or 10 ppt
bindsym Escape mode default bindsym Escape mode default
bindsym Left resize shrink width 10 px or 10 ppt bindsym Left resize shrink width 10 px or 10 ppt
bindsym Return mode default bindsym Return mode default
bindsym Right resize grow width 10 px or 10 ppt bindsym Right resize grow width 10 px or 10 ppt
bindsym Up resize shrink height 10 px or 10 ppt bindsym Up resize shrink height 10 px or 10 ppt
} }
bar { bar {
font pango:monospace 8.000000 font pango:monospace 8.000000
mode dock mode dock
hidden_state hide hidden_state hide
@ -90,21 +86,11 @@ bar {
background #000000 background #000000
statusline #ffffff statusline #ffffff
separator #666666 separator #666666
focused_workspace #4c7899 #285577 #ffffff focused_workspace #4c7899 #285577 #ffffff
active_workspace #333333 #5f676a #ffffff active_workspace #333333 #5f676a #ffffff
inactive_workspace #333333 #222222 #888888 inactive_workspace #333333 #222222 #888888
urgent_workspace #2f343a #900000 #ffffff urgent_workspace #2f343a #900000 #ffffff
binding_mode #2f343a #900000 #ffffff binding_mode #2f343a #900000 #ffffff
} }
} }

28
tests/modules/services/window-managers/i3/i3-fonts-expected.conf
View file

@ -9,7 +9,6 @@ focus_on_window_activation smart
mouse_warping output mouse_warping output
workspace_layout default workspace_layout default
workspace_auto_back_and_forth no workspace_auto_back_and_forth no
client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577 client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577
client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a
client.unfocused #333333 #222222 #888888 #292d2e #222222 client.unfocused #333333 #222222 #888888 #292d2e #222222
@ -17,7 +16,6 @@ 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+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
@ -66,17 +64,15 @@ bindsym Mod1+v split v
bindsym Mod1+w layout tabbed bindsym Mod1+w layout tabbed
mode "resize" { mode "resize" {
bindsym Down resize grow height 10 px or 10 ppt bindsym Down resize grow height 10 px or 10 ppt
bindsym Escape mode default bindsym Escape mode default
bindsym Left resize shrink width 10 px or 10 ppt bindsym Left resize shrink width 10 px or 10 ppt
bindsym Return mode default bindsym Return mode default
bindsym Right resize grow width 10 px or 10 ppt bindsym Right resize grow width 10 px or 10 ppt
bindsym Up resize shrink height 10 px or 10 ppt bindsym Up resize shrink height 10 px or 10 ppt
} }
bar { bar {
font pango:FontAwesome, Iosevka 11.500000 font pango:FontAwesome, Iosevka 11.500000
mode dock mode dock
hidden_state hide hidden_state hide
@ -90,21 +86,11 @@ bar {
background #000000 background #000000
statusline #ffffff statusline #ffffff
separator #666666 separator #666666
focused_workspace #4c7899 #285577 #ffffff focused_workspace #4c7899 #285577 #ffffff
active_workspace #333333 #5f676a #ffffff active_workspace #333333 #5f676a #ffffff
inactive_workspace #333333 #222222 #888888 inactive_workspace #333333 #222222 #888888
urgent_workspace #2f343a #900000 #ffffff urgent_workspace #2f343a #900000 #ffffff
binding_mode #2f343a #900000 #ffffff binding_mode #2f343a #900000 #ffffff
} }
} }

28
tests/modules/services/window-managers/i3/i3-keybindings-expected.conf
View file

@ -9,7 +9,6 @@ focus_on_window_activation smart
mouse_warping output mouse_warping output
workspace_layout default workspace_layout default
workspace_auto_back_and_forth no workspace_auto_back_and_forth no
client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577 client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577
client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a
client.unfocused #333333 #222222 #888888 #292d2e #222222 client.unfocused #333333 #222222 #888888 #292d2e #222222
@ -17,7 +16,6 @@ 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+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
@ -67,17 +65,15 @@ bindsym Mod1+v split v
bindsym Mod1+w layout tabbed bindsym Mod1+w layout tabbed
mode "resize" { mode "resize" {
bindsym Down resize grow height 10 px or 10 ppt bindsym Down resize grow height 10 px or 10 ppt
bindsym Escape mode default bindsym Escape mode default
bindsym Left resize shrink width 10 px or 10 ppt bindsym Left resize shrink width 10 px or 10 ppt
bindsym Return mode default bindsym Return mode default
bindsym Right resize grow width 10 px or 10 ppt bindsym Right resize grow width 10 px or 10 ppt
bindsym Up resize shrink height 10 px or 10 ppt bindsym Up resize shrink height 10 px or 10 ppt
} }
bar { bar {
font pango:monospace 8.000000 font pango:monospace 8.000000
mode dock mode dock
hidden_state hide hidden_state hide
@ -91,21 +87,11 @@ bar {
background #000000 background #000000
statusline #ffffff statusline #ffffff
separator #666666 separator #666666
focused_workspace #4c7899 #285577 #ffffff focused_workspace #4c7899 #285577 #ffffff
active_workspace #333333 #5f676a #ffffff active_workspace #333333 #5f676a #ffffff
inactive_workspace #333333 #222222 #888888 inactive_workspace #333333 #222222 #888888
urgent_workspace #2f343a #900000 #ffffff urgent_workspace #2f343a #900000 #ffffff
binding_mode #2f343a #900000 #ffffff binding_mode #2f343a #900000 #ffffff
} }
} }

2
tests/modules/services/window-managers/i3/i3-null-config.nix
View file

@ -11,6 +11,6 @@
nmt.script = '' nmt.script = ''
assertFileExists home-files/.config/i3/config assertFileExists home-files/.config/i3/config
assertFileContent home-files/.config/i3/config \ assertFileContent home-files/.config/i3/config \
${pkgs.writeText "expected" "\n"} ${pkgs.writeText "expected" ""}
''; '';
} }

28
tests/modules/services/window-managers/i3/i3-workspace-default-expected.conf
View file

@ -9,14 +9,12 @@ focus_on_window_activation smart
mouse_warping output mouse_warping output
workspace_layout default workspace_layout default
workspace_auto_back_and_forth no workspace_auto_back_and_forth no
client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577 client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577
client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a
client.unfocused #333333 #222222 #888888 #292d2e #222222 client.unfocused #333333 #222222 #888888 #292d2e #222222
client.urgent #2f343a #900000 #ffffff #900000 #900000 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+1 workspace number 1 bindsym Mod1+1 workspace number 1
bindsym Mod1+0 workspace number 10 bindsym Mod1+0 workspace number 10
bindsym Mod1+2 workspace number 2 bindsym Mod1+2 workspace number 2
@ -65,17 +63,15 @@ bindsym Mod1+v split v
bindsym Mod1+w layout tabbed bindsym Mod1+w layout tabbed
mode "resize" { mode "resize" {
bindsym Down resize grow height 10 px or 10 ppt bindsym Down resize grow height 10 px or 10 ppt
bindsym Escape mode default bindsym Escape mode default
bindsym Left resize shrink width 10 px or 10 ppt bindsym Left resize shrink width 10 px or 10 ppt
bindsym Return mode default bindsym Return mode default
bindsym Right resize grow width 10 px or 10 ppt bindsym Right resize grow width 10 px or 10 ppt
bindsym Up resize shrink height 10 px or 10 ppt bindsym Up resize shrink height 10 px or 10 ppt
} }
bar { bar {
font pango:monospace 8.000000 font pango:monospace 8.000000
mode dock mode dock
hidden_state hide hidden_state hide
@ -89,21 +85,11 @@ bar {
background #000000 background #000000
statusline #ffffff statusline #ffffff
separator #666666 separator #666666
focused_workspace #4c7899 #285577 #ffffff focused_workspace #4c7899 #285577 #ffffff
active_workspace #333333 #5f676a #ffffff active_workspace #333333 #5f676a #ffffff
inactive_workspace #333333 #222222 #888888 inactive_workspace #333333 #222222 #888888
urgent_workspace #2f343a #900000 #ffffff urgent_workspace #2f343a #900000 #ffffff
binding_mode #2f343a #900000 #ffffff binding_mode #2f343a #900000 #ffffff
} }
} }

27
tests/modules/services/window-managers/i3/i3-workspace-output-expected.conf
View file

@ -9,7 +9,6 @@ focus_on_window_activation smart
mouse_warping output mouse_warping output
workspace_layout default workspace_layout default
workspace_auto_back_and_forth no workspace_auto_back_and_forth no
client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577 client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577
client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a
client.unfocused #333333 #222222 #888888 #292d2e #222222 client.unfocused #333333 #222222 #888888 #292d2e #222222
@ -17,7 +16,6 @@ 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+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
@ -66,17 +64,15 @@ bindsym Mod1+v split v
bindsym Mod1+w layout tabbed bindsym Mod1+w layout tabbed
mode "resize" { mode "resize" {
bindsym Down resize grow height 10 px or 10 ppt bindsym Down resize grow height 10 px or 10 ppt
bindsym Escape mode default bindsym Escape mode default
bindsym Left resize shrink width 10 px or 10 ppt bindsym Left resize shrink width 10 px or 10 ppt
bindsym Return mode default bindsym Return mode default
bindsym Right resize grow width 10 px or 10 ppt bindsym Right resize grow width 10 px or 10 ppt
bindsym Up resize shrink height 10 px or 10 ppt bindsym Up resize shrink height 10 px or 10 ppt
} }
bar { bar {
font pango:monospace 8.000000 font pango:monospace 8.000000
mode dock mode dock
hidden_state hide hidden_state hide
@ -90,24 +86,15 @@ bar {
background #000000 background #000000
statusline #ffffff statusline #ffffff
separator #666666 separator #666666
focused_workspace #4c7899 #285577 #ffffff focused_workspace #4c7899 #285577 #ffffff
active_workspace #333333 #5f676a #ffffff active_workspace #333333 #5f676a #ffffff
inactive_workspace #333333 #222222 #888888 inactive_workspace #333333 #222222 #888888
urgent_workspace #2f343a #900000 #ffffff urgent_workspace #2f343a #900000 #ffffff
binding_mode #2f343a #900000 #ffffff binding_mode #2f343a #900000 #ffffff
}
} }
}
workspace "1" output eDP workspace "1" output eDP
workspace "ABC" output DP workspace "ABC" output DP
workspace "3: Test" output HDMI workspace "3: Test" output HDMI
workspace "!"§$%&/(){}[]=?\*#<>-_.:,;²³" output DVI workspace "!"§$%&/(){}[]=?\*#<>-_.:,;²³" output DVI

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

@ -9,7 +9,6 @@ focus_on_window_activation smart
mouse_warping output mouse_warping output
workspace_layout default workspace_layout default
workspace_auto_back_and_forth no workspace_auto_back_and_forth no
client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577 client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577
client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a
client.unfocused #333333 #222222 #888888 #292d2e #222222 client.unfocused #333333 #222222 #888888 #292d2e #222222
@ -17,7 +16,6 @@ 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+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
@ -71,20 +69,19 @@ bindsym Mod1+v splitv
bindsym Mod1+w layout tabbed bindsym Mod1+w layout tabbed
mode "resize" { mode "resize" {
bindsym Down resize grow height 10 px bindsym Down resize grow height 10 px
bindsym Escape mode default bindsym Escape mode default
bindsym Left resize shrink width 10 px bindsym Left resize shrink width 10 px
bindsym Return mode default bindsym Return mode default
bindsym Right resize grow width 10 px bindsym Right resize grow width 10 px
bindsym Up resize shrink height 10 px bindsym Up resize shrink height 10 px
bindsym h resize shrink width 10 px bindsym h resize shrink width 10 px
bindsym j resize grow height 10 px bindsym j resize grow height 10 px
bindsym k resize shrink height 10 px bindsym k resize shrink height 10 px
bindsym l resize grow width 10 px bindsym l resize grow width 10 px
} }
bar { bar {
font pango:monospace 8.000000 font pango:monospace 8.000000
mode dock mode dock
hidden_state hide hidden_state hide
@ -106,8 +103,7 @@ bar {
inactive_workspace #333333 #222222 #888888 inactive_workspace #333333 #222222 #888888
urgent_workspace #2f343a #900000 #ffffff urgent_workspace #2f343a #900000 #ffffff
binding_mode #2f343a #900000 #ffffff binding_mode #2f343a #900000 #ffffff
} }
} }
exec "systemctl --user import-environment; systemctl --user start sway-session.target" exec "systemctl --user import-environment; systemctl --user start sway-session.target"

29
tests/modules/services/window-managers/sway/sway-bindkeys-to-code.conf
View file

@ -9,7 +9,6 @@ focus_on_window_activation smart
mouse_warping output mouse_warping output
workspace_layout default workspace_layout default
workspace_auto_back_and_forth no workspace_auto_back_and_forth no
client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577 client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577
client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a
client.unfocused #333333 #222222 #888888 #292d2e #222222 client.unfocused #333333 #222222 #888888 #292d2e #222222
@ -17,7 +16,6 @@ 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+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
@ -71,20 +69,19 @@ bindsym --to-code Mod1+v splitv
bindsym --to-code Mod1+w layout tabbed bindsym --to-code Mod1+w layout tabbed
mode "resize" { mode "resize" {
bindsym --to-code Down resize grow height 10 px bindsym --to-code Down resize grow height 10 px
bindsym --to-code Escape mode default bindsym --to-code Escape mode default
bindsym --to-code Left resize shrink width 10 px bindsym --to-code Left resize shrink width 10 px
bindsym --to-code Return mode default bindsym --to-code Return mode default
bindsym --to-code Right resize grow width 10 px bindsym --to-code Right resize grow width 10 px
bindsym --to-code Up resize shrink height 10 px bindsym --to-code Up resize shrink height 10 px
bindsym --to-code h resize shrink width 10 px bindsym --to-code h resize shrink width 10 px
bindsym --to-code j resize grow height 10 px bindsym --to-code j resize grow height 10 px
bindsym --to-code k resize shrink height 10 px bindsym --to-code k resize shrink height 10 px
bindsym --to-code l resize grow width 10 px bindsym --to-code l resize grow width 10 px
} }
bar { bar {
font pango:monospace 8.000000 font pango:monospace 8.000000
mode dock mode dock
hidden_state hide hidden_state hide
@ -98,16 +95,12 @@ bar {
background #000000 background #000000
statusline #ffffff statusline #ffffff
separator #666666 separator #666666
focused_workspace #4c7899 #285577 #ffffff focused_workspace #4c7899 #285577 #ffffff
active_workspace #333333 #5f676a #ffffff active_workspace #333333 #5f676a #ffffff
inactive_workspace #333333 #222222 #888888 inactive_workspace #333333 #222222 #888888
urgent_workspace #2f343a #900000 #ffffff urgent_workspace #2f343a #900000 #ffffff
binding_mode #2f343a #900000 #ffffff binding_mode #2f343a #900000 #ffffff
} }
} }
exec "systemctl --user import-environment; systemctl --user start sway-session.target" exec "systemctl --user import-environment; systemctl --user start sway-session.target"

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

@ -9,7 +9,6 @@ focus_on_window_activation smart
mouse_warping output mouse_warping output
workspace_layout default workspace_layout default
workspace_auto_back_and_forth no workspace_auto_back_and_forth no
client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577 client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577
client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a
client.unfocused #333333 #222222 #888888 #292d2e #222222 client.unfocused #333333 #222222 #888888 #292d2e #222222
@ -17,7 +16,6 @@ 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+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
@ -71,20 +69,19 @@ bindsym Mod1+v splitv
bindsym Mod1+w layout tabbed bindsym Mod1+w layout tabbed
mode "resize" { mode "resize" {
bindsym Down resize grow height 10 px bindsym Down resize grow height 10 px
bindsym Escape mode default bindsym Escape mode default
bindsym Left resize shrink width 10 px bindsym Left resize shrink width 10 px
bindsym Return mode default bindsym Return mode default
bindsym Right resize grow width 10 px bindsym Right resize grow width 10 px
bindsym Up resize shrink height 10 px bindsym Up resize shrink height 10 px
bindsym h resize shrink width 10 px bindsym h resize shrink width 10 px
bindsym j resize grow height 10 px bindsym j resize grow height 10 px
bindsym k resize shrink height 10 px bindsym k resize shrink height 10 px
bindsym l resize grow width 10 px bindsym l resize grow width 10 px
} }
bar { bar {
font pango:monospace 8.000000 font pango:monospace 8.000000
mode dock mode dock
hidden_state hide hidden_state hide
@ -98,16 +95,12 @@ bar {
background #000000 background #000000
statusline #ffffff statusline #ffffff
separator #666666 separator #666666
focused_workspace #4c7899 #285577 #ffffff focused_workspace #4c7899 #285577 #ffffff
active_workspace #333333 #5f676a #ffffff active_workspace #333333 #5f676a #ffffff
inactive_workspace #333333 #222222 #888888 inactive_workspace #333333 #222222 #888888
urgent_workspace #2f343a #900000 #ffffff urgent_workspace #2f343a #900000 #ffffff
binding_mode #2f343a #900000 #ffffff binding_mode #2f343a #900000 #ffffff
} }
} }
exec "systemctl --user import-environment; systemctl --user start sway-session.target" exec "systemctl --user import-environment; systemctl --user start sway-session.target"

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

@ -9,7 +9,6 @@ focus_on_window_activation smart
mouse_warping output mouse_warping output
workspace_layout default workspace_layout default
workspace_auto_back_and_forth no workspace_auto_back_and_forth no
client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577 client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577
client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a
client.unfocused #333333 #222222 #888888 #292d2e #222222 client.unfocused #333333 #222222 #888888 #292d2e #222222
@ -17,7 +16,6 @@ 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+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
@ -71,16 +69,16 @@ bindsym Mod1+v splitv
bindsym Mod1+w layout tabbed bindsym Mod1+w layout tabbed
mode "resize" { mode "resize" {
bindsym Down resize grow height 10 px bindsym Down resize grow height 10 px
bindsym Escape mode default bindsym Escape mode default
bindsym Left resize shrink width 10 px bindsym Left resize shrink width 10 px
bindsym Return mode default bindsym Return mode default
bindsym Right resize grow width 10 px bindsym Right resize grow width 10 px
bindsym Up resize shrink height 10 px bindsym Up resize shrink height 10 px
bindsym h resize shrink width 10 px bindsym h resize shrink width 10 px
bindsym j resize grow height 10 px bindsym j resize grow height 10 px
bindsym k resize shrink height 10 px bindsym k resize shrink height 10 px
bindsym l resize grow width 10 px bindsym l resize grow width 10 px
} }
exec "systemctl --user import-environment; systemctl --user start sway-session.target" exec "systemctl --user import-environment; systemctl --user start sway-session.target"

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

@ -9,7 +9,6 @@ focus_on_window_activation smart
mouse_warping output mouse_warping output
workspace_layout default workspace_layout default
workspace_auto_back_and_forth no workspace_auto_back_and_forth no
client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577 client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577
client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a
client.unfocused #333333 #222222 #888888 #292d2e #222222 client.unfocused #333333 #222222 #888888 #292d2e #222222
@ -17,7 +16,6 @@ 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+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
@ -71,16 +69,16 @@ bindsym Mod1+v splitv
bindsym Mod1+w layout tabbed bindsym Mod1+w layout tabbed
mode "resize" { mode "resize" {
bindsym Down resize grow height 10 px bindsym Down resize grow height 10 px
bindsym Escape mode default bindsym Escape mode default
bindsym Left resize shrink width 10 px bindsym Left resize shrink width 10 px
bindsym Return mode default bindsym Return mode default
bindsym Right resize grow width 10 px bindsym Right resize grow width 10 px
bindsym Up resize shrink height 10 px bindsym Up resize shrink height 10 px
bindsym h resize shrink width 10 px bindsym h resize shrink width 10 px
bindsym j resize grow height 10 px bindsym j resize grow height 10 px
bindsym k resize shrink height 10 px bindsym k resize shrink height 10 px
bindsym l resize grow width 10 px bindsym l resize grow width 10 px
} }
exec "systemctl --user import-environment; systemctl --user start sway-session.target" exec "systemctl --user import-environment; systemctl --user start sway-session.target"

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

@ -9,7 +9,6 @@ focus_on_window_activation smart
mouse_warping output mouse_warping output
workspace_layout default workspace_layout default
workspace_auto_back_and_forth no workspace_auto_back_and_forth no
client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577 client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577
client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a
client.unfocused #333333 #222222 #888888 #292d2e #222222 client.unfocused #333333 #222222 #888888 #292d2e #222222
@ -17,7 +16,6 @@ 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+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
@ -83,20 +81,19 @@ hide_cursor when-typing enable
} }
mode "resize" { mode "resize" {
bindsym Down resize grow height 10 px bindsym Down resize grow height 10 px
bindsym Escape mode default bindsym Escape mode default
bindsym Left resize shrink width 10 px bindsym Left resize shrink width 10 px
bindsym Return mode default bindsym Return mode default
bindsym Right resize grow width 10 px bindsym Right resize grow width 10 px
bindsym Up resize shrink height 10 px bindsym Up resize shrink height 10 px
bindsym h resize shrink width 10 px bindsym h resize shrink width 10 px
bindsym j resize grow height 10 px bindsym j resize grow height 10 px
bindsym k resize shrink height 10 px bindsym k resize shrink height 10 px
bindsym l resize grow width 10 px bindsym l resize grow width 10 px
} }
bar { bar {
font pango:monospace 8.000000 font pango:monospace 8.000000
mode dock mode dock
hidden_state hide hidden_state hide
@ -110,16 +107,12 @@ bar {
background #000000 background #000000
statusline #ffffff statusline #ffffff
separator #666666 separator #666666
focused_workspace #4c7899 #285577 #ffffff focused_workspace #4c7899 #285577 #ffffff
active_workspace #333333 #5f676a #ffffff active_workspace #333333 #5f676a #ffffff
inactive_workspace #333333 #222222 #888888 inactive_workspace #333333 #222222 #888888
urgent_workspace #2f343a #900000 #ffffff urgent_workspace #2f343a #900000 #ffffff
binding_mode #2f343a #900000 #ffffff binding_mode #2f343a #900000 #ffffff
} }
} }
exec "systemctl --user import-environment; systemctl --user start sway-session.target" exec "systemctl --user import-environment; systemctl --user start sway-session.target"

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

@ -9,7 +9,6 @@ focus_on_window_activation smart
mouse_warping output mouse_warping output
workspace_layout default workspace_layout default
workspace_auto_back_and_forth no workspace_auto_back_and_forth no
client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577 client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577
client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a
client.unfocused #333333 #222222 #888888 #292d2e #222222 client.unfocused #333333 #222222 #888888 #292d2e #222222
@ -17,7 +16,6 @@ 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+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
@ -71,20 +69,19 @@ bindsym Mod1+v splitv
bindsym Mod1+w layout tabbed bindsym Mod1+w layout tabbed
mode "resize" { mode "resize" {
bindsym Down resize grow height 10 px bindsym Down resize grow height 10 px
bindsym Escape mode default bindsym Escape mode default
bindsym Left resize shrink width 10 px bindsym Left resize shrink width 10 px
bindsym Return mode default bindsym Return mode default
bindsym Right resize grow width 10 px bindsym Right resize grow width 10 px
bindsym Up resize shrink height 10 px bindsym Up resize shrink height 10 px
bindsym h resize shrink width 10 px bindsym h resize shrink width 10 px
bindsym j resize grow height 10 px bindsym j resize grow height 10 px
bindsym k resize shrink height 10 px bindsym k resize shrink height 10 px
bindsym l resize grow width 10 px bindsym l resize grow width 10 px
} }
bar { bar {
font pango:monospace 8.000000 font pango:monospace 8.000000
mode dock mode dock
hidden_state hide hidden_state hide
@ -98,16 +95,12 @@ bar {
background #000000 background #000000
statusline #ffffff statusline #ffffff
separator #666666 separator #666666
focused_workspace #4c7899 #285577 #ffffff focused_workspace #4c7899 #285577 #ffffff
active_workspace #333333 #5f676a #ffffff active_workspace #333333 #5f676a #ffffff
inactive_workspace #333333 #222222 #888888 inactive_workspace #333333 #222222 #888888
urgent_workspace #2f343a #900000 #ffffff urgent_workspace #2f343a #900000 #ffffff
binding_mode #2f343a #900000 #ffffff binding_mode #2f343a #900000 #ffffff
} }
} }
exec "systemctl --user import-environment; systemctl --user start sway-session.target" exec "systemctl --user import-environment; systemctl --user start sway-session.target"

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

@ -9,14 +9,12 @@ focus_on_window_activation smart
mouse_warping output mouse_warping output
workspace_layout default workspace_layout default
workspace_auto_back_and_forth no workspace_auto_back_and_forth no
client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577 client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577
client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a
client.unfocused #333333 #222222 #888888 #292d2e #222222 client.unfocused #333333 #222222 #888888 #292d2e #222222
client.urgent #2f343a #900000 #ffffff #900000 #900000 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+1 workspace number 1 bindsym Mod1+1 workspace number 1
bindsym Mod1+2 workspace number 2 bindsym Mod1+2 workspace number 2
@ -70,20 +68,19 @@ bindsym Mod1+v splitv
bindsym Mod1+w layout tabbed bindsym Mod1+w layout tabbed
mode "resize" { mode "resize" {
bindsym Down resize grow height 10 px bindsym Down resize grow height 10 px
bindsym Escape mode default bindsym Escape mode default
bindsym Left resize shrink width 10 px bindsym Left resize shrink width 10 px
bindsym Return mode default bindsym Return mode default
bindsym Right resize grow width 10 px bindsym Right resize grow width 10 px
bindsym Up resize shrink height 10 px bindsym Up resize shrink height 10 px
bindsym h resize shrink width 10 px bindsym h resize shrink width 10 px
bindsym j resize grow height 10 px bindsym j resize grow height 10 px
bindsym k resize shrink height 10 px bindsym k resize shrink height 10 px
bindsym l resize grow width 10 px bindsym l resize grow width 10 px
} }
bar { bar {
font pango:monospace 8.000000 font pango:monospace 8.000000
mode dock mode dock
hidden_state hide hidden_state hide
@ -97,16 +94,12 @@ bar {
background #000000 background #000000
statusline #ffffff statusline #ffffff
separator #666666 separator #666666
focused_workspace #4c7899 #285577 #ffffff focused_workspace #4c7899 #285577 #ffffff
active_workspace #333333 #5f676a #ffffff active_workspace #333333 #5f676a #ffffff
inactive_workspace #333333 #222222 #888888 inactive_workspace #333333 #222222 #888888
urgent_workspace #2f343a #900000 #ffffff urgent_workspace #2f343a #900000 #ffffff
binding_mode #2f343a #900000 #ffffff binding_mode #2f343a #900000 #ffffff
} }
} }
exec "systemctl --user import-environment; systemctl --user start sway-session.target" exec "systemctl --user import-environment; systemctl --user start sway-session.target"

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

@ -9,7 +9,6 @@ focus_on_window_activation smart
mouse_warping output mouse_warping output
workspace_layout default workspace_layout default
workspace_auto_back_and_forth no workspace_auto_back_and_forth no
client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577 client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577
client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a
client.unfocused #333333 #222222 #888888 #292d2e #222222 client.unfocused #333333 #222222 #888888 #292d2e #222222
@ -17,7 +16,6 @@ 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+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
@ -71,20 +69,19 @@ bindsym Mod1+v splitv
bindsym Mod1+w layout tabbed bindsym Mod1+w layout tabbed
mode "resize" { mode "resize" {
bindsym Down resize grow height 10 px bindsym Down resize grow height 10 px
bindsym Escape mode default bindsym Escape mode default
bindsym Left resize shrink width 10 px bindsym Left resize shrink width 10 px
bindsym Return mode default bindsym Return mode default
bindsym Right resize grow width 10 px bindsym Right resize grow width 10 px
bindsym Up resize shrink height 10 px bindsym Up resize shrink height 10 px
bindsym h resize shrink width 10 px bindsym h resize shrink width 10 px
bindsym j resize grow height 10 px bindsym j resize grow height 10 px
bindsym k resize shrink height 10 px bindsym k resize shrink height 10 px
bindsym l resize grow width 10 px bindsym l resize grow width 10 px
} }
bar { bar {
font pango:monospace 8.000000 font pango:monospace 8.000000
mode dock mode dock
hidden_state hide hidden_state hide
@ -98,16 +95,12 @@ bar {
background #000000 background #000000
statusline #ffffff statusline #ffffff
separator #666666 separator #666666
focused_workspace #4c7899 #285577 #ffffff focused_workspace #4c7899 #285577 #ffffff
active_workspace #333333 #5f676a #ffffff active_workspace #333333 #5f676a #ffffff
inactive_workspace #333333 #222222 #888888 inactive_workspace #333333 #222222 #888888
urgent_workspace #2f343a #900000 #ffffff urgent_workspace #2f343a #900000 #ffffff
binding_mode #2f343a #900000 #ffffff binding_mode #2f343a #900000 #ffffff
} }
} }
workspace "1" output eDP workspace "1" output eDP