aboutsummaryrefslogtreecommitdiff
path: root/modules/services/window-managers
diff options
context:
space:
mode:
authorRoman Volosatovs <rvolosatovs@riseup.net>2020-05-11 19:41:44 +0200
committerRobert Helgesson <robert@rycee.net>2020-05-11 22:02:38 +0200
commit7f4053084c389f767e0fad18db5f16691a46de17 (patch)
treebee42625103a02e3093f67f42749dadc2e6ebc22 /modules/services/window-managers
parent37202a1b708c36bfc3a0f4bac9b7af0d9666f9b0 (diff)
sway: allow unsetting status command
Diffstat (limited to 'modules/services/window-managers')
-rw-r--r--modules/services/window-managers/i3-sway/lib/functions.nix5
-rw-r--r--modules/services/window-managers/i3-sway/lib/options.nix2
2 files changed, 5 insertions, 2 deletions
diff --git a/modules/services/window-managers/i3-sway/lib/functions.nix b/modules/services/window-managers/i3-sway/lib/functions.nix
index dd59e691678..31d314b041d 100644
--- a/modules/services/window-managers/i3-sway/lib/functions.nix
+++ b/modules/services/window-managers/i3-sway/lib/functions.nix
@@ -48,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"}
diff --git a/modules/services/window-managers/i3-sway/lib/options.nix b/modules/services/window-managers/i3-sway/lib/options.nix
index 690bbbcc235..38f2ec19683 100644
--- a/modules/services/window-managers/i3-sway/lib/options.nix
+++ b/modules/services/window-managers/i3-sway/lib/options.nix
@@ -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.";
};