new wm, hyprland gone

modules/desktop/themes/catppuccin/default.nix

@@ -45,24 +45,6 @@ in {
         size = 24;
       };
 
-      sddmTheme = {
-        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.jpg;
-          loginBackground = true;
-        });
-      };
-
-      plymouthTheme = {
-        name = "catppuccin-${variant}";
-        package = (pkgs.catppuccin-plymouth.override {
-          variant = variant;
-        });
-      };
-
       editor = {
         vscode = {
           colorTheme = {
@@ -84,21 +66,13 @@ in {
         };
       };
 
-      hyprland = {
-        source = "${inputs.hyprland-catppuccin}/themes/${variant}.conf";
-        extraConfig = ''
-          general {
-            col.active_border=''$${accent}
-            col.inactive_border=$surface0
-          }
-          decoration:shadow {
-            color=$crust
-            color_inactive=$crust
-          }
-          misc {
-            background_color=$crust
-          }
-        '';
+      niri = with colorScheme.palette; {
+        # TODO: make more dynamic
+        # catppuccin pink
+        accent = "#f5c2e7";
+        inactive = "#${base02}";
+        # catppuccin crust
+        shadow = "#11111b";
       };
 
       waybar = builtins.concatStringsSep "\n" [
@@ -113,17 +87,17 @@ in {
         barColor = "${base05}FF";
       };
 
-      rofi = ./rofi.rasi;
+      rofi = builtins.concatStringsSep "\n" [
+        "@theme \"${inputs.rofi-catppuccin}/themes/catppuccin-${variant}.rasi\""
+        "* { accent: @${accent}; }"
+        (lib.readFile ./rofi.rasi)
+      ];
+
+      fuzzel = "${inputs.fuzzel-catppuccin}/themes/catppuccin-${variant}/${accent}.ini";
 
       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

@@ -1,33 +0,0 @@
-window {
-  background: alpha(@base, 0.5);
-  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/rofi.rasi

@@ -1,13 +1,4 @@
 * {
-  bg-col: #24273a;
-  bg-col-light: #313244;
-  border-col: #363a4f;
-  selected-col: #45475a;
-  pink: #f5c2e7;
-  fg-col: #cdd6f4;
-  fg-col2: @pink;
-  grey: #bac2de;
-
   width: 450px;
 }
 
@@ -20,24 +11,25 @@ window {
   height: 500px;
   border: 1px;
   border-radius: 1em;
-  /* TODO: make more dynamic */
-  border-color: @pink;
-  background-color: @bg-col;
+  border-color: @accent;
+  background-color: @base;
 }
 
-mainbox {background-color: @bg-col;}
+mainbox {
+  background-color: @base;
+}
 
 inputbar {
   margin: 10px 5px 5px 5px;
   children: [prompt, entry];
-  background-color: @bg-col;
+  background-color: @base;
   padding: 1px;
 }
 
 prompt {
   background-color: transparent;
   padding: 1px;
-  text-color: @fg-col;
+  text-color: @text;
   border-radius: 1.5em;
 }
 
@@ -49,8 +41,8 @@ textbox-prompt-colon {
 entry {
   padding: 1px;
   margin: 0px;
-  text-color: @fg-col;
-  background-color: @bg-col;
+  text-color: @text;
+  background-color: @base;
 }
 
 listview {
@@ -58,27 +50,26 @@ listview {
   margin: 5px 0px 0px 10px;
   columns: 1;
   lines: 10;
-  background-color: @bg-col;
+  background-color: @base;
 }
 
 element {
   padding: 1px;
-  background-color: @bg-col;
-  text-color: @fg-col;
+  background-color: @base;
+  text-color: @text;
 }
 
 element-icon {size: 12px;}
 
 element.selected {
-  background-color: @selected-col;
-  text-color: @fg-col2;
+  background-color: @surface1;
+  text-color: @accent;
 }
 
-
 scrollbar {
   width:        4px ;
   border:       0;
-  handle-color: @fg-col;
+  handle-color: @text;
   handle-width: 8px ;
   padding:      0;
 }
@@ -87,13 +78,13 @@ mode-switcher {spacing: 0;}
 
 button {
   spacing: 0;
-  background-color: @bg-col-light;
-  text-color: @grey;
+  background-color: @surface0;
+  text-color: @subtext1;
   vertical-align: 0.5;
   horizontal-align: 0.5;
 }
 
 button.selected {
-  background-color: @bg-col;
-  text-color: @pink;
+  background-color: @base;
+  text-color: @accent;
 }

modules/desktop/themes/catppuccin/waybar.css

@@ -11,7 +11,8 @@ button, button:hover {
 window#waybar {
   color: @text;
   /* background: alpha(@base, 0.8); */
-  background: @base;
+  /* background: @base; */
+  background: alpha(@base, 0.9999999);
   border-radius: 1em;
   /* font-family: 'Lexica Ultralegible', 'Atkinson Hyperlegible', "Font Awesome 6 Free", "Noto Sans CJK"; */
   font-family: "CozetteVector", monospace, "FontAwesome 6 Free", "Noto Sans CJK";