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

Merge PR #1229

Browse source
This commit is contained in:
Robert Helgesson 2020-05-11 23:02:14 +02:00
parent b886cbea0b 7f4053084c
commit 4ae188bfc7
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,8 +10,9 @@ rec {
keybindingsStr = keybindings:
concatStringsSep "\n" (mapAttrsToList (keycomb: action:
optionalString (action != null) "bindsym ${keycomb} ${action}")
keybindings);
optionalString (action != null) "bindsym ${
lib.optionalString (moduleName == "sway") "--to-code "
}${keycomb} ${action}") keybindings);
keycodebindingsStr = keycodebindings:
concatStringsSep "\n" (mapAttrsToList (keycomb: action:
@ -47,7 +48,10 @@ rec {
mode ${mode}
hidden_state ${hiddenState}
position ${position}
status_command ${statusCommand}
${
optionalString (statusCommand != null)
"status_command ${statusCommand}"
}
${moduleName}bar_command ${command}
workspace_buttons ${if workspaceButtons then "yes" else "no"}
strip_workspace_numbers ${if !workspaceNumbers then "yes" else "no"}

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

@ -111,7 +111,7 @@ let
};
statusCommand = mkOption {
type = types.str;
type = types.nullOr types.str;
default = "${pkgs.i3status}/bin/i3status";
description = "Command that will be used to get status lines.";
};