treewide: nix fmt
nix fmt updated in nixpkgs with string handling changes Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
This commit is contained in:
parent
0150937c66
commit
4e235a8746
9 changed files with 11 additions and 12 deletions
|
|
@ -87,7 +87,7 @@ in
|
|||
pathStr = toString path;
|
||||
name = lib.hm.strings.storeFileName (baseNameOf pathStr);
|
||||
in
|
||||
pkgs.runCommandLocal name { } ''ln -s ${lib.escapeShellArg pathStr} $out'';
|
||||
pkgs.runCommandLocal name { } "ln -s ${lib.escapeShellArg pathStr} $out";
|
||||
|
||||
# This verifies that the links we are about to create will not
|
||||
# overwrite an existing file.
|
||||
|
|
|
|||
|
|
@ -278,7 +278,7 @@ in
|
|||
type = types.nullOr types.str;
|
||||
default = if platforms.darwin ? "defaultsId" then platforms.darwin.defaultsId else null;
|
||||
example = if default != null then default else "com.developer.app";
|
||||
description = ''The id for the darwin defaults in order to set policies'';
|
||||
description = "The id for the darwin defaults in order to set policies";
|
||||
};
|
||||
|
||||
darwinAppName = mkOption {
|
||||
|
|
|
|||
|
|
@ -108,11 +108,11 @@ in
|
|||
if lib.versionAtLeast (lib.versions.major cfg.package.version) "26" then
|
||||
"${lib.getExe cfg.package} init nu ${configArgument}"
|
||||
else
|
||||
''source ${
|
||||
"source ${
|
||||
pkgs.runCommand "oh-my-posh-nushell-config.nu" { } ''
|
||||
${lib.getExe cfg.package} init nu ${configArgument} --print >> "$out"
|
||||
''
|
||||
}''
|
||||
}"
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@
|
|||
contactLocalStorageDirs = lib.mapAttrsToList localStorageDir contactAccounts;
|
||||
localStorageDirs = calendarLocalStorageDirs ++ contactLocalStorageDirs;
|
||||
|
||||
mkTmpFileRule = (dir: ''d ${dir} 0755 ${config.home.username} ${config.home.username} - -'');
|
||||
mkTmpFileRule = (dir: "d ${dir} 0755 ${config.home.username} ${config.home.username} - -");
|
||||
tmpFileRules = map mkTmpFileRule localStorageDirs;
|
||||
in
|
||||
lib.mkIf cfg.enable {
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ let
|
|||
else if (n == "itemTypes") then
|
||||
"item_types = ${listString (map wrap v)}"
|
||||
else if (n == "useVcard4") then
|
||||
''use_vcard_4 = ${v}''
|
||||
"use_vcard_4 = ${v}"
|
||||
else if (n == "userName") then
|
||||
''username = "${v}"''
|
||||
else if (n == "userNameCommand") then
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ in
|
|||
}
|
||||
{
|
||||
assertion = !cfg.useLayerShell -> !versionPost0_17;
|
||||
message = ''After version 0.17, if you want to explicitly disable the use of layer shell, you need to set {option}.programs.vicinae.settings.launcher_window.layer_shell.enabled = false.'';
|
||||
message = "After version 0.17, if you want to explicitly disable the use of layer shell, you need to set {option}.programs.vicinae.settings.launcher_window.layer_shell.enabled = false.";
|
||||
}
|
||||
];
|
||||
lib.vicinae.mkExtension = (
|
||||
|
|
|
|||
|
|
@ -352,8 +352,7 @@ in
|
|||
warning = "You have enabled hyprland.systemd.enable or listed plugins in hyprland.plugins but do not have any configuration in hyprland.settings or hyprland.extraConfig. This is almost certainly a mistake.";
|
||||
|
||||
filterNonBinds =
|
||||
attrs:
|
||||
builtins.filter (n: builtins.match ''bind[[:lower:]]*'' n == null) (builtins.attrNames attrs);
|
||||
attrs: builtins.filter (n: builtins.match "bind[[:lower:]]*" n == null) (builtins.attrNames attrs);
|
||||
|
||||
# attrset of { <submap name> = <list of non bind* keys>; } for all submaps
|
||||
submapWarningsAttrset = builtins.mapAttrs (
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@
|
|||
};
|
||||
|
||||
test.asserts.assertions.expected = [
|
||||
''After version 0.17, if you want to explicitly disable the use of layer shell, you need to set {option}.programs.vicinae.settings.launcher_window.layer_shell.enabled = false.''
|
||||
"After version 0.17, if you want to explicitly disable the use of layer shell, you need to set {option}.programs.vicinae.settings.launcher_window.layer_shell.enabled = false."
|
||||
];
|
||||
|
||||
nmt.script = ''
|
||||
|
|
|
|||
|
|
@ -64,9 +64,9 @@
|
|||
in
|
||||
map (
|
||||
option:
|
||||
''The option `services.mako.${option}' defined in ${
|
||||
"The option `services.mako.${option}' defined in ${
|
||||
lib.showFiles options.services.mako.${option}.files
|
||||
} has been renamed to `services.mako.settings.${lib.hm.strings.toKebabCase option}'.''
|
||||
} has been renamed to `services.mako.settings.${lib.hm.strings.toKebabCase option}'."
|
||||
) renamedOptions;
|
||||
|
||||
nmt.script = ''
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue