From 4e235a8746b195e335306d898f0cc93ad6c4564c Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 13 Jan 2026 22:47:32 -0600 Subject: [PATCH] treewide: nix fmt nix fmt updated in nixpkgs with string handling changes Signed-off-by: Austin Horstman --- modules/files.nix | 2 +- modules/programs/firefox/mkFirefoxModule.nix | 2 +- modules/programs/oh-my-posh.nix | 4 ++-- modules/programs/pimsync/default.nix | 2 +- modules/programs/vdirsyncer/default.nix | 2 +- modules/programs/vicinae.nix | 2 +- modules/services/window-managers/hyprland.nix | 3 +-- tests/modules/programs/vicinae/example-settings.nix | 2 +- tests/modules/services/mako/renamed-options.nix | 4 ++-- 9 files changed, 11 insertions(+), 12 deletions(-) diff --git a/modules/files.nix b/modules/files.nix index db63fced..bc96fbe8 100644 --- a/modules/files.nix +++ b/modules/files.nix @@ -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. diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix index f7ebb6ab..5cf049c2 100644 --- a/modules/programs/firefox/mkFirefoxModule.nix +++ b/modules/programs/firefox/mkFirefoxModule.nix @@ -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 { diff --git a/modules/programs/oh-my-posh.nix b/modules/programs/oh-my-posh.nix index 162be4e1..3501d150 100644 --- a/modules/programs/oh-my-posh.nix +++ b/modules/programs/oh-my-posh.nix @@ -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" '' - }'' + }" } ''; }; diff --git a/modules/programs/pimsync/default.nix b/modules/programs/pimsync/default.nix index c9a016e6..40092c47 100644 --- a/modules/programs/pimsync/default.nix +++ b/modules/programs/pimsync/default.nix @@ -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 { diff --git a/modules/programs/vdirsyncer/default.nix b/modules/programs/vdirsyncer/default.nix index a81a6cc2..10ef3229 100644 --- a/modules/programs/vdirsyncer/default.nix +++ b/modules/programs/vdirsyncer/default.nix @@ -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 diff --git a/modules/programs/vicinae.nix b/modules/programs/vicinae.nix index 4f8e3b1e..7f27e41b 100644 --- a/modules/programs/vicinae.nix +++ b/modules/programs/vicinae.nix @@ -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 = ( diff --git a/modules/services/window-managers/hyprland.nix b/modules/services/window-managers/hyprland.nix index 88691e7d..53593c74 100644 --- a/modules/services/window-managers/hyprland.nix +++ b/modules/services/window-managers/hyprland.nix @@ -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 { = ; } for all submaps submapWarningsAttrset = builtins.mapAttrs ( diff --git a/tests/modules/programs/vicinae/example-settings.nix b/tests/modules/programs/vicinae/example-settings.nix index 75df2422..01224052 100644 --- a/tests/modules/programs/vicinae/example-settings.nix +++ b/tests/modules/programs/vicinae/example-settings.nix @@ -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 = '' diff --git a/tests/modules/services/mako/renamed-options.nix b/tests/modules/services/mako/renamed-options.nix index faf05cfe..2a102b06 100644 --- a/tests/modules/services/mako/renamed-options.nix +++ b/tests/modules/services/mako/renamed-options.nix @@ -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 = ''