faukah/nichts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gtk: fixed stuff

Browse source
This commit is contained in:
Charlie Root 2024-08-15 23:59:00 +02:00
commit 2d98ccfdb5
4 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosts/vali/temperance/configuration.nix
View file

@ -66,6 +66,7 @@
}; };
}; };
style = { style = {
gtk.enable = true;
stylix = { stylix = {
enable = true; enable = true;
scheme = "${pkgs.base16-schemes}/share/themes/bright.yaml"; scheme = "${pkgs.base16-schemes}/share/themes/bright.yaml";
@ -108,7 +109,6 @@
}; };
theming = { theming = {
quickshell.enable = true; quickshell.enable = true;
gtk.enable = true;
qt = { qt = {
enable = false; enable = false;
package = pkgs.kde-gruvbox; package = pkgs.kde-gruvbox;

27
modules/options/style/gtk.nix
View file

@ -4,11 +4,10 @@
config, config,
... ...
}: let }: let
inherit (config.modules.other.system) username;
inherit (lib) mkOption mkEnableOption; inherit (lib) mkOption mkEnableOption;
inherit (lib.types) str package submodule; inherit (lib.types) str package submodule;
in { in {
options.modules.style.gtk = { options.modules.usrEnv.style.gtk = {
enable = mkEnableOption "Wether to enable GTK theming"; enable = mkEnableOption "Wether to enable GTK theming";
theme = { theme = {
name = mkOption { name = mkOption {
@ -22,21 +21,17 @@ in {
type = package; type = package;
}; };
}; };
iconTheme = mkOption { iconTheme = {
description = "The GTK icon theme"; description = "The GTK icon theme";
type = submodule { name = mkOption {
options = { description = "The GTK icon theme name";
name = mkOption { default = "Papirus-Dark";
description = "The GTK icon theme name"; type = str;
default = "Papirus-Dark"; };
type = str; package = mkOption {
}; description = "The GTK icon theme package";
package = mkOption { default = pkgs.catppuccin-papirus-folders;
description = "The GTK icon theme package"; type = package;
default = pkgs.catppuccin-papirus-folders;
type = package;
};
};
}; };
}; };
}; };

2
modules/options/style/module.nix
View file

@ -9,7 +9,7 @@ in {
imports = [ imports = [
./stylix.nix ./stylix.nix
# ./qt.nix # ./qt.nix
# ./gtk.nix ./gtk.nix
]; ];
options.modules.style = { options.modules.style = {

6
modules/style/gtk.nix
View file

@ -4,9 +4,9 @@
... ...
}: }:
with lib; let with lib; let
cfg = config.modules.theming.gtk; cfg = config.modules.usrEnv.style.gtk;
inherit (config.modules.other.system) username; inherit (config.modules.other.system) username;
inherit (config.modules.style.gtk) theme iconTheme; inherit (config.modules.usrEnv.style.gtk) theme iconTheme;
in { in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager.users.${username} = { home-manager.users.${username} = {
@ -16,7 +16,7 @@ in {
inherit (theme) name package; inherit (theme) name package;
}; };
iconTheme = { iconTheme = {
inherit (iconTheme) name Package; inherit (iconTheme) name package;
}; };
}; };
}; };