nullbite/nixfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update default config to match stylix#244

Browse Source
This commit is contained in:
NullBite 2024-05-23 02:45:41 -04:00
parent 60d486da70
commit 19460ea48f
Signed by: nullbite
GPG Key ID: 6C4D545385D4925A
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
home/stylix.nix
View File

@ -1,14 +1,18 @@
{ pkgs, lib, config, inputs, ... }@args: { pkgs, lib, config, inputs, ... }@args:
{ {
imports = [ imports = [ inputs.stylix.homeManagerModules.stylix ];
inputs.stylix.homeManagerModules.stylix
];
config = { config = {
stylix = lib.mkMerge [
{ targets.vim.enable = lib.mkDefault false; }
# only if styix is standalone # only if styix is standalone
stylix = lib.mkIf (!(args ? osConfig && args.osConfig ? stylix )) { (lib.mkIf (!(args ? osConfig && args.osConfig ? stylix)) {
autoEnable = lib.mkDefault false; # all of this is documented in system/stylix.nix
autoEnable = lib.mkDefault config.stylix.enable;
enable = lib.mkDefault false;
image = lib.mkDefault "${pkgs.nixfiles-assets}/share/wallpapers/nixfiles-static/Djayjesse-finding_life.png"; image = lib.mkDefault "${pkgs.nixfiles-assets}/share/wallpapers/nixfiles-static/Djayjesse-finding_life.png";
base16Scheme = lib.mkDefault "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; base16Scheme = lib.mkDefault "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
}; })
];
}; };
} }

18
system/stylix.nix
View File

@ -1,18 +1,22 @@
{ pkgs, config, lib, inputs, ... }@args: { pkgs, config, lib, inputs, ... }@args:
{ {
imports = [ imports = [ inputs.stylix.nixosModules.stylix ];
inputs.stylix.nixosModules.stylix
];
config = { config = {
# stylix defaults (this is an external module so i don't mind setting sane defaults right here). # stylix defaults (this is an external module so i don't mind setting sane defaults right here).
stylix = { stylix = {
# don't mess with things by default. note: this still messes with things # don't mess with things by default.
# by default; the stylix.enable option is currently being added, see #
# danth/stylix#244 # this naming is confusing as shit
autoEnable = lib.mkDefault false; # this enables color theming of things by stylix
autoEnable = lib.mkDefault config.stylix.enable;
# this enables installation of fonts/images/etc
enable = lib.mkDefault false;
# an image i like
image = lib.mkDefault "${pkgs.nixfiles-assets}/share/wallpapers/nixfiles-static/Djayjesse-finding_life.png"; image = lib.mkDefault "${pkgs.nixfiles-assets}/share/wallpapers/nixfiles-static/Djayjesse-finding_life.png";
# default theme
base16Scheme = lib.mkDefault "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; base16Scheme = lib.mkDefault "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
homeManagerIntegration = { homeManagerIntegration = {
# use system config in home-manager # use system config in home-manager