nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-11-08 11:36:05 +01:00
Code Activity

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

9
modules/programs/alot/accounts.nix
View file

@ -23,6 +23,15 @@ in
"'\\[?{" + ''"name": "(?P<name>.*)", "address": "(?P<email>.+)", "name-addr": ".*"'' + "}[,\\]]?'";
shellcommand_external_filtering = "False";
};
defaultText = lib.literalExpression ''
{
type = "shellcommand";
command = "''\'''${pkgs.notmuch}/bin/notmuch address --format=json --output=recipients date:6M..'";
regexp =
"'\\[?{" + '''"name": "(?P<name>.*)", "address": "(?P<email>.+)", "name-addr": ".*"''' + "}[,\\]]?'";
shellcommand_external_filtering = "False";
}
'';
example = lib.literalExpression ''
{
type = "shellcommand";

2
modules/programs/awscli.nix
View file

@ -41,7 +41,7 @@ in
example = lib.literalExpression ''
{
"default" = {
"credential_process" = "${pkgs.pass}/bin/pass show aws";
"credential_process" = "''${pkgs.pass}/bin/pass show aws";
};
};
'';

1
modules/programs/newsboat.nix
View file

@ -122,6 +122,7 @@ in
browser = mkOption {
type = types.str;
default = "${pkgs.xdg-utils}/bin/xdg-open";
defaultText = lib.literalExpression "\${pkgs.xdg-utils}/bin/xdg-open";
description = "External browser to use.";
};

2
modules/programs/ranger.nix
View file

@ -137,7 +137,7 @@ in
description = ''
A command to run for the matching file.
'';
example = literalExpression ''"${pkgs.vim}/bin/vim -- \"$@\""'';
example = literalExpression ''"''${pkgs.vim}/bin/vim -- \"$@\""'';
};
};
}

2
modules/programs/swayr.nix
View file

@ -26,7 +26,7 @@ in
default = { };
example = lib.literalExpression ''
menu = {
executable = "${pkgs.wofi}/bin/wofi";
executable = "''${pkgs.wofi}/bin/wofi";
args = [
"--show=dmenu"
"--allow-markup"

2
modules/programs/termite.nix
View file

@ -124,7 +124,7 @@ in
browser = mkOption {
default = null;
type = types.nullOr types.str;
example = "${pkgs.xdg-utils}/xdg-open";
example = "\${pkgs.xdg-utils}/xdg-open";
description = ''
Set the default browser for opening links. If its not set, $BROWSER is read.
If that's not set, url hints will be disabled.

2
modules/programs/tmux.nix
View file

@ -302,7 +302,7 @@ in
shell = mkOption {
default = defaultShell;
example = literalExpression "${pkgs.zsh}/bin/zsh";
example = literalExpression "\${pkgs.zsh}/bin/zsh";
type = with types; nullOr str;
description = "Set the default-shell tmux variable.";
};

3
modules/services/fluidsynth.nix
View file

@ -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.
'';

8
modules/services/grobi.nix
View file

@ -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";
];
}
]

6
modules/services/swayidle.nix
View file

@ -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"; }
]
'';

2
modules/services/twmn.nix
View file

@ -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>

10
modules/services/unison.nix
View file

@ -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.

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'.