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
+406 -405
View File
File diff suppressed because it is too large Load Diff
+26 -25
View File
@@ -1325,41 +1325,42 @@ in
This file installs and configures waybar This file installs and configures waybar
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/waybar.nix :noweb yes :mkdirp yes :eval never #+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 let
# Use the config option defaultUser directly, fallback to "henrov"
username = config.defaultUser or "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 in
{ {
# Install Waybar system-wide
environment.systemPackages = [ pkgs.waybar ]; environment.systemPackages = [ pkgs.waybar ];
home-manager.users = { home-manager.users.${username} = { config, ... }: {
${username} = { config, lib, ... }: {
home.file = { home.file = {
".config/waybar/config.jsonc".source = config.lib.file.mkOutOfStoreSymlink "${assetPath}/config.jsonc"; # --- Waybar config (REAL symlinks, not copied into store)
".config/waybar/style-dark.css".source = config.lib.file.mkOutOfStoreSymlink "${assetPath}/style-dark.css"; ".config/waybar/config.jsonc".source =
".config/scripts/bluetooth-status.sh" = { link "${waybarPath}/config.jsonc";
text = builtins.readFile "${basePath}/scripts/bluetooth-status.sh";
force = true; ".config/waybar/style-dark.css".source =
executable = true; link "${waybarPath}/style-dark.css";
};
".config/scripts/hypr-workspaces.sh" = { # --- Scripts (DO NOT use builtins.readFile here)
text = builtins.readFile "${basePath}/scripts/hypr-workspaces.sh"; ".config/scripts/bluetooth-status.sh".source =
force = true; link "${basePath}/scripts/bluetooth-status.sh";
executable = true;
}; ".config/scripts/hypr-workspaces.sh".source =
".config/scripts/hypr-workspacesmenu.sh" = { link "${basePath}/scripts/hypr-workspaces.sh";
text = builtins.readFile "${basePath}/scripts/hypr-workspacesmenu.sh";
force = true; ".config/scripts/hypr-workspacesmenu.sh".source =
executable = true; link "${basePath}/scripts/hypr-workspacesmenu.sh";
};
};
}; };
}; };
# Systemd user service for Waybar
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,40 +1,41 @@
# --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. --- # --- 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 let
# Use the config option defaultUser directly, fallback to "henrov"
username = config.defaultUser or "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 in
{ {
# Install Waybar system-wide
environment.systemPackages = [ pkgs.waybar ]; environment.systemPackages = [ pkgs.waybar ];
home-manager.users = { home-manager.users.${username} = { config, ... }: {
${username} = { config, lib, ... }: {
home.file = { home.file = {
".config/waybar/config.jsonc".source = config.lib.file.mkOutOfStoreSymlink "${assetPath}/config.jsonc"; # --- Waybar config (REAL symlinks, not copied into store)
".config/waybar/style-dark.css".source = config.lib.file.mkOutOfStoreSymlink "${assetPath}/style-dark.css"; ".config/waybar/config.jsonc".source =
".config/scripts/bluetooth-status.sh" = { link "${waybarPath}/config.jsonc";
text = builtins.readFile "${basePath}/scripts/bluetooth-status.sh";
force = true; ".config/waybar/style-dark.css".source =
executable = true; link "${waybarPath}/style-dark.css";
};
".config/scripts/hypr-workspaces.sh" = { # --- Scripts (DO NOT use builtins.readFile here)
text = builtins.readFile "${basePath}/scripts/hypr-workspaces.sh"; ".config/scripts/bluetooth-status.sh".source =
force = true; link "${basePath}/scripts/bluetooth-status.sh";
executable = true;
}; ".config/scripts/hypr-workspaces.sh".source =
".config/scripts/hypr-workspacesmenu.sh" = { link "${basePath}/scripts/hypr-workspaces.sh";
text = builtins.readFile "${basePath}/scripts/hypr-workspacesmenu.sh";
force = true; ".config/scripts/hypr-workspacesmenu.sh".source =
executable = true; link "${basePath}/scripts/hypr-workspacesmenu.sh";
};
};
}; };
}; };
# Systemd user service for Waybar
systemd.user.services.waybar = { systemd.user.services.waybar = {
description = "Waybar for Hyprland"; description = "Waybar for Hyprland";
after = [ "graphical-session.target" ]; after = [ "graphical-session.target" ];