henrov/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Regenerated

Browse Source
This commit is contained in:
Henro Veijer
2026-03-25 21:18:47 +00:00
parent 969dc8bf73
commit f6aad59f10
2 changed files with 17 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droidnix/README.org
+9 -42
View File
@@ -812,60 +812,27 @@ in
** =generated/modules/traveldroid/desktop/waybar.nix= ** =generated/modules/traveldroid/desktop/waybar.nix=
This file installs and configures waybar This file installs and configures waybar
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/waybar.nix :noweb tangle :mkdirp yes :eval never-html #+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/waybar.nix :noweb tangle :mkdirp yes :eval never-html
{ lib, config, pkgs, flakeRoot, home-manager, ... }: { lib, config, pkgs, ... }:
let let
# Path to Waybar assets username = config.defaultUser or "henrov";
assetPath = "${flakeRoot}/assets/system/conf/waybar"; assetPath = ../../../assets/system/conf/waybar;
# Determine the username safely
username =
builtins.head (builtins.filter (u: config.users.users.${u}.isNormalUser != false)
(builtins.attrNames config.users.users));
# Compute the Home Manager user map safely
hmUser = config.home-manager.users.${username} or {};
in in
{ {
############################## # Install Waybar globally
# System-wide Waybar package
##############################
environment.systemPackages = [ pkgs.waybar ]; environment.systemPackages = [ pkgs.waybar ];
############################## # Contribute to the existing Home Manager users map safely
# Home Manager Waybar config
##############################
home-manager.users = lib.recursiveUpdate config.home-manager.users { home-manager.users = lib.recursiveUpdate config.home-manager.users {
${username} = lib.recursiveUpdate hmUser { ${username} = {
home.file = lib.recursiveUpdate (hmUser.home.file or {}) { home.file = lib.recursiveUpdate (config.home-manager.users.${username}.home.file or {}) {
".config/waybar/config" = { source = "${assetPath}/config"; }; ".config/waybar/config" = { source = "${assetPath}/config"; };
".config/waybar/style.css" = { source = "${assetPath}/style.css"; }; ".config/waybar/style.css" = { source = "${assetPath}/style.css"; };
}; };
}; };
}; };
/*
##############################
# Optional: Systemd --user service for Waybar
##############################
systemd.user.services.waybar = {
description = "Waybar for Hyprland";
after = [ "graphical-session.target" ];
serviceConfig = {
ExecStart = "${pkgs.waybar}/bin/waybar";
Restart = "always";
# Use the runtime dir provided by systemd, avoids null/UID issues
Environment = ''
WAYLAND_DISPLAY=${config.environment.sessionVariables.WAYLAND_DISPLAY or "wayland-0"}
XDG_CURRENT_DESKTOP=Hyprland
'';
};
wantedBy = [ "default.target" ];
};
*/
} }
#+END_SRC #+END_SRC
** =generated/modules/traveldroid/desktop/wayland.nix= ** =generated/modules/traveldroid/desktop/wayland.nix=
Droidnix/generated/modules/traveldroid/desktop/waybar.nix
+8 -42
View File
@@ -1,54 +1,20 @@
{ lib, config, pkgs, flakeRoot, home-manager, ... }: { lib, config, pkgs, ... }:
let let
# Path to Waybar assets username = config.defaultUser or "henrov";
assetPath = "${flakeRoot}/assets/system/conf/waybar"; assetPath = ../../../assets/system/conf/waybar;
# Determine the username safely
username =
builtins.head (builtins.filter (u: config.users.users.${u}.isNormalUser != false)
(builtins.attrNames config.users.users));
# Compute the Home Manager user map safely
hmUser = config.home-manager.users.${username} or {};
in in
{ {
############################## # Install Waybar globally
# System-wide Waybar package
##############################
environment.systemPackages = [ pkgs.waybar ]; environment.systemPackages = [ pkgs.waybar ];
############################## # Contribute to the existing Home Manager users map safely
# Home Manager Waybar config
##############################
home-manager.users = lib.recursiveUpdate config.home-manager.users { home-manager.users = lib.recursiveUpdate config.home-manager.users {
${username} = lib.recursiveUpdate hmUser { ${username} = {
home.file = lib.recursiveUpdate (hmUser.home.file or {}) { home.file = lib.recursiveUpdate (config.home-manager.users.${username}.home.file or {}) {
".config/waybar/config" = { source = "${assetPath}/config"; }; ".config/waybar/config" = { source = "${assetPath}/config"; };
".config/waybar/style.css" = { source = "${assetPath}/style.css"; }; ".config/waybar/style.css" = { source = "${assetPath}/style.css"; };
}; };
}; };
}; };
/*
##############################
# Optional: Systemd --user service for Waybar
##############################
systemd.user.services.waybar = {
description = "Waybar for Hyprland";
after = [ "graphical-session.target" ];
serviceConfig = {
ExecStart = "${pkgs.waybar}/bin/waybar";
Restart = "always";
# Use the runtime dir provided by systemd, avoids null/UID issues
Environment = ''
WAYLAND_DISPLAY=${config.environment.sessionVariables.WAYLAND_DISPLAY or "wayland-0"}
XDG_CURRENT_DESKTOP=Hyprland
'';
};
wantedBy = [ "default.target" ];
};
*/
} }