fix(home-manager/hyprland): import accents from file (#347)
Ensure accents are defined before user vars
Partially reverts 512306ae
This commit is contained in:
parent
bad96d3fab
commit
65f2a8a364
2 changed files with 16 additions and 6 deletions
|
@ -18,9 +18,14 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
wayland.windowManager.hyprland.settings = {
|
wayland.windowManager.hyprland.settings = {
|
||||||
source = [ "${sources.hyprland}/themes/${cfg.flavor}.conf" ];
|
source = [
|
||||||
"$accent" = "\$${cfg.accent}";
|
"${sources.hyprland}/themes/${cfg.flavor}.conf"
|
||||||
"$accentAlpha" = "\$${cfg.accent}Alpha";
|
# Define accents in file to ensure they appear before user vars
|
||||||
|
(builtins.toFile "hyprland-${cfg.accent}-accent.conf" ''
|
||||||
|
$accent = ''$${cfg.accent}
|
||||||
|
$accentAlpha = ''$${cfg.accent}Alpha
|
||||||
|
'')
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,9 +11,14 @@ in
|
||||||
|
|
||||||
config = lib.mkIf enable {
|
config = lib.mkIf enable {
|
||||||
programs.hyprlock.settings = {
|
programs.hyprlock.settings = {
|
||||||
source = [ "${sources.hyprland}/themes/${cfg.flavor}.conf" ];
|
source = [
|
||||||
"$accent" = "\$${cfg.accent}";
|
"${sources.hyprland}/themes/${cfg.flavor}.conf"
|
||||||
"$accentAlpha" = "\$${cfg.accent}Alpha";
|
# Define accents in file to ensure they appear before user vars
|
||||||
|
(builtins.toFile "hyprland-${cfg.accent}-accent.conf" ''
|
||||||
|
$accent = ''$${cfg.accent}
|
||||||
|
$accentAlpha = ''$${cfg.accent}Alpha
|
||||||
|
'')
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue