From c48fd66a196a3de99a23ca4d8949421f064d1c11 Mon Sep 17 00:00:00 2001 From: sefidel Date: Fri, 15 Sep 2023 16:56:11 +0900 Subject: feat(home/gui): waybar: make battery an optional module --- home/profiles/gui/config/waybar/settings.nix | 10 ++++++++-- home/profiles/gui/default.nix | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'home') diff --git a/home/profiles/gui/config/waybar/settings.nix b/home/profiles/gui/config/waybar/settings.nix index 83b5cf7..1901958 100644 --- a/home/profiles/gui/config/waybar/settings.nix +++ b/home/profiles/gui/config/waybar/settings.nix @@ -1,13 +1,19 @@ -{ neotheme }: +{ config, lib, neotheme }: with neotheme.colors; + +let + guiCfg = config.profiles.gui; +in { layer = "bottom"; position = "top"; height = 22; modules-left = [ "pulseaudio" "custom/separator" "cpu" "custom/separator" "memory" "custom/separator" "idle_inhibitor" ]; modules-center = [ "sway/workspaces" ]; - modules-right = [ "network" "custom/separator" "battery" "custom/separator" "clock" ]; + modules-right = [ "network" "custom/separator" ] + ++ lib.optionals (guiCfg.laptop.enable) [ "battery" "custom/separator" ] + ++ [ "clock" ]; "sway/workspaces" = { all-outputs = true; diff --git a/home/profiles/gui/default.nix b/home/profiles/gui/default.nix index 65d2c4a..edc1646 100644 --- a/home/profiles/gui/default.nix +++ b/home/profiles/gui/default.nix @@ -13,6 +13,9 @@ in enable = lib.mkEnableOption "The gui profile, sets up sway and related applications."; + laptop.enable = lib.mkEnableOption + "Enable laptop-specific tweaks"; + font = { name = lib.mkOption { type = lib.types.str; @@ -131,7 +134,7 @@ in waybar = { enable = config.wayland.windowManager.sway.enable; - settings = [ (import ./config/waybar/settings.nix { inherit neotheme; }) ]; + settings = [ (import ./config/waybar/settings.nix { inherit config lib neotheme; }) ]; style = import ./config/waybar/style.nix { inherit config neotheme; }; }; -- cgit 1.4.1