From 566ba727cc0e0851e9bd5a5e812e6371708fdec6 Mon Sep 17 00:00:00 2001 From: Kyler Olsen Date: Thu, 8 May 2025 14:30:10 -0600 Subject: [PATCH] Started waybar --- home/home.nix | 8 +- home/hyprland.nix | 15 ++- home/vscode.nix | 7 ++ home/waybar/style.css | 280 +++++++++++++++++++++++++++++++++++++++++ home/waybar/waybar.nix | 136 ++++++++++++++++++++ sys/configuration.nix | 1 + 6 files changed, 439 insertions(+), 8 deletions(-) create mode 100644 home/vscode.nix create mode 100644 home/waybar/style.css create mode 100644 home/waybar/waybar.nix diff --git a/home/home.nix b/home/home.nix index 0b7244f..988a059 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,10 +1,10 @@ { config, pkgs, ... }: { - imports = - [ - ./hyprland.nix - ]; + imports = [ + ./vscode.nix + ./hyprland.nix + ]; home.username = "kyler"; home.homeDirectory = "/home/kyler"; diff --git a/home/hyprland.nix b/home/hyprland.nix index d7bd654..0002b4f 100644 --- a/home/hyprland.nix +++ b/home/hyprland.nix @@ -1,12 +1,19 @@ { config, pkgs, ... }: { + imports = [ + ./waybar/waybar.nix + ]; + home.packages = with pkgs; [ wl-clipboard dolphin wofi google-chrome firefox + ario + procps + font-awesome ]; wayland.windowManager.hyprland = { @@ -19,7 +26,7 @@ bind = [ "$mainMod, W, killactive," - "$mainMod, Q, exec, wlogout" + # "$mainMod, Q, exec, wlogout" "$mainMod SHIFT, Q, exit," "$mainMod, F, togglefloating," "$mainMod, P, pseudo," @@ -31,8 +38,8 @@ # Lock desktop # "$mainMod, L, exec, bash .config/swaylock/lock.sh" - # Reload waybar - # "$mainMod SHIFT, B, exec, killall waybar && waybar" + # Reload waybar/waybar + "$mainMod SHIFT, B, exec, pkill waybar && waybar" # Open terminal "$mainMod, T, exec, $terminal" @@ -41,7 +48,7 @@ # "$mainMod, SPACE, exec, $menu" # Open VS Code - # "$mainMod, X, exec, code" + "$mainMod, X, exec, code" # Clipboard History # "$mainMod, V, exec, cliphist list | wofi --show dmenu -H 600 -W 900 | cliphist decode | wl-copy" diff --git a/home/vscode.nix b/home/vscode.nix new file mode 100644 index 0000000..887efdc --- /dev/null +++ b/home/vscode.nix @@ -0,0 +1,7 @@ +{ config, pkgs, ... }: + +{ + programs.vscode = { + enable = true; + }; +} diff --git a/home/waybar/style.css b/home/waybar/style.css new file mode 100644 index 0000000..cf5c5fb --- /dev/null +++ b/home/waybar/style.css @@ -0,0 +1,280 @@ +* { + /* `otf-font-awesome` is required to be installed for icons */ + font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif; + font-size: 13px; +} + +window#waybar { + background-color: rgba(43, 48, 59, 0.5); + border-bottom: 3px solid rgba(100, 114, 125, 0.5); + color: #ffffff; + transition-property: background-color; + transition-duration: .5s; +} + +window#waybar.hidden { + opacity: 0.2; +} + +/* +window#waybar.empty { + background-color: transparent; +} +window#waybar.solo { + background-color: #FFFFFF; +} +*/ + +window#waybar.termite { + background-color: #3F3F3F; +} + +window#waybar.chromium { + background-color: #000000; + border: none; +} + +button { + /* Use box-shadow instead of border so the text isn't offset */ + box-shadow: inset 0 -3px transparent; + /* Avoid rounded borders under each button name */ + border: none; + border-radius: 0; +} + +/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ +button:hover { + background: inherit; + 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; +} + +#clock, +#battery, +#cpu, +#memory, +#disk, +#temperature, +#backlight, +#network, +#pulseaudio, +#wireplumber, +#custom-media, +#tray, +#mode, +#idle_inhibitor, +#scratchpad, +#mpd { + padding: 0 10px; + color: #ffffff; +} + +#window, +#workspaces { + 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; +} + +#battery { + background-color: #ffffff; + color: #000000; +} + +#battery.charging, #battery.plugged { + color: #ffffff; + background-color: #26A65B; +} + +@keyframes blink { + to { + background-color: #ffffff; + color: #000000; + } +} + +#battery.critical:not(.charging) { + background-color: #f53c3c; + color: #ffffff; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; +} + +label:focus { + background-color: #000000; +} + +#cpu { + background-color: #2ecc71; + color: #000000; +} + +#memory { + background-color: #9b59b6; +} + +#disk { + background-color: #964B00; +} + +#backlight { + background-color: #90b1b1; +} + +#network { + background-color: #2980b9; +} + +#network.disconnected { + background-color: #f53c3c; +} + +#pulseaudio { + background-color: #f1c40f; + color: #000000; +} + +#pulseaudio.muted { + background-color: #90b1b1; + color: #2a5c45; +} + +#wireplumber { + background-color: #fff0f5; + color: #000000; +} + +#wireplumber.muted { + background-color: #f53c3c; +} + +#custom-media { + background-color: #66cc99; + color: #2a5c45; + min-width: 100px; +} + +#custom-media.custom-spotify { + background-color: #66cc99; +} + +#custom-media.custom-vlc { + background-color: #ffa000; +} + +#temperature { + background-color: #f0932b; +} + +#temperature.critical { + background-color: #eb4d4b; +} + +#tray { + background-color: #2980b9; +} + +#tray > .passive { + -gtk-icon-effect: dim; +} + +#tray > .needs-attention { + -gtk-icon-effect: highlight; + background-color: #eb4d4b; +} + +#idle_inhibitor { + background-color: #2d3436; +} + +#idle_inhibitor.activated { + background-color: #ecf0f1; + color: #2d3436; +} + +#mpd { + background-color: #66cc99; + color: #2a5c45; +} + +#mpd.disconnected { + background-color: #f53c3c; +} + +#mpd.stopped { + background-color: #90b1b1; +} + +#mpd.paused { + background-color: #51a37a; +} + +#language { + background: #00b093; + color: #740864; + padding: 0 5px; + margin: 0 5px; + min-width: 16px; +} + +#keyboard-state { + background: #97e1ad; + color: #000000; + padding: 0 0px; + margin: 0 5px; + min-width: 16px; +} + +#keyboard-state > label { + padding: 0 5px; +} + +#keyboard-state > label.locked { + background: rgba(0, 0, 0, 0.2); +} + +#scratchpad { + background: rgba(0, 0, 0, 0.2); +} + +#scratchpad.empty { + background-color: transparent; +} diff --git a/home/waybar/waybar.nix b/home/waybar/waybar.nix new file mode 100644 index 0000000..d90d9ee --- /dev/null +++ b/home/waybar/waybar.nix @@ -0,0 +1,136 @@ +{ config, pkgs, ... }: + +{ + programs.waybar = { + enable = true; + style = builtins.readFile ./style.css; + settings = [{ + # ---- Settings ---- + + position = "bottom"; + height = 30; + spacing = 4; + + modules-left = [ + "hyprland/workspaces" + "hyprland/window" + ]; + modules-center = [ + "mpd" + ]; + modules-right = [ + "memory" + "cpu" + "temperature" + "network" + "pulseaudio" + "clock#utc" + "clock" + "tray" + ]; + + 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}) "; + 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 = ""; + paused = ""; + playing = ""; + }; + tooltip-format = "MPD (connected)"; + tooltip-format-disconnected = "MPD (disconnected)"; + on-click = "ario"; + }; + tray = { + # icon-size = 21; + spacing = 10; + }; + clock = { + timezone = "America/Boise"; + tooltip-format = "{:%Y %B}\n{calendar}"; + format = "{:%a %Y %b %d %H:%M %Z}"; + format-alt = "{:%W %a %Y %b %d %H:%M:%S %Z}"; + }; + "clock#utc" = { + timezone = "UTC"; + tooltip-format = "{:%Y %B}\n{calendar}"; + format = "{:%a %H:%M %Z}"; + format-alt = "{:%W %a %Y %b %d %H:%M:%S %Z}"; + }; + cpu = { + format = "{usage}% "; + format-alt = "CPU {usage}% "; + tooltip = false; + }; + memory = { + format = "{}% "; + format-alt = "RAM {}% "; + }; + temperature = { + # thermal-zone = 2; + # hwmon-path = "/sys/class/hwmon/hwmon2/temp1_input"; + # critical-threshold = 80; + # format-critical = "{temperatureC}°C {icon}"; + format = "{temperatureF}°F {icon}"; + format-alt = "{temperatureC}°C {icon}"; + format-icons = ["" "" ""]; + }; + network = { + # interface = "wlp2*"; # (Optional) To force the use of this interface + format-wifi = "{essid} ({signalStrength}%) "; + format-ethernet = "{ipaddr}/{cidr} "; + tooltip-format = "{ifname} via {gwaddr} "; + format-linked = "{ifname} (No IP) "; + format-disconnected = "Disconnected ⚠"; + format-alt = "{ifname}: {ipaddr}/{cidr}"; + }; + pulseaudio = { + # scroll-step = 1; # %, can be a float + format = "{volume}% {icon} {format_source}"; + format-bluetooth = "{volume}% {icon} {format_source}"; + format-bluetooth-muted = " {icon} {format_source}"; + format-muted = " {format_source}"; + format-source = "{volume}% "; + format-source-muted = ""; + format-icons = { + headphone = ""; + hands-free = ""; + headset = ""; + phone = ""; + portable = ""; + car = ""; + default = ["" "" ""]; + }; + # on-click = "pavucontrol", + # on-click-right = "bluetoothctl connect CA:BD:EF:01:A7:36"; + }; + + }]; + }; +} diff --git a/sys/configuration.nix b/sys/configuration.nix index 721ac47..c0833f7 100644 --- a/sys/configuration.nix +++ b/sys/configuration.nix @@ -59,6 +59,7 @@ wget micro git + mpd ]; networking.extraHosts =