Modules/Hyprland: Ensure hypr-utils only start on hyprland session
This commit is contained in:
@ -13,6 +13,7 @@ builtins.concatLists [
|
|||||||
|
|
||||||
"hyprctl setcursor ${config.home.pointerCursor.name} ${builtins.toString config.home.pointerCursor.size}"
|
"hyprctl setcursor ${config.home.pointerCursor.name} ${builtins.toString config.home.pointerCursor.size}"
|
||||||
"hyprsunset --identity"
|
"hyprsunset --identity"
|
||||||
|
"hyprpanel"
|
||||||
|
|
||||||
# HACK: Hyprland doesn't set the xwayland/x11 keymap correctly
|
# HACK: Hyprland doesn't set the xwayland/x11 keymap correctly
|
||||||
"setxkbmap -layout ${hyprland.keyboard.layout} -variant ${hyprland.keyboard.variant} -option ${hyprland.keyboard.option} -model pc104"
|
"setxkbmap -layout ${hyprland.keyboard.layout} -variant ${hyprland.keyboard.variant} -option ${hyprland.keyboard.option} -model pc104"
|
||||||
|
|||||||
@ -113,20 +113,6 @@ in {
|
|||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
hyprlock = import ./hyprlock.nix {inherit config hyprland color;};
|
hyprlock = import ./hyprlock.nix {inherit config hyprland color;};
|
||||||
|
|
||||||
# TODO: IMV shouldn't be part of the hyprland module
|
|
||||||
imv = {
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
options = {
|
|
||||||
background = "${color.hex.base}";
|
|
||||||
overlay = true;
|
|
||||||
overlay_font = "${color.font}:12";
|
|
||||||
overlay_background_color = "${color.hex.accent}";
|
|
||||||
overlay_text_color = "${color.hex.accentText}";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
@ -136,6 +122,16 @@ in {
|
|||||||
hyprpaper = import ./hyprpaper.nix {inherit config hyprland color;};
|
hyprpaper = import ./hyprpaper.nix {inherit config hyprland color;};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Make sure the units only start when using Hyprland
|
||||||
|
systemd.user.services.dunst.Unit.After = lib.mkIf hyprland.dunst.enable (lib.mkForce ["hyprland-session.target"]);
|
||||||
|
systemd.user.services.dunst.Unit.PartOf = lib.mkIf hyprland.dunst.enable (lib.mkForce ["hyprland-session.target"]);
|
||||||
|
systemd.user.services.hypridle.Install.WantedBy = lib.mkForce ["hyprland-session.target"];
|
||||||
|
systemd.user.services.hypridle.Unit.After = lib.mkForce ["hyprland-session.target"];
|
||||||
|
systemd.user.services.hypridle.Unit.PartOf = lib.mkForce ["hyprland-session.target"];
|
||||||
|
systemd.user.services.hyprpaper.Install.WantedBy = lib.mkForce ["hyprland-session.target"];
|
||||||
|
systemd.user.services.hyprpaper.Unit.After = lib.mkForce ["hyprland-session.target"];
|
||||||
|
systemd.user.services.hyprpaper.Unit.PartOf = lib.mkForce ["hyprland-session.target"];
|
||||||
|
|
||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
|
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
|
||||||
|
|||||||
@ -13,7 +13,7 @@ in {
|
|||||||
config = lib.mkIf hyprpanel.enable {
|
config = lib.mkIf hyprpanel.enable {
|
||||||
programs.hyprpanel = {
|
programs.hyprpanel = {
|
||||||
enable = true;
|
enable = true;
|
||||||
systemd.enable = true;
|
systemd.enable = false;
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
#
|
#
|
||||||
|
|||||||
Reference in New Issue
Block a user