Regenerated

This commit is contained in:
2026-04-27 18:42:02 +02:00
parent ebb5d5ef6b
commit 04f955242f
3 changed files with 470 additions and 467 deletions
+410 -409
View File
File diff suppressed because it is too large Load Diff
+30 -29
View File
@@ -1324,42 +1324,43 @@ in
** =generated/modules/traveldroid/desktop/waybar.nix=
This file installs and configures waybar
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/waybar.nix :noweb yes :mkdirp yes :eval never
{ lib, config, pkgs, repoPath, buildUser, mutableConfigPath,... }:
{ lib, config, pkgs, repoPath, buildUser, mutableConfigPath, ... }:
let
# Use the config option defaultUser directly, fallback to "henrov"
username = config.defaultUser or "henrov";
basePath = "${mutableConfigPath}";
assetPath = "${mutableConfigPath}/waybar";
# IMPORTANT: keep these as plain strings, not Nix paths
basePath = mutableConfigPath;
waybarPath = "${mutableConfigPath}/waybar";
# Helper to make out-of-store symlinks (clean + reusable)
link = path: config.lib.file.mkOutOfStoreSymlink path;
in
{
# Install Waybar system-wide
environment.systemPackages = [ pkgs.waybar ];
home-manager.users = {
${username} = { config, lib, ... }: {
home.file = {
".config/waybar/config.jsonc".source = config.lib.file.mkOutOfStoreSymlink "${assetPath}/config.jsonc";
".config/waybar/style-dark.css".source = config.lib.file.mkOutOfStoreSymlink "${assetPath}/style-dark.css";
".config/scripts/bluetooth-status.sh" = {
text = builtins.readFile "${basePath}/scripts/bluetooth-status.sh";
force = true;
executable = true;
};
".config/scripts/hypr-workspaces.sh" = {
text = builtins.readFile "${basePath}/scripts/hypr-workspaces.sh";
force = true;
executable = true;
};
".config/scripts/hypr-workspacesmenu.sh" = {
text = builtins.readFile "${basePath}/scripts/hypr-workspacesmenu.sh";
force = true;
executable = true;
};
};
};
};
home-manager.users.${username} = { config, ... }: {
home.file = {
# --- Waybar config (REAL symlinks, not copied into store)
".config/waybar/config.jsonc".source =
link "${waybarPath}/config.jsonc";
".config/waybar/style-dark.css".source =
link "${waybarPath}/style-dark.css";
# --- Scripts (DO NOT use builtins.readFile here)
".config/scripts/bluetooth-status.sh".source =
link "${basePath}/scripts/bluetooth-status.sh";
".config/scripts/hypr-workspaces.sh".source =
link "${basePath}/scripts/hypr-workspaces.sh";
".config/scripts/hypr-workspacesmenu.sh".source =
link "${basePath}/scripts/hypr-workspacesmenu.sh";
};
};
# Systemd user service for Waybar
systemd.user.services.waybar = {
description = "Waybar for Hyprland";
after = [ "graphical-session.target" ];
@@ -1,40 +1,41 @@
# --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. ---
{ lib, config, pkgs, repoPath, buildUser, mutableConfigPath,... }:
{ lib, config, pkgs, repoPath, buildUser, mutableConfigPath, ... }:
let
# Use the config option defaultUser directly, fallback to "henrov"
username = config.defaultUser or "henrov";
basePath = "${mutableConfigPath}";
assetPath = "${mutableConfigPath}/waybar";
# IMPORTANT: keep these as plain strings, not Nix paths
basePath = mutableConfigPath;
waybarPath = "${mutableConfigPath}/waybar";
# Helper to make out-of-store symlinks (clean + reusable)
link = path: config.lib.file.mkOutOfStoreSymlink path;
in
{
# Install Waybar system-wide
environment.systemPackages = [ pkgs.waybar ];
home-manager.users = {
${username} = { config, lib, ... }: {
home.file = {
".config/waybar/config.jsonc".source = config.lib.file.mkOutOfStoreSymlink "${assetPath}/config.jsonc";
".config/waybar/style-dark.css".source = config.lib.file.mkOutOfStoreSymlink "${assetPath}/style-dark.css";
".config/scripts/bluetooth-status.sh" = {
text = builtins.readFile "${basePath}/scripts/bluetooth-status.sh";
force = true;
executable = true;
};
".config/scripts/hypr-workspaces.sh" = {
text = builtins.readFile "${basePath}/scripts/hypr-workspaces.sh";
force = true;
executable = true;
};
".config/scripts/hypr-workspacesmenu.sh" = {
text = builtins.readFile "${basePath}/scripts/hypr-workspacesmenu.sh";
force = true;
executable = true;
};
};
};
};
home-manager.users.${username} = { config, ... }: {
home.file = {
# --- Waybar config (REAL symlinks, not copied into store)
".config/waybar/config.jsonc".source =
link "${waybarPath}/config.jsonc";
".config/waybar/style-dark.css".source =
link "${waybarPath}/style-dark.css";
# --- Scripts (DO NOT use builtins.readFile here)
".config/scripts/bluetooth-status.sh".source =
link "${basePath}/scripts/bluetooth-status.sh";
".config/scripts/hypr-workspaces.sh".source =
link "${basePath}/scripts/hypr-workspaces.sh";
".config/scripts/hypr-workspacesmenu.sh".source =
link "${basePath}/scripts/hypr-workspacesmenu.sh";
};
};
# Systemd user service for Waybar
systemd.user.services.waybar = {
description = "Waybar for Hyprland";
after = [ "graphical-session.target" ];