From 048edc3aa14b8844c93dc207348d5798aca0f95a Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Tue, 21 May 2024 22:03:09 +0200 Subject: [PATCH] feat: move waybar to hyprland --- home-manager-modules/waybar/default.nix | 55 ++++++++++++++++++++----- 1 file changed, 45 insertions(+), 10 deletions(-) diff --git a/home-manager-modules/waybar/default.nix b/home-manager-modules/waybar/default.nix index 54e04c8..b57d139 100644 --- a/home-manager-modules/waybar/default.nix +++ b/home-manager-modules/waybar/default.nix @@ -1,4 +1,9 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: let cfg = config.luj.programs.waybar; in @@ -6,9 +11,7 @@ with lib; { options.luj.programs.waybar = { enable = mkEnableOption "Enable waybar"; - interfaceName = mkOption { - type = lib.types.str; - }; + interfaceName = mkOption { type = lib.types.str; }; }; config = mkIf cfg.enable { @@ -18,14 +21,21 @@ with lib; settings = { mainBar = { layer = "top"; - modules-left = [ "custom/nixos" "sway/workspaces" ]; + modules-left = [ + "custom/nixos" + "hyprland/workspaces" + ]; modules-center = [ "clock" ]; - modules-right = [ "custom/mails" "network" "battery" ]; + modules-right = [ + "custom/mails" + "network" + "battery" + ]; "custom/nixos" = { format = " ❄ "; tooltip = false; }; - "sway/workspaces" = { + "hyprland/workspaces" = { format = "{name}"; tooltip = false; all-outputs = true; @@ -34,7 +44,17 @@ with lib; "backlight" = { device = "intel_backlight"; format = "{icon} {percent}%"; - format-icons = [ "" "" "" "" "" "" "" "" "" ]; + format-icons = [ + "" + "" + "" + "" + "" + "" + "" + "" + "" + ]; }; "pulseaudio" = { format = "{icon} {volume}%"; @@ -42,7 +62,16 @@ with lib; tooltip = false; format-icons = { headphone = ""; - default = [ "" "" "󰕾" "󰕾" "󰕾" "" "" "" ]; + default = [ + "" + "" + "󰕾" + "󰕾" + "󰕾" + "" + "" + "" + ]; }; scroll-step = 1; }; @@ -63,7 +92,13 @@ with lib; }; "battery" = { format = "{icon} {capacity}%"; - format-icons = [ "" "" "" "" "" ]; + format-icons = [ + "" + "" + "" + "" + "" + ]; format-charging = " {capacity}%"; tooltip = false; };