diff --git a/homeManagerModules/options.nix b/homeManagerModules/options.nix index eee03ad5..5201f5ec 100644 --- a/homeManagerModules/options.nix +++ b/homeManagerModules/options.nix @@ -198,41 +198,21 @@ in { waybar.enable = lib.mkEnableOption "Waybar wayland panel."; }; - theme = let - mkFontOption = typ: nam: pkg: siz: { - name = lib.mkOption { - description = "Default ${typ} font name."; - default = nam; - type = lib.types.str; - }; - - package = lib.mkOption { - description = "Default ${typ} font package."; - default = pkg; - type = lib.types.package; - }; - - size = lib.mkOption { - description = "Default ${typ} font size."; - default = siz; - type = lib.types.int; - }; - }; - in { + theme = { enable = lib.mkEnableOption "Gtk, Qt, and application colors."; - darkMode = lib.mkOption { - description = "Whether to prefer dark mode apps or not."; - default = cfg.theme.enable; - type = lib.types.bool; - }; - borderRadius = lib.mkOption { description = "Global border radius."; default = 10; type = lib.types.int; }; + darkMode = lib.mkOption { + description = "Whether to prefer dark mode apps or not."; + default = config.stylix.polarity == "dark"; + type = lib.types.bool; + }; + gtk.hideTitleBar = lib.mkOption { description = "Whether to hide GTK3/4 titlebars (useful for some window managers)."; default = false; diff --git a/homeManagerModules/theme.nix b/homeManagerModules/theme.nix index a03262e2..9d2c9ce8 100644 --- a/homeManagerModules/theme.nix +++ b/homeManagerModules/theme.nix @@ -55,19 +55,5 @@ in { gtk3 = {inherit (gtk) extraCss;}; gtk4 = {inherit (gtk) extraCss;}; }; - - qt = { - enable = true; - platformTheme.name = "qtct"; - - style = { - name = - if cfg.darkMode - then "Adwaita-Dark" - else "Adwaita"; - - package = pkgs.adwaita-qt6; - }; - }; }; } diff --git a/homes/aly/default.nix b/homes/aly/default.nix index 9e31d28b..7fac767c 100644 --- a/homes/aly/default.nix +++ b/homes/aly/default.nix @@ -113,6 +113,10 @@ self: { randomWallpaper.enable = true; }; - theme.enable = true; + theme = { + enable = true; + borderRadius = 0; + darkMode = true; + }; }; }