Adapting theme.css

Droidnix/README.org

@@ -93,7 +93,7 @@ This directory contains configurations specific to Hyprland.
 
 ** First Setup
 1. Clone this repository.
-2. Run the setup script: =./setup_droidnix.sh=.
+2. Run the setup script: =./setup_droid=.
 3. Edit =.assets/system/conf/base.conf= to choose your window manager (=wm = "hyprland"= or =wm = "mangowc"=).
 4. Tangle this Org file to generate Nix configurations: =C-c C-v t= in Emacs or use this: =emacs README.org --batch -f org-babel-tangle && emacs --batch --eval "(setq org-html-htmlize-output-type nil)" README.org -f org-html-export-to-html=
 5. Build and switch: =sudo nixos-rebuild switch --flake .#<hostname>=.
@@ -155,6 +155,10 @@ The Nix flake definition for Droidnix.
       url = "github:catppuccin/nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    stylix = {
+          url = "github:nix-community/stylix";
+          inputs.nixpkgs.follows = "nixpkgs";
+        };
     emacs-overlay = {
       url = "github:nix-community/emacs-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -175,6 +179,7 @@ outputs =
     catppuccin,
     zen-browser,
     hyprland,
+    stylix,
     ...
   }:
   let
@@ -195,8 +200,6 @@ outputs =
         modules = [
           # Import machine-specific configurations
           ./generated/out_of_tree/machines/traveldroid/top.nix
-          # Catppuccin theme module
-          catppuccin.nixosModules.catppuccin
           # Anchoring all the other nixes
           ./generated/top.nix
           # Home Manager module
@@ -204,6 +207,7 @@ outputs =
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
+
             home-manager.extraSpecialArgs = { inherit user inputs flakeRoot; };
           }
         ];
@@ -330,13 +334,16 @@ This is the top of the machine hierarchy
 
 {
   imports = [
+    ./../../core/nix.nix
+    ./../../core/stylix.nix
+    ./../../core/gtk.nix
+    ./../../core/terminal.nix
     ./boot.nix
     ./hardware-configuration.nix
     ./machine.nix
     ./dbus.nix
     ./audio.nix
     ./xdg.nix
-    ./session.nix
     ./networking.nix
     inputs.home-manager.nixosModules.home-manager
   ];
@@ -465,7 +472,7 @@ This is the top if the machine hierarchy
       home = user.homeDirectory;
     };
     # Optional: Enable auto-login for testing
-    services.getty.autologinUser = user.username;
+    #services.getty.autologinUser = user.username;
   };
 }
 #+END_SRC
@@ -531,31 +538,6 @@ This sets the networking.
 }
 #+END_SRC
 
-** =generated/out_of_tree/machines/traveldroid/session.nix=
-This sets the session variables
-#+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/session.nix :noweb tangle :mkdirp yes :eval never-html
-{ config, pkgs, user, ... }:
-{
-  environment.sessionVariables = {
-    XDG_SESSION_TYPE = "wayland";
-    XDG_CURRENT_DESKTOP = "Hyprland";
-    XCURSOR_SIZE = "24";
-    GTK_ENABLE_DARK_MODE = "1";
-    GTK_THEME = "Catppuccin-Mocha-Standard-Blue-Dark";
-    GTK_ICON_THEME = "Papirus-Dark";
-    # Use this instead of GTK_APPLICATION_PREFER_DARK_THEME for newer GTK apps:
-    GTK_THEME_VARIANT = "dark";
-    # For Qt apps (if any):
-    QT_STYLE_OVERRIDE = "gtk2";
-    # For Zen Browser (Firefox fork):
-    MOZ_ENABLE_WAYLAND = "1";
-    GSETTINGS_SCHEMA_DIR = "${pkgs.gsettings-desktop-schemas}/share/glib-2.0/schemas";
-  };
-
-    # Add other session-wide variables here (e.g., QT_QPA_PLATFORM, SDL_VIDEODRIVER)
-}
-#+END_SRC
-
 ** =generated/out_of_tree/machines/traveldroid/bluetooth.nix=
 This sets the bluetooth implementation
 #+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/bluetooth.nix :noweb tangle :mkdirp yes :eval never-html
@@ -606,6 +588,7 @@ This sets audiosystem for this machine
 }
 #+END_SRC
 
+
 ** =generated/out_of_tree/machines/traveldroid/xdg.nix=
 This sets the XDG implementation
 #+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/xdg.nix :noweb tangle :mkdirp yes :eval never-html
@@ -616,9 +599,79 @@ This sets the XDG implementation
     config.system.default = [ "hyprland" "gtk" ];
   };
 }
-
 #+END_SRC
 
