nix/11.stylix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

treewide: use strict mode for nixfmt (#2041)

Browse source 
Link: https://github.com/nix-community/stylix/pull/2041
Link: https://github.com/nix-community/stylix/pull/1976#discussion_r2539186937

Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
This commit is contained in:
0xda157 2025-12-05 14:05:09 -10:00 • committed by GitHub
parent 46440f1bc8
commit 3a332459f4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
82 changed files with 110 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

9
flake/default.nix
View file

@ -15,10 +15,7 @@
extraInputsFlake = ./dev;
};
partitionedAttrs = lib.genAttrs [
"checks"
"ci"
"devShells"
"formatter"
] (_: "dev");
partitionedAttrs = lib.genAttrs [ "checks" "ci" "devShells" "formatter" ] (
_: "dev"
);
}

10
flake/deprecation/default.nix
View file

@ -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.
#

4
flake/dev/packages.nix
View file

@ -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 = {

4
flake/dev/pre-commit.nix
View file

@ -1,8 +1,6 @@
{ inputs, ... }:
{
imports = [
inputs.git-hooks.flakeModule
];
imports = [ inputs.git-hooks.flakeModule ];
perSystem =
{ config, ... }:

1
flake/dev/treefmt.nix
View file

@ -28,6 +28,7 @@
nixfmt = {
enable = true;
width = 80;
strict = true;
};
ruff-format = {
enable = true;

4
flake/packages.nix
View file

@ -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;
};

4
flake/propagated-packages.nix
View file

@ -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 [
{

32
generated/all-maintainers.nix
View file

@ -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";
};

4
modules/anki/testbeds/anki.nix
View file

@ -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; };
}

4
modules/ashell/testbeds/ashell.nix
View file

@ -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; };
}

6
modules/blender/hm.nix
View file

@ -1,8 +1,4 @@
{
mkTarget,
lib,
...
}:
{ mkTarget, lib, ... }:
mkTarget {
name = "blender";
humanName = "Blender";

6
modules/btop/hm.nix
View file

@ -1,8 +1,4 @@
{
mkTarget,
lib,
...
}:
{ mkTarget, lib, ... }:
mkTarget {
name = "btop";
humanName = "btop";

4
modules/btop/testbeds/btop.nix
View file

@ -5,7 +5,5 @@
useTerminal = true;
};
home-manager.sharedModules = lib.singleton {
programs.btop.enable = true;
};
home-manager.sharedModules = lib.singleton { programs.btop.enable = true; };
}

4
modules/cava/testbeds/cava.nix
View file

@ -8,7 +8,5 @@
useTerminal = true;
};
home-manager.sharedModules = lib.singleton {
programs.cava.enable = true;
};
home-manager.sharedModules = lib.singleton { programs.cava.enable = true; };
}

4
modules/discord/common/theme-elements.nix
View file

@ -1,7 +1,5 @@
name: [
{
stylix.targets.${name}.themeBody = import ./theme-header.nix;
}
{ stylix.targets.${name}.themeBody = import ./theme-header.nix; }
(
{ fonts }:
{

6
modules/discord/hm.nix
View file

@ -1,8 +1,4 @@
{
mkTarget,
lib,
...
}:
{ mkTarget, lib, ... }:
{
imports = map (module: lib.modules.importApply module mkTarget) [
./nixcord.nix

4
modules/discord/nixcord.nix
View file

@ -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" ]; }
]
)
)

9
modules/discord/testbeds/vencord.nix
View file

@ -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" ];
}

4
modules/dunst/testbeds/dunst.nix
View file

@ -5,7 +5,5 @@
sendNotifications = true;
};
home-manager.sharedModules = lib.singleton {
services.dunst.enable = true;
};
home-manager.sharedModules = lib.singleton { services.dunst.enable = true; };
}

4
modules/fcitx5/hm.nix
View file

@ -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; };
};
};
}

6
modules/fcitx5/template.nix
View file

@ -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;

6
modules/fcitx5/testbeds/fcitx5.nix
View file

@ -1,8 +1,4 @@
{
pkgs,
lib,
...
}:
{ pkgs, lib, ... }:
{
stylix.testbed.ui.command.text = "fcitx5-config-qt";
home-manager.sharedModules = lib.singleton {

4
modules/firefox/each-config.nix
View file

@ -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 (

10
modules/firefox/hm.nix
View file

@ -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";

4
modules/fish/testbeds/fish-hm.nix
View file

@ -5,7 +5,5 @@
useTerminal = true;
};
home-manager.sharedModules = lib.singleton {
programs.fish.enable = true;
};
home-manager.sharedModules = lib.singleton { programs.fish.enable = true; };
}

4
modules/fnott/testbeds/fnott.nix
View file

@ -5,7 +5,5 @@
sendNotifications = true;
};
home-manager.sharedModules = lib.singleton {
services.fnott.enable = true;
};
home-manager.sharedModules = lib.singleton { services.fnott.enable = true; };
}

