hyprland uwsm hmhmhm

This commit is contained in:
cnst
2024-11-26 04:58:20 +01:00
parent 4f73565411
commit 556df7d169
4 changed files with 52 additions and 43 deletions

View File

@@ -44,7 +44,5 @@ in {
];
};
};
systemd.user.targets.tray.Unit.Requires = lib.mkForce ["graphical-session.target"];
};
}

View File

@@ -11,13 +11,16 @@ in {
home.programs.waybar.enable = mkEnableOption "Enables waybar";
};
config = mkIf cfg.enable {
systemd.user.services.waybar = {
Unit.StartLimitBurst = 30;
};
programs.waybar = {
enable = true;
package = pkgs.waybar;
systemd.enable = true;
};
systemd.user.services.waybar = {
Unit.After = ["graphical-session.target"];
Service.Slice = ["app-graphical.slice"];
Unit.StartLimitBurst = 30;
};
};
}

View File

@@ -16,7 +16,7 @@ in {
};
config = mkIf cfg.enable {
security.pam.services.hyprlock.text = "auth include login";
programs.hyprland.withUWSM = {
programs.hyprland = {
enable = true;
package = inputs.hyprland.packages.${pkgs.system}.default;
portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;

View File

@@ -23,45 +23,53 @@ in {
};
};
config = mkIf cfg.enable (mkMerge [
{
services.greetd = let
session = {
command = "${lib.getExe config.programs.uwsm.package} start hyprland-uwsm.desktop";
user = cfg.user;
};
in {
enable = true;
settings = {
terminal.vt = 1;
default_session = session;
initial_session = session;
};
config = mkIf cfg.enable {
services.greetd = let
session = {
command = "${lib.getExe config.programs.uwsm.package} start hyprland-uwsm.desktop";
user = cfg.user;
};
}
in {
enable = true;
settings = {
terminal.vt = 1;
default_session = session;
initial_session = session;
};
};
(mkIf (host == "cnix" || host == "cnixpad") {
programs.uwsm = {
enable = true;
waylandCompositors.hyprland = {
binPath = "/etc/profiles/per-user/cnst/bin/Hyprland";
prettyName = "Hyprland";
comment = "Hyprland managed by UWSM";
};
programs.uwsm = {
enable = true;
waylandCompositors.hyprland = {
binPath = "/run/current-system/sw/bin/Hyprland";
prettyName = "Hyprland";
comment = "Hyprland managed by UWSM";
};
})
};
(mkIf (host == "toothpc") {
programs.uwsm = {
enable = true;
waylandCompositors.hyprland = {
binPath = "/etc/profiles/per-user/toothpick/bin/Hyprland";
prettyName = "Hyprland";
comment = "Hyprland managed by UWSM";
};
};
})
# Apply GnomeKeyring PAM Service based on user configuration
# security.pam.services.greetd.enableGnomeKeyring = cfg.gnomeKeyring.enable;
]);
# (mkIf (host == "cnix" || host == "cnixpad") {
# programs.uwsm = {
# enable = true;
# waylandCompositors.hyprland = {
# binPath = "/etc/profiles/per-user/cnst/bin/Hyprland";
# prettyName = "Hyprland";
# comment = "Hyprland managed by UWSM";
# };
# };
# })
# (mkIf (host == "toothpc") {
# programs.uwsm = {
# enable = true;
# waylandCompositors.hyprland = {
# binPath = "/etc/profiles/per-user/toothpick/bin/Hyprland";
# prettyName = "Hyprland";
# comment = "Hyprland managed by UWSM";
# };
# };
# })
# # Apply GnomeKeyring PAM Service based on user configuration
# # security.pam.services.greetd.enableGnomeKeyring = cfg.gnomeKeyring.enable;
# ]);
};
}