From 3f550e7d5968614a0cb210a6010bf054b9596a44 Mon Sep 17 00:00:00 2001 From: Clay Gomera Date: Fri, 8 Mar 2024 17:49:38 -0400 Subject: [PATCH] Updated --- user/.config/hypr/animations.conf | 4 +-- user/.config/hypr/hyprland.conf | 2 +- user/.config/hypr/keybindings.conf | 20 ++++++------- user/.config/hypr/rules.conf | 4 +-- user/.config/hypr/theme.conf | 2 +- user/.config/waybar/config | 47 ++++++++++++++---------------- user/.config/waybar/power-profiles | 6 ++-- user/.config/waybar/style.css | 11 +++++-- 8 files changed, 49 insertions(+), 47 deletions(-) diff --git a/user/.config/hypr/animations.conf b/user/.config/hypr/animations.conf index 3dd105175..43555eab8 100644 --- a/user/.config/hypr/animations.conf +++ b/user/.config/hypr/animations.conf @@ -15,6 +15,6 @@ animations { animation = windowsMove, 1, 5, wind, slide animation = fadeIn, 1, 2, winIn animation = fadeOut, 1, 5, winOut - animation = workspaces, 1, 3, workIn, slidevert - animation = specialWorkspace, 1, 5, workIn, slidevert + animation = workspaces, 1, 3, workIn + animation = specialWorkspace, 1, 5, workIn } diff --git a/user/.config/hypr/hyprland.conf b/user/.config/hypr/hyprland.conf index d581cedd0..9aa433090 100644 --- a/user/.config/hypr/hyprland.conf +++ b/user/.config/hypr/hyprland.conf @@ -5,7 +5,7 @@ exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = dbus-update-activation-environment --systemd --all exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP -exec-once = /usr/libexec/polkit-kde-authentication-agent-1 +exec-once = /usr/libexec/kf5/polkit-kde-authentication-agent-1 exec-once = waybar exec-once = mako -c ~/.config/mako/config exec-once = swww init diff --git a/user/.config/hypr/keybindings.conf b/user/.config/hypr/keybindings.conf index 9cdbf709d..41f7e2d9f 100644 --- a/user/.config/hypr/keybindings.conf +++ b/user/.config/hypr/keybindings.conf @@ -60,11 +60,11 @@ bind = $supMod_SHIFT, 0, movetoworkspace, 10 # move active window to bind = $supMod, mouse_down, workspace, e+1 # move to next workspace with mouse wheel bind = $supMod, mouse_up, workspace, e-1 # move to previous workspace with mouse wheel -bind = $supMod, Down, workspace, e+1 # move to next workspace with down cursor key -bind = $supMod, Up, workspace, e-1 # move to previous workspace with up cursor key +bind = $supMod, Right, workspace, e+1 # move to next workspace with right cursor key +bind = $supMod, Left, workspace, e-1 # move to previous workspace with left cursor key -bind = $supMod_SHIFT, Down, movetoworkspace, e+1 # move active window to next workspace with down cursor key -bind = $supMod_SHIFT, Up, movetoworkspace, e-1 # move active window to previous workspace with up cursor key +bind = $supMod_SHIFT, Right, movetoworkspace, e+1 # move active window to next workspace with right cursor key +bind = $supMod_SHIFT, Left, movetoworkspace, e-1 # move active window to previous workspace with left cursor key # common binds bindl=, XF86AudioRaiseVolume, exec, pamixer -i 5 # increase volume by 5% @@ -96,16 +96,16 @@ binde = $supMod_SHIFT, m, exec, pkill fuzzel || $HOME/.config/fuzzel/scripts/f # apps binds binde = $supMod_$altMod, r, exec, alacritty --class newsboat -e newsboat # launch news feed reader -binde = $supMod_$altMod, y, exec, alacritty --class ytfzf -e ytfzf -flstT ueberzug # launch youtube player -binde = $supMod_$altMod, m, exec, alacritty --class ytfzf_music -e ytfzf -mlstT ueberzug # launch youtube music player +binde = $supMod_$altMod, y, exec, alacritty --class ytfzf -e ytfzf -flstT chafa # launch youtube player +binde = $supMod_$altMod, m, exec, alacritty --class ytfzf_music -e ytfzf -mlstT chafa # launch youtube music player binde = $supMod_$altMod, f, exec, alacritty --class flix_cli -e flix-cli # launch torrent movie player binde = $supMod_$altMod, a, exec, alacritty --class ani_cli -e ani-cli # launch anime player -binde = $supMod_$altMod, p, exec, alacritty --class pulsemixer -e pulsemixer # launch audio mixer binde = $supMod_$altMod, b, exec, alacritty --class btop -e btop # launch resource monitor -binde = $supMod_$conMod, m, exec, alacritty --class music_player -e cmus # launch music player -binde = $supMod_$conMod, f, exec, alacritty --class file_manager -e $HOME/.config/vifm/scripts/vifmrun # launch file manager -binde = $supMod_$conMod, w, exec, flatpak run org.mozilla.firefox # launch web browser binde = $supMod_$conMod, e, exec, alacritty --class editor -e $HOME/.local/bin/lvim # launch text editor +binde = $supMod_$conMod, f, exec, alacritty --class file_manager -e $HOME/.config/vifm/scripts/vifmrun # launch file manager +binde = $supMod_$altMod, p, exec, pavucontrol # launch audio mixer +binde = $supMod_$conMod, w, exec, flatpak run org.mozilla.firefox # launch web browser binde = $supMod_$conMod, c, exec, flatpak run org.signal.Signal # launch chat app binde = $supMod_$conMod, g, exec, flatpak run org.libretro.Retroarch # launch gaming app binde = $supMod_$conMod, p, exec, flatpak run com.bitwarden.desktop # launch password manager +binde = $supMod_$conMod, m, exec, flatpak run org.gnome.Lollypop # launch music player diff --git a/user/.config/hypr/rules.conf b/user/.config/hypr/rules.conf index aac95042d..edc2fd161 100644 --- a/user/.config/hypr/rules.conf +++ b/user/.config/hypr/rules.conf @@ -63,9 +63,9 @@ windowrule = workspace 5, ^(revolt-desktop)$ windowrule = workspace 5, ^(Element)$ # workspace 5 - music & audio -windowrule = workspace 6, ^(music_player)$ +windowrule = workspace 6, ^(lollypop)$ windowrule = workspace 6, ^(ytfzf_music)$ -windowrule = workspace 6, ^(audacity)$ +windowrule = workspace 6, ^(Audacity)$ windowrule = workspace 6, ^(Ardour)$ windowrule = workspace 6, ^(carla)$ windowrule = workspace 6, ^(carla-control)$ diff --git a/user/.config/hypr/theme.conf b/user/.config/hypr/theme.conf index ed3ec8085..790d3bbe5 100644 --- a/user/.config/hypr/theme.conf +++ b/user/.config/hypr/theme.conf @@ -9,7 +9,7 @@ exec = hyprctl setcursor Simp1e-Gruvbox-Dark 16 exec = gsettings set org.gnome.desktop.interface cursor-theme 'Simp1e-Gruvbox-Dark' exec = gsettings set org.gnome.desktop.interface cursor-size 16 exec = gsettings set org.gnome.desktop.interface icon-theme 'gruvbox-dark-icons-gtk' -exec = gsettings set org.gnome.desktop.interface gtk-theme 'gruvbox-dark-gtk' +exec = gsettings set org.gnome.desktop.interface gtk-theme 'Gruvbox-Dark-BL' exec = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' general { diff --git a/user/.config/waybar/config b/user/.config/waybar/config index 2b8b4f38a..a3f6dfed5 100644 --- a/user/.config/waybar/config +++ b/user/.config/waybar/config @@ -1,5 +1,7 @@ { - "position": "left", + "position": "top", + "height": 41, + "spacing": 3, "layer": "top", // Choose the order of the modules @@ -31,22 +33,20 @@ }, "hyprland/language": { - "format": "{}", + "format": "{} \udb80\udf0c", "format-en": "US", "format-es": "ES", - "on-click": "~/.config/hypr/scripts/switchlayout" }, "clock": { "tooltip-format": "{:%Y %B}\n{calendar}", - "format": "{:%H\n--\n%M}", - "format-alt": "{:%y\n--\n%m\n--\n%d}", + "format": "\udb82\udd54 {:%H:%M}", + "format-alt": "\udb80\udcf5 {:%Y-%m-%d}" }, "backlight": { - "format": "{icon}", - "format-icons": ["\udb86\ude4e", "\udb86\ude4f", "\udb86\ude50", "\udb86\ude51", "\udb86\ude52", "\udb86\ude53", "\udb86\ude54", "\udb86\ude55", "\udb81\udee8"], - "tooltip-format": "{percent}%" + "format": "{percent}% {icon}", + "format-icons": ["\udb86\ude4e", "\udb86\ude4f", "\udb86\ude50", "\udb86\ude51", "\udb86\ude52", "\udb86\ude53", "\udb86\ude54", "\udb86\ude55", "\udb81\udee8"] }, "battery": { @@ -54,13 +54,12 @@ "warning": 30, "critical": 15 }, - "tooltip-format": "{capacity}% - {timeTo}", - "format": "{icon}", - "format-charging": "{icon}\n\n\udb81\udea5", - "format-plugged": "{icon}\n\n\udb81\udea5", + "format": "{capacity}% {icon}", + "format-charging": "{capacity}% {icon}\udb81\udea5", + "format-plugged": "{capacity}% {icon}\udb81\udea5", "format-alt": "{time} {icon}", - "format-critical": "{icon}\n\n\udb84\ude38", - "format-warning": "{icon}\n\n\udb84\ude38", + "format-critical": "{capacity}% {icon}\udb84\ude38", + "format-warning": "{capacity}% {icon}\udb84\ude38", "format-icons": ["\udb80\udc7a", "\udb80\udc7c", "\udb80\udc7e", "\udb80\udc80", "\udb80\udc79"] }, @@ -71,12 +70,12 @@ }, "pulseaudio": { - "scroll-step": 5, // %, can be a float - "format": "{icon}\n\n{format_source}", - "format-bluetooth": "{icon}\n\n\udb80\udcaf\n\n{format_source}", - "format-bluetooth-muted": "\udb81\udd81\n\n{icon}\udb80\udcaf\n\n{format_source}", - "format-muted": "\udb81\udd81\n\n{format_source}", - "format-source": "\udb80\udf6c", + "scroll-step": 1, // %, can be a float + "format": "{volume}% {icon} {format_source}", + "format-bluetooth": "{volume}% {icon}\udb80\udcaf {format_source}", + "format-bluetooth-muted": "\udb81\udd81 {icon}\udb80\udcaf {format_source}", + "format-muted": "\udb81\udd81 {format_source}", + "format-source": "{volume}% \udb80\udf6c", "format-source-muted": "\udb80\udf6d", "format-icons": { "headphone": "\udb80\udecb", @@ -87,17 +86,15 @@ "car": "\udb80\udd0b", "default": ["\udb81\udd7f", "\udb81\udd80", "\udb81\udd7e"] }, - "tooltip-format": "{desc} - {volume}%", - "on-click": "alacritty --class pulsemixer -e pulsemixer" + "on-click": "wezterm start --class pulsemixer -- pulsemixer" }, "network": { // "interface": "wlp2*", // (Optional) To force the use of this interface - "format-wifi": "\udb81\udda9", + "format-wifi": "{essid} \udb81\udda9", "format-ethernet": "{ipaddr}/{cidr} \udb80\ude00", "format-disconnected": "Disconnected \udb81\uddaa", - "format-alt": "{ifname}: {ipaddr}/{cidr}", - "tooltip-format": "{essid}" + "format-alt": "{ifname}: {ipaddr}/{cidr}" }, } diff --git a/user/.config/waybar/power-profiles b/user/.config/waybar/power-profiles index ce8b990be..35f9dc126 100755 --- a/user/.config/waybar/power-profiles +++ b/user/.config/waybar/power-profiles @@ -1,10 +1,10 @@ #!/bin/bash currntpwr=$(powerprofilesctl get) if [ "${currntpwr}" = "performance" ]; then - pwr="󰓅" + pwr="Performance 󰓅" elif [ "${currntpwr}" = "balanced" ]; then - pwr="󰾅" + pwr="Balanced 󰾅" elif [ "${currntpwr}" = "power-saver" ]; then - pwr="󰾆" + pwr="PowerSaver 󰾆" fi echo "$pwr" diff --git a/user/.config/waybar/style.css b/user/.config/waybar/style.css index aa549a228..bea4f0fff 100644 --- a/user/.config/waybar/style.css +++ b/user/.config/waybar/style.css @@ -10,7 +10,6 @@ window#waybar { color: #ebdbb2; transition-property: background-color; transition-duration: .5s; - border-right: 2px solid #665c54; } window#waybar.hidden { @@ -41,23 +40,29 @@ button:hover { #workspaces { font-family: Symbols Nerd Font Mono; - font-size: 22px; + font-size: 20px; } #workspaces button { + padding: 0 3px; + background-color: transparent; color: #ebdbb2; + border-radius: 5px; } #workspaces button.active { color: #8ec07c; + border-radius: 5px; } #workspaces button:hover { color: #fb4934; + border-radius: 5px; } #workspaces button.urgent { background-color: #eb4d4b; + border-radius: 5px; } #mode { @@ -75,7 +80,7 @@ button:hover { #mode { font-family: Symbols Nerd Font Mono, mononoki Nerd Font; font-size: 16px; - padding: 8 1px; + padding: 0 8px; color: #ebdbb2; }