dotfiles

commit 10c7e4770bbddb0582572eec9773419e0f9a8ed9
parent e873384003ec9d639f6ac4fdd8065a00ae4adc2c
Author: maydayv7 <maydayv7@gmail.com>
Date:   Tue, 10 Sep 2024 19:34:40 +0530

fix: Update to latest `stylix`

Diffstat:

2 files changed, 16 insertions(+), 31 deletions(-)
diff --git a/modules/gui/gtk.nix b/modules/gui/gtk.nix
@@ -5,7 +5,7 @@
   files,
   ...
 }: let
-  inherit (lib) mkEnableOption mkIf mkOption types;
+  inherit (lib) mkEnableOption mkForce mkIf mkOption types;
   cfg = config.gui.gtk;
 in {
   options.gui.gtk = {
@@ -52,7 +52,7 @@ in {
         dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
         gtk = {
           enable = true;
-          inherit (cfg) theme;
+          theme = mkForce cfg.theme;
           iconTheme = config.gui.icons;
           cursorTheme = config.gui.cursors;
           gtk3.extraConfig.gtk-application-prefer-dark-theme = 1;
diff --git a/modules/gui/theme.nix b/modules/gui/theme.nix
@@ -10,7 +10,6 @@
   cfg = config.gui;
   enable = !(cfg.desktop == "" || hasSuffix "-minimal" cfg.desktop);
   exists = app: builtins.elem app config.apps.list;
-  shell = config.shell.utilities;
 in {
   imports = [inputs.stylix.nixosModules.stylix];
 
@@ -62,37 +61,23 @@ in {
     environment.systemPackages =
       [stylix.cursor.package]
       ++ optionals enable [cfg.icons.package cfg.cursors.package];
-    stylix =
-      {
-        autoEnable = false;
-        image = cfg.wallpaper;
-        cursor = cfg.cursors;
-      }
-      // (
-        if (!enable)
-        then {
-          homeManagerIntegration.autoImport = false;
-        }
-        else {
-          homeManagerIntegration.autoImport = true;
-          polarity = "dark";
-          opacity = {
-            popups = 0.9;
-            terminal = 0.9;
-          };
 
-          targets = {
-            console.enable = true;
-            kmscon.enable = true;
-            plymouth.enable = false;
-          };
-        }
-      );
+    stylix = {
+      inherit enable;
+      autoEnable = true;
+      image = cfg.wallpaper;
+      cursor = cfg.cursors;
+      polarity = "dark";
+      opacity = {
+        popups = 0.9;
+        terminal = 0.9;
+      };
+
+      homeManagerIntegration.autoImport = true;
+      targets.plymouth.enable = false;
+    };
 
     user.homeConfig.stylix.targets = {
-      bat.enable = mkIf shell true;
-      btop.enable = mkIf shell true;
-      yazi.enable = mkIf shell true;
       firefox.enable = false;
       vscode.enable = mkIf (exists "vscode") false;
     };