diff --git a/foot/foot.ini b/foot/foot.ini index 9a5a490..b5c77ce 100644 --- a/foot/foot.ini +++ b/foot/foot.ini @@ -1,14 +1,14 @@ # -*- conf -*- -# shell=$SHELL (if set, otherwise user's default shell from /etc/passwd) +shell=/bin/fish # term=foot (or xterm-256color if built with -Dterminfo=disabled) # login-shell=no -# app-id=foot +app-id=foot title=Terminal # locked-title=no -font=Roboto Mono:size=10 +font=JetBrainsMono NF:size=12 # font-bold= # font-italic= # font-bold-italic= @@ -65,7 +65,7 @@ dpi-aware=no # alternate-scroll-mode=yes [colors] -alpha=1.0 +alpha=0.8 foreground=ffffff background=000000 regular0=000000 # black diff --git a/waybar/config b/waybar/config old mode 100755 new mode 100644 index f4f4ff9..a4c0d5c --- a/waybar/config +++ b/waybar/config @@ -1,52 +1,198 @@ { - "layer": "top", - "modules-left": ["river/tags"], - "modules-center": ["river/window"], - "modules-right": ["tray", "battery", "pulseaudio","cpu", "temperature" ,"clock"], - "pulseaudio": { - "tooltip": false, - "scroll-step": 5, - "format": "{icon} {volume}%", - "format-muted": "婢 0%", - "on-click":"amixer -D pulse Master 1+ toggle", - "scroll-step": 5, - "format-icons": { - "default": ["", "", ""] - } - }, - "temperature": { - "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", - "format": " {temperatureC}°C" - }, - "river/window": { - "format": "{}", - "max-length": 90 - }, - "battery": { - "states": { - "good": 100, - "warning": 30, - "critical": 20 - }, - "format": "{icon} {capacity}%", - "format-charging": "{icon} {capacity}%", - "format-plugged": "{icon} {capacity}%", - "format-alt": "{time} {icon}", - "format-icons": ["", "", "", "", ""] - }, - "tray":{ - "icon-size":18, - "show-passive-items":true, - "spacing": 10, - "reverse-direction": true - }, - "clock": { - "interval": 60, - "format": "{:%H:%M}", - "max-length": 25 - }, - "cpu": { - "interval": 10, - "format": "{usage}% - {avg_frequency}Ghz", - } -} \ No newline at end of file + "layer": "top", // Waybar at top layer + "position": "top", // Waybar position (top|bottom|left|right) + "height": 34, // Waybar height (to be removed for auto height) + // "width": 1280, // Waybar width + "spacing": 4, // Gaps between modules (4px) + // Choose the order of the modules + "modules-left": ["hyprland/workspaces", "idle_inhibitor", "pulseaudio", "backlight", "network", "custom/updates"], + "modules-center": ["hyprland/window"], + "modules-right": ["bluetooth", "cpu", "memory", "temperature", "battery", "tray", "clock"], + // Modules configuration + "hyprland/workspaces": { + "disable-scroll": true, + "on-click": "activate", + // "all-outputs": false, + // "format": "{name}: {icon}", + "format": "{name}", + "on-scroll-up": "hyprctl dispatch workspace m-1 > /dev/null", + "on-scroll-down": "hyprctl dispatch workspace m+1 > /dev/null", + "format-icons": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "", + "urgent": "", + "focused": "", + "default": "" + } + }, + "keyboard-state": { + "numlock": false, + "capslock": false, + "format": "{name} {icon}", + "format-icons": { + "locked": "", + "unlocked": "" + } + }, + "hyprland/window": { + "max-length": 50, + "separate-outputs": true + }, + "sway/mode": { + "format": "{}" + }, + "sway/scratchpad": { + "format": "{icon} {count}", + "show-empty": false, + "format-icons": ["", ""], + "tooltip": true, + "tooltip-format": "{app}: {title}" + }, + "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": 0 + }, + "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": ["", "", "", "", ""] + }, + "battery#bat2": { + "bat": "BAT2" + }, + "network": { + "format-wifi": "{essid} ", + "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": 10, // %, 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" + }, + "bluetooth": { + "format": " {status} ", + "format-disabled": "", // an empty format will hide the module + "format-connected": " {device_alias} ", + "tooltip-format": "{device_alias} ", + "tooltip-format-connected": " {device_alias} ", + "tooltip-format-enumerate-connected": "{device_alias} " + }, + "custom/notification": { + "tooltip": false, + "format": "{} {icon}", + "format-icons": { + "notification": " ", + "none": "", + "dnd-notification": " ", + "dnd-none": "", + "inhibited-notification": " ", + "inhibited-none": "", + "dnd-inhibited-notification": " ", + "dnd-inhibited-none": "" + }, + "return-type": "json", + "exec-if": "which swaync-client", + "exec": "swaync-client -swb", + "on-click": "sleep 0.1 && swaync-client -t -sw", + "on-click-right": "swaync-client -d -sw", + "escape": true + }, + "custom/updates": { + "format": "{} {icon}", + "return-type": "json", + "format-icons": { + "has-updates": "󱍷", + "updated": "󰂪" + }, + "exec-if": "which waybar-module-pacman-updates", + "exec": "waybar-module-pacman-updates" + } +} diff --git a/waybar/style.css b/waybar/style.css index 63c29f2..654de7f 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -1,148 +1,98 @@ +@define-color base00 #ff0000; +@define-color base01 #1a1a1a; +@define-color base02 #363636; +@define-color base03 #ffffff; +@define-color base04 #cfac78; +@define-color base05 #cfac78; +@define-color base06 #e8e8e8; +@define-color base07 #f8f8f8; +@define-color base08 #ab4642; +@define-color base09 #dc9656; +@define-color base0A #f7ca88; +@define-color base0B #a1b56c; +@define-color base0C #86c1b9; +@define-color base0D #7cafc2; +@define-color base0E #ba8baf; +@define-color base0F #a16946; + * { - border: none; - border-radius: 0; - font-family: "JetbrainsMono Nerd Font"; - font-size: 12px; + transition: none; + box-shadow: none; } -window#waybar { - background: none; +#waybar { + font-family: 'Source Code Pro', sans-serif; + font-size: 1.2em; + font-weight: 400; + color: @base04; + background: @base01; } -window#waybar.hidden { - opacity: 0.2; +#workspaces { + margin: 0 4px; } -#window { - margin-top: 6px; - padding-left: 10px; - padding-right: 10px; - border-radius: 5px; - transition: none; - background: #2e3440; - color: #d8dee9; +#workspaces button { + margin: 4px 0; + padding: 0 4px; + color: @base05; } -#tags { - margin-top: 6px; - margin-right: 12px; - margin-left: 12px; - font-size: 4px; - border-radius: 5px; - transition: none; - background: #2e3440; +#workspaces button.visible { } -#tags button { - transition: none; - color: #4c566a; - background: transparent; - border-radius: 0px; +#workspaces button.active { + border-radius: 4px; + background-color: #8c4b00; } -#tags button.occupied { - transition: none; - color: #a3be8c; - background: transparent; - font-size: 4px; -} - -#tags button.focused { - color: #81a1c1; - border-bottom: 2px solid #81a1c1; -} - -#tags button:hover { - transition: none; - box-shadow: inherit; - text-shadow: inherit; - color: #81a1c1; -} - -#temperature { - margin-top: 6px; - margin-left: 12px; - border-radius: 5px; - transition: none; - padding: 0 10px; - color: #a3be8c; - background: #2e3440; -} - -#pulseaudio { - margin-top: 6px; - margin-left: 12px; - border-radius: 5px; - transition: none; - padding: 0 10px; - color: #a3be8c; - background: #2e3440; -} - -#cpu { - margin-top: 6px; - margin-left: 12px; - border-radius: 5px; - transition: none; - padding: 0 10px; - color: #a3be8c; - background: #2e3440; -} - -#clock { - margin-top: 6px; - margin-left: 12px; - margin-right: 12px; - border-radius: 5px; - transition: none; - padding: 0 10px; - color: #a3be8c; - background: #2e3440; -} - -#battery { - margin-top: 6px; - margin-left: 12px; - border-radius: 5px; - transition: none; - padding: 10px 10px; - color: #a3be8c; - background: #2e3440; -} - -#battery.critical:not(.charging) { - background-color: #d8dee9; - color: #2e3440; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; -} - -@keyframes blink { - to { - background-color: #bf616a; - color: #d8dee9; - } -} - -#backlight { - margin-top: 6px; - margin-left: 12px; - border-radius: 5px; - transition: none; - padding: 10px 10px; - color: #88c0d0; - background: #2e3440; +#workspaces button.urgent { + color: rgba(238, 46, 36, 1); } #tray { - margin-top: 6px; - margin-right: 12px; - border-radius: 5px; - padding-left: 10px; - padding-right: 10px; - color: #d8dee9; - background: #2e3440; -} \ No newline at end of file + margin: 4px 4px 4px 4px; + border-radius: 4px; + background-color: @base02; +} + +#tray * { + padding: 0 6px; + border-left: 1px solid @base00; +} + +#tray *:first-child { + border-left: none; +} + +#mode, #battery, #cpu, #memory, #bluetooth, #network, #pulseaudio, #idle_inhibitor, #backlight, #custom-storage, #custom-updates, #custom-weather, #custom-mail, #clock, #temperature { + margin: 4px 2px; + padding: 0 6px; + background-color: @base02; + border-radius: 4px; + min-width: 20px; +} + +#pulseaudio.muted { + color: @base0F; +} + +#pulseaudio.bluetooth { + color: @base0C; +} + +#clock { + margin-left: 0px; + margin-right: 4px; + background-color: transparent; +} + +#temperature.critical { + color: @base0F; +} + +#window { + font-size: 0.9em; + font-weight: 400; + font-family: sans-serif; +}