4
modules/font-packages/darwin.nix
View file

@ -6,8 +6,6 @@ mkTarget {
configElements =
{ fonts }:
{
fonts = {
inherit (fonts) packages;
};
fonts = { inherit (fonts) packages; };
};
}

4
modules/font-packages/hm.nix
View file

@ -6,8 +6,6 @@ mkTarget {
configElements =
{ fonts }:
{
home = {
inherit (fonts) packages;
};
home = { inherit (fonts) packages; };
};
}

4
modules/font-packages/nixos.nix
View file

@ -6,8 +6,6 @@ mkTarget {
configElements =
{ fonts }:
{
fonts = {
inherit (fonts) packages;
};
fonts = { inherit (fonts) packages; };
};
}

4
modules/fontconfig/hm.nix
View file

@ -1,6 +1,4 @@
{ lib, mkTarget, ... }:
{
imports = [
(lib.modules.importApply ./fontconfig.nix { inherit mkTarget; })
];
imports = [ (lib.modules.importApply ./fontconfig.nix { inherit mkTarget; }) ];
}

4
modules/fontconfig/nixos.nix
View file

@ -1,6 +1,4 @@
{ lib, mkTarget, ... }:
{
imports = [
(lib.modules.importApply ./fontconfig.nix { inherit mkTarget; })
];
imports = [ (lib.modules.importApply ./fontconfig.nix { inherit mkTarget; }) ];
}

4
modules/fuzzel/testbeds/fuzzel.nix
View file

@ -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; };
}

4
modules/fzf/testbeds/fzf.nix
View file

@ -5,7 +5,5 @@
useTerminal = true;
};
home-manager.sharedModules = lib.singleton {
programs.fzf.enable = true;
};
home-manager.sharedModules = lib.singleton { programs.fzf.enable = true; };
}

5
modules/gdu/hm.nix
View file

@ -1,7 +1,4 @@
{
mkTarget,
...
}:
{ mkTarget, ... }:
mkTarget {
name = "gdu";
humanName = "go DiskUsage()";

4
modules/gdu/testbeds/gdu.nix
View file

@ -5,7 +5,5 @@
useTerminal = true;
};
home-manager.sharedModules = lib.singleton {
home.packages = [ pkgs.gdu ];
};
home-manager.sharedModules = lib.singleton { home.packages = [ pkgs.gdu ]; };
}

4
modules/gnome/hm.nix
View file

@ -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";

20
modules/gnome/nixos.nix
View file

@ -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
]

4
modules/gnome/testbeds/gnome.nix
View file

@ -1,3 +1 @@
{
stylix.testbed.ui.graphicalEnvironment = "gnome";
}
{ stylix.testbed.ui.graphicalEnvironment = "gnome"; }

4
modules/helix/hm.nix
View file

@ -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

4
modules/helix/testbeds/helix.nix
View file

@ -5,7 +5,5 @@
useTerminal = true;
};
home-manager.sharedModules = lib.singleton {
programs.helix.enable = true;
};
home-manager.sharedModules = lib.singleton { programs.helix.enable = true; };
}

6
modules/hyprpanel/testbeds/hyprpanel.nix
View file

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

4
modules/i3/hm.nix
View file

@ -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;

6
modules/i3bar-river/hm.nix
View file

@ -1,8 +1,4 @@
{
mkTarget,
lib,
...
}:
{ mkTarget, lib, ... }:
mkTarget {
name = "i3bar-river";
humanName = "i3bar-river";

18
modules/kde/hm.nix
View file

@ -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 {

5
modules/kde/testbeds/kde.nix
View file

@ -1,7 +1,4 @@
{
lib,
...
}:
{ lib, ... }:
{
config = {
stylix.testbed.ui.graphicalEnvironment = "kde";

4
modules/limine/nixos.nix
View file

@ -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 ];
}
)
(

4
modules/mako/testbeds/mako.nix
View file

@ -5,7 +5,5 @@
sendNotifications = true;
};
home-manager.sharedModules = lib.singleton {
services.mako.enable = true;
};
home-manager.sharedModules = lib.singleton { services.mako.enable = true; };
}

4
modules/micro/testbeds/micro.nix
View file

@ -5,7 +5,5 @@
useTerminal = true;
};
home-manager.sharedModules = lib.singleton {
programs.micro.enable = true;
};
home-manager.sharedModules = lib.singleton { programs.micro.enable = true; };
}

4
modules/ncspot/testbeds/ncspot.nix
View file

@ -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; };
}

6
modules/neovim/neovim.nix
View file

@ -1,9 +1,5 @@
mkTarget:
{
lib,
pkgs,
...
}:
{ lib, pkgs, ... }:
mkTarget {
name = "neovim";
humanName = "Neovim";

6
modules/neovim/nixvim.nix
View file

@ -1,9 +1,5 @@
mkTarget:
{
lib,
options,
...
}:
{ lib, options, ... }:
mkTarget {
name = "nixvim";
humanName = "NixVim";

10
modules/neovim/nvf.nix
View file

@ -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"; };
};
}
)

