Format Nix files ...forgot to format before commit. ```sh $ nix fmt ```

Changes

3 changed files (+44/-34)

• features/wayland-de/fcitx5.nix
  • @@ -1,6 +1,8 @@
    - { config, lib, pkgs, ... }: let + { config, lib, pkgs, ... }: + let wayland-de = config.features.wayland-de; - in { + in + { options = { features.wayland-de.ime = { enable = lib.mkEnableOption "Input method";
• features/wayland-de/swaybg.nix
  • @@ -1,7 +1,8 @@
    { config, lib, pkgs, ... }: let cfg = config.features.wayland-de.swaybg; - in { + in + { options.features.wayland-de.swaybg = { background = lib.mkOption { type = lib.types.nonEmptyStr;
  • @@ -27,14 +28,17 @@ # https://github.com/swaywm/swaybg
    pkgs.swaybg ]; - wayland.windowManager.sway.extraConfig = let - bg = "--color '${cfg.background}'"; - image = if builtins.isNull cfg.image then - "" - else - "--image ${builtins.toString cfg.image}"; - in '' - exec "${pkgs.swaybg}/bin/swaybg ${bg} ${image}" - ''; + wayland.windowManager.sway.extraConfig = + let + bg = "--color '${cfg.background}'"; + image = + if builtins.isNull cfg.image then + "" + else + "--image ${builtins.toString cfg.image}"; + in + '' + exec "${pkgs.swaybg}/bin/swaybg ${bg} ${image}" + ''; }; }
• themes/catppuccin/wallpaper/default.nix
  • @@ -25,35 +25,39 @@ # │ │
    # ┌─▼───────────▼────────┐ # │Render PNG using resvg│ # └──────────────────────┘ - buildPhase = let - # Replace mocha colors to specified flavor's colors. - replaceColors = pkgs.lib.trivial.pipe mocha - [ (pkgs.lib.attrsets.mapAttrsToList ( - name: value: - let - old = value.hex; - new = colors.${name}.hex; - in + buildPhase = + let + # Replace mocha colors to specified flavor's colors. + replaceColors = pkgs.lib.trivial.pipe mocha + [ + (pkgs.lib.attrsets.mapAttrsToList ( + name: value: + let + old = value.hex; + new = colors.${name}.hex; + in # Skip the argument if same, otherwise replace-literal exits with an error if old == new then null else "\"${value.hex}\" \"${colors.${name}.hex}\"" - )) - (builtins.filter builtins.isString) - (pkgs.lib.strings.concatStringsSep " -a ") - ]; + )) + (builtins.filter builtins.isString) + (pkgs.lib.strings.concatStringsSep " -a ") + ]; - # Skip replace-literal if there is no replace argument, otherwise it exits with an error - replaceStep = if replaceColors == "" then - "cp $src/source.svg wallpaper.svg" - else - "cat $src/source.svg | ${pkgs.replace}/bin/replace-literal ${replaceColors} > wallpaper.svg"; - in with colors; '' - ${replaceStep} + # Skip replace-literal if there is no replace argument, otherwise it exits with an error + replaceStep = + if replaceColors == "" then + "cp $src/source.svg wallpaper.svg" + else + "cat $src/source.svg | ${pkgs.replace}/bin/replace-literal ${replaceColors} > wallpaper.svg"; + in + with colors; '' + ${replaceStep} - ${pkgs.resvg}/bin/resvg -w ${builtins.toString width} -h ${builtins.toString height} --background "${base.hex}" wallpaper.svg out.png - ''; + ${pkgs.resvg}/bin/resvg -w ${builtins.toString width} -h ${builtins.toString height} --background "${base.hex}" wallpaper.svg out.png + ''; installPhase = '' mkdir -p $out/usr/share/backgrounds