Commit cda089f

HPCesia <me@hpcesia.com>
2025-10-11 09:15:49
feat: use catppuccin theme
1 parent b3b71c8
Changed files (4)
modules
modules/desktop/shell/niri/appearance/dms.nix
@@ -6,10 +6,12 @@
 
         dankBarTransparency = 0.95;
         dankBarWidgetTransparency = 0.85;
+        dankBarGothCornersEnabled = true;
+        dankBarSquareCorners = true;
+        dankBarSpacing = 0;
+        cornerRadius = 15;
         popupTransparency = 0.95;
 
-        cornerRadius = 10;
-
         fontScale = 1.1;
       };
       wallpaper = {
modules/desktop/shell/niri/appearance/theme.nix
@@ -1,35 +1,42 @@
 {lib, ...}: {
-  flake.modules.homeManager.niri = {pkgs, ...}: let
+  flake.modules.homeManager.niri = {
+    pkgs,
+    config,
+    ...
+  }: let
     whitesur-icon-theme = pkgs.whitesur-icon-theme.override {
       boldPanelIcons = true;
       alternativeIcons = true;
     };
   in {
-    catppuccin.kvantum.enable = false;
-
-    home.packages = [pkgs.colloid-gtk-theme];
-
     gtk = {
       enable = true;
       gtk2.enable = false;
+      theme = {
+        package = pkgs.catppuccin-gtk.override {
+          variant = config.catppuccin.flavor;
+          accents = [config.catppuccin.accent];
+        };
+        name = "catppuccin-macchiato-${config.catppuccin.accent}-standard";
+      };
       iconTheme = lib.mkForce {
         name = "WhiteSur";
         package = whitesur-icon-theme;
       };
     };
 
+    catppuccin.kvantum.apply = false;
+
     qt = {
       enable = true;
       platformTheme = {
-        name = "gtk3";
+        name = "qt6ct";
+        package = pkgs.kdePackages.qt6ct;
+      };
+      style = {
+        name = "kvantum";
+        package = pkgs.kdePackages.qtstyleplugin-kvantum;
       };
-    };
-
-    xdg.configFile = {
-      "gtk-4.0/gtk.css".enable = lib.mkForce false;
-      "gtk-3.0/gtk.css".enable = lib.mkForce false;
-      "gtk-4.0/settings.ini".enable = lib.mkForce false;
-      "gtk-3.0/settings.ini".enable = lib.mkForce false;
     };
 
     home.sessionVariables = {
modules/desktop/shell/niri/appearance/window-rules.nix
@@ -4,7 +4,7 @@
       # Corner radius for all windows
       {
         clip-to-geometry = true;
-        geometry-corner-radius = lib.genAttrs ["bottom-left" "bottom-right" "top-left" "top-right"] (_: 10.0);
+        geometry-corner-radius = lib.genAttrs ["bottom-left" "bottom-right" "top-left" "top-right"] (_: 15.0);
         tiled-state = true;
         draw-border-with-background = false;
       }
modules/desktop/shell/niri/greeter.nix
@@ -9,11 +9,10 @@
       font.size = 22;
       theme = {
         package = pkgs.catppuccin-gtk.override {
-          variant = "macchiato";
-          size = "compact";
+          variant = config.catppuccin.flavor;
           accents = [config.catppuccin.accent];
         };
-        name = "catppuccin-macchiato-${config.catppuccin.accent}-compact";
+        name = "catppuccin-macchiato-${config.catppuccin.accent}-standard";
       };
       cursorTheme = {
         package = pkgs.bibata-cursors;
@@ -21,7 +20,7 @@
       };
       settings = {
         background = {
-          path = "${inputs.wallpapers}/default_wallpaper";
+          path = "${inputs.wallpapers}/Nahida-2.png";
           fit = "Cover";
         };
       };