From e2ada7099205ca1ffc8fa1046c5675008d8033ff Mon Sep 17 00:00:00 2001 From: specCon18 Date: Thu, 31 Aug 2023 03:32:13 -0400 Subject: [PATCH] fixed waybar writing new config --- modules/home-manager/style.css | 65 +++--------- modules/home-manager/waybar.nix | 168 ++++++++++++-------------------- 2 files changed, 79 insertions(+), 154 deletions(-) diff --git a/modules/home-manager/style.css b/modules/home-manager/style.css index cc2aef1..e63c74e 100644 --- a/modules/home-manager/style.css +++ b/modules/home-manager/style.css @@ -1,11 +1,11 @@ * { /* `otf-font-awesome` is required to be installed for icons */ - font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif; - font-size: 13px; + font-family: FontAwesome, FiraCode, Helvetica, Arial, sans-serif; + font-size: 16px; } window#waybar { - background-color: rgba(43, 48, 59, 0.5); + background-color: rgba(68, 64, 60, 1); border-bottom: 3px solid rgba(100, 114, 125, 0.5); color: #ffffff; transition-property: background-color; @@ -48,25 +48,6 @@ button:hover { box-shadow: inset 0 -3px #ffffff; } -#workspaces button { - padding: 0 5px; - background-color: transparent; - color: #ffffff; -} - -#workspaces button:hover { - background: rgba(0, 0, 0, 0.2); -} - -#workspaces button.focused { - background-color: #64727D; - box-shadow: inset 0 -3px #ffffff; -} - -#workspaces button.urgent { - background-color: #eb4d4b; -} - #mode { background-color: #64727D; border-bottom: 3px solid #ffffff; @@ -89,7 +70,7 @@ button:hover { #scratchpad, #mpd { padding: 0 10px; - color: #ffffff; + color: #030712; } #window, @@ -97,18 +78,8 @@ button:hover { margin: 0 4px; } -/* If workspaces is the leftmost module, omit left margin */ -.modules-left>widget:first-child>#workspaces { - margin-left: 0; -} - -/* If workspaces is the rightmost module, omit right margin */ -.modules-right>widget:last-child>#workspaces { - margin-right: 0; -} - #clock { - background-color: #64727D; + background-color: #ec4899; } #battery { @@ -144,12 +115,13 @@ label:focus { } #cpu { - background-color: #2ecc71; - color: #000000; + background-color: #10b981; + color: #030712; } #memory { - background-color: #9b59b6; + background-color: #d946ef; + color: #030712; } #disk { @@ -157,20 +129,21 @@ label:focus { } #backlight { - background-color: #90b1b1; + background-color: #8b5cf6; } #network { - background-color: #2980b9; + background-color: #0ea5e9; + color: #030712; } #network.disconnected { - background-color: #f53c3c; + background-color: #ef4444; } #pulseaudio { - background-color: #f1c40f; - color: #000000; + background-color: #eab308; + color: #030712; } #pulseaudio.muted { @@ -270,12 +243,4 @@ label:focus { #keyboard-state>label.locked { background: rgba(0, 0, 0, 0.2); -} - -#scratchpad { - background: rgba(0, 0, 0, 0.2); -} - -#scratchpad.empty { - background-color: transparent; } \ No newline at end of file diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index b44cbee..724ac43 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -11,102 +11,76 @@ main_bar = { layer = "top"; position = "top"; - height = 30; - spacing = 4; - # // Choose the order of the modules + height = 40; + spacing = 8; modules-left = []; - modules-center = []; + modules-center = [ + ]; modules-right = [ + "battery" + "temperature" + "backlight" + "cpu" + "memory" "pulseaudio" "network" + "clock" ]; - # "keyboard-state": { - # "numlock": true, - # "capslock": true, - # "format": "{name} {icon}", - # "format-icons": { - # "locked": "", - # "unlocked": "" - # } - # }, - # "mpd": { - # "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ", - # "format-disconnected": "Disconnected ", - # "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ", - # "unknown-tag": "N/A", - # "interval": 2, - # "consume-icons": { - # "on": " " - # }, - # "random-icons": { - # "off": " ", - # "on": " " - # }, - # "repeat-icons": { - # "on": " " - # }, - # "single-icons": { - # "on": "1 " - # }, - # "state-icons": { - # "paused": "", - # "playing": "" - # }, - # "tooltip-format": "MPD (connected)", - # "tooltip-format-disconnected": "MPD (disconnected)" - # }, - # "idle_inhibitor": { - # "format": "{icon}", - # "format-icons": { - # "activated": "", - # "deactivated": "" - # } - # }, - # "tray": { - # // "icon-size": 21, - # "spacing": 10 - # }, - # "clock": { - # // "timezone": "America/New_York", - # "tooltip-format": "{:%Y %B}\n{calendar}", - # "format-alt": "{:%Y-%m-%d}" - # }, - # "cpu": { - # "format": "{usage}% ", - # "tooltip": false - # }, - # "memory": { - # "format": "{}% " - # }, - # "temperature": { - # // "thermal-zone": 2, - # // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", - # "critical-threshold": 80, - # // "format-critical": "{temperatureC}°C {icon}", - # "format": "{temperatureC}°C {icon}", - # "format-icons": ["", "", ""] - # }, - # "backlight": { - # // "device": "acpi_video1", - # "format": "{percent}% {icon}", - # "format-icons": ["", "", "", "", "", "", "", "", ""] - # }, - # "battery": { - # "states": { - # // "good": 95, - # "warning": 30, - # "critical": 15 - # }, - # "format": "{capacity}% {icon}", - # "format-charging": "{capacity}% ", - # "format-plugged": "{capacity}% ", - # "format-alt": "{time} {icon}", - # // "format-good": "", // An empty format will hide the module - # // "format-full": "", - # "format-icons": ["", "", "", "", ""] - # }, + keyboard-state = { + numlock = true; + capslock = true; + format = "{name} {icon}"; + format-icons = { + locked = ""; + unlocked = ""; + }; + }; + clock = { + timezone = "America/Detroit"; + tooltip-format = "{:%Y %B}\n{calendar}"; + format-alt = "{:%d-%m-%Y}"; + }; + cpu = { + format = "{usage}% "; + tooltip = false; + }; + memory = { + format = "{}% "; + }; + temperature = { + thermal-zone = 2; + hwmon-path = "/sys/class/hwmon/hwmon2/temp1_input"; + critical-threshold = 80; + format-critical = "{temperatureC}°C {icon}"; + format = "{temperatureC}°C {icon}"; + format-icons = ["" "" ""]; + }; + backlight = { + format = "{percent}% {icon}"; + format-icons = ["" "" "" "" "" "" "" "" ""]; + }; + battery = { + states = { + good = 95; + warning = 30; + critical = 15; + }; + format = "{capacity}% {icon}"; + format-charging = "{capacity}% "; + format-plugged = "{capacity}% "; + format-alt = "{time} {icon}"; + format-good = ""; + format-full = ""; + format-icons = [ + "" + "" + "" + "" + "" + ]; + }; # "battery#bat2": { - # "bat": "BAT2" + # "bat": "BAT2" # }, network = { format-wifi = "{essid} ({signalStrength}%) "; @@ -139,20 +113,6 @@ }; on-click = "pavucontrol"; }; - # custom/media = { - # format = "{icon} {}"; - # return-type = "json"; - # max-length = 40; - # format-icons = { - # spotify = ""; - # default = "🎜"; - # }; - # escape = true; - # # Script in resources folder - # exec = "$HOME/.config/waybar/mediaplayer.py 2> /dev/null"; - # # Filter player based on name - # exec = "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null"; - # }; }; }; style = builtins.readFile ./style.css;