From a551e88fd2cf4ab114426a89be87d12975dbef80 Mon Sep 17 00:00:00 2001 From: elwrcl Date: Fri, 4 Sep 2026 00:37:41 +0300 Subject: [PATCH] desktop theme --- modules/home/home-noctalia.ulu.nix | 3 --- modules/home/niri/desktop-niri-env.ulu.nix | 6 +++--- modules/home/niri/desktop-niri-execs.ulu.nix | 15 +-------------- modules/home/niri/desktop-niri-package.ulu.nix | 8 ++++++++ modules/home/theme/home-theme-kemuri.ulu.nix | 2 +- modules/home/theme/home-theme-qt.ulu.nix | 6 ++++-- 6 files changed, 17 insertions(+), 23 deletions(-) create mode 100644 modules/home/niri/desktop-niri-package.ulu.nix diff --git a/modules/home/home-noctalia.ulu.nix b/modules/home/home-noctalia.ulu.nix index 36e1f91..e66fcb0 100644 --- a/modules/home/home-noctalia.ulu.nix +++ b/modules/home/home-noctalia.ulu.nix @@ -280,7 +280,6 @@ "tray" "group:g2" "control-center" - "pulse" ]; font_family = "CaskaydiaCove Nerd Font"; font_weight = 400; @@ -812,8 +811,6 @@ icon_spacing = 0; }; - pulse.type = "lowcache/claude-companion:pulse"; - ram.show_glyph = false; recorder = { diff --git a/modules/home/niri/desktop-niri-env.ulu.nix b/modules/home/niri/desktop-niri-env.ulu.nix index 0ba483c..e6a54a6 100644 --- a/modules/home/niri/desktop-niri-env.ulu.nix +++ b/modules/home/niri/desktop-niri-env.ulu.nix @@ -6,15 +6,15 @@ programs.niri.settings = { environment = { DISPLAY = ":0"; - XCURSOR_SIZE = "24"; TERMINAL = "ghostty"; - XCURSOR_THEME = "macOS"; GDK_BACKEND = "wayland,x11"; - QT_QPA_PLATFORMTHEME = "kde"; QT_QPA_PLATFORM = "wayland;xcb"; + # HD 4000 caps at GL 4.2; ghostty and friends ask for more. MESA_GL_VERSION_OVERRIDE = "4.6"; MESA_GLSL_VERSION_OVERRIDE = "460"; ELECTRON_OZONE_PLATFORM_HINT = "auto"; + # XCURSOR_* comes from home.pointerCursor (home-cursor). + # QT_QPA_PLATFORMTHEME comes from qt.platformTheme (home-theme-qt). }; }; }; diff --git a/modules/home/niri/desktop-niri-execs.ulu.nix b/modules/home/niri/desktop-niri-execs.ulu.nix index 999bd8e..4e501d2 100644 --- a/modules/home/niri/desktop-niri-execs.ulu.nix +++ b/modules/home/niri/desktop-niri-execs.ulu.nix @@ -5,23 +5,10 @@ { programs.niri.settings = { "prefer-no-csd" = true; + # noctalia ships its own clipboard history; no cliphist watcher needed. spawn-at-startup = [ { command = [ "noctalia" ]; } { command = [ "xwayland-satellite" ]; } - { - command = [ - "sh" - "-c" - "wl-paste --type text --watch cliphist store" - ]; - } - { - command = [ - "sh" - "-c" - "wl-paste --type image --watch cliphist store" - ]; - } ]; }; }; diff --git a/modules/home/niri/desktop-niri-package.ulu.nix b/modules/home/niri/desktop-niri-package.ulu.nix new file mode 100644 index 0000000..a304e5b --- /dev/null +++ b/modules/home/niri/desktop-niri-package.ulu.nix @@ -0,0 +1,8 @@ +{ ... }: +{ + flake.homeModules.desktop-niri-package = + { pkgs, ... }: + { + programs.niri.package = pkgs.niri; + }; +} diff --git a/modules/home/theme/home-theme-kemuri.ulu.nix b/modules/home/theme/home-theme-kemuri.ulu.nix index 33e4727..ffe060e 100644 --- a/modules/home/theme/home-theme-kemuri.ulu.nix +++ b/modules/home/theme/home-theme-kemuri.ulu.nix @@ -17,7 +17,7 @@ base07 = "fafbfe"; base08 = "cf7670"; # red / mError - base09 = "d1ba94"; # orange + base09 = "d1ba94"; # orange base0A = "bfa67a"; # yellow base0B = "8ca38a"; # green base0C = "7fa39a"; # cyan diff --git a/modules/home/theme/home-theme-qt.ulu.nix b/modules/home/theme/home-theme-qt.ulu.nix index d8c0673..48c5757 100644 --- a/modules/home/theme/home-theme-qt.ulu.nix +++ b/modules/home/theme/home-theme-qt.ulu.nix @@ -115,8 +115,10 @@ { qt = { enable = true; - platformTheme.name = "qtct"; - style.name = "qtct"; + # qt6ct, not "qtct": the latter maps to QT_QPA_PLATFORMTHEME=qt5ct, + # which Qt6 apps (dolphin, qbittorrent, ...) ignore. The widget style + # is picked in qt6ct.conf below, so no QT_STYLE_OVERRIDE here. + platformTheme.name = "qt6ct"; }; home.packages = [