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

treewide: Remove unwanted dependencies (#7487)

Browse source 
Fixes interpolation of packages in the default and example texts.
This commit is contained in:
Tom Hubrecht 2025-07-17 21:12:50 +02:00 • committed by GitHub
parent 460f1e9af9
commit 8eb2f2a26a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 50 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -98,7 +98,6 @@ let
defaultText = literalExpression ''
null for state version ≥ 20.09, as example otherwise
'';
example = default;
}
);
in
@ -181,7 +180,7 @@ let
pkg = if isSway && isNull cfg.package then pkgs.sway else cfg.package;
in
"${pkg}/bin/${moduleName}bar";
defaultText = "i3bar";
defaultText = literalExpression "i3bar";
description = "Command that will be used to start a bar.";
example = if isI3 then "\${pkgs.i3}/bin/i3bar -t" else "\${pkgs.waybar}/bin/waybar";
};
@ -189,6 +188,7 @@ let
statusCommand = mkNullableOption {
type = types.str;
default = "${pkgs.i3status}/bin/i3status";
defaultText = literalExpression "\${pkgs.i3status}/bin/i3status";
description = "Command that will be used to get status lines.";
};
@ -959,6 +959,9 @@ in
terminal = mkOption {
type = types.str;
default = if isI3 then "i3-sensible-terminal" else "${pkgs.foot}/bin/foot";
defaultText = literalExpression (
if isI3 then ''"i3-sensible-terminal"'' else "\${pkgs.foot}/bin/foot"
);
description = "Default terminal to run.";
example = "alacritty";
};
@ -970,6 +973,12 @@ in
"${pkgs.dmenu}/bin/dmenu_path | ${pkgs.dmenu}/bin/dmenu | ${pkgs.findutils}/bin/xargs swaymsg exec --"
else
"${pkgs.dmenu}/bin/dmenu_run";
defaultText = literalExpression (
if isSway then
"\${pkgs.dmenu}/bin/dmenu_path | \${pkgs.dmenu}/bin/dmenu | \${pkgs.findutils}/bin/xargs swaymsg exec --"
else
"\${pkgs.dmenu}/bin/dmenu_run"
);
description = "Default launcher to use.";
example = "bemenu-run";
};

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

@ -155,9 +155,9 @@ let
let
modifier = config.wayland.windowManager.sway.config.modifier;
in lib.mkOptionDefault {
"''${modifier}+Return" = "exec ${cfg.config.terminal}";
"''${modifier}+Return" = "exec ''${cfg.config.terminal}";
"''${modifier}+Shift+q" = "kill";
"''${modifier}+d" = "exec ${cfg.config.menu}";
"''${modifier}+d" = "exec ''${cfg.config.menu}";
}
'';
};
@ -509,7 +509,7 @@ in
withBaseWrapper = cfg.wrapperFeatures.base;
withGtkWrapper = cfg.wrapperFeatures.gtk;
};
defaultText = lib.literalExpression "${pkgs.sway}";
defaultText = lib.literalExpression "\${pkgs.sway}";
description = ''
Sway package to use. Will override the options
'wrapperFeatures', 'extraSessionCommands', and 'extraOptions'.