diff --git a/home/modules/defaultDesktopPack.nix b/home/modules/defaultDesktopPack.nix index 6e84fab..a6021e5 100644 --- a/home/modules/defaultDesktopPack.nix +++ b/home/modules/defaultDesktopPack.nix @@ -9,6 +9,10 @@ with lib; let in { options.local.defaultDesktopPack = { enable = mkEnableOption "common desktop programs and services"; + laptop = mkOption { + type = types.bool; + default = false; + }; }; config = mkIf cfg.enable { home.packages = with pkgs; [ diff --git a/home/modules/gui/waybar.nix b/home/modules/gui/waybar.nix index 7112b41..e7ed2aa 100644 --- a/home/modules/gui/waybar.nix +++ b/home/modules/gui/waybar.nix @@ -6,7 +6,7 @@ }: with lib; let cfg = config.local.gui; - laptop = config.trivium.laptop.enable; + laptop = config.local.defaultDesktopPack.laptop; in { config = mkIf cfg.enable { programs.waybar = { @@ -26,20 +26,22 @@ in { "clock" ]; - modules-right = [ - "privacy" - "cpu" - "memory" - "disk" - "temperature" - "keyboard-state" - "tray" - ] ++ lists.optionals laptop [ - "battery" - ]; + modules-right = + [ + "privacy" + "cpu" + "memory" + "disk" + "temperature" + "keyboard-state" + "tray" + ] + ++ lists.optionals laptop [ + "battery" + ]; "battery" = mkIf laptop { - format = "{capacity}% {icon}"; - format-icons = ["" "" "" "" ""]; + format = "{capacity}% {icon}"; + format-icons = ["" "" "" "" ""]; }; "keyboard-state" = { numlock = true; diff --git a/home/platforms/fabian@t14/default.nix b/home/platforms/fabian@t14/default.nix index f0ae36c..09472d7 100644 --- a/home/platforms/fabian@t14/default.nix +++ b/home/platforms/fabian@t14/default.nix @@ -11,7 +11,10 @@ ]; local = { - defaultDesktopPack.enable = true; + defaultDesktopPack = { + enable = true; + laptop = true; + }; services = { gpg.defaultKey = "7206D8EE2474F3DF18EA876F0EC1691FF8C1A81F";