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/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/services/window-managers/hyprland.nix b/modules/services/window-managers/hyprland.nix index 1a1caee4..2a03d259 100644 --- a/modules/services/window-managers/hyprland.nix +++ b/modules/services/window-managers/hyprland.nix @@ -342,8 +342,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/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 = ''