treewide: remove blank lines around 'let', 'in', and function arguments (#1700)

Link: https://github.com/nix-community/stylix/pull/1700

Reviewed-by: awwpotato <awwpotato@voidq.com>
This commit is contained in:
NAHO 2025-07-19 19:41:36 +02:00 committed by GitHub
parent 03699ed214
commit 2e2e96f6b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
60 changed files with 2 additions and 79 deletions

View file

@ -9,7 +9,6 @@
mdbook-alerts, mdbook-alerts,
mdbook-linkcheck, mdbook-linkcheck,
}: }:
let let
# Prefix to remove from option declaration file paths. # Prefix to remove from option declaration file paths.
rootPrefix = toString ../. + "/"; rootPrefix = toString ../. + "/";
@ -654,7 +653,6 @@ let
padding: unset; padding: unset;
} }
''; '';
in in
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
name = "stylix-book"; name = "stylix-book";

View file

@ -1,5 +1,4 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
let let
package = pkgs.alacritty; package = pkgs.alacritty;
in in

View file

@ -1,5 +1,4 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
stylix.testbed.ui = { stylix.testbed.ui = {
graphicalEnvironment = "bspwm"; graphicalEnvironment = "bspwm";

View file

@ -1,5 +1,4 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
let let
package = pkgs.cavalier; package = pkgs.cavalier;
in in

View file

@ -1,5 +1,4 @@
{ pkgs, ... }: { pkgs, ... }:
let let
package = pkgs.chromium; package = pkgs.chromium;
in in

View file

@ -1,5 +1,4 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
let let
package = pkgs.discord.override { package = pkgs.discord.override {
withVencord = true; withVencord = true;

View file

@ -1,5 +1,4 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
let let
package = pkgs.vesktop; package = pkgs.vesktop;
in in

View file

@ -1,5 +1,4 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
let let
package = pkgs.emacs; package = pkgs.emacs;
in in

View file

@ -1,5 +1,4 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
let let
package = pkgs.firefox; package = pkgs.firefox;
profileName = "stylix"; profileName = "stylix";

View file

@ -1,5 +1,4 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
let let
package = pkgs.firefox; package = pkgs.firefox;
profileName = "stylix"; profileName = "stylix";

View file

@ -1,5 +1,4 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
let let
package = pkgs.foliate; package = pkgs.foliate;
in in

View file

@ -1,5 +1,4 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
let let
package = pkgs.foot; package = pkgs.foot;
in in

View file

@ -1,5 +1,4 @@
{ pkgs, ... }: { pkgs, ... }:
let let
package = pkgs.gedit; package = pkgs.gedit;
in in

View file

@ -1,5 +1,4 @@
{ pkgs, ... }: { pkgs, ... }:
let let
package = pkgs.gnome-text-editor; package = pkgs.gnome-text-editor;
in in

View file

@ -4,7 +4,6 @@
lib, lib,
... ...
}: }:
let let
inherit (config.stylix.fonts) sansSerif serif monospace; inherit (config.stylix.fonts) sansSerif serif monospace;
fontSize = toString config.stylix.fonts.sizes.applications; fontSize = toString config.stylix.fonts.sizes.applications;
@ -40,7 +39,6 @@ let
fi fi
''; '';
}; };
in in
{ {
options.stylix.targets.gnome = { options.stylix.targets.gnome = {

View file

@ -4,13 +4,11 @@
config, config,
... ...
}: }:
let let
theme = pkgs.callPackage ./theme.nix { theme = pkgs.callPackage ./theme.nix {
inherit (config.lib.stylix) colors; inherit (config.lib.stylix) colors;
inherit (config.stylix) inputs; inherit (config.stylix) inputs;
}; };
in in
{ {
options.stylix.targets.gnome.enable = options.stylix.targets.gnome.enable =

View file

@ -5,13 +5,11 @@
colors, colors,
inputs, inputs,
}: }:
let let
colorsScss = colors { colorsScss = colors {
template = ./colors.scss.mustache; template = ./colors.scss.mustache;
extension = ".scss"; extension = ".scss";
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "${colors.slug}-gnome-shell-theme"; name = "${colors.slug}-gnome-shell-theme";

View file

@ -4,7 +4,6 @@
lib, lib,
... ...
}: }:
let let
cfg = config.stylix.targets.grub; cfg = config.stylix.targets.grub;
inherit (config.stylix) imageScalingMode fonts; inherit (config.stylix) imageScalingMode fonts;

View file

@ -1,5 +1,4 @@
{ mkTarget, ... }: { mkTarget, ... }:
mkTarget { mkTarget {
name = "gtksourceview"; name = "gtksourceview";
humanName = "GTKSourceView"; humanName = "GTKSourceView";

View file

@ -1,5 +1,4 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
let let
package = pkgs.halloy; package = pkgs.halloy;
in in

View file

@ -1,5 +1,4 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
stylix.testbed.ui = { stylix.testbed.ui = {
graphicalEnvironment = "hyprland"; graphicalEnvironment = "hyprland";

View file

@ -1,5 +1,4 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
let let
package = pkgs.kitty; package = pkgs.kitty;
in in

View file

@ -1,5 +1,4 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
{ {
stylix.testbed.ui.command = { stylix.testbed.ui.command = {
text = '' text = ''

View file

@ -1,5 +1,4 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
{ {
stylix.testbed.ui = { stylix.testbed.ui = {
# We use Hyprland because Gnome has its own notification daemon # We use Hyprland because Gnome has its own notification daemon

View file

@ -1,13 +1,10 @@
{ lib, config, ... }: { lib, config, ... }:
let let
recommendedStyle = { recommendedStyle = {
gnome = if config.stylix.polarity == "dark" then "adwaita-dark" else "adwaita"; gnome = if config.stylix.polarity == "dark" then "adwaita-dark" else "adwaita";
kde = "breeze"; kde = "breeze";
qtct = "kvantum"; qtct = "kvantum";
}; };
in in
{ {
options.stylix.targets.qt = { options.stylix.targets.qt = {

View file

@ -1,5 +1,4 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
let let
package = pkgs.qutebrowser; package = pkgs.qutebrowser;
in in

View file

@ -1,5 +1,4 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
let let
package = pkgs.rio; package = pkgs.rio;
in in

View file

@ -1,5 +1,4 @@
{ config, lib, ... }: { config, lib, ... }:
{ {
options.stylix.targets.river.enable = options.stylix.targets.river.enable =
config.lib.stylix.mkEnableTarget "River" true; config.lib.stylix.mkEnableTarget "River" true;

View file

@ -1,5 +1,4 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
let let
package = pkgs.nsxiv; package = pkgs.nsxiv;
in in

View file

@ -5,7 +5,6 @@
lib, lib,
... ...
}: }:
mkTarget { mkTarget {
name = "vscode"; name = "vscode";
humanName = "VSCode"; humanName = "VSCode";

View file

@ -1,8 +1,4 @@
fonts: fonts: with fonts; {
with fonts;
{
"workbench.colorTheme" = "Stylix"; "workbench.colorTheme" = "Stylix";
"editor.fontFamily" = monospace.name; "editor.fontFamily" = monospace.name;
"editor.inlayHints.fontFamily" = monospace.name; "editor.inlayHints.fontFamily" = monospace.name;

View file

@ -1,7 +1,4 @@
colors: colors: with colors.withHashtag; {
with colors.withHashtag;
{
"$schema" = "vscode://schemas/color-theme"; "$schema" = "vscode://schemas/color-theme";
name = scheme; name = scheme;
type = "dark"; type = "dark";

View file

@ -1,5 +1,4 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
# We are using VSCodium because VSCode is an unfree package # We are using VSCodium because VSCode is an unfree package
let let
package = pkgs.vscodium; package = pkgs.vscodium;

View file

@ -1,5 +1,4 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
let let
package = pkgs.wezterm; package = pkgs.wezterm;
in in

View file

@ -1,5 +1,4 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
let let
package = pkgs.wofi; package = pkgs.wofi;
in in

View file

@ -1,9 +1,7 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
let let
package = pkgs.yazi; package = pkgs.yazi;
in in
{ {
stylix.testbed.ui.application = { stylix.testbed.ui.application = {
name = "yazi"; name = "yazi";

View file

@ -1,5 +1,4 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
let let
package = pkgs.zathura; package = pkgs.zathura;
in in

View file

@ -1,5 +1,4 @@
{ haskellPackages, stdenvNoCC }: { haskellPackages, stdenvNoCC }:
let let
ghc = haskellPackages.ghcWithPackages ( ghc = haskellPackages.ghcWithPackages (
ps: with ps; [ ps: with ps; [
@ -23,7 +22,6 @@ let
dontInstall = true; dontInstall = true;
dontFixup = true; dontFixup = true;
}; };
in in
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
name = "palette-generator"; name = "palette-generator";

View file

@ -1,5 +1,4 @@
{ lib }: { lib }:
# string -> [ path ] # string -> [ path ]
# List include path for either nixos modules or hm modules # List include path for either nixos modules or hm modules
platform: platform:

View file

@ -1,5 +1,4 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.stylix.cursor = lib.mkOption { options.stylix.cursor = lib.mkOption {
description = '' description = ''

View file

@ -3,7 +3,6 @@
config, config,
... ...
}: }:
let let
autoload = import ../autoload.nix { inherit lib; } "darwin"; autoload = import ../autoload.nix { inherit lib; } "darwin";
in in

View file

@ -1,5 +1,4 @@
{ config, lib, ... }: { config, lib, ... }:
{ {
config = lib.mkIf config.stylix.enable { config = lib.mkIf config.stylix.enable {
environment.etc = config.stylix.generated.fileTree; environment.etc = config.stylix.generated.fileTree;

View file

@ -1,5 +1,4 @@
{ lib, ... }: { lib, ... }:
let let
autoload = import ../autoload.nix { inherit lib; } "droid"; autoload = import ../autoload.nix { inherit lib; } "droid";
in in

View file

@ -4,7 +4,6 @@
pkgs, pkgs,
... ...
}: }:
let let
mkFont = mkFont =
font: font:

View file

@ -1,6 +1,5 @@
args: args:
{ config, lib, ... }: { config, lib, ... }:
{ {
imports = [ (lib.modules.importApply ../palette.nix args) ]; imports = [ (lib.modules.importApply ../palette.nix args) ];

View file

@ -4,7 +4,6 @@
lib, lib,
... ...
}: }:
let let
cfg = config.stylix.fonts; cfg = config.stylix.fonts;
@ -25,7 +24,6 @@ let
default = fontName; default = fontName;
}; };
}; };
in in
{ {
options.stylix.fonts = { options.stylix.fonts = {

View file

@ -4,10 +4,8 @@
pkgs, pkgs,
... ...
}: }:
let let
cfg = config.stylix.cursor; cfg = config.stylix.cursor;
in in
{ {
config = config =

View file

@ -3,7 +3,6 @@
config, config,
... ...
}: }:
let let
autoload = import ../autoload.nix { inherit lib; } "hm"; autoload = import ../autoload.nix { inherit lib; } "hm";
in in

View file

@ -1,5 +1,4 @@
{ config, lib, ... }: { config, lib, ... }:
let let
cfg = config.stylix.iconTheme; cfg = config.stylix.iconTheme;
inherit (config.stylix) polarity; inherit (config.stylix) polarity;

View file

@ -1,5 +1,4 @@
{ config, lib, ... }: { config, lib, ... }:
{ {
config = lib.mkIf config.stylix.enable { config = lib.mkIf config.stylix.enable {
xdg.configFile = config.stylix.generated.fileTree; xdg.configFile = config.stylix.generated.fileTree;

View file

@ -5,7 +5,6 @@
pkgs, pkgs,
... ...
}: }:
let let
copyModules = copyModules =
map map
@ -171,7 +170,6 @@ let
} }
# keep-sorted end # keep-sorted end
]; ];
in in
{ {
options.stylix.homeManagerIntegration = { options.stylix.homeManagerIntegration = {

View file

@ -1,5 +1,4 @@
{ lib, ... }: { lib, ... }:
{ {
options.stylix.iconTheme = { options.stylix.iconTheme = {
enable = lib.mkOption { enable = lib.mkOption {

View file

@ -1,5 +1,4 @@
{ config, lib, ... }: { config, lib, ... }:
{ {
config = lib.mkIf (config.stylix.enable && config.stylix.cursor != null) { config = lib.mkIf (config.stylix.enable && config.stylix.cursor != null) {
environment.variables.XCURSOR_SIZE = toString config.stylix.cursor.size; environment.variables.XCURSOR_SIZE = toString config.stylix.cursor.size;

View file

@ -3,7 +3,6 @@
config, config,
... ...
}: }:
let let
autoload = import ../autoload.nix { inherit lib; } "nixos"; autoload = import ../autoload.nix { inherit lib; } "nixos";
in in

View file

@ -1,5 +1,4 @@
{ config, lib, ... }: { config, lib, ... }:
{ {
config = lib.mkIf config.stylix.enable { config = lib.mkIf config.stylix.enable {
environment.etc = config.stylix.generated.fileTree; environment.etc = config.stylix.generated.fileTree;

View file

@ -1,5 +1,4 @@
{ lib, ... }: { lib, ... }:
{ {
options.stylix.opacity = { options.stylix.opacity = {
desktop = lib.mkOption { desktop = lib.mkOption {

View file

@ -5,7 +5,6 @@
options, options,
... ...
}: }:
let let
cfg = config.stylix; cfg = config.stylix;
opts = options.stylix; opts = options.stylix;

View file

@ -1,5 +1,4 @@
{ config, lib, ... }: { config, lib, ... }:
{ {
options.stylix = { options.stylix = {
enable = lib.mkOption { enable = lib.mkOption {

View file

@ -4,12 +4,10 @@
lib, lib,
modules ? import ./autoload.nix { inherit pkgs lib; }, modules ? import ./autoload.nix { inherit pkgs lib; },
}: }:
let let
makeTestbed = makeTestbed =
name: testbed: name: testbed:
let let
system = lib.nixosSystem { system = lib.nixosSystem {
inherit (pkgs) system; inherit (pkgs) system;

View file

@ -2,7 +2,6 @@
lib, lib,
pkgs, pkgs,
}: }:
/** /**
Creates a minimal configuration to extract the `stylix.testbed.enable` option Creates a minimal configuration to extract the `stylix.testbed.enable` option
value. value.