diff --git a/files/.config/fish/config.fish b/files/.config/fish/config.fish index d791313..060ebac 100644 --- a/files/.config/fish/config.fish +++ b/files/.config/fish/config.fish @@ -6,11 +6,14 @@ if status is-interactive end set -x EDITOR hx +set -x TERM xterm-256color + alias tmux="tmux -2" +alias l="ls -lAh --color=auto" +alias ll="ls -lh --color=auto" + alias json-get="curl --request GET -H 'Content-Type: application/json'" alias json-post="curl --request POST -H 'Content-Type: application/json'" -set -x TERM xterm-256color - alias code="code --ozone-platform=wayland" diff --git a/files/.config/hypr/hyprland.conf b/files/.config/hypr/hyprland.conf index af5a209..a1f8847 100644 --- a/files/.config/hypr/hyprland.conf +++ b/files/.config/hypr/hyprland.conf @@ -67,10 +67,10 @@ general { gaps_in = 2 gaps_out = 8 - border_size = 2 + border_size = 3 - col.active_border = rgba(0071ffff) 1deg - col.inactive_border = rgba(595959aa) + col.active_border = rgba(21548dff) 1deg + col.inactive_border = rgba(536878ff) layout = dwindle @@ -81,10 +81,10 @@ general { decoration { # See https://wiki.hyprland.org/Configuring/Variables/ for more - rounding = 12 + rounding = 0 blur { - enabled = false + enabled = true } shadow { @@ -144,7 +144,7 @@ device { sensitivity = -0.5 } -monitor = , preferred, auto, 1.33 +monitor = , preferred, auto, 1.2 xwayland { force_zero_scaling = true } diff --git a/files/.config/waybar/config b/files/.config/waybar/config index 8f96ed8..4eceafc 100644 --- a/files/.config/waybar/config +++ b/files/.config/waybar/config @@ -1,7 +1,7 @@ { "modules-left": ["hyprland/workspaces", "hyprland/window"], "modules-center": ["clock", "custom/lock"], - "modules-right": ["tray", "custom/spotify", "custom/ram", "custom/cpu", "pulseaudio", "custom/brightness", "battery"], + "modules-right": ["custom/spotify", "custom/ram", "custom/cpu", "pulseaudio", "custom/brightness", "battery", "tray"], "network": { "format-wifi": "{essid} ({signalStrength}%) ", @@ -78,15 +78,15 @@ "custom/brightness": { "return-type": "text", "exec": "~/.config/waybar/brightness.sh", - "on-click": "light -S 1" + "on-click": "light -S 0" }, "custom/spotify": { "return-type": "json", "exec": "~/.config/waybar/media.py --player spotify", - "on-click": "playerctl play-pause", - "on-scroll-up": "playerctl next", - "on-scroll-down": "playerctl previous", + "on-click": "playerctl --player spotify play-pause", + "on-scroll-up": "playerctl --player spotify next", + "on-scroll-down": "playerctl --player spotify previous", "escape": true } } diff --git a/files/.config/waybar/media.py b/files/.config/waybar/media.py index 6ddc245..402c831 100755 --- a/files/.config/waybar/media.py +++ b/files/.config/waybar/media.py @@ -60,13 +60,15 @@ def print_info(player: str, last_text = str | None) -> str | None: title = metadata.get('xesam:title').replace("&", "&") album = metadata.get('xesam:album') - icon = '' if status == 'playing' else '' + icon = '' if status == 'playing' else '' text = f'{title} ‒ {artist}' if artist and title else title if len(text) > LIMIT: text = text[:LIMIT] + '…' - return write_text(player, f'{icon} {text}', last_text) + text = f'󰎇 {icon} {text}' + + return write_text(player, text, last_text) diff --git a/files/.config/waybar/style.css b/files/.config/waybar/style.css index cd63068..92b87fa 100644 --- a/files/.config/waybar/style.css +++ b/files/.config/waybar/style.css @@ -1,50 +1,57 @@ * { - border: none; - font-family: Font Awesome, Roboto, Arial, sans-serif; - font-size: 13px; - color: white; - border-radius: 20px; + box-shadow: none; } window { - /*font-weight: bold;*/ + font-family: Font Awesome, JetBrains Mono, monospace; + font-size: 12px; + color: white; } + window#waybar { - background: rgba(0, 0, 0, 0); + background: #0d1117; + border-bottom: 3px solid #21548d; } + /*-----module groups----*/ .modules-right { - background-color: #0d1117; - margin: 2px 10px 0 0; - padding: 0 5px; + margin: 2px; + padding: 0 3px; } + .modules-center { - background-color: #0d1117; - margin: 2px 5px 0 5px; - padding: 0 5px; + margin: 2px; + padding: 0 3px; } + .modules-left { - margin: 2px 0 0 5px; - background-color: #0071ff; + margin: 2px; } -/*-----modules indv----*/ + +/* WORKSPACES */ +#workspaces { + padding: 4px; + padding-right: 12px; +} + #workspaces button { - padding: 1px 6px; + margin: 0 2px; + padding: 0px 4px; + color: white; background-color: transparent; } + #workspaces button:hover { - box-shadow: inherit; - background-color: rgba(0,153,153,1); + color: black; + background-color: white; } #workspaces button.active { - background-color: rgba(0,43,51,0.85); + background-color: #21548d; } -#window { - font-family: 'Go Mono', 'JetBrains Mono', 'Ubuntu Mono', 'Droid Sans Mono', 'monospace', monospace; - font-weight: bold; - padding: 0 10px; +.modules-right * { + margin: 0 3px; } #tray * { @@ -52,7 +59,7 @@ window#waybar { } #custom-cpu { - min-width: 48px; + /*min-width: 48px; */ } #clock, @@ -69,6 +76,7 @@ window#waybar { #pulseaudio.muted { color: #cc3436; } + #battery.charging { color: #2dcc36; } @@ -78,11 +86,6 @@ window#waybar { #battery.critical:not(.charging) { color: #cc3436; } -/*-----Colors----*/ -/* - *rgba(0,85,102,1),#005566 --> Indigo(dye) - *rgba(0,43,51,1),#002B33 --> Dark Green - *rgba(0,153,153,1),#009999 --> Persian Green - * - */ + +