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

sway&i3: refactor replace moduleName check with variables

Browse source
This commit is contained in:
Nicolas Berbiche 2021-01-11 12:18:32 -05:00
parent cc89be5a30
commit 45e3b0ce0e
No known key found for this signature in database
GPG key ID: 31D89C1E266CFDC8
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,6 +4,9 @@
with lib; with lib;
let let
isI3 = moduleName == "i3";
isSway = !isI3;
fonts = mkOption { fonts = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = [ "monospace 8" ]; default = [ "monospace 8" ];
@ -26,7 +29,7 @@ let
default = false; default = false;
description = "Whether to run command on each ${moduleName} restart."; description = "Whether to run command on each ${moduleName} restart.";
}; };
} // optionalAttrs (moduleName == "i3") { } // optionalAttrs isI3 {
notification = mkOption { notification = mkOption {
type = types.bool; type = types.bool;
default = true; default = true;
@ -120,7 +123,7 @@ let
default = "${cfg.package}/bin/${moduleName}bar"; default = "${cfg.package}/bin/${moduleName}bar";
defaultText = "i3bar"; defaultText = "i3bar";
description = "Command that will be used to start a bar."; description = "Command that will be used to start a bar.";
example = if moduleName == "i3" then example = if isI3 then
"\${pkgs.i3-gaps}/bin/i3bar -t" "\${pkgs.i3-gaps}/bin/i3bar -t"
else else
"\${pkgs.waybar}/bin/waybar"; "\${pkgs.waybar}/bin/waybar";
@ -311,7 +314,7 @@ in {
titlebar = mkOption { titlebar = mkOption {
type = types.bool; type = types.bool;
default = !isGaps; default = !isGaps;
defaultText = if moduleName == "i3" then defaultText = if isI3 then
"xsession.windowManager.i3.package != nixpkgs.i3-gaps (titlebar should be disabled for i3-gaps)" "xsession.windowManager.i3.package != nixpkgs.i3-gaps (titlebar should be disabled for i3-gaps)"
else else
"false"; "false";
@ -354,7 +357,7 @@ in {
titlebar = mkOption { titlebar = mkOption {
type = types.bool; type = types.bool;
default = !isGaps; default = !isGaps;
defaultText = if moduleName == "i3" then defaultText = if isI3 then
"xsession.windowManager.i3.package != nixpkgs.i3-gaps (titlebar should be disabled for i3-gaps)" "xsession.windowManager.i3.package != nixpkgs.i3-gaps (titlebar should be disabled for i3-gaps)"
else else
"false"; "false";
@ -408,14 +411,14 @@ in {
}; };
followMouse = mkOption { followMouse = mkOption {
type = if moduleName == "sway" then type = if isSway then
types.either (types.enum [ "yes" "no" "always" ]) types.bool types.either (types.enum [ "yes" "no" "always" ]) types.bool
else else
types.bool; types.bool;
default = if moduleName == "sway" then "yes" else true; default = if isSway then "yes" else true;
description = "Whether focus should follow the mouse."; description = "Whether focus should follow the mouse.";
apply = val: apply = val:
if (moduleName == "sway" && isBool val) then if (isSway && isBool val) then
(if val then "yes" else "no") (if val then "yes" else "no")
else else
val; val;
@ -645,7 +648,7 @@ in {
See <link xlink:href="https://i3wm.org/docs/userguide.html#_automatically_starting_applications_on_i3_startup"/>. See <link xlink:href="https://i3wm.org/docs/userguide.html#_automatically_starting_applications_on_i3_startup"/>.
''; '';
example = if moduleName == "i3" then example = if isI3 then
literalExample '' literalExample ''
[ [
{ command = "systemctl --user restart polybar"; always = true; notification = false; } { command = "systemctl --user restart polybar"; always = true; notification = false; }
@ -743,7 +746,7 @@ in {
}; };
}); });
default = null; default = null;
description = if moduleName == "sway" then '' description = if isSway then ''
Gaps related settings. Gaps related settings.
'' else '' '' else ''
i3Gaps related settings. The i3-gaps package must be used for these features to work. i3Gaps related settings. The i3-gaps package must be used for these features to work.
@ -752,7 +755,7 @@ in {
terminal = mkOption { terminal = mkOption {
type = types.str; type = types.str;
default = if moduleName == "i3" then default = if isI3 then
"i3-sensible-terminal" "i3-sensible-terminal"
else else
"${pkgs.rxvt-unicode-unwrapped}/bin/urxvt"; "${pkgs.rxvt-unicode-unwrapped}/bin/urxvt";
@ -762,7 +765,7 @@ in {
menu = mkOption { menu = mkOption {
type = types.str; type = types.str;
default = if moduleName == "sway" then default = if isSway then
"${pkgs.dmenu}/bin/dmenu_path | ${pkgs.dmenu}/bin/dmenu | ${pkgs.findutils}/bin/xargs swaymsg exec --" "${pkgs.dmenu}/bin/dmenu_path | ${pkgs.dmenu}/bin/dmenu | ${pkgs.findutils}/bin/xargs swaymsg exec --"
else else
"${pkgs.dmenu}/bin/dmenu_run"; "${pkgs.dmenu}/bin/dmenu_run";