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

Compare commits

base: nix:master
Branches Tags
nix:master
nix:release-25.11
..
compare: nix:release-25.11
Branches Tags
nix:release-25.11
nix:master

40 commits
master ... release-25

Author SHA1 Message Date
0xda157
cfe89cabaa ci: don't run checks on github actions
Some checks failed
Label Merge Conflicts / conflicts (push) Has been cancelled
Details 
(cherry picked from commit 69f1522ca6)
 2025-12-24 20:15:40 +01:00
0xda157
21da33cdd4 flake: add remaining drvs to ci.buildbot 
Closes: https://github.com/nix-community/stylix/issues/2056
(cherry picked from commit 7420f203ca)
 2025-12-24 20:15:40 +01:00
NAHO
c97b7b37b2 nvf: add empty line to improve readability (#2086) 
Link: https://github.com/nix-community/stylix/pull/2086

Reviewed-by: 0xda157 <da157@voidq.com>
(cherry picked from commit 1297baa750)
 2025-12-23 19:41:15 +01:00
0xda157
15f6ffc5e5 flake: add nix-community cachix as substituters (#1796) 
Link: https://github.com/nix-community/stylix/pull/1796

Reviewed-by: Matt Sturgeon <matt@sturgeon.me.uk>
Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
(cherry picked from commit 844294a58e)
 2025-12-22 23:09:16 -08:00
dependabot[bot]
c51431509b ci: bump korthout/backport-action from 3.4.1 to 4.0.1 (#2094) 
Link: https://github.com/nix-community/stylix/pull/2094

Reviewed-by: NAHO <trueNAHO@users.noreply.github.com>
(cherry picked from commit e6829552d4)
 2025-12-22 16:55:01 +01:00
Jon Erling Hustadnes
76c65d08c1 qt: improve highlight and text contrast (#2097) 
Closes: https://github.com/nix-community/stylix/issues/2079
Link: https://github.com/nix-community/stylix/pull/2097

Reviewed-by: NAHO <trueNAHO@users.noreply.github.com>
(cherry picked from commit c53b4a548a)
 2025-12-22 16:53:48 +01:00
ulli-lassance
87d4fd1127 qt: add standardDialogs option (#2090) 
Link: https://github.com/nix-community/stylix/pull/2090

Co-authored-by: NAHO <trueNAHO@users.noreply.github.com>
Reviewed-by: NAHO <trueNAHO@users.noreply.github.com>
Reviewed-by: Mikilio <official.mikilio@gmail.com>
(cherry picked from commit 626dab1b56)
 2025-12-22 16:45:41 +01:00
Viktor Titov
259af48fe5
qt: use qt.qt{5,6}ctSettings options (#2095) 
Link: https://github.com/nix-community/stylix/pull/2095

Reviewed-by: NAHO <trueNAHO@users.noreply.github.com>
 2025-12-16 16:48:22 +01:00
NAHO
b019ddbaf4 flake: lock base16-fish input to custom patchset (#2092) 
Closes: https://github.com/nix-community/stylix/issues/526
Link: https://github.com/nix-community/stylix/pull/2092
Link: https://github.com/tomyun/base16-fish/pull/16

Tested-by: Rafael Alexander Muijsert <rafael@muijsert.org>
Approved-by: Rafael Alexander Muijsert <rafael@muijsert.org>
(cherry picked from commit 9ba353558a)
 2025-12-16 16:41:42 +01:00
theunpleasantowl
4e63fa32d8 gnome: only exclude GNOME backgrounds when setting wallpaper (#2088) 
Link: https://github.com/nix-community/stylix/pull/2088

Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
(cherry picked from commit f6e9fbaeb3)
 2025-12-15 13:44:00 +01:00
rwxae
a7fb3944d1 noctalia-shell: init (#2077) 
Link: https://github.com/nix-community/stylix/pull/2077

Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
(cherry picked from commit dd14de4432)
 2025-12-11 19:37:37 +01:00
NAHO
93c8a26eee stylix/mk-target: rename normalizeConfig function to normalize (#2081) 
Rename the normalizeConfig function to normalize to generalize the name
beyond the specific config and options module arguments, following
commit 1272e6858e ("stylix/mk-target: rename mkConfig function to
callModule").

Fixes: 6153df31ce ("stylix/mk-target: normalize options argument identically to config")
Link: https://github.com/nix-community/stylix/pull/2081
(cherry picked from commit cb6bbed75e)
 2025-12-10 19:14:48 +01:00
NAHO
93f0ee1c34 stylix/mk-target: normalize options argument identically to config 
Normalize the options argument identically to config to provide a
coherent and extensible options interface.

(cherry picked from commit 6153df31ce)
 2025-12-10 07:14:37 -10:00
NAHO
eaeb3d6b59 stylix/mk-target: generate options for configuring safeguarded arguments 
Generate targets.${target}.${argument}.enable and
targets.${target}.${argument}.override options for disabling and
configuring safeguarded arguments on a target level.

(cherry picked from commit 953c3fb01e)
 2025-12-10 07:14:37 -10:00
NAHO
707059378b treewide: optionalize mkTarget's humanName and name arguments 
Optionalize mkTarget's 'humanName' and 'name' arguments by inferring
'humanName' from the 'name' attribute in the /modules/<MODULE>/meta.nix
file, and 'name' from the /modules/<NAME>/ directory name.

Inferring the 'humanName' and 'name' arguments ensures consistency and
reduces boilerplate.

The 'humanName' and 'name' arguments are optionalized instead of removed
because complex modules generating target derivations need to
distinguish between them.

Closes: https://github.com/nix-community/stylix/issues/1661
(cherry picked from commit dfc859f54d)
 2025-12-10 07:14:37 -10:00
NAHO
3fb65013f7 treewide: rename mkTarget's configElements and extraOptions options 
Rename mkTarget's 'configElements' argument to 'config' and
'extraOptions' to 'options' to provide a more transparent interface with
the underlying Nixpkgs module system.

(cherry picked from commit 16df6b8448)
 2025-12-10 07:14:37 -10:00
NAHO
e87a003de1 stylix/mk-target: rename generalConfig argument to unconditionalConfig 
Rename the generalConfig argument to unconditionalConfig to better imply
the intentional lack of safeguarding.

(cherry picked from commit 76d05fd9c0)
 2025-12-10 07:14:37 -10:00
NAHO
cf17ca6259 stylix/mk-target: polish implementation and improve error reporting 
Polish the mkTarget implementation to improve error reporting and
simplify future enhancements.

Configuration elements can now recursively resolve to paths.

(cherry picked from commit f7b554dea9)
 2025-12-10 07:14:37 -10:00
NAHO
66576c1e09 stylix/mk-target: rename mkConfig function to callModule 
Rename the mkConfig function to callModule to generalize the name beyond
the specific config and options module arguments.

Fixes: dea0337e0b ("stylix: restrict access to config while using mkTarget (#1368)")
(cherry picked from commit 1272e6858e)
 2025-12-10 07:14:37 -10:00
NAHO
4ec8181cd8 stylix/mk-target: document imports argument 
Fixes: 093087e969 ("stylix: add imports to mkTarget (#1363)")
(cherry picked from commit 9afd8230cd)
 2025-12-10 07:14:37 -10:00
NAHO
e34f85f1f1 stylix/mk-target: sort optional arguments 
(cherry picked from commit 25354cc88b)
 2025-12-10 07:14:37 -10:00
NAHO
2f1565508a modules: flatten single-attribute set declarations 
(cherry picked from commit a4ffbc20ea)
 2025-12-10 07:14:37 -10:00
0xda157
84d9d55885 fcitx5: add da157 as maintainer (#2066) 
Link: https://github.com/nix-community/stylix/pull/2066

Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
(cherry picked from commit bd00e01aab)
 2025-12-06 13:51:36 -10:00
NAHO
b1c99fd952 ci: deprecate 25.05 branch (#2051) 
Link: https://github.com/nix-community/stylix/pull/2051
(cherry picked from commit c9e89d4478)
 2025-12-05 14:53:34 -10:00
NAHO
be22e21cee ci: update-flake: match PR title to commit title (#2043) 
Link: https://github.com/nix-community/stylix/pull/2043
Fixes: b01dbcdc08 ("ci: update-flake: use one atomic commit")

Reviewed-by: 0xda157 <da157@voidq.com>
(cherry picked from commit 794b6e1fa7)
 2025-12-05 14:53:34 -10:00
NAHO
b014261858 ci: update-flake: fix invalid 'gh pr edit' label flag (#2038) 
Closes: https://github.com/nix-community/stylix/issues/2037
(cherry picked from commit 8a096ccec8)
 2025-12-05 14:53:34 -10:00
NAHO
95b692c874 ci: update-flake: parallelize updates to minimize version drift 
(cherry picked from commit a87d4cb376)
 2025-12-05 14:53:34 -10:00
NAHO
5e392c36d2 ci: update-flake: use one atomic commit 
Use one atomic commit to simplify the commit history and prevent the
previous commits from individually breaking CI.

(cherry picked from commit b01dbcdc08)
 2025-12-05 14:53:34 -10:00
Mikilio
d9b3c18cb3 qt: fix colorscheme not applying sometimes 
(cherry picked from commit d5bbace3ff)
 2025-12-05 14:53:34 -10:00
Mikilio
ec6f4a973c qt: update template in accordance with reference 
(cherry picked from commit a8bb9ee2fa)
 2025-12-05 14:53:34 -10:00
0xda157
c3e7ce08ae treewide: use strict mode for nixfmt (#2041) 
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>
(cherry picked from commit 3a332459f4)
 2025-12-05 14:52:41 -10:00
Louis Dalibard
62a3fa671e fcitx5: conform to stylix styling guidelines (#2063) 
Link: https://github.com/nix-community/stylix/pull/2063
Closes: https://github.com/nix-community/stylix/issues/2062
(cherry picked from commit 46440f1bc8)
 2025-12-05 14:03:35 -10:00
NAHO
6f3b50c8fa flake/dev/flake: override vicinae's system input (#2057) 
Link: https://github.com/nix-community/stylix/pull/2057

Reviewed-by: 0xda157 <da157@voidq.com>
(cherry picked from commit 4b9e0e7ba3)
 2025-12-04 09:19:53 +01:00
stylix-automation[bot]
cfde343ff3
flake: update all inputs (#2034) 
Link: https://github.com/nix-community/stylix/pull/2034

Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
 2025-12-03 22:04:11 +01:00
0xda157
228616717d doc: recommend 25.11 as stable branch (#2025) 
Link: https://github.com/nix-community/stylix/pull/2025

Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
(cherry picked from commit ddc49fd564)
 2025-12-03 02:34:13 -10:00
NAHO
a1e741dbce stylix/testbed/modules/application: add notification progress bar (#2021) 
Link: https://github.com/nix-community/stylix/pull/2021

Reviewed-by: 0xda157 <da157@voidq.com>
(cherry picked from commit 71054adbc3)
 2025-12-02 18:03:37 +01:00
0xda157
6d5708ee0c
flake: use 25.11 branch of dependencies (#2026) 
Link: https://github.com/nix-community/stylix/pull/2026

Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
 2025-12-02 17:40:02 +01:00
chillcicada
c9760a6a2b gdu: properly rename module and option names (#2044) 
Fixes: b9b0501839 ("gdu: init (#1995)")
Link: https://github.com/nix-community/stylix/pull/2044

Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
Co-authored-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
(cherry picked from commit 961e2f02af)
 2025-12-01 15:45:18 +01:00
0xda157
1fdde45cb0 ci: update dependencies on 25.11 branch (#2027) 
Link: https://github.com/nix-community/stylix/pull/2027

Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
(cherry picked from commit 70c444a10d)
 2025-11-30 02:09:05 +01:00
Kilian Mio
9bf8725a3d regreet: explicitly apply GTK theme (#1964) 
Explicitly apply the GTK theme, as global GTK theming is scoped to
individual derivations.

Closes: https://github.com/nix-community/stylix/issues/690

Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
(cherry picked from commit 687a8c1bf2)
 2025-11-26 22:46:43 +01:00
9 changed files with 22 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.editorconfig
View file

@ -6,6 +6,7 @@ end_of_line = lf
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
charset = unset
[*.{diff,patch}]
end_of_line = unset

8
flake.lock generated
View file

@ -141,16 +141,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1764517877,
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
"lastModified": 1764522689,
"narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
"rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}

2
flake.nix
View file

@ -2,7 +2,7 @@
description = "Theming framework for NixOS, Home Manager, nix-darwin, and Nix-on-Droid";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
flake-parts = {
url = "github:hercules-ci/flake-parts";

22
flake/dev/flake.lock generated
View file

@ -22,16 +22,16 @@
},
"dev-nixpkgs": {
"locked": {
"lastModified": 1764517877,
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
"lastModified": 1764522689,
"narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
"rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
@ -97,15 +97,16 @@
]
},
"locked": {
"lastModified": 1765172714,
"narHash": "sha256-/cjofqGxSWpRj2XJM+Bd5VUgWDkBWSxxO//HE+zOHMY=",
"lastModified": 1765859973,
"narHash": "sha256-LN5O0h9GSgcDE/sz4+sLS3CbQALru1x4lh9hrxpeHwI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "a7887340779d5e70ef68012f3823568ee59eaa30",
"rev": "7df150f0d3857cf68dae443813b27acfb201b2d8",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-25.11",
"repo": "home-manager",
"type": "github"
}
@ -139,15 +140,16 @@
]
},
"locked": {
"lastModified": 1764764672,
"narHash": "sha256-BZN3w7AYQlXLKBK/FXu8K/tVTXxVsk/pAwEl6aAyxhE=",
"lastModified": 1764755396,
"narHash": "sha256-f6UrlGdwg+TIxxyDjeq1M7WGNZH/vpbOm0yzPgkMy9c=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "8c9ba3b5d85cb985ab7372abf11af1954df15e4a",
"rev": "64d9e2616f4ee2acee380d61ccf1f3d610e7e969",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "nixos-25.11",
"repo": "nixvim",
"type": "github"
}

6
flake/dev/flake.nix
View file

@ -120,7 +120,7 @@
#
# [1]: https://github.com/NixOS/nix/blob/d4f67fd46dfe2bc950bdfa14273f87b8a4c32e47/doc/manual/source/release-notes/rl-2.26.md?plain=1#L3-L11
inputs = {
dev-nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
dev-nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
dev-flake-parts = {
url = "github:hercules-ci/flake-parts";
@ -142,12 +142,12 @@
};
home-manager = {
url = "github:nix-community/home-manager";
url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "dev-nixpkgs";
};
nixvim = {
url = "github:nix-community/nixvim";
url = "github:nix-community/nixvim/nixos-25.11";
inputs = {
flake-parts.follows = "dev-flake-parts";
nixpkgs.follows = "dev-nixpkgs";

177
modules/vivid/hm.nix
View file

@ -1,177 +0,0 @@
{ mkTarget, ... }:
mkTarget {
config =
{ colors }:
let
theme = "stylix";
in
{
programs.vivid = {
activeTheme = theme;
themes.${theme} = {
colors = {
inherit (colors)
base00
base01
base02
base03
base04
base05
base06
base07
base08
base09
base0A
base0B
base0C
base0D
base0E
base0F
;
};
core = {
normal_text.foreground = "base04";
reset_to_normal = {
background = "base00";
foreground = "base04";
font-style = "regular";
};
# File Types
regular_file.foreground = "base04";
directory = {
foreground = "base0F";
font-style = "bold";
};
multi_hard_link = {
foreground = "base0C";
font-style = "underline";
};
symlink.foreground = "base0C";
broken_symlink.foreground = "base08";
missing_symlink_target = {
background = "base08";
foreground = "base05";
font-style = "bold";
};
fifo = {
foreground = "base07";
font-style = [
"bold"
"underline"
];
};
character_device.foreground = "base0A";
block_device = {
foreground = "base0A";
font-style = "underline";
};
door = {
foreground = "base0A";
font-style = "italic";
};
socket = {
foreground = "base0A";
font-style = "bold";
};
# File Permissions
executable_file = {
foreground = "base07";
font-style = "bold";
};
file_with_capability = {
foreground = "base04";
font-style = [
"bold"
"underline"
];
};
setuid = {
foreground = "base04";
font-style = [
"bold"
"underline"
];
};
setgid = {
foreground = "base04";
font-style = [
"bold"
"underline"
];
};
sticky = {
background = "base0F";
foreground = "base05";
font-style = "underline";
};
other_writable = {
background = "base0F";
foreground = "base05";
font-style = "bold";
};
sticky_other_writable = {
background = "base0F";
foreground = "base05";
font-style = [
"bold"
"underline"
];
};
};
# Document Types
archives = {
foreground = "base05";
font-style = "bold";
};
executable = {
foreground = "base07";
font-style = "bold";
};
markup = {
foreground = "base06";
web.foreground = "base04";
};
media = {
foreground = "base0E";
fonts.foreground = "base04";
};
office.foreground = "base0B";
programming = {
source.foreground = "base07";
tooling.foreground = "base04";
};
text.foreground = "base04";
unimportant.foreground = "base03";
};
};
};
}

6
modules/vivid/meta.nix
View file

@ -1,6 +0,0 @@
{ lib, ... }:
{
name = "vivid";
homepage = "https://github.com/sharkdp/vivid";
maintainers = [ lib.maintainers.arunoruto ];
}

17
modules/vivid/testbeds/vivid.nix
View file

@ -1,17 +0,0 @@
{ lib, pkgs, ... }:
let
package = pkgs.vivid;
in
{
stylix.testbed.ui.command = {
text = "${lib.getExe pkgs.lsd} --all --long --recursive flake-parts/";
useTerminal = true;
};
home-manager.sharedModules = lib.singleton {
programs.vivid = {
enable = true;
inherit package;
};
};
}

2
stylix/release.nix
View file

@ -3,7 +3,7 @@
options.stylix = {
release = lib.mkOption {
description = "The version of NixOS that Stylix is built to support";
default = "26.05";
default = "25.11";
internal = true;
readOnly = true;
};