From 8794a99af42a11da93a51a1bfebaea5d5d8f6738 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Fri, 21 Jun 2024 20:10:43 -0400 Subject: [PATCH] home: config.alyraffauf.theme.enable follows config.alyraffauf.desktop.enable --- homeManagerModules/options.nix | 7 +++-- homes/aly.nix | 55 ---------------------------------- homes/dustin.nix | 1 - homes/morgan.nix | 1 - 4 files changed, 5 insertions(+), 59 deletions(-) diff --git a/homeManagerModules/options.nix b/homeManagerModules/options.nix index 60a22577..5133dd42 100644 --- a/homeManagerModules/options.nix +++ b/homeManagerModules/options.nix @@ -291,8 +291,11 @@ }; }; theme = { - enable = - lib.mkEnableOption "GTK and Qt themes."; + enable = lib.mkOption { + description = "Gtk, Qt, and application colors."; + default = config.alyraffauf.desktop.enable; + type = lib.types.bool; + }; gtk = { name = lib.mkOption { description = "GTK theme name."; diff --git a/homes/aly.nix b/homes/aly.nix index b3893645..a1c757af 100644 --- a/homes/aly.nix +++ b/homes/aly.nix @@ -164,61 +164,6 @@ }; theme = { - enable = true; - - gtk = { - name = "Catppuccin-Frappe-Compact-Mauve-Dark"; - package = pkgs.catppuccin-gtk.override { - accents = ["mauve"]; - size = "compact"; - variant = "frappe"; - tweaks = ["normal"]; - }; - }; - - qt = { - name = "Catppuccin-Frappe-Mauve"; - package = pkgs.catppuccin-kvantum.override { - accent = "Mauve"; - variant = "Frappe"; - }; - }; - - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.catppuccin-papirus-folders.override { - flavor = "frappe"; - accent = "mauve"; - }; - }; - - cursorTheme = { - name = "Catppuccin-Frappe-Dark-Cursors"; - size = 24; - package = pkgs.catppuccin-cursors.frappeDark; - }; - - font = { - name = "NotoSans Nerd Font"; - size = 11; - package = pkgs.nerdfonts.override {fonts = ["Noto"];}; - }; - - terminalFont = { - name = "NotoSansM Nerd Font"; - size = 11; - package = pkgs.nerdfonts.override {fonts = ["Noto"];}; - }; - - colors = { - text = "#FAFAFA"; - background = "#232634"; - primary = "#CA9EE6"; - secondary = "#99D1DB"; - inactive = "#626880"; - shadow = "#1A1A1A"; - }; - wallpaper = "${config.xdg.dataHome}/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg"; }; }; diff --git a/homes/dustin.nix b/homes/dustin.nix index b5c6b521..f0e9bb72 100644 --- a/homes/dustin.nix +++ b/homes/dustin.nix @@ -47,7 +47,6 @@ }; }; theme = { - enable = true; gtk = { name = "Catppuccin-Frappe-Compact-Mauve-Dark"; package = pkgs.catppuccin-gtk.override { diff --git a/homes/morgan.nix b/homes/morgan.nix index c9458bb9..6dc891ac 100644 --- a/homes/morgan.nix +++ b/homes/morgan.nix @@ -40,7 +40,6 @@ }; defaultApps.enable = true; theme = { - enable = true; gtk = { name = "Catppuccin-Frappe-Compact-Mauve-Dark"; package = pkgs.catppuccin-gtk.override {