theme improvements

modules/desktop/themes/catppuccin/default.nix

@@ -43,13 +43,13 @@ in {
       };
 
       sddmTheme = {
-        name = "catppuccin-sddm-corners";
-        package = (pkgs.my.catppuccin-sddm-corners.override {
-          config.General = {
-            Background = ../../../../assets/lockscreen.png;
-            GeneralFontSize = toString config.modules.desktop.fonts.fonts.sansSerif.size;
-            Font = config.modules.desktop.fonts.fonts.sansSerif.family;
-          };
+        name = "catppuccin-${variant}";
+        package = (pkgs.catppuccin-sddm.override {
+          flavor = variant;
+          font = config.modules.desktop.fonts.fonts.sansSerif.family;
+          fontSize = toString config.modules.desktop.fonts.fonts.sansSerif.size;
+          background = ../../../../assets/lockscreen.png;
+          loginBackground = true;
         });
       };
 
@@ -115,6 +115,12 @@ in {
       wezterm = ''
         config.color_scheme = 'Catppuccin ${pascalCase variant}'
       '';
+
+      nwg-drawer = builtins.concatStringsSep "\n" [
+        "@import \"${inputs.waybar-catppuccin}/themes/${variant}.css\";"
+        #"@define-color accent @${accent};" # gtk already does our styling here
+        (lib.readFile ./nwg-drawer.css)
+      ];
     };
   };
 }

modules/desktop/themes/catppuccin/nwg-drawer.css

@@ -0,0 +1,33 @@
+window {
+  background: alpha(@base, 0.3);
+  color: @text;
+  font-family: 'Lexica Ultralegible', 'Atkinson Hyperlegible', "Font Awesome 6 Free", "Noto Sans CJK";
+  font-size: 13px;
+  font-style: normal;
+}
+
+/* search entry */
+entry {
+  /* we don't actually need to specify accent color here */
+  /* this is a gtk app, remember? */
+  background-color: alpha(@surface0, 0.5);
+  color: @text;
+}
+
+button, box, widget, image {
+  background: none;
+  border: none;
+  color: @text;
+  text-shadow: 0 1px alpha(@base, 0.75);
+  box-shadow: none;
+  outline: none;
+}
+
+button {
+  padding: 1em 0.5em;
+  border-radius: 1em;
+}
+
+button:hover, button:active, box:hover, box:active {
+  background: alpha(@surface0, 0.5);
+}

modules/desktop/themes/catppuccin/waybar.css

@@ -13,8 +13,8 @@ window#waybar {
   /*background: alpha(@base, 0.6);*/
   background: @base;
   border-radius: 1em;
-  /*font-family: 'Lexica Ultralegible', 'Atkinson Hyperlegible', FontAwesome, Noto Sans CJK;*/
-  font-family: CozetteVector, monospace, FontAwesome, Noto Sans CJK;
+  /* font-family: 'Lexica Ultralegible', 'Atkinson Hyperlegible', "Font Awesome 6 Free", "Noto Sans CJK"; */
+  font-family: "CozetteVector", monospace, "FontAwesome 6 Free", "Noto Sans CJK";
   font-size: 13px;
   font-style: normal;
   

modules/desktop/themes/default.nix

@@ -68,6 +68,8 @@ in {
     rofi = mkOpt (nullOr path) null;
 
     wezterm = mkOpt (nullOr str) null;
+
+    nwg-drawer = mkOpt (nullOr str) null;
   };
 
   config = mkIf (cfg.active != null) {
@@ -136,7 +138,8 @@ in {
 
     hm.programs.rofi.theme = cfg.rofi;
 
-    hm.xdg.configFile ={
+    hm.xdg.configFile = {
+      # kvantum
       "Kvantum/${cfg.kvantumTheme.name}".source = "${cfg.kvantumTheme.package}/share/Kvantum/${cfg.kvantumTheme.name}";
       "Kvantum/kvantum.kvconfig" = {
         text = ''
@@ -144,6 +147,9 @@ in {
           theme=${cfg.kvantumTheme.name}
         '';
       };
+
+      # nwg-drawer
+      "nwg-drawer/drawer.css".text = cfg.nwg-drawer;
     };
   };
 }