Regenerated
This commit is contained in:
+5
-12
@@ -815,20 +815,15 @@ This file installs and configures waybar
|
|||||||
{ lib, config, pkgs, flakeRoot, ... }:
|
{ lib, config, pkgs, flakeRoot, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
# Use the config option defaultUser directly, fallback to "henrov"
|
||||||
|
username = config.defaultUser or "henrov";
|
||||||
assetPath = "${flakeRoot}/assets/system/conf/waybar";
|
assetPath = "${flakeRoot}/assets/system/conf/waybar";
|
||||||
|
|
||||||
# Pick a normal user safely
|
|
||||||
username =
|
|
||||||
builtins.head (builtins.filter (u: config.users.users.${u}.isNormalUser != false)
|
|
||||||
(builtins.attrNames config.users.users));
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# Install Waybar globally
|
# Install Waybar system-wide
|
||||||
environment.systemPackages = [ pkgs.waybar ];
|
environment.systemPackages = [ pkgs.waybar ];
|
||||||
|
|
||||||
##############################
|
# Home Manager user definition: only define what you need
|
||||||
# Home Manager: only define the user entries we want
|
|
||||||
##############################
|
|
||||||
home-manager.users = {
|
home-manager.users = {
|
||||||
${username} = {
|
${username} = {
|
||||||
home.file = {
|
home.file = {
|
||||||
@@ -838,9 +833,7 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
##############################
|
# Systemd user service for Waybar
|
||||||
# Systemd user service
|
|
||||||
##############################
|
|
||||||
systemd.user.services.waybar = {
|
systemd.user.services.waybar = {
|
||||||
description = "Waybar for Hyprland";
|
description = "Waybar for Hyprland";
|
||||||
after = [ "graphical-session.target" ];
|
after = [ "graphical-session.target" ];
|
||||||
|
|||||||
@@ -1,20 +1,15 @@
|
|||||||
{ lib, config, pkgs, flakeRoot, ... }:
|
{ lib, config, pkgs, flakeRoot, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
# Use the config option defaultUser directly, fallback to "henrov"
|
||||||
|
username = config.defaultUser or "henrov";
|
||||||
assetPath = "${flakeRoot}/assets/system/conf/waybar";
|
assetPath = "${flakeRoot}/assets/system/conf/waybar";
|
||||||
|
|
||||||
# Pick a normal user safely
|
|
||||||
username =
|
|
||||||
builtins.head (builtins.filter (u: config.users.users.${u}.isNormalUser != false)
|
|
||||||
(builtins.attrNames config.users.users));
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# Install Waybar globally
|
# Install Waybar system-wide
|
||||||
environment.systemPackages = [ pkgs.waybar ];
|
environment.systemPackages = [ pkgs.waybar ];
|
||||||
|
|
||||||
##############################
|
# Home Manager user definition: only define what you need
|
||||||
# Home Manager: only define the user entries we want
|
|
||||||
##############################
|
|
||||||
home-manager.users = {
|
home-manager.users = {
|
||||||
${username} = {
|
${username} = {
|
||||||
home.file = {
|
home.file = {
|
||||||
@@ -24,9 +19,7 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
##############################
|
# Systemd user service for Waybar
|
||||||
# Systemd user service
|
|
||||||
##############################
|
|
||||||
systemd.user.services.waybar = {
|
systemd.user.services.waybar = {
|
||||||
description = "Waybar for Hyprland";
|
description = "Waybar for Hyprland";
|
||||||
after = [ "graphical-session.target" ];
|
after = [ "graphical-session.target" ];
|
||||||
|
|||||||
Reference in New Issue
Block a user