eww: Start from sway instead of systemd

This commit is contained in:
Erwin Boskma 2023-09-06 17:00:41 +02:00
parent 3e3eaafbe4
commit 19b1ea7bcd
Signed by: erwin
SSH key fingerprint: SHA256:9LmFDe1C6jSrEyqxxvX8NtJBmcbB105XoqyUZF092bg
3 changed files with 12 additions and 18 deletions

View file

@ -113,6 +113,7 @@
(box :class "temperature" (box :class "temperature"
:space-evenly false :space-evenly false
:spacing 2 :spacing 2
:tooltip {jq(EWW_TEMPS, ". | to_entries | reduce .[] as $temp (\"\"; . + $temp.key + \": \" + ($temp.value | tostring) + \"\\n\") | {tooltip:.}").tooltip}
(label :class "icon" (label :class "icon"
:text "󰔏") :text "󰔏")
(label :text "${round(EWW_TEMPS.ZENPOWER_TDIE, 1)}°C"))) (label :text "${round(EWW_TEMPS.ZENPOWER_TDIE, 1)}°C")))

View file

@ -17,23 +17,5 @@ in
}; };
home.packages = [ cfg.package ]; home.packages = [ cfg.package ];
systemd.user.services.eww-daemon = {
Unit = {
Description = "eww";
};
Service = {
ExecStart = "${cfg.package}/bin/eww --no-daemonize daemon";
Environment = [
"PATH=${makeBinPath [ pkgs.ha-now-playing pkgs.jaq pkgs.pamedia pkgs.bash ]}:${config.home.profileDirectory}/bin"
];
};
Install = {
WantedBy = [ "default.target" ];
};
};
}; };
} }

View file

@ -14,6 +14,16 @@ with lib; let
# swaylockcmd = "${pkgs.swaylock-effects}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --clock --image ${wallpapers.qhd} --fade-in 0.5 --scaling fill"; # swaylockcmd = "${pkgs.swaylock-effects}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --clock --image ${wallpapers.qhd} --fade-in 0.5 --scaling fill";
swaylockcmd = "${pkgs.swaylock}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --image ${wallpapers.qhd} --scaling fill"; swaylockcmd = "${pkgs.swaylock}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --image ${wallpapers.qhd} --scaling fill";
rofiPower = pkgs.writeShellScriptBin "rofi-power" (builtins.readFile ./powermenu.sh); rofiPower = pkgs.writeShellScriptBin "rofi-power" (builtins.readFile ./powermenu.sh);
ewwDaemon =
let
path = lib.makeBinPath (with pkgs; [ ha-now-playing jaq pamedia bash helvum pavucontrol ]);
in
pkgs.writeShellScript "eww-daemon" ''
export PATH=${path}:''${PATH}
${config.eboskma.programs.eww.package}/bin/eww kill
${config.eboskma.programs.eww.package}/bin/eww daemon
'';
in in
{ {
options.eboskma.programs.sway.enable = mkEnableOption "Enable sway"; options.eboskma.programs.sway.enable = mkEnableOption "Enable sway";
@ -233,6 +243,7 @@ in
}; };
startup = [ startup = [
{ command = toString ewwDaemon; always = true; }
{ command = "${config.eboskma.programs.eww.package}/bin/eww open bar-home"; always = true; } { command = "${config.eboskma.programs.eww.package}/bin/eww open bar-home"; always = true; }
]; ];
}; };