From fed1fe96e271d357e017fd555bca2be899d456ad Mon Sep 17 00:00:00 2001 From: serenity-F Date: Fri, 29 Nov 2024 23:44:37 +1000 Subject: [PATCH] trying to fix GTK/QT themeing ... again --- home/desktop/default.nix | 151 ++++++++++++++++++--------------------- 1 file changed, 71 insertions(+), 80 deletions(-) diff --git a/home/desktop/default.nix b/home/desktop/default.nix index e22cd02..a901a64 100755 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -1,27 +1,27 @@ -{ pkgs, ... }: +{ config, pkgs, lib, ... }: { imports = [ - ## Import misc desktop files - #./xdg-mime.nix - ./gtk-qt.nix - ../scripts + ## Import misc desktop files + #./xdg-mime.nix + #./gtk-qt.nix + ../scripts - ## Import common desktop configs - ./hyprcursor.nix - ./hyprlock.nix - ./hypridle.nix - ./udiskie.nix - ./wlogout.nix - ./waybar.nix - ./dunst.nix - ./wofi.nix - - ## Import individual desktop configs - #./sway - ./hypr + ## Import common desktop configs + ./hyprcursor.nix + ./hyprlock.nix + ./hypridle.nix + ./udiskie.nix + ./wlogout.nix + ./waybar.nix + ./dunst.nix + ./wofi.nix + + ## Import individual desktop configs + #./sway + ./hypr ]; @@ -30,36 +30,35 @@ enable = false; xdgOpenUsePortal = false; config = { - common."org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ]; + common."org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ]; common.default = [ "gtk" "gnome" ]; - #sway.default = [ "gtk" "gnome" ]; + #sway.default = [ "gtk" "gnome" ]; hyprland.default = [ "hyprland" "gtk" "gnome" ]; }; configPackages = with pkgs; [ - #xdg-desktop-portal - #xdg-desktop-portal-wlr + #xdg-desktop-portal + #xdg-desktop-portal-wlr xdg-desktop-portal-gtk xdg-desktop-portal-gnome xdg-desktop-portal-hyprland ]; extraPortals = with pkgs; [ - #xdg-desktop-portal - #xdg-desktop-portal-wlr + #xdg-desktop-portal + #xdg-desktop-portal-wlr xdg-desktop-portal-gtk xdg-desktop-portal-gnome xdg-desktop-portal-hyprland ]; }; - #userDirs = { - #extraConfig = { - #XDG_FLAKE_DIR = "${config.home.homeDirectory}/flakes/nixdots"; - #XDG_SYNC_DIR = "${config.home.homeDirectory}/Sync"; - #}; - #}; + #userDirs = { + #extraConfig = { + #XDG_FLAKE_DIR = "${config.home.homeDirectory}/flakes/nixdots"; + #XDG_SYNC_DIR = "${config.home.homeDirectory}/Sync"; + #}; + #}; }; - programs = { - }; + programs = { }; services = { ## Daemon for easyeffects @@ -75,61 +74,53 @@ }; }; - # qt = { - # enable = true; - # platformTheme.name = "Adwaita-dark"; - # style = { - # name = "Adwaita-dark"; - # package = pkgs.adwaita-qt; - # }; - # }; + qt = { + enable = true; + platformTheme.name = "Adwaita-dark"; + style = { + name = "Adwaita-dark"; + package = pkgs.adwaita-qt; + }; + }; - #gtk = { - #enable = true; - #theme = { - #name = "Adwaita-dark"; - #package = pkgs.gnome-themes-extra; - #}; - #font = { - #name = config.theme.font; - #size = 10; - #}; - #iconTheme = { - #package = pkgs.flat-remix-icon-theme; - #name = "Flat-Remix-Grey-Darkest"; - #}; - #gtk3.extraConfig = { - #settings = '' - #gtk-application-prefer-dark-theme=1 - #''; - #}; - #gtk4.extraConfig = { - #Settings = '' - #gtk-application-prefer-dark-theme=1 - #''; - #}; - #}; + gtk = { + enable = true; + theme = lib.mkForce { + name = "Adwaita-dark"; + package = pkgs.gnome-themes-extra; + }; + font = { + name = "${config.theme.font}"; + size = 10; + }; + iconTheme = { + package = pkgs.flat-remix-icon-theme; + name = "Flat-Remix-Grey-Darkest"; + }; + gtk3.extraConfig = { gtk-application-prefer-dark-theme = 1; }; + gtk4.extraConfig = { gtk-application-prefer-dark-theme = 1; }; + }; #dconf = { - #enable = true; - #settings = { - # "org/gnome/desktop/interface" = { - # gtk-theme = "Adwaita-dark"; - # color-scheme = "prefer-dark"; - # }; - #}; + #enable = true; + #settings = { + # "org/gnome/desktop/interface" = { + # gtk-theme = "Adwaita-dark"; + # color-scheme = "prefer-dark"; + # }; + #}; #}; home = { - #pointerCursor = { - #gtk.enable = true; - #package = pkgs.bibata-cursors; - #name = "Bibata-Modern-Classic"; - #size = 12; - #}; + #pointerCursor = { + #gtk.enable = true; + #package = pkgs.bibata-cursors; + #name = "Bibata-Modern-Classic"; + #size = 12; + #}; - #sessionVariables.GTK_THEME = "Adwaita-dark"; + sessionVariables.GTK_THEME = "Adwaita-dark"; packages = with pkgs; [ ## auth/security @@ -187,7 +178,7 @@ libsForQt5.qt5ct libnotify libva - #gitwatch + #gitwatch ]; };