working on waybar

This commit is contained in:
2026-03-11 19:54:54 +01:00
parent 47895c3562
commit d6736ab99d
3 changed files with 405 additions and 434 deletions
+363 -373
View File
File diff suppressed because it is too large Load Diff
+21 -31
View File
@@ -888,43 +888,33 @@ This file installs and configures waybar
{ lib, pkgs, config, ... }:
let
cfg = config.programs.waybar;
waybar-config = builtins.readFile ./assets/system/conf/config;
waybar-style = builtins.readFile ./assets/system/conf/style.css;
waybar-config = ./assets/system/conf/config;
waybar-style = ./assets/system/conf/style.css;
in
{
options.programs.waybar = {
enable = lib.mkEnableOption "Waybar";
package = lib.mkOption {
type = lib.types.package;
default = pkgs.waybar;
description = "Waybar package to use.";
programs.waybar = {
enable = true;
package = pkgs.waybar;
};
systemd.user.services.waybar = {
description = "Waybar (status bar for Wayland)";
wantedBy = [ "graphical-session.target" ];
after = [ "graphical-session.target" ];
serviceConfig = {
ExecStart = "${config.programs.waybar.package}/bin/waybar -c ${waybar-config} -s ${waybar-style}";
Restart = "on-failure";
RestartSec = "5s";
};
};
config = lib.mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
systemd.user.services.waybar = {
description = "Waybar (status bar for Wayland)";
wantedBy = [ "graphical-session.target" ];
after = [ "graphical-session.target" ];
serviceConfig = {
ExecStart = "${cfg.package}/bin/waybar -c ${./assets/system/conf/config} -s ${./assets/system/conf/style.css}";
Restart = "on-failure";
RestartSec = "5s";
};
};
# Create symlinks for config and style
system.activationScripts.waybarSetup = lib.mkAfter ''
mkdir -p /home/${config.users.users.${config.nixpkgs.config.permittedUsers[0]}.name}/.config/waybar
ln -sf ${./assets/system/conf/config} /home/${config.users.users.${config.nixpkgs.config.permittedUsers[0]}.name}/.config/waybar/config
ln -sf ${./assets/system/conf/style.css} /home/${config.users.users.${config.nixpkgs.config.permittedUsers[0]}.name}/.config/waybar/style.css
'';
};
# Create symlinks for config and style
system.activationScripts.waybarSetup = lib.mkAfter ''
mkdir -p /home/${config.users.users.${config.nixpkgs.config.permittedUsers[0]}.name}/.config/waybar
ln -sf ${waybar-config} /home/${config.users.users.${config.nixpkgs.config.permittedUsers[0]}.name}/.config/waybar/config
ln -sf ${waybar-style} /home/${config.users.users.${config.nixpkgs.config.permittedUsers[0]}.name}/.config/waybar/style.css
'';
}
#+END_SRC
** =generated/system/core/login-tuigreeter.nix=
+21 -30
View File
@@ -1,39 +1,30 @@
{ lib, pkgs, config, ... }:
let
cfg = config.programs.waybar;
waybar-config = builtins.readFile ./assets/system/conf/config;
waybar-style = builtins.readFile ./assets/system/conf/style.css;
waybar-config = ./assets/system/conf/config;
waybar-style = ./assets/system/conf/style.css;
in
{
options.programs.waybar = {
enable = lib.mkEnableOption "Waybar";
package = lib.mkOption {
type = lib.types.package;
default = pkgs.waybar;
description = "Waybar package to use.";
programs.waybar = {
enable = true;
package = pkgs.waybar;
};
systemd.user.services.waybar = {
description = "Waybar (status bar for Wayland)";
wantedBy = [ "graphical-session.target" ];
after = [ "graphical-session.target" ];
serviceConfig = {
ExecStart = "${config.programs.waybar.package}/bin/waybar -c ${waybar-config} -s ${waybar-style}";
Restart = "on-failure";
RestartSec = "5s";
};
};
config = lib.mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
systemd.user.services.waybar = {
description = "Waybar (status bar for Wayland)";
wantedBy = [ "graphical-session.target" ];
after = [ "graphical-session.target" ];
serviceConfig = {
ExecStart = "${cfg.package}/bin/waybar -c ${./assets/system/conf/config} -s ${./assets/system/conf/style.css}";
Restart = "on-failure";
RestartSec = "5s";
};
};
# Create symlinks for config and style
system.activationScripts.waybarSetup = lib.mkAfter ''
mkdir -p /home/${config.users.users.${config.nixpkgs.config.permittedUsers[0]}.name}/.config/waybar
ln -sf ${./assets/system/conf/config} /home/${config.users.users.${config.nixpkgs.config.permittedUsers[0]}.name}/.config/waybar/config
ln -sf ${./assets/system/conf/style.css} /home/${config.users.users.${config.nixpkgs.config.permittedUsers[0]}.name}/.config/waybar/style.css
'';
};
# Create symlinks for config and style
system.activationScripts.waybarSetup = lib.mkAfter ''
mkdir -p /home/${config.users.users.${config.nixpkgs.config.permittedUsers[0]}.name}/.config/waybar
ln -sf ${waybar-config} /home/${config.users.users.${config.nixpkgs.config.permittedUsers[0]}.name}/.config/waybar/config
ln -sf ${waybar-style} /home/${config.users.users.${config.nixpkgs.config.permittedUsers[0]}.name}/.config/waybar/style.css
'';
}