diff --git a/README.md b/README.md index bc50265..2ec83fb 100644 --- a/README.md +++ b/README.md @@ -41,13 +41,11 @@ You also need to install all the dependencies: - wlogout - tofi - waybar -- swaybg - nmtui - kitty - python3 - Curved Square font https://www.1001freefonts.com/curved-square.font - FontAwesome -- JetBrainsMono Font There are probably more, I will update the list next time I'm installing it on a new computer. diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 9b1504e..cde340e 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -15,7 +15,7 @@ env = XCURSOR_SIZE,24 env = HYPRCURSOR_SIZE,24 env = GTK_THEME,Adwaita:dark env = QT_QPA_PLATFORMTHEME,qt5ct -env = HYPRSHOT_DIR,~/Screenshots +env = HYPRSHOT_DIR,${HOME}/Screenshots ################ ### MONITORS ### diff --git a/waybar/config b/waybar/config index 83e7baa..51de641 100644 --- a/waybar/config +++ b/waybar/config @@ -1,22 +1,25 @@ // -*- mode: jsonc -*- { - "spacing": 4, - + // "layer": "top", // Waybar at top layer + // "position": "bottom", // Waybar position (top|bottom|left|right) + // "height": 30, // 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", "hyprland/window" ], "modules-center": [ - "clock" + "clock", ], "modules-right": [ - "custom/date", + "custom/date", "wireplumber", "network", - "hyprland/language", + "hyprland/language", "custom/power" ], - "hyprland/workspaces": { "disable-scroll": true, "all-outputs": true, @@ -28,46 +31,185 @@ "default": "" } }, - + "keyboard-state": { + "numlock": true, + "capslock": true, + "format": "{layout} {variant}", + "format-icons": { + "locked": "", + "unlocked": "" + } + }, "hyprland/language": { - "format": "󰌌 {long}", + "format": "󰌌 {long}", "format-us": "US", "format-se": "SE", "format-kr": "KR", "keyboard-name": "typematrix.com-usb-keyboard", "on-click": "hyprctl switchxkblayout all next" }, - + "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": 5, + "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, + // "icons": { + // "blueman": "bluetooth", + // "TelegramDesktop": "$HOME/.local/share/icons/hicolor/16x16/apps/telegram.png" + // } + }, "clock": { - "format": "{:%H:%M}", + "format": "{:%H:%M}", "tooltip-format": "{:%Y %B}\n{calendar}", "on-click": "gnome-calendar" }, - - "wireplumber": { - "format": " {volume}% · {node_name}", - "format-muted": "", - "reverse-scrolling": 1, - "on-click": "$HOME/.config/tofi/select_audio.py" + "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-full": "{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" + }, + "power-profiles-daemon": { + "format": "{icon}", + "tooltip-format": "Power profile: {profile}\nDriver: {driver}", + "tooltip": true, + "format-icons": { + "default": "", + "performance": "", + "balanced": "", + "power-saver": "" + } }, - "network": { - "format-wifi": " {essid}", - "format-ethernet": "󰈀 Wired", + "format-wifi": " {essid}", + "format-ethernet": "󰈀 Wired", "on-click": "kitty -e nmtui" }, - + "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" + }, + "wireplumber": { + "format": " {volume}% · {node_name}", + "format-muted": "", + "reverse-scrolling": 1, + "on-click": "$HOME/.config/tofi/select_audio.py", + }, + "custom/media": { + "format": "{icon} {text}", + "return-type": "json", + "max-length": 40, + "format-icons": { + "spotify": "", + "default": "🎜" + }, + "escape": true, + "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder + // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name + }, + "custom/power": { + "format" : " ⏻ ", + "tooltip": false, + "on-click": "wlogout --protocol layer-shell", + }, + "custom/arch": { + "format" : "󰣇", + "tooltip": false, + "on-click": "$HOME/.config/hypr/launch-tofi.sh" + }, "custom/date": { "format": "{}", - "exec": "date +\"󰸗 %A %Y-%m-%d\"", + "exec": "date +\"󰸗 %A %Y-%m-%d\"", "on-click": "gnome-calendar", "interval": 60 - }, - - "custom/power": { - "format": " ⏻ ", - "tooltip": false, - "on-click": "wlogout --protocol layer-shell" } } diff --git a/waybar/style.css b/waybar/style.css index 8e38245..38a3b83 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -1,8 +1,7 @@ * { /* `otf-font-awesome` is required to be installed for icons */ - font-family: "JetBrainsMono Nerd Font Propo", FontAwesome, Roboto, Helvetica, Arial, monospace; - font-weight: bold; - font-size: 13px; + font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif; + font-size: 14px; min-height: 0; margin: 0; padding: 0; @@ -14,6 +13,13 @@ window#waybar { padding: 0; } +/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ +button:hover { + background: transparent; + box-shadow: inherit; + text-shadow: inherit; +} + #workspaces { margin: 8px 2px; } @@ -36,7 +42,7 @@ window#waybar { #workspaces button { margin: 0; - padding: 2px 10px 2px 10px; + padding: 2px 10px 0 10px; border: 3px solid #C1B3BB; border-width: 3px 0; border-radius: 0; @@ -58,7 +64,6 @@ window#waybar { } #clock, -#hyprland-window, #custom-date, #custom-arch, #battery, @@ -100,8 +105,7 @@ window#waybar { #clock { padding: 0; margin: 0; - font-family: "Curved Square"; - font-weight: 100; + font-family: Curved Square; font-size: 50px; color: rgba(255, 255, 255, 0.7); background: transparent; @@ -112,5 +116,6 @@ window#waybar { } #custom-power { - padding: 0 1px; + padding: 0; + font-size: 20px; }