+** =generated/out_of_tree/core/stylix.nix=
+This sets the stylix implementation
+#+BEGIN_SRC nix :tangle generated/out_of_tree/core/stylix.nix :noweb tangle :mkdirp yes :eval never-html
+{ config, pkgs, inputs, flakeRoot, ... }:
+
+let
+  _ = builtins.trace ("Stylix enable = " + toString config.stylix.enable) null;
+in
+{
+  imports = [
+    inputs.stylix.nixosModules.stylix
+  ];
+
+  environment.systemPackages = with pkgs; [
+      feh      # wallpaper target
+      #gtk3     # GTK target
+     # gtk4     # GTK target
+      st       # NVF / terminal target, or kitty
+    ];
+
+  stylix = {
+    enable = true;
+    base16Scheme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
+    polarity = "dark";
+  };
+}
+#+END_SRC
+
+** =generated/out_of_tree/core/gtk.nix=
+Sets theming for GTK
+#+BEGIN_SRC nix :tangle generated/out_of_tree/core/gtk.nix :noweb tangle :mkdirp yes :eval never-html
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+      # feh      # wallpaper target
+      gtk3     # GTK target
+      gtk4     # GTK target
+      #st       # NVF / terminal target, or kitty
+    ];
+  # Stylix GTK target
+  stylix.targets.gtk.enable = true;
+}
+#+END_SRC
+
+** =generated/out_of_tree/core/terminal.nix=
+Sets theming for the terminal
+#+BEGIN_SRC nix :tangle generated/out_of_tree/core/terminal.nix :noweb tangle :mkdirp yes :eval never-html
+{ config, pkgs, ... }:
+
+{
+  # Example for terminal (NVF = Neovim/terminal flavor)
+  stylix.targets.nvf.enable = true;
+  # Optional: feh wallpaper integration
+  stylix.targets.feh.enable = true;
+}
+#+END_SRC
+
+** =generated/out_of_tree/core/nix.nix=
+I use the [[https://catppuccin.com/][Catppuccin]] almost everywhere. The nix module integrates almost automatically everywhere (except gtk).
+You'll notice the color values in multiple places outside this as well.
+#+BEGIN_SRC nix :tangle generated/out_of_tree/core/nix.nix :noweb tangle :mkdirp yes :eval never-html
+{ config, pkgs, ... }:
+{
+  nix.settings = {
+    extra-experimental-features = [ "nix-command" "flakes" ];
+  };
+}
+#+END_SRC
+
+
 * Now we reach the top of the hierarchy which will call all other imports
 
 ** =generated/top.nix=
@@ -824,26 +877,13 @@ This is top file of this level which contains just an import statement for all r
 ** =generated/system/applications/browsing/zen-browser.nix=
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 #+BEGIN_SRC nix :tangle generated/system/applications/browsing/zen-browser.nix :noweb tangle :mkdirp yes :eval never-html
-{ inputs, pkgs, ... }:
-
+{ config, lib, pkgs, flakeRoot, inputs, ... }:
+let
+zenBrowser = inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default;
+in
 {
-  imports = [
-    inputs.zen-browser.homeManagerModules.default
-  ];
-
-  home-manager = {
-    packages = [
-      inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default
-    ];
-
-    sessionVariables = {
-      GTK_THEME = "Catppuccin-GTK-Grey-Dark-Compact";
-      GTK_ICON_THEME = "Papirus-Dark";
-      GTK_ENABLE_DARK_MODE = "1";
-    };
-  };
+    environment.systemPackages =  [zenBrowser];
 }
-
 #+END_SRC
 
 ** =generated/system/applications/packages.nix=
@@ -1019,7 +1059,6 @@ This is top file of this level which contains just an import statement for all r
     ./login-tuigreeter.nix
     #./login-lightdm.nix
     ./fonts.nix
-    ./gtk.nix
   ];
 }
 #+END_SRC
@@ -1053,7 +1092,6 @@ You'll notice the color values in multiple places outside this as well.
 }
 #+END_SRC
 
-
 ** =generated/system/core/fonts.nix=
 This file installs and configures fonts
 #+BEGIN_SRC nix :tangle generated/system/core/fonts.nix :noweb tangle :mkdirp yes :eval never-html

Droidnix/assets/hyprland/conf/hypr/hyprland.conf

@@ -1,5 +1,5 @@
 source = ./variables.conf
-source = ./theming.conf
+source = ./theme.css
 source = ./animations.conf
 source = ./bindings.conf
 # source = ./behaviour.conf

Droidnix/assets/hyprland/conf/hypr/theme.css

@@ -1,7 +1,7 @@
 # Catppuccin Mocha for Hyprland
 # Colors (match your variables.conf or override here)
 $base = #1e1e2e
-$inactive = rgba(595959aa)
+$inactive = rgba(89, 89, 89, 0.67)
 $mantle = #181825
 $crust = #11111b
 $surface0 = #313244
@@ -32,30 +32,37 @@ $rosewater = #f5e0dc
 general {
     gaps_in = 2
     gaps_out = 4
-    border_size = 2
+    border_size = 4
     col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
     col.inactive_border = $inactive
     layout = scrolling
     resize_on_border = true
-    extend_border_grab_area = 20 # Makes it easier to "grab" the edge
+    extend_border_grab_area = 20
 }
 
 decoration {
-    rounding = 6
+    rounding = 8
+    shadow_enabled = true       # replaces drop_shadow
+    shadow_offset = 10          # replaces shadow_range
+    shadow_strength = 0.3       # replaces shadow_render_power; adjust 0–1
 }
 
 # Input fields (e.g., Hyprctl menus)
 input_field {
+    # Optional: set input field background, border, text
 }
 
 # Hyprbar (if used)
 hyprbar {
+    # Optional: set bar colors
 }
 
 # Hyprlock (if used)
 hyprlock {
+    # Optional: set lock screen colors
 }
 
 # Hypridle (if used)
 hypridle {
+    # Optional: set idle screen colors
 }

Droidnix/assets/hyprland/themes/Catppuccin-Mocha-Standard-Blue-Dark/Catppuccin-Mocha-Standard-Blue-Dark-hdpi/xfwm4/themerc

@@ -0,0 +1,23 @@
+button_offset=9
+button_spacing=0
+
+show_app_icon=false
+
+full_width_title=true
+
+title_shadow_active=false
+title_shadow_inactive=false
+
+title_horizontal_offset=3
+
+active_text_color=#afafaf
+active_text_shadow_color=#252525
+
+inactive_text_color=#808080
+inactive_text_shadow_color=#252525
+
+shadow_delta_height=2
+shadow_delta_width=0
+shadow_delta_x=0
+shadow_delta_y=-5
+shadow_opacity=40