diff --git a/flake/default.nix b/flake/default.nix index 4932617d..18d4cafc 100644 --- a/flake/default.nix +++ b/flake/default.nix @@ -15,10 +15,7 @@ extraInputsFlake = ./dev; }; - partitionedAttrs = lib.genAttrs [ - "checks" - "ci" - "devShells" - "formatter" - ] (_: "dev"); + partitionedAttrs = lib.genAttrs [ "checks" "ci" "devShells" "formatter" ] ( + _: "dev" + ); } diff --git a/flake/deprecation/default.nix b/flake/deprecation/default.nix index da7cb8e6..7fe73e3b 100644 --- a/flake/deprecation/default.nix +++ b/flake/deprecation/default.nix @@ -1,12 +1,6 @@ +{ lib, self, ... }: { - lib, - self, - ... -}: -{ - imports = [ - ./per-system-option.nix - ]; + imports = [ ./per-system-option.nix ]; # NOTE: the `flake` submodule has a `lazyAttrsOf` freeform type. # diff --git a/flake/dev/packages.nix b/flake/dev/packages.nix index dc6ed95f..20217c89 100644 --- a/flake/dev/packages.nix +++ b/flake/dev/packages.nix @@ -12,9 +12,7 @@ # Testbeds are virtual machines based on NixOS, therefore they are # only available for Linux systems. testbeds = lib.mkIf pkgs.stdenv.hostPlatform.isLinux ( - import ../../stylix/testbed { - inherit pkgs inputs lib; - } + import ../../stylix/testbed { inherit pkgs inputs lib; } ); ci.buildbot = { diff --git a/flake/dev/pre-commit.nix b/flake/dev/pre-commit.nix index 360f12c6..a2d21568 100644 --- a/flake/dev/pre-commit.nix +++ b/flake/dev/pre-commit.nix @@ -1,8 +1,6 @@ { inputs, ... }: { - imports = [ - inputs.git-hooks.flakeModule - ]; + imports = [ inputs.git-hooks.flakeModule ]; perSystem = { config, ... }: diff --git a/flake/dev/treefmt.nix b/flake/dev/treefmt.nix index c899074d..47afc03c 100644 --- a/flake/dev/treefmt.nix +++ b/flake/dev/treefmt.nix @@ -28,6 +28,7 @@ nixfmt = { enable = true; width = 80; + strict = true; }; ruff-format = { enable = true; diff --git a/flake/packages.nix b/flake/packages.nix index 88648577..4e11148c 100644 --- a/flake/packages.nix +++ b/flake/packages.nix @@ -7,9 +7,7 @@ apps.doc.program = config.packages.serve-docs; packages = { - doc = pkgs.callPackage ../doc { - inherit (inputs) self; - }; + doc = pkgs.callPackage ../doc { inherit (inputs) self; }; serve-docs = pkgs.callPackage ../doc/server.nix { inherit (config.packages) doc; }; diff --git a/flake/propagated-packages.nix b/flake/propagated-packages.nix index ebc2a75b..020258e5 100644 --- a/flake/propagated-packages.nix +++ b/flake/propagated-packages.nix @@ -16,9 +16,7 @@ { pkgs, system, ... }: lib.optionalAttrs (partitionStack == [ ]) { apps = { - inherit (config.partitions.dev.module.flake.apps.${system}) - all-maintainers - ; + inherit (config.partitions.dev.module.flake.apps.${system}) all-maintainers; }; packages = lib.mkMerge [ { diff --git a/generated/all-maintainers.nix b/generated/all-maintainers.nix index eedf152d..af748fb1 100644 --- a/generated/all-maintainers.nix +++ b/generated/all-maintainers.nix @@ -52,9 +52,7 @@ github = "TheColorman"; githubId = 18369995; keys = [ - { - fingerprint = "3D8C A43C FBA2 5D28 0196 19F0 AB11 0475 B417 291D"; - } + { fingerprint = "3D8C A43C FBA2 5D28 0196 19F0 AB11 0475 B417 291D"; } ]; name = "colorman"; }; @@ -81,9 +79,7 @@ github = "brckd"; githubId = 92804487; keys = [ - { - fingerprint = "58A2 81E6 2FBD 6E4E 664C B603 7B4D 2A02 BB0E C28C"; - } + { fingerprint = "58A2 81E6 2FBD 6E4E 664C B603 7B4D 2A02 BB0E C28C"; } ]; name = "bricked"; }; @@ -104,9 +100,7 @@ github = "danth"; githubId = 28959268; keys = [ - { - fingerprint = "4779 D1D5 3C97 2EAE 34A5 ED3D D8AF C4BF 0567 0F9D"; - } + { fingerprint = "4779 D1D5 3C97 2EAE 34A5 ED3D D8AF C4BF 0567 0F9D"; } ]; matrix = "@danth:danth.me"; name = "Daniel Thwaites"; @@ -146,9 +140,7 @@ github = "make-42"; githubId = 17462236; keys = [ - { - fingerprint = "36BC 916D DD4E B1EE EE82 4BBF DC95 900F 6DA7 9992"; - } + { fingerprint = "36BC 916D DD4E B1EE EE82 4BBF DC95 900F 6DA7 9992"; } ]; matrix = "@ontake:matrix.ontake.dev"; name = "Louis Dalibard"; @@ -158,9 +150,7 @@ github = "mateusauler"; githubId = 24767687; keys = [ - { - fingerprint = "A09D C093 3C37 4BFC 2B5A 269F 80A5 D62F 6EB7 D9F0"; - } + { fingerprint = "A09D C093 3C37 4BFC 2B5A 269F 80A5 D62F 6EB7 D9F0"; } ]; name = "Mateus Auler"; }; @@ -181,9 +171,7 @@ github = "nukdokplex"; githubId = 25458915; keys = [ - { - fingerprint = "7CE2 4C42 942D 58EA 99F6 F00A A47E 7374 3EF6 FCC4"; - } + { fingerprint = "7CE2 4C42 942D 58EA 99F6 F00A A47E 7374 3EF6 FCC4"; } ]; name = "Viktor Titov"; }; @@ -204,9 +192,7 @@ github = "panchoh"; githubId = 471059; keys = [ - { - fingerprint = "4430 F502 8B19 FAF4 A40E C4E8 11E0 447D 4ABB A7D0"; - } + { fingerprint = "4430 F502 8B19 FAF4 A40E C4E8 11E0 447D 4ABB A7D0"; } ]; matrix = "@panchoh:matrix.org"; name = "pancho horrillo"; @@ -233,9 +219,7 @@ github = "trueNAHO"; githubId = 90870942; keys = [ - { - fingerprint = "5FC6 088A FB1A 609D 4532 F919 0C1C 177B 3B64 68E0"; - } + { fingerprint = "5FC6 088A FB1A 609D 4532 F919 0C1C 177B 3B64 68E0"; } ]; name = "Noah Pierre Biewesch"; }; diff --git a/modules/anki/testbeds/anki.nix b/modules/anki/testbeds/anki.nix index 66ca7c77..ccf35b01 100644 --- a/modules/anki/testbeds/anki.nix +++ b/modules/anki/testbeds/anki.nix @@ -2,7 +2,5 @@ { stylix.testbed.ui.command.text = "anki"; - home-manager.sharedModules = lib.singleton { - programs.anki.enable = true; - }; + home-manager.sharedModules = lib.singleton { programs.anki.enable = true; }; } diff --git a/modules/ashell/testbeds/ashell.nix b/modules/ashell/testbeds/ashell.nix index 474e51ea..f0c62ed1 100644 --- a/modules/ashell/testbeds/ashell.nix +++ b/modules/ashell/testbeds/ashell.nix @@ -5,7 +5,5 @@ command.text = "ashell"; }; - home-manager.sharedModules = lib.singleton { - programs.ashell.enable = true; - }; + home-manager.sharedModules = lib.singleton { programs.ashell.enable = true; }; } diff --git a/modules/blender/hm.nix b/modules/blender/hm.nix index 34e5b292..e4484063 100644 --- a/modules/blender/hm.nix +++ b/modules/blender/hm.nix @@ -1,8 +1,4 @@ -{ - mkTarget, - lib, - ... -}: +{ mkTarget, lib, ... }: mkTarget { name = "blender"; humanName = "Blender"; diff --git a/modules/btop/hm.nix b/modules/btop/hm.nix index 7e804c0d..c7de0798 100644 --- a/modules/btop/hm.nix +++ b/modules/btop/hm.nix @@ -1,8 +1,4 @@ -{ - mkTarget, - lib, - ... -}: +{ mkTarget, lib, ... }: mkTarget { name = "btop"; humanName = "btop"; diff --git a/modules/btop/testbeds/btop.nix b/modules/btop/testbeds/btop.nix index 4072523f..20b180a1 100644 --- a/modules/btop/testbeds/btop.nix +++ b/modules/btop/testbeds/btop.nix @@ -5,7 +5,5 @@ useTerminal = true; }; - home-manager.sharedModules = lib.singleton { - programs.btop.enable = true; - }; + home-manager.sharedModules = lib.singleton { programs.btop.enable = true; }; } diff --git a/modules/cava/testbeds/cava.nix b/modules/cava/testbeds/cava.nix index a8d5d1b8..1719ea29 100644 --- a/modules/cava/testbeds/cava.nix +++ b/modules/cava/testbeds/cava.nix @@ -8,7 +8,5 @@ useTerminal = true; }; - home-manager.sharedModules = lib.singleton { - programs.cava.enable = true; - }; + home-manager.sharedModules = lib.singleton { programs.cava.enable = true; }; } diff --git a/modules/discord/common/theme-elements.nix b/modules/discord/common/theme-elements.nix index 19366d29..964a72b5 100644 --- a/modules/discord/common/theme-elements.nix +++ b/modules/discord/common/theme-elements.nix @@ -1,7 +1,5 @@ name: [ - { - stylix.targets.${name}.themeBody = import ./theme-header.nix; - } + { stylix.targets.${name}.themeBody = import ./theme-header.nix; } ( { fonts }: { diff --git a/modules/discord/hm.nix b/modules/discord/hm.nix index 82ed017e..6a98ce57 100644 --- a/modules/discord/hm.nix +++ b/modules/discord/hm.nix @@ -1,8 +1,4 @@ -{ - mkTarget, - lib, - ... -}: +{ mkTarget, lib, ... }: { imports = map (module: lib.modules.importApply module mkTarget) [ ./nixcord.nix diff --git a/modules/discord/nixcord.nix b/modules/discord/nixcord.nix index 08fb1180..d974f9b7 100644 --- a/modules/discord/nixcord.nix +++ b/modules/discord/nixcord.nix @@ -53,9 +53,7 @@ mkTarget { writePath "Equicord" )) (lib.mkIf nixcord.equibop.enable (writePath "equibop")) - { - programs.nixcord.config.enabledThemes = [ "stylix.theme.css" ]; - } + { programs.nixcord.config.enabledThemes = [ "stylix.theme.css" ]; } ] ) ) diff --git a/modules/discord/testbeds/vencord.nix b/modules/discord/testbeds/vencord.nix index 15177749..fda8dcd7 100644 --- a/modules/discord/testbeds/vencord.nix +++ b/modules/discord/testbeds/vencord.nix @@ -1,8 +1,6 @@ { lib, pkgs, ... }: let - package = pkgs.discord.override { - withVencord = true; - }; + package = pkgs.discord.override { withVencord = true; }; in { stylix.testbed = { @@ -17,8 +15,5 @@ in environment.systemPackages = [ package ]; nixpkgs.config.allowUnfreePredicate = - pkg: - builtins.elem (lib.getName pkg) [ - "discord" - ]; + pkg: builtins.elem (lib.getName pkg) [ "discord" ]; } diff --git a/modules/dunst/testbeds/dunst.nix b/modules/dunst/testbeds/dunst.nix index 83971065..0bb36d95 100644 --- a/modules/dunst/testbeds/dunst.nix +++ b/modules/dunst/testbeds/dunst.nix @@ -5,7 +5,5 @@ sendNotifications = true; }; - home-manager.sharedModules = lib.singleton { - services.dunst.enable = true; - }; + home-manager.sharedModules = lib.singleton { services.dunst.enable = true; }; } diff --git a/modules/fcitx5/hm.nix b/modules/fcitx5/hm.nix index a31096fd..7fbffb7d 100644 --- a/modules/fcitx5/hm.nix +++ b/modules/fcitx5/hm.nix @@ -34,9 +34,7 @@ mkTarget { template = ./panel.svg.mustache; extension = ".svg"; }; - theme = import ./template.nix { - colors = colors.withHashtag; - }; + theme = import ./template.nix { colors = colors.withHashtag; }; }; }; } diff --git a/modules/fcitx5/template.nix b/modules/fcitx5/template.nix index fe108652..c13de7fd 100644 --- a/modules/fcitx5/template.nix +++ b/modules/fcitx5/template.nix @@ -83,16 +83,14 @@ with colors; Top = 6; Bottom = 7; }; - "InputPanel/PrevPage" = { - }; + "InputPanel/PrevPage" = { }; "InputPanel/PrevPage/ClickMargin" = { Left = 5; Right = 5; Top = 4; Bottom = 4; }; - "InputPanel/NextPage" = { - }; + "InputPanel/NextPage" = { }; "InputPanel/NextPage/ClickMargin" = { Left = 5; Right = 5; diff --git a/modules/fcitx5/testbeds/fcitx5.nix b/modules/fcitx5/testbeds/fcitx5.nix index bb816119..330488ba 100644 --- a/modules/fcitx5/testbeds/fcitx5.nix +++ b/modules/fcitx5/testbeds/fcitx5.nix @@ -1,8 +1,4 @@ -{ - pkgs, - lib, - ... -}: +{ pkgs, lib, ... }: { stylix.testbed.ui.command.text = "fcitx5-config-qt"; home-manager.sharedModules = lib.singleton { diff --git a/modules/firefox/each-config.nix b/modules/firefox/each-config.nix index 79c1e0ef..eaaed89d 100644 --- a/modules/firefox/each-config.nix +++ b/modules/firefox/each-config.nix @@ -102,9 +102,7 @@ mkTarget { b = colors."${color}-rgb-b"; }; inherit (pkgs.stdenv.hostPlatform) system; - inherit (inputs.nur.legacyPackages.${system}.repos.rycee) - firefox-addons - ; + inherit (inputs.nur.legacyPackages.${system}.repos.rycee) firefox-addons; in { programs.${name}.profiles = lib.mkIf cfg.colorTheme.enable ( diff --git a/modules/firefox/hm.nix b/modules/firefox/hm.nix index 74faf8ec..8e8e12d4 100644 --- a/modules/firefox/hm.nix +++ b/modules/firefox/hm.nix @@ -1,16 +1,10 @@ -{ - lib, - mkTarget, - ... -}: +{ lib, mkTarget, ... }: { imports = lib.mapAttrsToList ( name: humanName: - lib.modules.importApply ./each-config.nix { - inherit mkTarget name humanName; - } + lib.modules.importApply ./each-config.nix { inherit mkTarget name humanName; } ) { "firefox" = "Firefox"; diff --git a/modules/fish/testbeds/fish-hm.nix b/modules/fish/testbeds/fish-hm.nix index 692a0bd9..b6bd4e50 100644 --- a/modules/fish/testbeds/fish-hm.nix +++ b/modules/fish/testbeds/fish-hm.nix @@ -5,7 +5,5 @@ useTerminal = true; }; - home-manager.sharedModules = lib.singleton { - programs.fish.enable = true; - }; + home-manager.sharedModules = lib.singleton { programs.fish.enable = true; }; } diff --git a/modules/fnott/testbeds/fnott.nix b/modules/fnott/testbeds/fnott.nix index 668b6ce7..de39d2eb 100644 --- a/modules/fnott/testbeds/fnott.nix +++ b/modules/fnott/testbeds/fnott.nix @@ -5,7 +5,5 @@ sendNotifications = true; }; - home-manager.sharedModules = lib.singleton { - services.fnott.enable = true; - }; + home-manager.sharedModules = lib.singleton { services.fnott.enable = true; }; } diff --git a/modules/font-packages/darwin.nix b/modules/font-packages/darwin.nix index 0a73d502..eac7fa35 100644 --- a/modules/font-packages/darwin.nix +++ b/modules/font-packages/darwin.nix @@ -6,8 +6,6 @@ mkTarget { configElements = { fonts }: { - fonts = { - inherit (fonts) packages; - }; + fonts = { inherit (fonts) packages; }; }; } diff --git a/modules/font-packages/hm.nix b/modules/font-packages/hm.nix index 81a37dff..3e730bd6 100644 --- a/modules/font-packages/hm.nix +++ b/modules/font-packages/hm.nix @@ -6,8 +6,6 @@ mkTarget { configElements = { fonts }: { - home = { - inherit (fonts) packages; - }; + home = { inherit (fonts) packages; }; }; } diff --git a/modules/font-packages/nixos.nix b/modules/font-packages/nixos.nix index 0a73d502..eac7fa35 100644 --- a/modules/font-packages/nixos.nix +++ b/modules/font-packages/nixos.nix @@ -6,8 +6,6 @@ mkTarget { configElements = { fonts }: { - fonts = { - inherit (fonts) packages; - }; + fonts = { inherit (fonts) packages; }; }; } diff --git a/modules/fontconfig/hm.nix b/modules/fontconfig/hm.nix index 9e14cdbc..0fd01d7a 100644 --- a/modules/fontconfig/hm.nix +++ b/modules/fontconfig/hm.nix @@ -1,6 +1,4 @@ { lib, mkTarget, ... }: { - imports = [ - (lib.modules.importApply ./fontconfig.nix { inherit mkTarget; }) - ]; + imports = [ (lib.modules.importApply ./fontconfig.nix { inherit mkTarget; }) ]; } diff --git a/modules/fontconfig/nixos.nix b/modules/fontconfig/nixos.nix index 9e14cdbc..0fd01d7a 100644 --- a/modules/fontconfig/nixos.nix +++ b/modules/fontconfig/nixos.nix @@ -1,6 +1,4 @@ { lib, mkTarget, ... }: { - imports = [ - (lib.modules.importApply ./fontconfig.nix { inherit mkTarget; }) - ]; + imports = [ (lib.modules.importApply ./fontconfig.nix { inherit mkTarget; }) ]; } diff --git a/modules/fuzzel/testbeds/fuzzel.nix b/modules/fuzzel/testbeds/fuzzel.nix index c371e791..9e9f73b7 100644 --- a/modules/fuzzel/testbeds/fuzzel.nix +++ b/modules/fuzzel/testbeds/fuzzel.nix @@ -5,7 +5,5 @@ command.text = "fuzzel"; }; - home-manager.sharedModules = lib.singleton { - programs.fuzzel.enable = true; - }; + home-manager.sharedModules = lib.singleton { programs.fuzzel.enable = true; }; } diff --git a/modules/fzf/testbeds/fzf.nix b/modules/fzf/testbeds/fzf.nix index d17f32b2..b79f742f 100644 --- a/modules/fzf/testbeds/fzf.nix +++ b/modules/fzf/testbeds/fzf.nix @@ -5,7 +5,5 @@ useTerminal = true; }; - home-manager.sharedModules = lib.singleton { - programs.fzf.enable = true; - }; + home-manager.sharedModules = lib.singleton { programs.fzf.enable = true; }; } diff --git a/modules/gdu/hm.nix b/modules/gdu/hm.nix index dc6a637c..6c2f57a7 100644 --- a/modules/gdu/hm.nix +++ b/modules/gdu/hm.nix @@ -1,7 +1,4 @@ -{ - mkTarget, - ... -}: +{ mkTarget, ... }: mkTarget { name = "gdu"; humanName = "go DiskUsage()"; diff --git a/modules/gdu/testbeds/gdu.nix b/modules/gdu/testbeds/gdu.nix index e1db9e66..15ce7a22 100644 --- a/modules/gdu/testbeds/gdu.nix +++ b/modules/gdu/testbeds/gdu.nix @@ -5,7 +5,5 @@ useTerminal = true; }; - home-manager.sharedModules = lib.singleton { - home.packages = [ pkgs.gdu ]; - }; + home-manager.sharedModules = lib.singleton { home.packages = [ pkgs.gdu ]; }; } diff --git a/modules/gnome/hm.nix b/modules/gnome/hm.nix index 4807fe3a..f94add89 100644 --- a/modules/gnome/hm.nix +++ b/modules/gnome/hm.nix @@ -114,9 +114,7 @@ mkTarget { dataFile."themes/Stylix/gnome-shell/gnome-shell.css" = { source = let - theme = pkgs.callPackage ./theme.nix { - inherit inputs colors; - }; + theme = pkgs.callPackage ./theme.nix { inherit inputs colors; }; in "${theme}/share/gnome-shell/gnome-shell.css"; diff --git a/modules/gnome/nixos.nix b/modules/gnome/nixos.nix index e2d15e02..0e2cbe82 100644 --- a/modules/gnome/nixos.nix +++ b/modules/gnome/nixos.nix @@ -46,9 +46,7 @@ in cp ${theme}/share/gnome-shell/gnome-shell-theme.gresource \ $out/share/gnome-shell/gnome-shell-theme.gresource ''; - patches = (oldAttrs.patches or [ ]) ++ [ - ./shell_remove_dark_mode.patch - ]; + patches = (oldAttrs.patches or [ ]) ++ [ ./shell_remove_dark_mode.patch ]; }); }) ]; @@ -56,14 +54,9 @@ in # Cursor and icon settings are usually applied via Home Manager, # but the login screen uses a separate database. services.displayManager.environment.XDG_DATA_DIRS = lib.mkIf (iconCfg != null) ( - (lib.makeSearchPath "share" [ - iconCfg.package - ]) - + ":" + (lib.makeSearchPath "share" [ iconCfg.package ]) + ":" ); - environment.systemPackages = lib.mkIf (cursorCfg != null) [ - cursorCfg.package - ]; + environment.systemPackages = lib.mkIf (cursorCfg != null) [ cursorCfg.package ]; programs.dconf.profiles.gdm.databases = lib.mkMerge [ (lib.mkIf (cursorCfg != null) [ { @@ -80,12 +73,7 @@ in settings."org/gnome/desktop/interface" = { icon-theme = builtins.head ( lib.filter (x: null != x) [ - ( - { - inherit (iconCfg) dark light; - } - ."${polarity}" or null - ) + ({ inherit (iconCfg) dark light; }."${polarity}" or null) iconCfg.dark iconCfg.light ] diff --git a/modules/gnome/testbeds/gnome.nix b/modules/gnome/testbeds/gnome.nix index ba4edd89..b25848ab 100644 --- a/modules/gnome/testbeds/gnome.nix +++ b/modules/gnome/testbeds/gnome.nix @@ -1,3 +1 @@ -{ - stylix.testbed.ui.graphicalEnvironment = "gnome"; -} +{ stylix.testbed.ui.graphicalEnvironment = "gnome"; } diff --git a/modules/helix/hm.nix b/modules/helix/hm.nix index 7d583b6d..28bbddaf 100644 --- a/modules/helix/hm.nix +++ b/modules/helix/hm.nix @@ -32,9 +32,7 @@ mkTarget { themes.stylix = let - theme = colors { - templateRepo = inputs.base16-helix; - }; + theme = colors { templateRepo = inputs.base16-helix; }; # Removing the background exposes transparency from the terminal. The # background might be helpful if the terminal isn't themed, so we only diff --git a/modules/helix/testbeds/helix.nix b/modules/helix/testbeds/helix.nix index ddbe26f0..a61563f4 100644 --- a/modules/helix/testbeds/helix.nix +++ b/modules/helix/testbeds/helix.nix @@ -5,7 +5,5 @@ useTerminal = true; }; - home-manager.sharedModules = lib.singleton { - programs.helix.enable = true; - }; + home-manager.sharedModules = lib.singleton { programs.helix.enable = true; }; } diff --git a/modules/hyprpanel/testbeds/hyprpanel.nix b/modules/hyprpanel/testbeds/hyprpanel.nix index 5d01739e..a92958a6 100644 --- a/modules/hyprpanel/testbeds/hyprpanel.nix +++ b/modules/hyprpanel/testbeds/hyprpanel.nix @@ -1,8 +1,4 @@ -{ - lib, - pkgs, - ... -}: +{ lib, pkgs, ... }: { stylix.testbed.ui.graphicalEnvironment = "hyprland"; diff --git a/modules/i3/hm.nix b/modules/i3/hm.nix index 1bf4298d..6fccc166 100644 --- a/modules/i3/hm.nix +++ b/modules/i3/hm.nix @@ -104,9 +104,7 @@ mkTarget { inherit border background; text = focused; }; - inactiveWorkspace = { - inherit text border background; - }; + inactiveWorkspace = { inherit text border background; }; urgentWorkspace = { inherit text background; border = urgent; diff --git a/modules/i3bar-river/hm.nix b/modules/i3bar-river/hm.nix index 2b194987..cd48c10d 100644 --- a/modules/i3bar-river/hm.nix +++ b/modules/i3bar-river/hm.nix @@ -1,8 +1,4 @@ -{ - mkTarget, - lib, - ... -}: +{ mkTarget, lib, ... }: mkTarget { name = "i3bar-river"; humanName = "i3bar-river"; diff --git a/modules/kde/hm.nix b/modules/kde/hm.nix index 98e70a8e..7bf93fee 100644 --- a/modules/kde/hm.nix +++ b/modules/kde/hm.nix @@ -7,14 +7,8 @@ let cfg = config.stylix.targets.kde; - inherit (config.lib.stylix) - colors - mkEnableTarget - mkEnableWallpaper - ; - inherit (config.stylix) - image - ; + inherit (config.lib.stylix) colors mkEnableTarget mkEnableWallpaper; + inherit (config.stylix) image; mergeWithImage = default: withImage: @@ -165,9 +159,7 @@ let Name = "Stylix"; wallpaperMetadata = { - KPlugin = { - inherit Id Name; - }; + KPlugin = { inherit Id Name; }; }; lookAndFeelMetadata = { @@ -257,9 +249,7 @@ let # The gtkconfig module copies settings from KDE to the GTK configuration. # This blocks Home Manager activation because the same files are already # managed by Stylix. - Module-gtkconfig = makeImmutable { - autoload = false; - }; + Module-gtkconfig = makeImmutable { autoload = false; }; }; kdeglobals = rec { diff --git a/modules/kde/testbeds/kde.nix b/modules/kde/testbeds/kde.nix index c9b8493b..e367b71a 100644 --- a/modules/kde/testbeds/kde.nix +++ b/modules/kde/testbeds/kde.nix @@ -1,7 +1,4 @@ -{ - lib, - ... -}: +{ lib, ... }: { config = { stylix.testbed.ui.graphicalEnvironment = "kde"; diff --git a/modules/limine/nixos.nix b/modules/limine/nixos.nix index d352fd85..6a7294de 100644 --- a/modules/limine/nixos.nix +++ b/modules/limine/nixos.nix @@ -30,9 +30,7 @@ mkTarget { ( { cfg, image }: { - boot.loader.limine.style.wallpapers = lib.mkIf cfg.useWallpaper [ - image - ]; + boot.loader.limine.style.wallpapers = lib.mkIf cfg.useWallpaper [ image ]; } ) ( diff --git a/modules/mako/testbeds/mako.nix b/modules/mako/testbeds/mako.nix index b020b1b0..af2e0930 100644 --- a/modules/mako/testbeds/mako.nix +++ b/modules/mako/testbeds/mako.nix @@ -5,7 +5,5 @@ sendNotifications = true; }; - home-manager.sharedModules = lib.singleton { - services.mako.enable = true; - }; + home-manager.sharedModules = lib.singleton { services.mako.enable = true; }; } diff --git a/modules/micro/testbeds/micro.nix b/modules/micro/testbeds/micro.nix index 5a722290..29fbd88d 100644 --- a/modules/micro/testbeds/micro.nix +++ b/modules/micro/testbeds/micro.nix @@ -5,7 +5,5 @@ useTerminal = true; }; - home-manager.sharedModules = lib.singleton { - programs.micro.enable = true; - }; + home-manager.sharedModules = lib.singleton { programs.micro.enable = true; }; } diff --git a/modules/ncspot/testbeds/ncspot.nix b/modules/ncspot/testbeds/ncspot.nix index 157abb61..133cc362 100644 --- a/modules/ncspot/testbeds/ncspot.nix +++ b/modules/ncspot/testbeds/ncspot.nix @@ -4,7 +4,5 @@ text = lib.getExe pkgs.ncspot; useTerminal = true; }; - home-manager.sharedModules = lib.singleton { - programs.ncspot.enable = true; - }; + home-manager.sharedModules = lib.singleton { programs.ncspot.enable = true; }; } diff --git a/modules/neovim/neovim.nix b/modules/neovim/neovim.nix index e1b7d39c..62161ebd 100644 --- a/modules/neovim/neovim.nix +++ b/modules/neovim/neovim.nix @@ -1,9 +1,5 @@ mkTarget: -{ - lib, - pkgs, - ... -}: +{ lib, pkgs, ... }: mkTarget { name = "neovim"; humanName = "Neovim"; diff --git a/modules/neovim/nixvim.nix b/modules/neovim/nixvim.nix index 6f53d471..2dc091c2 100644 --- a/modules/neovim/nixvim.nix +++ b/modules/neovim/nixvim.nix @@ -1,9 +1,5 @@ mkTarget: -{ - lib, - options, - ... -}: +{ lib, options, ... }: mkTarget { name = "nixvim"; humanName = "NixVim"; diff --git a/modules/neovim/nvf.nix b/modules/neovim/nvf.nix index b3e74c71..88ed74ff 100644 --- a/modules/neovim/nvf.nix +++ b/modules/neovim/nvf.nix @@ -1,9 +1,5 @@ mkTarget: -{ - lib, - options, - ... -}: +{ lib, options, ... }: mkTarget { name = "nvf"; humanName = "nvf"; @@ -48,9 +44,7 @@ mkTarget { ; }; }; - statusline = lib.mkIf (cfg.plugin == "base16") { - lualine.theme = "base16"; - }; + statusline = lib.mkIf (cfg.plugin == "base16") { lualine.theme = "base16"; }; }; } ) diff --git a/modules/neovim/testbeds/neovim.nix b/modules/neovim/testbeds/neovim.nix index 823f1db7..6e7540cc 100644 --- a/modules/neovim/testbeds/neovim.nix +++ b/modules/neovim/testbeds/neovim.nix @@ -5,7 +5,5 @@ useTerminal = true; }; - home-manager.sharedModules = lib.singleton { - programs.neovim.enable = true; - }; + home-manager.sharedModules = lib.singleton { programs.neovim.enable = true; }; } diff --git a/modules/neovim/testbeds/vim.nix b/modules/neovim/testbeds/vim.nix index 3bc44930..424cd082 100644 --- a/modules/neovim/testbeds/vim.nix +++ b/modules/neovim/testbeds/vim.nix @@ -5,7 +5,5 @@ useTerminal = true; }; - home-manager.sharedModules = lib.singleton { - programs.vim.enable = true; - }; + home-manager.sharedModules = lib.singleton { programs.vim.enable = true; }; } diff --git a/modules/neovim/vim.nix b/modules/neovim/vim.nix index 11b3bac5..20bc48b3 100644 --- a/modules/neovim/vim.nix +++ b/modules/neovim/vim.nix @@ -1,9 +1,5 @@ mkTarget: -{ - lib, - pkgs, - ... -}: +{ lib, pkgs, ... }: mkTarget { name = "vim"; humanName = "Vim"; diff --git a/modules/nushell/testbeds/nushell.nix b/modules/nushell/testbeds/nushell.nix index b045f270..22f0180d 100644 --- a/modules/nushell/testbeds/nushell.nix +++ b/modules/nushell/testbeds/nushell.nix @@ -5,7 +5,5 @@ useTerminal = true; }; - home-manager.sharedModules = lib.singleton { - programs.nushell.enable = true; - }; + home-manager.sharedModules = lib.singleton { programs.nushell.enable = true; }; } diff --git a/modules/obsidian/hm.nix b/modules/obsidian/hm.nix index 91f2dc75..ecaa66e5 100644 --- a/modules/obsidian/hm.nix +++ b/modules/obsidian/hm.nix @@ -1,8 +1,4 @@ -{ - mkTarget, - lib, - ... -}: +{ mkTarget, lib, ... }: mkTarget { name = "obsidian"; humanName = "Obsidian"; diff --git a/modules/obsidian/testbeds/obsidian.nix b/modules/obsidian/testbeds/obsidian.nix index 4607f91e..12067ba3 100644 --- a/modules/obsidian/testbeds/obsidian.nix +++ b/modules/obsidian/testbeds/obsidian.nix @@ -4,10 +4,7 @@ let in { nixpkgs.config.allowUnfreePredicate = - pkg: - builtins.elem (lib.getName pkg) [ - "obsidian" - ]; + pkg: builtins.elem (lib.getName pkg) [ "obsidian" ]; stylix.testbed.ui.application = { name = "obsidian"; diff --git a/modules/opencode/testbeds/opencode.nix b/modules/opencode/testbeds/opencode.nix index d2f350ab..fe1eda0e 100644 --- a/modules/opencode/testbeds/opencode.nix +++ b/modules/opencode/testbeds/opencode.nix @@ -5,7 +5,5 @@ useTerminal = true; }; - home-manager.sharedModules = lib.singleton { - programs.opencode.enable = true; - }; + home-manager.sharedModules = lib.singleton { programs.opencode.enable = true; }; } diff --git a/modules/qt/hm.nix b/modules/qt/hm.nix index 8cd8bf18..44098703 100644 --- a/modules/qt/hm.nix +++ b/modules/qt/hm.nix @@ -104,9 +104,7 @@ (lib.mkIf (config.qt.style.name == "kvantum") { "Kvantum/kvantum.kvconfig".source = (pkgs.formats.ini { }).generate "kvantum.kvconfig" - { - General.theme = "Base16Kvantum"; - }; + { General.theme = "Base16Kvantum"; }; "Kvantum/Base16Kvantum".source = "${kvantumPackage}/share/Kvantum/Base16Kvantum"; diff --git a/modules/regreet/nixos.nix b/modules/regreet/nixos.nix index 54ba913a..ce77a5eb 100644 --- a/modules/regreet/nixos.nix +++ b/modules/regreet/nixos.nix @@ -94,17 +94,13 @@ mkTarget { ( { fonts }: { - programs.regreet.font = { - inherit (fonts.sansSerif) name package; - }; + programs.regreet.font = { inherit (fonts.sansSerif) name package; }; } ) ( { cursor }: { - programs.regreet.cursorTheme = { - inherit (cursor) name package; - }; + programs.regreet.cursorTheme = { inherit (cursor) name package; }; } ) ( diff --git a/modules/spicetify/testbeds/spicetify.nix b/modules/spicetify/testbeds/spicetify.nix index d5673f99..72cf9226 100644 --- a/modules/spicetify/testbeds/spicetify.nix +++ b/modules/spicetify/testbeds/spicetify.nix @@ -17,8 +17,5 @@ programs.spicetify.enable = true; nixpkgs.config.allowUnfreePredicate = - pkg: - builtins.elem (lib.getName pkg) [ - "spotify" - ]; + pkg: builtins.elem (lib.getName pkg) [ "spotify" ]; } diff --git a/modules/sxiv/testbeds/sxiv.nix b/modules/sxiv/testbeds/sxiv.nix index 28d54508..dc0efe0b 100644 --- a/modules/sxiv/testbeds/sxiv.nix +++ b/modules/sxiv/testbeds/sxiv.nix @@ -11,7 +11,5 @@ in "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; ''; - home-manager.sharedModules = lib.singleton { - home.packages = [ package ]; - }; + home-manager.sharedModules = lib.singleton { home.packages = [ package ]; }; } diff --git a/modules/tmux/testbeds/tmux.nix b/modules/tmux/testbeds/tmux.nix index fe9581ae..1b1dfc54 100644 --- a/modules/tmux/testbeds/tmux.nix +++ b/modules/tmux/testbeds/tmux.nix @@ -4,7 +4,5 @@ text = lib.getExe pkgs.tmux; useTerminal = true; }; - home-manager.sharedModules = lib.singleton { - programs.tmux.enable = true; - }; + home-manager.sharedModules = lib.singleton { programs.tmux.enable = true; }; } diff --git a/modules/vicinae/testbeds/vicinae.nix b/modules/vicinae/testbeds/vicinae.nix index 87d921ad..bb1698d5 100644 --- a/modules/vicinae/testbeds/vicinae.nix +++ b/modules/vicinae/testbeds/vicinae.nix @@ -5,7 +5,5 @@ command.text = "sleep 5 && vicinae open"; }; - home-manager.sharedModules = lib.singleton { - services.vicinae.enable = true; - }; + home-manager.sharedModules = lib.singleton { services.vicinae.enable = true; }; } diff --git a/modules/vscode/templates/theme.nix b/modules/vscode/templates/theme.nix index a3cc3563..f1957317 100644 --- a/modules/vscode/templates/theme.nix +++ b/modules/vscode/templates/theme.nix @@ -999,9 +999,7 @@ colors: with colors.withHashtag; { } { name = "Block Level Variables"; - scope = [ - "meta.block variable.other" - ]; + scope = [ "meta.block variable.other" ]; settings.foreground = base08; } { @@ -1096,9 +1094,7 @@ colors: with colors.withHashtag; { } { name = "Language methods"; - scope = [ - "variable.language" - ]; + scope = [ "variable.language" ]; settings = { fontStyle = "italic"; foreground = base08; @@ -1106,9 +1102,7 @@ colors: with colors.withHashtag; { } { name = "entity.name.method.js"; - scope = [ - "entity.name.method.js" - ]; + scope = [ "entity.name.method.js" ]; settings = { fontStyle = "italic"; foreground = base0D; @@ -1195,9 +1189,7 @@ colors: with colors.withHashtag; { } { name = "ES7 Bind Operator"; - scope = [ - "source.js constant.other.object.key.js string.unquoted.label.js" - ]; + scope = [ "source.js constant.other.object.key.js string.unquoted.label.js" ]; settings = { fontStyle = "italic"; foreground = base0E; @@ -1302,9 +1294,7 @@ colors: with colors.withHashtag; { } { name = "Markup - Italic"; - scope = [ - "markup.italic" - ]; + scope = [ "markup.italic" ]; settings = { fontStyle = "italic"; foreground = base08; @@ -1381,9 +1371,7 @@ colors: with colors.withHashtag; { } { name = "Markdown - Fenced Bode Block"; - scope = [ - "punctuation.definition.fenced.markdown" - ]; + scope = [ "punctuation.definition.fenced.markdown" ]; settings.foreground = "#00000050"; } { diff --git a/modules/waybar/hm.nix b/modules/waybar/hm.nix index 273bf2bf..9c5c166a 100644 --- a/modules/waybar/hm.nix +++ b/modules/waybar/hm.nix @@ -72,10 +72,7 @@ mkTarget { } ) ( - { - cfg, - colors, - }: + { cfg, colors }: let colorlessModules = place: '' .modules-${place} #workspaces button { diff --git a/modules/waybar/testbeds/waybar.nix b/modules/waybar/testbeds/waybar.nix index 454c9c56..a4c0f68a 100644 --- a/modules/waybar/testbeds/waybar.nix +++ b/modules/waybar/testbeds/waybar.nix @@ -14,9 +14,7 @@ "hyprland/submap" "custom/media" ]; - modules-center = [ - "hyprland/window" - ]; + modules-center = [ "hyprland/window" ]; modules-right = [ "mpd" "idle_inhibitor" diff --git a/modules/yazi/testbeds/yazi.nix b/modules/yazi/testbeds/yazi.nix index b0eafb91..a3af3808 100644 --- a/modules/yazi/testbeds/yazi.nix +++ b/modules/yazi/testbeds/yazi.nix @@ -14,8 +14,6 @@ in inherit package; }; - home.packages = [ - pkgs.nerd-fonts.fira-mono - ]; + home.packages = [ pkgs.nerd-fonts.fira-mono ]; }; } diff --git a/modules/zed/hm.nix b/modules/zed/hm.nix index 2b864190..29155344 100644 --- a/modules/zed/hm.nix +++ b/modules/zed/hm.nix @@ -22,9 +22,7 @@ mkTarget { { programs.zed-editor = { userSettings.theme = "Base16 ${colors.scheme-name}"; - themes.stylix = colors { - templateRepo = inputs.tinted-zed; - }; + themes.stylix = colors { templateRepo = inputs.tinted-zed; }; }; } ) diff --git a/modules/zellij/testbeds/zellij.nix b/modules/zellij/testbeds/zellij.nix index 40ff609c..521d9924 100644 --- a/modules/zellij/testbeds/zellij.nix +++ b/modules/zellij/testbeds/zellij.nix @@ -5,7 +5,5 @@ useTerminal = true; }; - home-manager.sharedModules = lib.singleton { - programs.zellij.enable = true; - }; + home-manager.sharedModules = lib.singleton { programs.zellij.enable = true; }; } diff --git a/modules/zen-browser/hm.nix b/modules/zen-browser/hm.nix index 09573dee..04495db1 100644 --- a/modules/zen-browser/hm.nix +++ b/modules/zen-browser/hm.nix @@ -35,10 +35,7 @@ mkTarget { } ) ( - { - cfg, - fonts, - }: + { cfg, fonts }: { programs.zen-browser.profiles = lib.genAttrs cfg.profileNames (_: { settings = { @@ -50,10 +47,7 @@ mkTarget { } ) ( - { - cfg, - colors, - }: + { cfg, colors }: { programs.zen-browser.profiles = lib.mkIf cfg.enableCss ( lib.genAttrs cfg.profileNames (_: { diff --git a/stylix/darwin/default.nix b/stylix/darwin/default.nix index 1f0bbb68..bafe2bda 100644 --- a/stylix/darwin/default.nix +++ b/stylix/darwin/default.nix @@ -1,8 +1,4 @@ -{ - lib, - config, - ... -}: +{ lib, config, ... }: let autoload = import ../autoload.nix { inherit lib; } "darwin"; in diff --git a/stylix/droid/default.nix b/stylix/droid/default.nix index 91ca5196..e23d7cfe 100644 --- a/stylix/droid/default.nix +++ b/stylix/droid/default.nix @@ -19,7 +19,5 @@ in ++ autoload; # See https://github.com/nix-community/nix-on-droid/issues/436 - options.lib = lib.mkOption { - type = with lib.types; attrsOf attrs; - }; + options.lib = lib.mkOption { type = with lib.types; attrsOf attrs; }; } diff --git a/stylix/hm/default.nix b/stylix/hm/default.nix index 5dcd1ce5..8c533047 100644 --- a/stylix/hm/default.nix +++ b/stylix/hm/default.nix @@ -1,8 +1,4 @@ -{ - lib, - config, - ... -}: +{ lib, config, ... }: let autoload = import ../autoload.nix { inherit lib; } "hm"; in diff --git a/stylix/hm/icons.nix b/stylix/hm/icons.nix index 76b4b560..b23c8742 100644 --- a/stylix/hm/icons.nix +++ b/stylix/hm/icons.nix @@ -10,12 +10,7 @@ in inherit (cfg) package; name = builtins.head ( lib.filter (x: null != x) [ - ( - { - inherit (cfg) dark light; - } - ."${polarity}" or null - ) + ({ inherit (cfg) dark light; }."${polarity}" or null) cfg.dark cfg.light ] diff --git a/stylix/meta.nix b/stylix/meta.nix index 5557bf0b..05379671 100644 --- a/stylix/meta.nix +++ b/stylix/meta.nix @@ -1,7 +1,4 @@ -{ - pkgs, - lib, -}: +{ pkgs, lib }: builtins.mapAttrs ( _: value: diff --git a/stylix/nixos/default.nix b/stylix/nixos/default.nix index ebf2d807..431383f8 100644 --- a/stylix/nixos/default.nix +++ b/stylix/nixos/default.nix @@ -1,8 +1,4 @@ -{ - lib, - config, - ... -}: +{ lib, config, ... }: let autoload = import ../autoload.nix { inherit lib; } "nixos"; in diff --git a/stylix/target.nix b/stylix/target.nix index 0f6da2ed..7846e8e9 100644 --- a/stylix/target.nix +++ b/stylix/target.nix @@ -85,9 +85,7 @@ example ? if args ? autoEnableExpr then true else !autoEnable, }@args: let - wrapExpr = wrapExprWith { - inherit autoWrapExpr; - }; + wrapExpr = wrapExprWith { inherit autoWrapExpr; }; in self.mkEnableIf { description = "Whether to enable theming for ${name}."; @@ -129,11 +127,7 @@ lib.mkOption { type = lib.types.bool; defaultText = if args ? defaultText then defaultText else default; - inherit - default - description - example - ; + inherit default description example; }; }; } diff --git a/stylix/testbed/graphical-environments/kde.nix b/stylix/testbed/graphical-environments/kde.nix index b9aaf0b4..0a1cf31a 100644 --- a/stylix/testbed/graphical-environments/kde.nix +++ b/stylix/testbed/graphical-environments/kde.nix @@ -1,8 +1,4 @@ -{ - config, - lib, - ... -}: +{ config, lib, ... }: { config = lib.mkIf (config.stylix.testbed.ui.graphicalEnvironment or null == "kde") diff --git a/stylix/testbed/images.nix b/stylix/testbed/images.nix index 1b5bde79..f03b0be2 100644 --- a/stylix/testbed/images.nix +++ b/stylix/testbed/images.nix @@ -1,7 +1,4 @@ -{ - fetchurl, - runCommandLocal, -}: +{ fetchurl, runCommandLocal }: { dark = fetchurl { name = "mountains.jpg"; diff --git a/stylix/testbed/is-enabled.nix b/stylix/testbed/is-enabled.nix index 4fd02ace..72029045 100644 --- a/stylix/testbed/is-enabled.nix +++ b/stylix/testbed/is-enabled.nix @@ -1,7 +1,4 @@ -{ - lib, - pkgs, -}: +{ lib, pkgs }: /** Creates a minimal configuration to extract the `stylix.testbed.enable` option value.