diff --git a/Droidnix/README.org b/Droidnix/README.org index 91d8ea87f..f6325ec59 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -800,14 +800,23 @@ in # Home Manager: Hyprland-specific configurations home-manager.users.${user.username} = { # Use config.home-manager.users.${user.username} instead of userConfig - home.stateVersion = config.home-manager.users.${user.username}.stateVersion or "23.11"; # Default fallback + home.stateVersion = config.home-manager.users.${user.username}.stateVersion or "25.11"; # Default fallback home.username = user.username; # Use the 'user' argument home.homeDirectory = config.home-manager.users.${user.username}.homeDirectory or "/home/${user.username}"; - wayland.windowManager.hyprland = { enable = true; - }; + shell = { + enable = true; + # Example: Set colors to match Catppuccin Mocha + colors = { + background = "#1e1e2e"; # base + foreground = "#cdd6f4"; # text + cursor = "#f5e0dc"; # rosewater + # Add more colors as needed (see Catppuccin Mocha palette) + }; + }; + }; # Ensure the Hyprland config directory exists xdg.configFile = { @@ -1052,6 +1061,7 @@ This is top file of this level which contains just an import statement for all r ./waybar.nix ./login-tuigreeter.nix #./login-lightdm.nix + ./gtk.nix ]; # .. put any code here } @@ -1164,7 +1174,7 @@ settings = { #+END_SRC ** =generated/system/core/wayland.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 +This file sets up wayland #+BEGIN_SRC nix :tangle generated/system/core/wayland.nix :noweb tangle :mkdirp yes :eval never-html { config, pkgs, lib, user, ... }: { @@ -1180,6 +1190,48 @@ This is top file of this level which contains just an import statement for all r } #+END_SRC +** =generated/system/core/gtk.nix= +This file installs and configures eww +#+BEGIN_SRC nix :tangle generated/system/core/gtk.nix :noweb tangle :mkdirp yes :eval never-html +{ config, pkgs, ... }: + +{ + # Enable GTK and Qt theming + programs.gtk.enable = true; + programs.qt.enable = true; + + # Set a dark GTK theme (e.g., Adwaita-dark) + environment.systemPackages = with pkgs; [ + adwaita-icon-theme + ]; + + # GTK settings + gtk = { + enable = true; + theme = { + name = "Adwaita-dark"; + iconTheme = { + name = "Adwaita"; + package = adwaita-icon-theme; + }; + }; + }; + + # Qt settings + environment.sessionVariables = { + QT_STYLE_OVERRIDE = "gtk2"; + QT_QPA_PLATFORMTHEME = "gtk2"; + GTK_THEME = "Adwaita:dark"; + }; + + # For Qt5/Qt6 apps + environment.etc."xdg/qt5ct/qss/qt5ct.qss".text = '' + /* Set dark palette for Qt5 apps */ + @import "dark"; + ''; +} +#+END_SRC + ** =generated/system/development/top.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/development/top.nix :noweb tangle :mkdirp yes :eval never-html