File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 156156 claude-code = inputs . claude-code . packages . ${ system } . default ;
157157 codex = inputs . codex . packages . ${ system } . default ;
158158 zen-browser = inputs . zen-browser . packages . ${ system } . default ;
159- quickshell = inputs . quickshell . packages . ${ system } . default ;
160- templ = inputs . templ . packages . ${ system } . templ ;
159+ quickshell = inputs . quickshell . packages . ${ system } . default . override {
160+ libxcb = prev . libxcb ;
161+ } ;
162+ templ = inputs . templ . packages . ${ system } . templ ;
161163 neovim = inputs . neovim-nightly-overlay . packages . ${ system } . default ;
162164 } ;
163165 in {
Original file line number Diff line number Diff line change 3636 patchShebangs $out
3737 '' ;
3838
39+ end4KvantumThemes = pkgs . runCommand "end4-kvantum-themes" { } ''
40+ mkdir -p "$out/share/Kvantum"
41+ cp -r ${ dotfilesSource } /dots/.config/Kvantum/Colloid "$out/share/Kvantum/"
42+ cp -r ${ dotfilesSource } /dots/.config/Kvantum/MaterialAdw "$out/share/Kvantum/"
43+ '' ;
44+
3945 patchedHypr = pkgs . runCommand "end4-hypr-patched" {
4046 buildInputs = [
4147 pkgs . bash
104110 '' ;
105111in
106112{
113+ # Stylix/Home Manager owns ~/.config/Kvantum globally. Add end4's bundled
114+ # themes through qt.kvantum.themes instead of replacing that whole directory.
115+ qt . kvantum . themes = lib . mkAfter [ end4KvantumThemes ] ;
116+
107117 home . file = {
108118 ".local/state/quickshell/.venv/bin/activate" = {
109119 force = true ;
146156 "hypr/end4" = forcedSource patchedHypr ;
147157 "kde-material-you-colors" = forcedSource "${ dotfilesSource } /dots/.config/kde-material-you-colors" ;
148158 "kitty" = forcedSource "${ dotfilesSource } /dots/.config/kitty" ;
149- "Kvantum" = forcedSource "${ dotfilesSource } /dots/.config/Kvantum" ;
150159 "matugen" = forcedSource "${ dotfilesSource } /dots/.config/matugen" ;
151160 "mpv" = forcedSource "${ dotfilesSource } /dots/.config/mpv" ;
152161 "quickshell/ii" = forcedSource "${ patchedQuickshell } /ii" ;
Original file line number Diff line number Diff line change 11{ config , lib , ... } :
22
33{
4- config = lib . mkMerge [
5- {
6- home . sessionVariables = {
7- QT_STYLE_OVERRIDE = lib . mkForce "" ;
8- ILLOGICAL_IMPULSE_DOTFILES_SOURCE = "${ config . home . homeDirectory } /.config" ;
9- ILLOGICAL_IMPULSE_VIRTUAL_ENV = "${ config . home . homeDirectory } /.local/state/quickshell/.venv" ;
10- qsConfig = "${ config . home . homeDirectory } /.config/quickshell/ii" ;
11- } ;
12- }
13- {
14- systemd . user . sessionVariables = config . home . sessionVariables ;
15- }
16- ] ;
4+ home . sessionVariables = {
5+ QT_STYLE_OVERRIDE = lib . mkForce "" ;
6+ ILLOGICAL_IMPULSE_DOTFILES_SOURCE = "${ config . home . homeDirectory } /.config" ;
7+ ILLOGICAL_IMPULSE_VIRTUAL_ENV = "${ config . home . homeDirectory } /.local/state/quickshell/.venv" ;
8+ qsConfig = "${ config . home . homeDirectory } /.config/quickshell/ii" ;
9+ } ;
10+
11+ # HM's Qt module already manages most systemd session env on its own.
12+ # Mirror only end4-specific runtime vars here so we do not reintroduce
13+ # option conflicts by copying the whole home.sessionVariables attrset.
14+ systemd . user . sessionVariables = {
15+ QT_STYLE_OVERRIDE = lib . mkForce "" ;
16+ ILLOGICAL_IMPULSE_DOTFILES_SOURCE = "${ config . home . homeDirectory } /.config" ;
17+ ILLOGICAL_IMPULSE_VIRTUAL_ENV = "${ config . home . homeDirectory } /.local/state/quickshell/.venv" ;
18+ qsConfig = "${ config . home . homeDirectory } /.config/quickshell/ii" ;
19+ } ;
1720}
Original file line number Diff line number Diff line change 3838 ripgrep
3939 rsync
4040 slurp
41- swww
41+ awww
4242 swappy
4343 translate-shell
4444 upower
Original file line number Diff line number Diff line change 22
33let
44 system = pkgs . stdenv . hostPlatform . system ;
5- qsPackage = inputs . quickshell-end4 . packages . ${ system } . default ;
5+ qsPackage = inputs . quickshell-end4 . packages . ${ system } . default . override {
6+ xorg = pkgs . xorg // { libxcb = pkgs . libxcb ; } ;
7+ } ;
68 qtRuntime = with pkgs ; [
79 qt6 . qtbase
810 qt6 . qtdeclarative
You can’t perform that action at this time.
0 commit comments