makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

l themes: fix startup, add xresources

Browse source
This commit is contained in:
lassulus 2022-05-10 18:57:57 +02:00
parent 376b92c877
commit c4888bf3ff
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lass/2configs/themes.nix
View file

@ -12,6 +12,7 @@
${pkgs.rsync}/bin/rsync --chown=lass:users -a --delete "/etc/themes/$1/" /var/theme/config/ ${pkgs.rsync}/bin/rsync --chown=lass:users -a --delete "/etc/themes/$1/" /var/theme/config/
echo "$1" > /var/theme/current_theme echo "$1" > /var/theme/current_theme
${pkgs.coreutils}/bin/chown lass:users /var/theme/current_theme ${pkgs.coreutils}/bin/chown lass:users /var/theme/current_theme
${pkgs.xorg.xrdb}/bin/xrdb -merge /var/theme/config/xresources
${pkgs.procps}/bin/pkill -HUP xsettingsd ${pkgs.procps}/bin/pkill -HUP xsettingsd
else else
echo "theme $1 not found" echo "theme $1 not found"
@ -26,6 +27,8 @@ in {
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.xsettingsd}/bin/xsettingsd -c /var/theme/config/xsettings.conf"; ExecStart = "${pkgs.xsettingsd}/bin/xsettingsd -c /var/theme/config/xsettings.conf";
User = "lass"; User = "lass";
Restart = "always";
RestartSec = "15s";
}; };
}; };
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
@ -38,11 +41,20 @@ in {
"themes/light/xsettings.conf".text = '' "themes/light/xsettings.conf".text = ''
Net/ThemeName "Adwaita" Net/ThemeName "Adwaita"
''; '';
"themes/light/xresources".text = ''
*background: #ffffff
*foreground: #000000
'';
"themes/dark/xsettings.conf".text = '' "themes/dark/xsettings.conf".text = ''
Net/ThemeName "Adwaita-dark" Net/ThemeName "Adwaita-dark"
''; '';
"themes/dark/xresources".text = ''
*background: #000000
*foreground: #ffffff
'';
}; };
system.activationScripts.theme.text = '' system.activationScripts.theme.text = ''
export DISPLAY=:0
if test -e /var/theme/current_theme; then if test -e /var/theme/current_theme; then
${switch-theme}/bin/switch-theme "$(cat /var/theme/current_theme)" || ${switch-theme}/bin/switch-theme "$(cat /var/theme/current_theme)" ||
${switch-theme}/bin/switch-theme dark ${switch-theme}/bin/switch-theme dark