From c136d744ded5ac16c43a24b639d2ba52099bf24b Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Thu, 10 Oct 2024 23:43:47 +0200 Subject: [PATCH] chore: format waybar files --- .../nixos/desktop/addons/waybar/config.jsonc | 404 +++++++++--------- modules/nixos/desktop/addons/waybar/style.css | 311 +++++++------- 2 files changed, 360 insertions(+), 355 deletions(-) diff --git a/modules/nixos/desktop/addons/waybar/config.jsonc b/modules/nixos/desktop/addons/waybar/config.jsonc index ae4faab..0e682df 100644 --- a/modules/nixos/desktop/addons/waybar/config.jsonc +++ b/modules/nixos/desktop/addons/waybar/config.jsonc @@ -1,205 +1,205 @@ { - "layer":"top", - "height": 42, - "position":"top", - "mod":"dock", - "margin-left":10, - "margin-right":10, - "margin-top":7, - "margin-bottom":0, - "exclusive":true, - "passthrough":false, - "gtk-layer-shell":true, - "reload_style_on_change":true, - "modules-left":[ - "custom/smallspacer", - "hyprland/workspaces", - "custom/spacer" + "layer": "top", + "height": 42, + "position": "top", + "mod": "dock", + "margin-left": 10, + "margin-right": 10, + "margin-top": 7, + "margin-bottom": 0, + "exclusive": true, + "passthrough": false, + "gtk-layer-shell": true, + "reload_style_on_change": true, + "modules-left": [ + "custom/smallspacer", + "hyprland/workspaces", + "custom/spacer" + ], + "modules-center": [ + "custom/padd", + "custom/l_end", + "custom/r_end", + "hyprland/window", + "custom/padd" + ], + "modules-right": [ + "custom/padd", + "custom/l_end", + "tray", + "custom/smallspacer", + "pulseaudio", + "pulseaudio/slider", + "memory", + "cpu", + "clock", + "custom/padd" + ], + "custom/smallspacer": { + "format": " " + }, + "memory": { + "interval": 1, + "rotate": 270, + "format": "{icon}", + "format-icons": [ + "󰝦", + "󰪞", + "󰪟", + "󰪠", + "󰪡", + "󰪢", + "󰪣", + "󰪤", + "󰪥" ], - "modules-center":[ - "custom/padd", - "custom/l_end", - "custom/r_end", - "hyprland/window", - "custom/padd" - ], - "modules-right":[ - "custom/padd", - "custom/l_end", - "tray", - "custom/smallspacer", - "pulseaudio", - "pulseaudio/slider", - "memory", - "cpu", - "clock", - "custom/padd" - ], - "custom/smallspacer":{ - "format":" " - }, - "memory":{ - "interval":1, - "rotate":270, - "format":"{icon}", - "format-icons":[ - "󰝦", - "󰪞", - "󰪟", - "󰪠", - "󰪡", - "󰪢", - "󰪣", - "󰪤", - "󰪥" - ], - "max-length":10 - }, - "cpu":{ - "interval":1, - "format":"{icon}", - "rotate":270, - "format-icons":[ - "󰝦", - "󰪞", - "󰪟", - "󰪠", - "󰪡", - "󰪢", - "󰪣", - "󰪤", - "󰪥" - ] - }, - "tray":{ - "icon-size":18, - "rotate":0, - "spacing":3 - }, - "hyprland/window":{ - "format":"{initialTitle}", - "max-length":120, - "separate-outputs":true, - "icon":false, - "icon-size":18 - }, - "custom/spacer":{ - "format":"|" - }, - "hyprland/workspaces":{ - "format":"{icon}", - "format-icons":{ - "default":"○", - "active":"", - } - }, - "wlr/workspaces":{ - "persistent-workspaces":{ - "1":[ - "DP-2" - ], - "2":[ - "HDMI-A-1" - ], - "3":[ - "DP-2" - ], - "4":[ - "HDMI-A-1" - ] - } - }, - "idle_inhibitor":{ - "format":"{icon}", - "rotate":0, - "format-icons":{ - "activated":"󰥔", - "deactivated":"" - } - }, - "clock":{ - "format":"{:%H:%M}", - "rotate":0, - "tooltip-format":"{calendar}", - "calendar":{ - "mode":"month", - "mode-mon-col":3, - "on-scroll":1, - "on-click-right":"mode", - "format":{ - "months":"{}", - "weekdays":"{}", - "today":"{}" - } - }, - "actions":{ - "on-click-right":"mode", - "on-click-forward":"tz_up", - "on-click-backward":"tz_down", - "on-scroll-up":"shift_up", - "on-scroll-down":"shift_down" - } - }, - "pulseaudio":{ - "format":" {icon}", - "rotate":0, - "format-muted":"婢", - "tooltip-format":"{icon} {desc} // {volume}%", - "scroll-step":5, - "format-icons":{ - "headphone":"", - "hands-free":"", - "headset":"", - "phone":"", - "portable":"", - "car":"", - "default":[ - "", - "", - "" - ] - } - }, - "custom/l_end":{ - "format":" ", - "interval":"once", - "tooltip":false - }, - "custom/r_end":{ - "format":" ", - "interval":"once", - "tooltip":false - }, - "custom/sl_end":{ - "format":" ", - "interval":"once", - "tooltip":false - }, - "custom/sr_end":{ - "format":" ", - "interval":"once", - "tooltip":false - }, - "custom/rl_end":{ - "format":" ", - "interval":"once", - "tooltip":false - }, - "custom/rr_end":{ - "format":" ", - "interval":"once", - "tooltip":false - }, - "custom/padd":{ - "format":" ", - "interval":"once", - "tooltip":false - }, - "pulseaudio/slider":{ - "min":5, - "max":100, - "rotate":0, - "device":"pulseaudio", - "scroll-step":1 + "max-length": 10 + }, + "cpu": { + "interval": 1, + "format": "{icon}", + "rotate": 270, + "format-icons": [ + "󰝦", + "󰪞", + "󰪟", + "󰪠", + "󰪡", + "󰪢", + "󰪣", + "󰪤", + "󰪥" + ] + }, + "tray": { + "icon-size": 18, + "rotate": 0, + "spacing": 3 + }, + "hyprland/window": { + "format": "{initialTitle}", + "max-length": 120, + "separate-outputs": true, + "icon": false, + "icon-size": 18 + }, + "custom/spacer": { + "format": "|" + }, + "hyprland/workspaces": { + "format": "{icon}", + "format-icons": { + "default": "○", + "active": "" } -} + }, + "wlr/workspaces": { + "persistent-workspaces": { + "1": [ + "DP-2" + ], + "2": [ + "HDMI-A-1" + ], + "3": [ + "DP-2" + ], + "4": [ + "HDMI-A-1" + ] + } + }, + "idle_inhibitor": { + "format": "{icon}", + "rotate": 0, + "format-icons": { + "activated": "󰥔", + "deactivated": "" + } + }, + "clock": { + "format": "{:%H:%M}", + "rotate": 0, + "tooltip-format": "{calendar}", + "calendar": { + "mode": "month", + "mode-mon-col": 3, + "on-scroll": 1, + "on-click-right": "mode", + "format": { + "months": "{}", + "weekdays": "{}", + "today": "{}" + } + }, + "actions": { + "on-click-right": "mode", + "on-click-forward": "tz_up", + "on-click-backward": "tz_down", + "on-scroll-up": "shift_up", + "on-scroll-down": "shift_down" + } + }, + "pulseaudio": { + "format": " {icon}", + "rotate": 0, + "format-muted": "婢", + "tooltip-format": "{icon} {desc} // {volume}%", + "scroll-step": 5, + "format-icons": { + "headphone": "", + "hands-free": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": [ + "", + "", + "" + ] + } + }, + "custom/l_end": { + "format": " ", + "interval": "once", + "tooltip": false + }, + "custom/r_end": { + "format": " ", + "interval": "once", + "tooltip": false + }, + "custom/sl_end": { + "format": " ", + "interval": "once", + "tooltip": false + }, + "custom/sr_end": { + "format": " ", + "interval": "once", + "tooltip": false + }, + "custom/rl_end": { + "format": " ", + "interval": "once", + "tooltip": false + }, + "custom/rr_end": { + "format": " ", + "interval": "once", + "tooltip": false + }, + "custom/padd": { + "format": " ", + "interval": "once", + "tooltip": false + }, + "pulseaudio/slider": { + "min": 5, + "max": 100, + "rotate": 0, + "device": "pulseaudio", + "scroll-step": 1 + } +} \ No newline at end of file diff --git a/modules/nixos/desktop/addons/waybar/style.css b/modules/nixos/desktop/addons/waybar/style.css index 10b624d..92e15be 100644 --- a/modules/nixos/desktop/addons/waybar/style.css +++ b/modules/nixos/desktop/addons/waybar/style.css @@ -1,199 +1,205 @@ * { - font-family: "JetBrains Mono Nerd Font"; - /*font-family: "JetBrainsMono Nerd Font";*/ - font-weight: bold; - font-size: 16px; + font-family: "JetBrains Mono Nerd Font"; + /*font-family: "JetBrainsMono Nerd Font";*/ + font-weight: bold; + font-size: 16px; } window#waybar { - background: #0F0F17; + background: #0F0F17; /* border-radius: 15px; */ - /* border: 2px solid #124323; */ -/* border: 0px solid #A1BDCE; */ - border: 3px solid rgba(255, 255, 255, 0.1); - border-radius: 10px; + /* border: 2px solid #124323; */ + /* border: 0px solid #A1BDCE; */ + border: 3px solid rgba(255, 255, 255, 0.1); + border-radius: 10px; } tooltip { - background: #171717; - color: #A1BDCE; - font-size: 13px; - border-radius: 7px; - border: 2px solid #101a24; + background: #171717; + color: #A1BDCE; + font-size: 13px; + border-radius: 7px; + border: 2px solid #101a24; - } -#workspaces{ -background: rgba(23, 23, 23, 0.0); - color: #888789; - box-shadow: none; - text-shadow: none; - border-radius: 9px; - transition: 0.2s ease; - padding-left: 4px; - padding-right: 4px; - padding-top: 1px; +} + +#workspaces { + background: rgba(23, 23, 23, 0.0); + color: #888789; + box-shadow: none; + text-shadow: none; + border-radius: 9px; + transition: 0.2s ease; + padding-left: 4px; + padding-right: 4px; + padding-top: 1px; } #workspaces button { -background: rgba(23, 23, 23, 0.0); - color: #A1BDCE; - box-shadow: none; - text-shadow: none; - border-radius: 9px; - transition: 0.2s ease; - padding-left: 4px; - padding-right: 4px; - /* animation: ws_normal 20s ease-in-out 1; */ + background: rgba(23, 23, 23, 0.0); + color: #A1BDCE; + box-shadow: none; + text-shadow: none; + border-radius: 9px; + transition: 0.2s ease; + padding-left: 4px; + padding-right: 4px; + /* animation: ws_normal 20s ease-in-out 1; */ } #workspaces button.active { /* background-image: url("/home/anik/Documents/bar1.png");*/ - color: #A1BDCE; - transition: all 0.3s ease; - padding-left: 4px; - padding-right: 4px; + color: #A1BDCE; + transition: all 0.3s ease; + padding-left: 4px; + padding-right: 4px; /* transition: all 0.4s cubic-bezier(.55,0.68,.48,1.682); */ } #workspaces button:hover { - background: none; - color: #72D792; - animation: ws_hover 20s ease-in-out 1; - transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); + background: none; + color: #72D792; + animation: ws_hover 20s ease-in-out 1; + transition: all 0.5s cubic-bezier(.55, -0.68, .48, 1.682); } #taskbar button { - box-shadow: none; - text-shadow: none; - font-size: 4px; - padding: 0px; - border-radius: 9px; - margin-bottom: 3px; - margin-left: 0px; - padding-left: 3px; - padding-right: 3px; - margin-right: 0px; - color: @wb-color; - animation: tb_normal 20s ease-in-out 1; + box-shadow: none; + text-shadow: none; + font-size: 4px; + padding: 0px; + border-radius: 9px; + margin-bottom: 3px; + margin-left: 0px; + padding-left: 3px; + padding-right: 3px; + margin-right: 0px; + color: @wb-color; + animation: tb_normal 20s ease-in-out 1; } #taskbar button.active { - background: @wb-act-bg; - color: @wb-act-color; - margin-left: 3px; - padding-left: 12px; - padding-right: 12px; - margin-right: 3px; - animation: tb_active 20s ease-in-out 1; - transition: all 0.4s cubic-bezier(.55,-0.68,.48,1.682); - min-height: 9px; + background: @wb-act-bg; + color: @wb-act-color; + margin-left: 3px; + padding-left: 12px; + padding-right: 12px; + margin-right: 3px; + animation: tb_active 20s ease-in-out 1; + transition: all 0.4s cubic-bezier(.55, -0.68, .48, 1.682); + min-height: 9px; } #taskbar button:hover { - background: @wb-hvr-bg; - color: @wb-hvr-color; - animation: tb_hover 20s ease-in-out 1; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); + background: @wb-hvr-bg; + color: @wb-hvr-color; + animation: tb_hover 20s ease-in-out 1; + transition: all 0.3s cubic-bezier(.55, -0.68, .48, 1.682); } #tray menu * { - min-height: 16px; - font-weight: bold; - font-size: 13px; - color: #9488e3; + min-height: 16px; + font-weight: bold; + font-size: 13px; + color: #9488e3; } #tray menu separator { - min-height: 10px + min-height: 10px } -#custom-spacer{ - opacity: 0.0; +#custom-spacer { + opacity: 0.0; } -#custom-smallspacer{ - opacity: 0.0; + +#custom-smallspacer { + opacity: 0.0; } #bluetooth { - color: #E6E7E7; - background: #161320; - opacity: 1; - margin: 4px 0px 4px 0px; - padding-left: 4px; - padding-right: 4px; - + color: #E6E7E7; + background: #161320; + opacity: 1; + margin: 4px 0px 4px 0px; + padding-left: 4px; + padding-right: 4px; + } -#clock{ - color: #A1BDCE; - font-size: 15px; - font-weight: 900; - font-family: "JetBrains Mono Nerd Font"; - background: rgba(23, 23, 23, 0.0); - opacity: 1; - margin: 3px 0px 0px 0px; - padding-left: 10px; - padding-right: 10px; - border: none; - +#clock { + color: #A1BDCE; + font-size: 15px; + font-weight: 900; + font-family: "JetBrains Mono Nerd Font"; + background: rgba(23, 23, 23, 0.0); + opacity: 1; + margin: 3px 0px 0px 0px; + padding-left: 10px; + padding-right: 10px; + border: none; + } -#pulseaudio{ -font-weight: normal; -font-size: 20px; -color: #6F8FDB; - background: rgba(22, 19, 32, 0.0); - opacity: 1; - margin: 0px 0px 0px 0px; - padding-left: 3px; - padding-right: 3px; +#pulseaudio { + font-weight: normal; + font-size: 20px; + color: #6F8FDB; + background: rgba(22, 19, 32, 0.0); + opacity: 1; + margin: 0px 0px 0px 0px; + padding-left: 3px; + padding-right: 3px; } -#cpu{ -font-weight: normal; -font-size: 24px; -color: #915CAF; +#cpu { + font-weight: normal; + font-size: 24px; + color: #915CAF; } -#memory{ -font-weight: normal; -font-size: 24px; -color: #E4C9AF; + +#memory { + font-weight: normal; + font-size: 24px; + color: #E4C9AF; } @keyframes blink { - to { - color: #4a4a4a; - - } + to { + color: #4a4a4a; + + } } + #tray, -#window{ -color: #A1BDCE; -font-family: "Martian Mono"; +#window { + color: #A1BDCE; + font-family: "Martian Mono"; } + #custom-l_end, #custom-r_end, #custom-sl_end, #custom-sr_end, #custom-rl_end, #upower#headset, -#upower{ -color: #a6d189; +#upower { + color: #a6d189; } + #custom-rr_end { -font-weight: normal; - color: #E8EDF0; - background: rgba(23, 23, 23, 0.0); - opacity: 1; - margin: 0px 0px 0px 0px; - padding-left: 4px; - padding-right: 4px; + font-weight: normal; + color: #E8EDF0; + background: rgba(23, 23, 23, 0.0); + opacity: 1; + margin: 0px 0px 0px 0px; + padding-left: 4px; + padding-right: 4px; ; - + } #pulseaudio-slider slider { @@ -218,51 +224,50 @@ font-weight: normal; } #taskbar { - padding: 1px; + padding: 1px; } #custom-r_end { - border-radius: 0px 7px 7px 0px; - margin-right: 1px; - padding-right: 3px; + border-radius: 0px 7px 7px 0px; + margin-right: 1px; + padding-right: 3px; } #custom-l_end { - border-radius: 7px 0px 0px 7px; - margin-left: 1px; - padding-left: 3px; + border-radius: 7px 0px 0px 7px; + margin-left: 1px; + padding-left: 3px; } #custom-sr_end { - border-radius: 0px; - margin-right: 1px; - padding-right: 3px; + border-radius: 0px; + margin-right: 1px; + padding-right: 3px; } #custom-sl_end { - border-radius: 0px; - margin-left: 1px; - padding-left: 3px; + border-radius: 0px; + margin-left: 1px; + padding-left: 3px; } #custom-rr_end { - border-radius: 0px 7px 7px 0px; - margin-right: 1px; - padding-right: 3px; + border-radius: 0px 7px 7px 0px; + margin-right: 1px; + padding-right: 3px; } #custom-rl_end { - border-radius: 7px 0px 0px 7px; - margin-left: 1px; - padding-left: 3px; + border-radius: 7px 0px 0px 7px; + margin-left: 1px; + padding-left: 3px; } /* Style for launchers */ #custom-expand { - min-width: 25px; - color: #A1BDCE; - font-size: 16px; -} - + min-width: 25px; + color: #A1BDCE; + font-size: 16px; +} \ No newline at end of file