new theme

flake.nix

@@ -100,7 +100,6 @@
               ./modules/graphical/stylix.nix
               nixos-cosmic.nixosModules.default
               ./modules/graphical/cosmic.nix
-              ({ outputs, ... }: { stylix.image = ./yuyukowallpaper.png; })
             ];
           specialArgs = specialArgs // { inherit inputs outputs; };
         };

home-manager/hyprland/hyprland-settings.nix

@@ -288,6 +288,7 @@ in {
           ##"immediate, class:^(Risk.*)$"
           "stayfocused,class:(steam_app_107410)"
           "immediate, class:^tetrio-desktop$"
+          "opacity 0.85, class:thunar"
         ];
 
         exec-once = [

home-manager/hyprland/styles/notifications.css

@@ -4,8 +4,8 @@
   padding-right: 5px;
   color: @peach;
   font-weight: bold;
-  background-color: @surface0;
-  border: 2px solid @surface1;
+  background-color: @backgound;
+  border: 2px solid @border;
 }
 
 #custom-notification,
@@ -30,7 +30,7 @@
 }
 
 #pulseaudio{
-  color: @green;
+  color: @lighttext;
 }
 
 #custom-github {

home-manager/hyprland/styles/stats.css

@@ -8,10 +8,11 @@
   margin: 0 0.5em;
   padding-left: 5px;
   padding-right: 5px;
-  color: @peach;
+  /*color: @peach;*/
+  color: @text;
   font-weight: bold;
-  background-color: @surface0;
-  border: 2px solid @surface1;
+  background-color: @background;
+  border: 2px solid @border;
 }
 #battery,
 #backlight
@@ -19,12 +20,16 @@
 #memory,
 #temperature,
 #disk,
-#nvidia,
+#custom-amd-gpu,
+#custom-nvidia,
+#memory,
 #network {
+  color: @text;
   padding: 0 0.5em;
 }
 
 /* Unique colors for modules */
+/*
 #cpu {
   color: @red;
 }
@@ -46,7 +51,7 @@
 
 #custom-amd-gpu {
   color: @amdgpu-red;
-}
+} */
 
 #network.disconnected {
   background-color: #f53c3c;

home-manager/hyprland/styles/style.css

@@ -94,6 +94,7 @@ box {
 #clock {
   font-size: 16px;
   font-weight: 900;
+  color: @text;
 }
 
 #custom-separator-right,

home-manager/hyprland/styles/theme.css

@@ -4,16 +4,21 @@
 *
 */
 
-@define-color base   #24273a;
+/*@define-color base   #24273a;*/
+@define-color base   @base01;
 @define-color mantle #1e2030;
 @define-color crust  #181926;
 
-@define-color text     #cad3f5;
+/*@define-color text     #cad3f5;*/
+@define-color text @base04;
+@define-color lighttext @base05;
 @define-color subtext0 #b8c0e0;
 @define-color subtext1 #a5adcb;
 
-@define-color surface0 #363a4f;
-@define-color surface1 #494d64;
+/*@define-color surface0 #363a4f;*/
+@define-color background @base;
+/*@define-color surface1 #494d64;*/
+@define-color border @base02;
 @define-color surface2 #5b6078;
 
 @define-color overlay0 #6e738d;

home-manager/hyprland/styles/workspaces.css

@@ -4,8 +4,8 @@
   padding-right: 5px;
   color: @peach;
   font-weight: bold;
-  background-color: @surface0;
-  border: 2px solid @surface1;
+  background-color: @background;
+  border: 2px solid @border;
 }
 
 #workspaces label {
@@ -15,7 +15,7 @@
 
 #workspaces button {
   padding: 0 0.5em;
-  background-color: @surface0;
+  background-color: @background;
   color: @text;
   margin: 0.25em;
 }
@@ -25,14 +25,15 @@
   color: @overlay0;
 }
 
-#workspaces button.visible {
-  /* background-color: @surface2; */
+/*#workspaces button.visible {
+  background-color: @surface2;
   color: @blue;
-}
-
+}*/
+#workspaces button.visible, 
+#workspaces button.focused,
 #workspaces button.active {
   /* background-color: @surface2; */
-  color: @green;
+  color: @lighttext;
 }
 
 #workspaces button.urgent {

home-manager/hyprland/waybar.nix

@@ -4,7 +4,11 @@ let cfg = osConfig.custom.graphical.hyprland;
 in {
   config = let
     # styles from https://github.com/khaneliman/khanelinix/blob/8375f8cfbe5bfd87565b4dc34c9d30630c17336d/modules/home/desktop/addons/waybar/default.nix
-    theme = builtins.readFile ./styles/catppuccin.css;
+    base16 = config.stylix.base16Scheme;
+    readAndReplace = path: replace: builtins.readFile (pkgs.replaceVars path replace);
+    # base 1, 7, 0
+    #theme = readAndReplace ./styles/theme.css { BASE="#5c4133"; BORDER="#fef1de"; TEXT="#dab353";};
+    theme = builtins.readFile ./styles/theme.css;
     style = builtins.readFile ./styles/style.css;
     notificationsStyle = builtins.readFile ./styles/notifications.css;
     powerStyle = builtins.readFile ./styles/power.css;

home-manager/stylix.nix

@@ -1,5 +1,6 @@
 { osConfig, pkgs, config, lib, ... }:
 let cfg = osConfig.custom.graphical.stylix;
+  base16 = config.stylix.base16Scheme;
 in {
   config = lib.mkIf cfg.enable {
     stylix = {
@@ -7,13 +8,17 @@ in {
       targets = {
         hyprlock.enable = false;
         hyprland.enable = false;
-        waybar.enable = false;
+        waybar = {
+          enable = true;
+          addCss = false;
+        };
         gtk.flatpakSupport.enable = true; #edits ~/.themes/adw-gtk3
       };
     };
 
-    wayland.windowManager.hyprland.settings.env = lib.mkIf osConfig.custom.graphical.hyprland.enable [
-      "GTK_THEME,adw-gtk3"
-    ];
+    wayland.windowManager.hyprland.settings = lib.mkIf osConfig.custom.graphical.hyprland.enable {
+      env = ["GTK_THEME,adw-gtk3"];
+      general."col.active_border" = lib.mkForce "rgb(${base16.base07}) rgb(${base16.base04}) 45deg";
+    };
   };
 }

modules/graphical/stylix.nix

@@ -12,6 +12,7 @@ in {
     };
     override = mkOption {
       type = types.attrs;
+      #default = {};
       default = {
         base08 = "ed8796"; # red
         base09 = "f5a97f"; # peach

systems/pc/configuration.nix

@@ -83,7 +83,10 @@
       #cosmic.enable = true;
       shared.enable = true;
       basics.enable = true;
-      stylix.enable = true;
+      stylix = {
+        enable = true;
+        image = ../../tsukasa.jpg;
+      };
     };
   };
   services.ollama = {