4
modules/neovim/testbeds/neovim.nix
View file

@ -5,7 +5,5 @@
useTerminal = true;
};
home-manager.sharedModules = lib.singleton {
programs.neovim.enable = true;
};
home-manager.sharedModules = lib.singleton { programs.neovim.enable = true; };
}

4
modules/neovim/testbeds/vim.nix
View file

@ -5,7 +5,5 @@
useTerminal = true;
};
home-manager.sharedModules = lib.singleton {
programs.vim.enable = true;
};
home-manager.sharedModules = lib.singleton { programs.vim.enable = true; };
}

6
modules/neovim/vim.nix
View file

@ -1,9 +1,5 @@
mkTarget:
{
lib,
pkgs,
...
}:
{ lib, pkgs, ... }:
mkTarget {
name = "vim";
humanName = "Vim";

4
modules/nushell/testbeds/nushell.nix
View file

@ -5,7 +5,5 @@
useTerminal = true;
};
home-manager.sharedModules = lib.singleton {
programs.nushell.enable = true;
};
home-manager.sharedModules = lib.singleton { programs.nushell.enable = true; };
}

6
modules/obsidian/hm.nix
View file

@ -1,8 +1,4 @@
{
mkTarget,
lib,
...
}:
{ mkTarget, lib, ... }:
mkTarget {
name = "obsidian";
humanName = "Obsidian";

5
modules/obsidian/testbeds/obsidian.nix
View file

@ -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";

4
modules/opencode/testbeds/opencode.nix
View file

@ -5,7 +5,5 @@
useTerminal = true;
};
home-manager.sharedModules = lib.singleton {
programs.opencode.enable = true;
};
home-manager.sharedModules = lib.singleton { programs.opencode.enable = true; };
}

4
modules/qt/hm.nix
View file

@ -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";

8
modules/regreet/nixos.nix
View file

@ -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; };
}
)
(

5
modules/spicetify/testbeds/spicetify.nix
View file

@ -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" ];
}

4
modules/sxiv/testbeds/sxiv.nix
View file

@ -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 ]; };
}

4
modules/tmux/testbeds/tmux.nix
View file

@ -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; };
}

4
modules/vicinae/testbeds/vicinae.nix
View file

@ -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; };
}

24
modules/vscode/templates/theme.nix
View file

@ -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";
}
{

5
modules/waybar/hm.nix
View file

@ -72,10 +72,7 @@ mkTarget {
}
)
(
{
cfg,
colors,
}:
{ cfg, colors }:
let
colorlessModules = place: ''
.modules-${place} #workspaces button {

4
modules/waybar/testbeds/waybar.nix
View file

@ -14,9 +14,7 @@
"hyprland/submap"
"custom/media"
];
modules-center = [
"hyprland/window"
];
modules-center = [ "hyprland/window" ];
modules-right = [
"mpd"
"idle_inhibitor"

4
modules/yazi/testbeds/yazi.nix
View file

@ -14,8 +14,6 @@ in
inherit package;
};
home.packages = [
pkgs.nerd-fonts.fira-mono
];
home.packages = [ pkgs.nerd-fonts.fira-mono ];
};
}

4
modules/zed/hm.nix
View file

@ -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; };
};
}
)

4
modules/zellij/testbeds/zellij.nix
View file

@ -5,7 +5,5 @@
useTerminal = true;
};
home-manager.sharedModules = lib.singleton {
programs.zellij.enable = true;
};
home-manager.sharedModules = lib.singleton { programs.zellij.enable = true; };
}

10
modules/zen-browser/hm.nix
View file

@ -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 (_: {

6
stylix/darwin/default.nix
View file

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

4
stylix/droid/default.nix
View file

@ -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; };
}

6
stylix/hm/default.nix
View file

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

7
stylix/hm/icons.nix
View file

@ -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
]

5
stylix/meta.nix
View file

@ -1,7 +1,4 @@
{
pkgs,
lib,
}:
{ pkgs, lib }:
builtins.mapAttrs
(
_: value:

6
stylix/nixos/default.nix
View file

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

10
stylix/target.nix
View file

@ -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;
};
};
}

6
stylix/testbed/graphical-environments/kde.nix
View file

@ -1,8 +1,4 @@
{
config,
lib,
...
}:
{ config, lib, ... }:
{
config =
lib.mkIf (config.stylix.testbed.ui.graphicalEnvironment or null == "kde")

5
stylix/testbed/images.nix
View file

@ -1,7 +1,4 @@
{
fetchurl,
runCommandLocal,
}:
{ fetchurl, runCommandLocal }:
{
dark = fetchurl {
name = "mountains.jpg";

5
stylix/testbed/is-enabled.nix
View file

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