From fc019d789523ce5f89436b8dbc458cf3b79abf43 Mon Sep 17 00:00:00 2001 From: aristote Date: Tue, 29 Jul 2025 15:25:11 +0200 Subject: reformat everything with nixfmt --- pkgs/static/css/lineAwesome/default.nix | 9 ++++--- pkgs/static/gitignore/default.nix | 16 +++++++++--- pkgs/static/icons/default.nix | 24 +++++++++--------- pkgs/static/userjs/arkenfox/default.nix | 11 +++++---- pkgs/static/userjs/thunderbird/default.nix | 11 +++++---- pkgs/static/wallpapers/default.nix | 39 +++++++++++++++--------------- 6 files changed, 62 insertions(+), 48 deletions(-) (limited to 'pkgs/static') diff --git a/pkgs/static/css/lineAwesome/default.nix b/pkgs/static/css/lineAwesome/default.nix index b1376fe..7769e46 100644 --- a/pkgs/static/css/lineAwesome/default.nix +++ b/pkgs/static/css/lineAwesome/default.nix @@ -1,12 +1,15 @@ -{ stdenv, fetchurl, fontsRelativeDirectory ? "./webfonts", fontDisplay ? "auto" +{ + stdenv, + fetchurl, + fontsRelativeDirectory ? "./webfonts", + fontDisplay ? "auto", }: stdenv.mkDerivation rec { name = "line-awesome.css"; version = "v1.2.1"; src = fetchurl { - url = - "https://raw.githubusercontent.com/icons8/line-awesome/${version}/dist/line-awesome/css/line-awesome.css"; + url = "https://raw.githubusercontent.com/icons8/line-awesome/${version}/dist/line-awesome/css/line-awesome.css"; sha256 = "sha256:GU24Xz6l3Ww4ZCcL2ByssTe04fHBRz9k2aZVRdj0xm4="; }; diff --git a/pkgs/static/gitignore/default.nix b/pkgs/static/gitignore/default.nix index d97dec5..6ee8649 100644 --- a/pkgs/static/gitignore/default.nix +++ b/pkgs/static/gitignore/default.nix @@ -1,6 +1,6 @@ { - templates ? [], - toUncomment ? [], + templates ? [ ], + toUncomment ? [ ], stdenvNoCC, fetchFromGitHub, lib, @@ -18,12 +18,20 @@ stdenvNoCC.mkDerivation { buildPhase = '' mv {Global,community}/*.gitignore . - for file in ${lib.concatStringsSep " " (builtins.map (name: lib.escapeShellArg "${name}.gitignore") templates)} + for file in ${ + lib.concatStringsSep " " (builtins.map (name: lib.escapeShellArg "${name}.gitignore") templates) + } do echo "### $(basename "$file" .gitignore)" >> $out cat "$file" >> $out echo >> $out done - substituteInPlace $out ${lib.concatStringsSep " " (builtins.map (line: "--replace ${lib.escapeShellArg "# ${line}"} ${lib.escapeShellArg line}") toUncomment)} + substituteInPlace $out ${ + lib.concatStringsSep " " ( + builtins.map ( + line: "--replace ${lib.escapeShellArg "# ${line}"} ${lib.escapeShellArg line}" + ) toUncomment + ) + } ''; } diff --git a/pkgs/static/icons/default.nix b/pkgs/static/icons/default.nix index 81acde6..0df7c12 100644 --- a/pkgs/static/icons/default.nix +++ b/pkgs/static/icons/default.nix @@ -1,15 +1,15 @@ { fetchurl }: { - netflix = fetchurl { - url = "https://www.vectorlogo.zone/logos/netflix/netflix-icon.svg"; - sha256 = "0i9211dsc8lrq8bvs9r217nwhfjcg84ja8b7lgqnza9ypv5lrqgs"; - }; - mubi = fetchurl { - url = "https://mubi.com/MUBI-logo.png"; - sha256 = "0fc53c8j6dvphykabqiy146hjmpnczm5rvlf92fycyiqgrg260c4"; - }; - deezer = fetchurl { - url = "https://raw.githubusercontent.com/edent/SuperTinyIcons/master/images/svg/deezer.svg"; - sha256 = "0gjh30082jc1yapkccp4fb9y2sr1q26gbqdjh0dkp9ldr00vy0q6"; - }; + netflix = fetchurl { + url = "https://www.vectorlogo.zone/logos/netflix/netflix-icon.svg"; + sha256 = "0i9211dsc8lrq8bvs9r217nwhfjcg84ja8b7lgqnza9ypv5lrqgs"; + }; + mubi = fetchurl { + url = "https://mubi.com/MUBI-logo.png"; + sha256 = "0fc53c8j6dvphykabqiy146hjmpnczm5rvlf92fycyiqgrg260c4"; + }; + deezer = fetchurl { + url = "https://raw.githubusercontent.com/edent/SuperTinyIcons/master/images/svg/deezer.svg"; + sha256 = "0gjh30082jc1yapkccp4fb9y2sr1q26gbqdjh0dkp9ldr00vy0q6"; + }; } diff --git a/pkgs/static/userjs/arkenfox/default.nix b/pkgs/static/userjs/arkenfox/default.nix index 67dc77b..7650a34 100644 --- a/pkgs/static/userjs/arkenfox/default.nix +++ b/pkgs/static/userjs/arkenfox/default.nix @@ -1,7 +1,8 @@ -{fetchurl}: let +{ fetchurl }: +let version = "135.0"; in - fetchurl { - url = "https://raw.githubusercontent.com/arkenfox/user.js/${version}/user.js"; - sha256 = "sha256-rPcH24YqEBOzoPB9yxMlke/3tqpi9L7GVMsZ3MUP8WY="; - } +fetchurl { + url = "https://raw.githubusercontent.com/arkenfox/user.js/${version}/user.js"; + sha256 = "sha256-rPcH24YqEBOzoPB9yxMlke/3tqpi9L7GVMsZ3MUP8WY="; +} diff --git a/pkgs/static/userjs/thunderbird/default.nix b/pkgs/static/userjs/thunderbird/default.nix index fada9dd..f08fa79 100644 --- a/pkgs/static/userjs/thunderbird/default.nix +++ b/pkgs/static/userjs/thunderbird/default.nix @@ -1,7 +1,8 @@ -{fetchurl}: let +{ fetchurl }: +let version = "128.0"; in - fetchurl { - url = "https://raw.githubusercontent.com/HorlogeSkynet/thunderbird-user.js/v${version}/user.js"; - sha256 = "sha256-V1cTcG52o24bF/0tki/c9+uOdpWaCxqZtIBoSqoQLYk="; - } +fetchurl { + url = "https://raw.githubusercontent.com/HorlogeSkynet/thunderbird-user.js/v${version}/user.js"; + sha256 = "sha256-V1cTcG52o24bF/0tki/c9+uOdpWaCxqZtIBoSqoQLYk="; +} diff --git a/pkgs/static/wallpapers/default.nix b/pkgs/static/wallpapers/default.nix index a0efda3..7f228b9 100644 --- a/pkgs/static/wallpapers/default.nix +++ b/pkgs/static/wallpapers/default.nix @@ -3,7 +3,8 @@ fetchurl, imagemagick, lib, -}: let +}: +let fetchWallpaper = lib.makeOverridable ( { name, @@ -13,24 +14,24 @@ ratio ? "16:9", gravity ? "center", }: - stdenv.mkDerivation { - inherit name; - src = fetchurl { - inherit url sha256; - }; - buildInputs = [imagemagick]; - phases = ["unpackPhase"]; - unpackPhase = '' - convert "$src" -gravity '${gravity}' \ - -extent '${ratio}' \ - -resize '${resolution}!' \ - "$out" - ''; - } + stdenv.mkDerivation { + inherit name; + src = fetchurl { + inherit url sha256; + }; + buildInputs = [ imagemagick ]; + phases = [ "unpackPhase" ]; + unpackPhase = '' + convert "$src" -gravity '${gravity}' \ + -extent '${ratio}' \ + -resize '${resolution}!' \ + "$out" + ''; + } ); sources = lib.importJSON ./sources.json; in - { - fetcher = fetchWallpaper; - } - // builtins.mapAttrs (_: fetchWallpaper) sources +{ + fetcher = fetchWallpaper; +} +// builtins.mapAttrs (_: fetchWallpaper) sources -- cgit v1.2.3