clean up qt stuff and tofi stuff

1 files changed, 18 insertions, 33 deletions

diff --git a/modules/desktop/nixos/qt.nix b/modules/desktop/nixos/qt.nix
index f65e361..5f5c630 100644
--- a/modules/desktop/nixos/qt.nix
+++ b/modules/desktop/nixos/qt.nix
@@ -4,28 +4,31 @@
   config,
   ...
 }: let
-  isCatppuccin = config.collinux.theme == "catppuccin";
-  useQtDesktop = config.collinux.desktop.wm.sway.enable || config.collinux.desktop.wm.niri.enable;
+  cfg = config.collinux.desktop.qt;
+  isCatppuccin = cfg.theme == "catppuccin";
 in
-  lib.mkIf useQtDesktop {
+  lib.mkIf cfg.enable {
     qt = {
       enable = true;
       platformTheme = "kde";
       style = "kvantum";
     };
 
-    environment.systemPackages = lib.optionals isCatppuccin [
-      pkgs.papirus-icon-theme
-      (pkgs.catppuccin-kde.override {
-        flavour = ["mocha"];
-        accents = ["blue"];
-        winDecStyles = ["modern"];
-      })
-      (pkgs.catppuccin-kvantum.override {
-        variant = "mocha";
-        accent = "blue";
-      })
-    ];
+    environment.systemPackages =
+      [
+        pkgs.papirus-icon-theme
+      ]
+      ++ lib.optionals isCatppuccin [
+        (pkgs.catppuccin-kde.override {
+          flavour = ["mocha"];
+          accents = ["blue"];
+          winDecStyles = ["modern"];
+        })
+        (pkgs.catppuccin-kvantum.override {
+          variant = "mocha";
+          accent = "blue";
+        })
+      ];
 
     environment.pathsToLink = lib.optionals isCatppuccin [
       "/share/color-schemes"
@@ -53,22 +56,4 @@ in
         "KDE_COLOR_SCHEME=CatppuccinMochaBlue"
       ];
     };
-
-    hjem.users."${config.collinux.user.name}".xdg.config.files = lib.optionalAttrs isCatppuccin {
-      "Kvantum/kvantum.kvconfig".text = ''
-        [General]
-        theme=catppuccin-mocha-blue
-      '';
-
-      "kdeglobals".text = ''
-        [General]
-        ColorScheme=CatppuccinMochaBlue
-
-        [Icons]
-        Theme=Papirus
-
-        [KDE]
-        widgetStyle=kvantum
-      '';
-    };
   }