home/desktop: check if sway/hyprland are enabled before binding services
Some checks are pending
git-mirror / gitlab-sync (push) Waiting to run
nix-build / default-build (push) Waiting to run
nix-build / fallarbor-build (push) Waiting to run
nix-build / lavaridge-build (push) Waiting to run
nix-build / mauville-build (push) Waiting to run
nix-build / petalburg-build (push) Waiting to run
nix-build / rustboro-build (push) Waiting to run
nix-check / fmt-check (push) Waiting to run
nix-check / eval-check (push) Waiting to run

This commit is contained in:
Aly Raffauf 2024-08-12 10:17:21 -04:00
parent 8dd1e5c113
commit 6aafa8969a
7 changed files with 14 additions and 14 deletions

View file

@ -13,9 +13,9 @@ in {
};
systemd.user.services.gammastep = {
Install.WantedBy = lib.mkForce ["hyprland-session.target" "sway-session.target"];
Install.WantedBy = lib.mkForce (lib.optional (cfg.desktop.hyprland.enable) "hyprland-session.target" ++ lib.optional (cfg.desktop.sway.enable) "sway-session.target");
Service.Restart = lib.mkForce "no";
Unit.BindsTo = ["hyprland-session.target" "sway-session.target"];
Unit.BindsTo = lib.optional (cfg.desktop.hyprland.enable) "hyprland-session.target" ++ lib.optional (cfg.desktop.sway.enable) "sway-session.target";
};
};
}

View file

@ -41,7 +41,7 @@ in {
systemd.user.services.mako = {
Unit = {
After = "graphical-session.target";
BindsTo = ["hyprland-session.target" "sway-session.target"];
BindsTo = lib.optional (cfg.desktop.hyprland.enable) "hyprland-session.target" ++ lib.optional (cfg.desktop.sway.enable) "sway-session.target";
Description = "Lightweight Wayland notification daemon";
Documentation = "man:mako(1)";
PartOf = "graphical-session.target";
@ -55,7 +55,7 @@ in {
Type = "dbus";
};
Install.WantedBy = ["hyprland-session.target" "sway-session.target"];
Install.WantedBy = lib.optional (cfg.desktop.hyprland.enable) "hyprland-session.target" ++ lib.optional (cfg.desktop.sway.enable) "sway-session.target";
};
};
}

View file

@ -10,7 +10,7 @@ in {
systemd.user.services.pipewire-inhibit-idle = {
Unit = {
After = "graphical-session.target";
BindsTo = ["hyprland-session.target" "sway-session.target"];
BindsTo = lib.optional (cfg.desktop.hyprland.enable) "hyprland-session.target" ++ lib.optional (cfg.desktop.sway.enable) "sway-session.target";
Description = "inhibit idle when audio is playing with Pipewire.";
PartOf = "graphical-session.target";
};
@ -20,7 +20,7 @@ in {
Restart = "no";
};
Install.WantedBy = ["hyprland-session.target" "sway-session.target"];
Install.WantedBy = lib.optional (cfg.desktop.hyprland.enable) "hyprland-session.target" ++ lib.optional (cfg.desktop.sway.enable) "sway-session.target";
};
};
}

View file

@ -89,7 +89,7 @@ in {
systemd.user.services.randomWallpaper = {
Unit = {
After = "graphical-session.target";
BindsTo = ["hyprland-session.target" "sway-session.target"];
BindsTo = lib.optional (config.ar.home.desktop.hyprland.enable) "hyprland-session.target" ++ lib.optional (config.ar.home.desktop.sway.enable) "sway-session.target";
Description = "Lightweight swaybg-based random wallpaper daemon.";
PartOf = "graphical-session.target";
};
@ -99,7 +99,7 @@ in {
Restart = "no";
};
Install.WantedBy = ["hyprland-session.target" "sway-session.target"];
Install.WantedBy = lib.optional (config.ar.home.desktop.hyprland.enable) "hyprland-session.target" ++ lib.optional (config.ar.home.desktop.sway.enable) "sway-session.target";
};
};
}

View file

@ -59,9 +59,9 @@ in {
};
systemd.user.services.swayidle = {
Install.WantedBy = lib.mkForce ["hyprland-session.target" "sway-session.target"];
Install.WantedBy = lib.mkForce (lib.optional (cfg.desktop.hyprland.enable) "hyprland-session.target" ++ lib.optional (cfg.desktop.sway.enable) "sway-session.target");
Service.Restart = lib.mkForce "no";
Unit.BindsTo = ["hyprland-session.target" "sway-session.target"];
Unit.BindsTo = lib.optional (cfg.desktop.hyprland.enable) "hyprland-session.target" ++ lib.optional (cfg.desktop.sway.enable) "sway-session.target";
};
};
}

View file

@ -17,9 +17,9 @@ in {
};
systemd.user.services.swayosd = {
Install.WantedBy = lib.mkForce ["hyprland-session.target" "sway-session.target"];
Install.WantedBy = lib.mkForce (lib.optional (cfg.desktop.hyprland.enable) "hyprland-session.target" ++ lib.optional (cfg.desktop.sway.enable) "sway-session.target");
Service.Restart = lib.mkForce "no";
Unit.BindsTo = ["hyprland-session.target" "sway-session.target"];
Unit.BindsTo = lib.optional (cfg.desktop.hyprland.enable) "hyprland-session.target" ++ lib.optional (cfg.desktop.sway.enable) "sway-session.target";
};
xdg.configFile."swayosd/style.css" = {

View file

@ -356,9 +356,9 @@ in {
};
systemd.user.services.waybar = {
Install.WantedBy = lib.mkForce ["hyprland-session.target" "sway-session.target"];
Install.WantedBy = lib.mkForce (lib.optional (cfg.desktop.hyprland.enable) "hyprland-session.target" ++ lib.optional (cfg.desktop.sway.enable) "sway-session.target");
Service.Restart = lib.mkForce "no";
Unit.BindsTo = ["hyprland-session.target" "sway-session.target"];
Unit.BindsTo = lib.optional (cfg.desktop.hyprland.enable) "hyprland-session.target" ++ lib.optional (cfg.desktop.sway.enable) "sway-session.target";
};
xdg.configFile."nwg-drawer/drawer.css".text = ''