From a318f13bd01d211fa76846fcf1bae4be04937540 Mon Sep 17 00:00:00 2001 From: Mohammad Rafiq Date: Sun, 1 Jun 2025 18:22:23 +0800 Subject: [PATCH] feat(homeModules/desktop): add status-bar --- modules/home/desktop/status-bar/default.nix | 16 ++++++++++++++++ .../desktop/windowManager/hyprland/default.nix | 1 + modules/nixos/desktop/default.nix | 1 + systems/x86_64-linux/nemesis/default.nix | 1 + 4 files changed, 19 insertions(+) create mode 100644 modules/home/desktop/status-bar/default.nix diff --git a/modules/home/desktop/status-bar/default.nix b/modules/home/desktop/status-bar/default.nix new file mode 100644 index 0000000..4049b01 --- /dev/null +++ b/modules/home/desktop/status-bar/default.nix @@ -0,0 +1,16 @@ +{ + config, + lib, + osConfig, + ... +}: +{ + config = lib.mkMerge [ + (lib.mkIf (osConfig.desktop.status-bar == "waybar") { + home.sessionVariables.STATUS_BAR = "waybar"; + programs.waybar = { + enable = true; + }; + }) + ]; +} diff --git a/modules/home/desktop/windowManager/hyprland/default.nix b/modules/home/desktop/windowManager/hyprland/default.nix index 5bdfb58..2057dc8 100644 --- a/modules/home/desktop/windowManager/hyprland/default.nix +++ b/modules/home/desktop/windowManager/hyprland/default.nix @@ -24,6 +24,7 @@ in exec-once = [ "uwsm app -- $LOCKSCREEN" "uwsm app -- $NOTIFICATION_DAEMON" + "uwsm app -- $STATUS_BAR" ]; xwayland.force_zero_scaling = true; } diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index ca06889..c719aa0 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -22,6 +22,7 @@ terminal = lib.pantheon.mkStrOption; notification-daemon = lib.pantheon.mkStrOption; launcher = lib.pantheon.mkStrOption; + status-bar = lib.pantheon.mkStrOption; enableSpotifyd = lib.mkEnableOption ""; enableSteam = lib.mkEnableOption ""; enableVR = lib.mkEnableOption ""; diff --git a/systems/x86_64-linux/nemesis/default.nix b/systems/x86_64-linux/nemesis/default.nix index d3e353f..67a5164 100644 --- a/systems/x86_64-linux/nemesis/default.nix +++ b/systems/x86_64-linux/nemesis/default.nix @@ -25,6 +25,7 @@ lockscreen = "hyprlock"; notification-daemon = "mako"; launcher = "fuzzel"; + status-bar = "waybar"; mainMonitor = { id = "desc:OOO AN-270W04K"; scale = "2";