refactor: hyprland module

nixos
Moritz Böhme 2023-10-10 11:53:01 +02:00
parent 5a1853ea22
commit 9f9badff24
Signed by: moritz
GPG Key ID: 970C6E89EB0547A9
2 changed files with 3 additions and 16 deletions

View File

@ -111,10 +111,10 @@ in
} }
misc { misc {
# disable_hypr_chan = true
vrr = 1 vrr = 1
mouse_move_enables_dpms = true mouse_move_enables_dpms = true
key_press_enables_dpms = true key_press_enables_dpms = true
force_default_wallpaper = 0
} }
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more

View File

@ -55,15 +55,10 @@ in
}; };
home-manager.users.moritz = { home-manager.users.moritz = {
# import home-manager module
imports = [ inputs.hyprland.homeManagerModules.default ];
# enable home-manager module # enable home-manager module
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
package = hyprland; package = hyprland;
recommendedEnvironment = true;
extraConfig = import ./_config.nix args; extraConfig = import ./_config.nix args;
}; };
@ -133,7 +128,7 @@ in
timeout = 30 * 60; timeout = 30 * 60;
command = "${pkgs.systemd}/bin/systemctl suspend-and-hibernate"; command = "${pkgs.systemd}/bin/systemctl suspend-and-hibernate";
}; };
systemdTarget = "hyprland-session.target"; systemdTarget = "graphical-session.target";
}; };
systemd.user.services.nextcloud-client.Service = { systemd.user.services.nextcloud-client.Service = {
@ -142,19 +137,11 @@ in
}; };
}; };
# adds pam module for swaylock # adds pam module for swaylock
security.pam.services.swaylock = { }; security.pam.services.swaylock = { };
# only consider graphical-session.target started when hyprland-sesstion.target is reached
systemd.user.targets.hyprland-session = {
partOf = [ "graphical-session.target" ];
wantedBy = [ "graphical-session.target" ];
before = [ "graphical-session.target" ];
};
systemd.user.services.xdg-desktop-portal-hyprland = { systemd.user.services.xdg-desktop-portal-hyprland = {
after = [ "hyrpland-session.target" ]; after = [ "hyprland-session.target" ];
requiredBy = [ "xdg-desktop-portal.service" ]; requiredBy = [ "xdg-desktop-portal.service" ];
}; };