cnst/cnix
1
0
Fork 0
Code Issues Pull Requests Activity

hyprland uwsm hmhmhm

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/home/programs/hyprland/default.nix
View File

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

9
modules/home/programs/waybar/default.nix
View File

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

2
modules/nixos/programs/hyprland/default.nix
View File

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

44
modules/nixos/services/greetd/default.nix
View File

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