diff --git a/configs/nixos/modules/desktop/session/mako.nix b/configs/nixos/modules/desktop/session/mako.nix index ec81c8b..d237b56 100644 --- a/configs/nixos/modules/desktop/session/mako.nix +++ b/configs/nixos/modules/desktop/session/mako.nix @@ -53,11 +53,6 @@ in registry.waybar.${config.networking.hostName}."custom/dnd" = { order = 80; - style = '' - #custom-dnd { - margin-right: 8px; - } - ''; settings = { return-type = "json"; exec = "${dndStatus}"; diff --git a/configs/nixos/modules/desktop/session/waybar.nix b/configs/nixos/modules/desktop/session/waybar.nix index 078ab91..a78c23a 100644 --- a/configs/nixos/modules/desktop/session/waybar.nix +++ b/configs/nixos/modules/desktop/session/waybar.nix @@ -7,12 +7,6 @@ }: # Waybar: a top status bar reading system state at a glance. let - registeredWaybarStyles = lib.concatStringsSep "\n" ( - lib.filter (style: style != "") (lib.mapAttrsToList (_name: module: module.style) hostWaybarModules) - ); - - hostWaybarModules = lib.attrByPath [ config.networking.hostName ] { } config.registry.waybar; - waybarModulesFor = position: map (module: module.name) ( @@ -29,6 +23,8 @@ let } ) hostWaybarModules; + hostWaybarModules = lib.attrByPath [ config.networking.hostName ] { } config.registry.waybar; + registeredWaybarModuleSettings = lib.mapAttrs (_name: module: module.settings) hostWaybarModules; networkStatus = pkgs.writeShellScript "waybar-network-status" '' @@ -79,19 +75,13 @@ in # so the bar comes up with the session and no compositor exec-once. systemd.enable = true; - style = '' - .modules-right { - margin-right: 8px; - } - '' - + registeredWaybarStyles; - settings.mainBar = lib.mkMerge [ { layer = "top"; position = "top"; height = 30; spacing = 8; + margin-right = 8; modules-left = waybarModulesFor "left"; modules-center = waybarModulesFor "center"; diff --git a/configs/nixos/registry/waybar.nix b/configs/nixos/registry/waybar.nix index 3a6beed..413f63b 100644 --- a/configs/nixos/registry/waybar.nix +++ b/configs/nixos/registry/waybar.nix @@ -19,12 +19,6 @@ description = "Sorts the module within its Waybar section."; }; - style = lib.mkOption { - type = lib.types.lines; - default = ""; - description = "Adds CSS for the Waybar module."; - }; - settings = lib.mkOption { type = lib.types.attrsOf lib.types.anything; default = { };