icons
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
with lib;
|
||||
let
|
||||
cfg = config.mjallen.programs.hyprland;
|
||||
drawer = "nwg-drawer -fm nautilus -term kitty -mb 10 -mt 10 -ml 10 -mr 10 -pbuseicontheme -i ${config.gtk.iconTheme.name}";
|
||||
drawer = "nwg-drawer -fm nautilus -term kitty -mb 10 -mt 10 -ml 10 -mr 10 -pbuseicontheme -i ${config.stylix.icons.dark}";
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
|
||||
@@ -152,18 +152,6 @@ with lib;
|
||||
description = "Any extra configuration options";
|
||||
};
|
||||
|
||||
iconThemeName = mkOption {
|
||||
type = types.str;
|
||||
default = "Colloid-Dark";
|
||||
description = "Icon theme name";
|
||||
};
|
||||
|
||||
gtkThemeName = mkOption {
|
||||
type = types.str;
|
||||
default = "Colloid-Dark";
|
||||
description = "GTK theme name";
|
||||
};
|
||||
|
||||
defaultApps = mkOption {
|
||||
type = types.submodule {
|
||||
options = {
|
||||
|
||||
@@ -16,11 +16,6 @@ let
|
||||
iconThemeVariant = "default"; # "default" | ... | "all"
|
||||
iconScheme = "nord"; # "default" | "nord" | "dracula" | ...
|
||||
|
||||
# Cursor
|
||||
cursorTheme = "macOS";
|
||||
cursorThemePkg = pkgs.apple-cursor;
|
||||
cursorSize = 24;
|
||||
|
||||
# GTK
|
||||
gtkTheme = "Colloid-dark-standard";
|
||||
gtkThemePkg = pkgs.colloid-gtk-theme.override {
|
||||
@@ -36,56 +31,45 @@ let
|
||||
schemeVariants = [ iconScheme ];
|
||||
colorVariants = [ iconThemeVariant ];
|
||||
};
|
||||
|
||||
# Fonts
|
||||
fontName = config.stylix.fonts.monospace.name;
|
||||
fontPackage = config.stylix.fonts.monospace.package;
|
||||
fontSize = 12;
|
||||
in
|
||||
{
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
dconf = {
|
||||
enable = true;
|
||||
settings = {
|
||||
"org/gnome/desktop/interface".color-scheme = mkForce "prefer-dark";
|
||||
"org/gnome/desktop/interface".cursor-theme = cursorTheme;
|
||||
"org/gnome/desktop/interface".gtk-theme = gtkTheme;
|
||||
"org/gnome/desktop/interface".icon-theme = iconTheme;
|
||||
};
|
||||
};
|
||||
# dconf = {
|
||||
# enable = true;
|
||||
# settings = {
|
||||
# "org/gnome/desktop/interface".color-scheme = mkForce "prefer-dark";
|
||||
# # "org/gnome/desktop/interface".cursor-theme = cursorTheme;
|
||||
# "org/gnome/desktop/interface".gtk-theme = gtkTheme;
|
||||
# "org/gnome/desktop/interface".icon-theme = iconTheme;
|
||||
# };
|
||||
# };
|
||||
|
||||
gtk = {
|
||||
enable = true;
|
||||
# gtk = {
|
||||
# enable = true;
|
||||
|
||||
cursorTheme = {
|
||||
name = cursorTheme;
|
||||
package = cursorThemePkg;
|
||||
};
|
||||
# cursorTheme = {
|
||||
# name = cursorTheme;
|
||||
# package = cursorThemePkg;
|
||||
# };
|
||||
|
||||
theme = {
|
||||
name = gtkTheme;
|
||||
package = gtkThemePkg;
|
||||
};
|
||||
# theme = {
|
||||
# name = gtkTheme;
|
||||
# package = gtkThemePkg;
|
||||
# };
|
||||
|
||||
iconTheme = {
|
||||
name = iconTheme;
|
||||
package = iconThemePkg;
|
||||
};
|
||||
# iconTheme = {
|
||||
# name = iconTheme;
|
||||
# package = iconThemePkg;
|
||||
# };
|
||||
|
||||
gtk3.extraConfig = {
|
||||
gtk-application-prefer-dark-theme = true;
|
||||
};
|
||||
# gtk3.extraConfig = {
|
||||
# gtk-application-prefer-dark-theme = true;
|
||||
# };
|
||||
|
||||
gtk4.extraConfig = {
|
||||
gtk-application-prefer-dark-theme = true;
|
||||
};
|
||||
|
||||
font = {
|
||||
name = mkDefault fontName;
|
||||
package = mkDefault fontPackage;
|
||||
size = mkDefault fontSize;
|
||||
};
|
||||
};
|
||||
# gtk4.extraConfig = {
|
||||
# gtk-application-prefer-dark-theme = true;
|
||||
# };
|
||||
# };
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user