treewide: Remove unwanted dependencies (#7487)
Fixes interpolation of packages in the default and example texts.
This commit is contained in:
parent
460f1e9af9
commit
8eb2f2a26a
14 changed files with 50 additions and 18 deletions
|
|
@ -20,6 +20,9 @@ in
|
|||
soundFont = mkOption {
|
||||
type = types.path;
|
||||
default = "${pkgs.soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2";
|
||||
defaultText = lib.literalExpression ''
|
||||
"''${pkgs.soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2";
|
||||
'';
|
||||
description = ''
|
||||
The soundfont file to use, in SoundFont 2 format.
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ in
|
|||
primary = true;
|
||||
atomic = true;
|
||||
execute_after = [
|
||||
"${pkgs.xorg.xrandr}/bin/xrandr --dpi 96"
|
||||
"${pkgs.xmonad-with-packages}/bin/xmonad --restart";
|
||||
"''${pkgs.xorg.xrandr}/bin/xrandr --dpi 96"
|
||||
"''${pkgs.xmonad-with-packages}/bin/xmonad --restart";
|
||||
];
|
||||
}
|
||||
{
|
||||
|
|
@ -54,8 +54,8 @@ in
|
|||
primary = true;
|
||||
atomic = true;
|
||||
execute_after = [
|
||||
"${pkgs.xorg.xrandr}/bin/xrandr --dpi 120"
|
||||
"${pkgs.xmonad-with-packages}/bin/xmonad --restart";
|
||||
"''${pkgs.xorg.xrandr}/bin/xrandr --dpi 120"
|
||||
"''${pkgs.xmonad-with-packages}/bin/xmonad --restart";
|
||||
];
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -76,8 +76,8 @@ in
|
|||
default = [ ];
|
||||
example = literalExpression ''
|
||||
[
|
||||
{ timeout = 60; command = "${pkgs.swaylock}/bin/swaylock -fF"; }
|
||||
{ timeout = 90; command = "${pkgs.systemd}/bin/systemctl suspend"; }
|
||||
{ timeout = 60; command = "''${pkgs.swaylock}/bin/swaylock -fF"; }
|
||||
{ timeout = 90; command = "''${pkgs.systemd}/bin/systemctl suspend"; }
|
||||
]
|
||||
'';
|
||||
description = "List of commands to run after idle timeout.";
|
||||
|
|
@ -88,7 +88,7 @@ in
|
|||
default = [ ];
|
||||
example = literalExpression ''
|
||||
[
|
||||
{ event = "before-sleep"; command = "${pkgs.swaylock}/bin/swaylock -fF"; }
|
||||
{ event = "before-sleep"; command = "''${pkgs.swaylock}/bin/swaylock -fF"; }
|
||||
{ event = "lock"; command = "lock"; }
|
||||
]
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ in
|
|||
extraConfig = mkOption {
|
||||
type = types.attrs;
|
||||
default = { };
|
||||
example = literalExpression ''{ main.activation_command = "\${pkgs.hello}/bin/hello"; }'';
|
||||
example = literalExpression ''{ main.activation_command = "''${pkgs.hello}/bin/hello"; }'';
|
||||
description = ''
|
||||
Extra configuration options to add to the twmnd config file. See
|
||||
<https://github.com/sboli/twmn/blob/master/README.md>
|
||||
|
|
|
|||
|
|
@ -42,6 +42,16 @@ let
|
|||
batch = "true";
|
||||
log = "false"; # don't log to file, handled by systemd
|
||||
};
|
||||
defaultText = lib.literalExpression ''
|
||||
{
|
||||
repeat = "watch";
|
||||
sshcmd = "''${pkgs.openssh}/bin/ssh";
|
||||
ui = "text";
|
||||
auto = "true";
|
||||
batch = "true";
|
||||
log = "false"; # don't log to file, handled by systemd
|
||||
}
|
||||
'';
|
||||
description = ''
|
||||
Additional command line options as a dictionary to pass to the
|
||||
`unison` program.
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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'.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue