Regenerated
This commit is contained in:
+7
-8
@@ -817,17 +817,16 @@ This file installs and configures waybar
|
||||
let
|
||||
waybarPath = "${pkgs.waybar}/bin/waybar";
|
||||
|
||||
# Pick the first normal (non-system) user automatically
|
||||
normalUsers = builtins.filter (u: config.users.users.${u}.isNormalUser != false) (builtins.attrNames config.users.users);
|
||||
# Pick the first normal user
|
||||
normalUsers = builtins.filter (u: (config.users.users.${u}.isNormalUser or false) != false) (builtins.attrNames config.users.users);
|
||||
myUser = if normalUsers == [] then builtins.head (builtins.attrNames config.users.users) else builtins.head normalUsers;
|
||||
|
||||
# Compute UID safely
|
||||
myUid = config.users.users.${myUser}.uid;
|
||||
in
|
||||
{
|
||||
# Install Waybar in the system
|
||||
environment.systemPackages = [
|
||||
pkgs.waybar
|
||||
];
|
||||
environment.systemPackages = [ pkgs.waybar ];
|
||||
|
||||
# User systemd service for Waybar
|
||||
systemd.user.services.waybar = {
|
||||
description = "Waybar for Hyprland";
|
||||
after = [ "graphical-session.target" ];
|
||||
@@ -838,7 +837,7 @@ in
|
||||
Environment = ''
|
||||
WAYLAND_DISPLAY=${config.environment.sessionVariables.WAYLAND_DISPLAY or "wayland-0"}
|
||||
XDG_CURRENT_DESKTOP=Hyprland
|
||||
XDG_RUNTIME_DIR=/run/user/${config.users.users.${myUser}.uid}
|
||||
XDG_RUNTIME_DIR=/run/user/${myUid}
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@@ -3,17 +3,16 @@
|
||||
let
|
||||
waybarPath = "${pkgs.waybar}/bin/waybar";
|
||||
|
||||
# Pick the first normal (non-system) user automatically
|
||||
normalUsers = builtins.filter (u: config.users.users.${u}.isNormalUser != false) (builtins.attrNames config.users.users);
|
||||
# Pick the first normal user
|
||||
normalUsers = builtins.filter (u: (config.users.users.${u}.isNormalUser or false) != false) (builtins.attrNames config.users.users);
|
||||
myUser = if normalUsers == [] then builtins.head (builtins.attrNames config.users.users) else builtins.head normalUsers;
|
||||
|
||||
# Compute UID safely
|
||||
myUid = config.users.users.${myUser}.uid;
|
||||
in
|
||||
{
|
||||
# Install Waybar in the system
|
||||
environment.systemPackages = [
|
||||
pkgs.waybar
|
||||
];
|
||||
environment.systemPackages = [ pkgs.waybar ];
|
||||
|
||||
# User systemd service for Waybar
|
||||
systemd.user.services.waybar = {
|
||||
description = "Waybar for Hyprland";
|
||||
after = [ "graphical-session.target" ];
|
||||
@@ -24,7 +23,7 @@ in
|
||||
Environment = ''
|
||||
WAYLAND_DISPLAY=${config.environment.sessionVariables.WAYLAND_DISPLAY or "wayland-0"}
|
||||
XDG_CURRENT_DESKTOP=Hyprland
|
||||
XDG_RUNTIME_DIR=/run/user/${config.users.users.${myUser}.uid}
|
||||
XDG_RUNTIME_DIR=/run/user/${myUid}
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user