diff options
| author | Ja.KooLit <jimmielovejay@gmail.com> | 2024-01-02 01:21:53 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-02 01:21:53 +0900 |
| commit | 1acea95602ecd292f4c806ce946c0ab33176e4ce (patch) | |
| tree | a43d4ccfd313a4effa92919fef8d96934c23bac8 | |
| parent | 3d0283f6c0f323bf504d99aadb0019e6357048a8 (diff) | |
| parent | e2bcb89ce79d0a0469e3eb362cc0cc802ddac208 (diff) | |
Merge pull request #116 from JaKooLit/development
Development
76 files changed, 716 insertions, 615 deletions
diff --git a/config/hypr/UserConfigs/00-Readme b/config/hypr/UserConfigs/00-Readme index 315e3376..481eeace 100644 --- a/config/hypr/UserConfigs/00-Readme +++ b/config/hypr/UserConfigs/00-Readme @@ -1,9 +1,16 @@ +www.github.com/JaKooLit + Hyprland-Dots v2.2.2 -1.) Suggest not to rename files in this folder. As this is connected and being sourced from hyprland.conf in ~/.config/hypr +1.) Suggest not to rename any files in this folder. As this is connected and being sourced from hyprland.conf in ~/.config/hypr 2.) This folder, along with UserScripts folder will NOT be touch during update. 3.) However, if hyprland has a big change in settings, i.e., blur section is moved into another group, you should managed the change. +4.) Guidance on the keybinds. Suggest NOT to assign a keybind which I set on the default Keybinds. Else will conflict. Once Hyprland decided to have a global keybinds, then I will adjust. + +5.) If you think that the default keybinds SHOULD be adjusted, open an issue on my github page and present me a valid argument. Like conflicting to GLOBAL keybinds, etc etc etc. + + I will update the Hyprland-Dots wiki for guidance. Make sure to check out changelogs as well diff --git a/config/hypr/UserConfigs/Laptops.conf b/config/hypr/UserConfigs/Laptops.conf index 14413ce0..20a6c6f9 100644 --- a/config/hypr/UserConfigs/Laptops.conf +++ b/config/hypr/UserConfigs/Laptops.conf @@ -3,10 +3,9 @@ # See https://wiki.hyprland.org/Configuring/Keywords/ for more variable settings # These configs are mostly for laptops. This is addemdum to Keybinds.conf -$configs = $HOME/.config/hypr/configs -$UserConfigs = $HOME/.config/hypr/UserConfigs $mainMod = SUPER $scriptsDir = $HOME/.config/hypr/scripts +$UserConfigs = $HOME/.config/hypr/UserConfigs bind = , xf86KbdBrightnessDown, exec, $scriptsDir/BrightnessKbd.sh --dec #Keyboard brightness Down bind = , xf86KbdBrightnessUp, exec, $scriptsDir/BrightnessKbd.sh --inc #Keyboard brightness up diff --git a/config/hypr/UserConfigs/Monitors.conf b/config/hypr/UserConfigs/Monitors.conf index ca2ef0e6..3e758c0a 100644 --- a/config/hypr/UserConfigs/Monitors.conf +++ b/config/hypr/UserConfigs/Monitors.conf @@ -15,7 +15,7 @@ monitor=,preferred,auto,1 #monitor = eDP-1, preferred, auto, 1 #monitor = eDP-1, 2560x1440@165, 0x0, 1 #own screen -#monitor = DP-2, preferred, auto, 1 +#monitor = DP-3, 1920x1080@240, auto, 1 #monitor = DP-1, preferred, auto, 1 #monitor = HDMI-A-1, preferred,auto,1 diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf index 2aacba44..d8385f03 100644 --- a/config/hypr/UserConfigs/Startup_Apps.conf +++ b/config/hypr/UserConfigs/Startup_Apps.conf @@ -2,15 +2,15 @@ #Commands & Apps to be executed at launch $scriptsDir = $HOME/.config/hypr/scripts -$UserscriptsDir = $HOME/.config/hypr/UserScripts -$lock = $scriptsDir/LockScreen.sh -$SwwwRandom = $scriptsDir/WallpaperRandom.sh -$WallpaperPath = $HOME/Pictures/wallpapers +$UserScripts = $HOME/.config/hypr/UserScripts +$wallDIR=$HOME/Pictures/wallpapers +$lock = $scriptsDir/LockScreen.sh +$SwwwRandom = $UserscriptsDir/WallpaperAutoChange.sh # wallpaper stuff / More wallpaper options below exec-once = swww query || swww init -exec-once = $SwwwRandom $WallpaperPath # random wallpaper switcher every 30 minutes +exec-once = $SwwwRandom $wallDIR # random wallpaper switcher every 30 minutes # Startup exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP diff --git a/config/hypr/UserScripts/00-Readme b/config/hypr/UserScripts/00-Readme index de251df0..de251df0 100644..100755 --- a/config/hypr/UserScripts/00-Readme +++ b/config/hypr/UserScripts/00-Readme diff --git a/config/hypr/scripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh index 9c7cdffc..163101e2 100755 --- a/config/hypr/scripts/QuickEdit.sh +++ b/config/hypr/UserScripts/QuickEdit.sh @@ -1,7 +1,8 @@ #!/bin/bash +# Rofi menu for Quick Edit / View of Settings (SUPER E) -defaultDir="$HOME/.config/hypr/configs" -userDir="$HOME/.config/hypr/UserConfigs" +configs="$HOME/.config/hypr/configs" +UserConfigs="$HOME/.config/hypr/UserConfigs" menu(){ printf "1. view Env-variables\n" @@ -19,31 +20,31 @@ main() { choice=$(menu | rofi -dmenu -config ~/.config/rofi/config-compact.rasi | cut -d. -f1) case $choice in 1) - kitty -e nano "$userDir/ENVariables.conf" + kitty -e nano "$UserConfigs/ENVariables.conf" ;; 2) - kitty -e nano "$userDir/WindowRules.conf" + kitty -e nano "$UserConfigs/WindowRules.conf" ;; 3) - kitty -e nano "$userDir/Startup_Apps.conf" + kitty -e nano "$UserConfigs/Startup_Apps.conf" ;; 4) - kitty -e nano "$userDir/UserKeybinds.conf" + kitty -e nano "$UserConfigs/UserKeybinds.conf" ;; 5) - kitty -e nano "$userDir/Monitors.conf" + kitty -e nano "$UserConfigs/Monitors.conf" ;; 6) - kitty -e nano "$userDir/Laptops.conf" + kitty -e nano "$UserConfigs/Laptops.conf" ;; 7) - kitty -e nano "$userDir/UserSettings.conf" + kitty -e nano "$UserConfigs/UserSettings.conf" ;; 8) - kitty -e nano "$defaultDir/Settings.conf" + kitty -e nano "$configs/Settings.conf" ;; 9) - kitty -e nano "$defaultDir/Keybinds.conf" + kitty -e nano "$configs/Keybinds.conf" ;; *) ;; diff --git a/config/hypr/scripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh index 405451f5..405451f5 100755 --- a/config/hypr/scripts/RofiBeats.sh +++ b/config/hypr/UserScripts/RofiBeats.sh diff --git a/config/hypr/UserScripts/Sunset.sh b/config/hypr/UserScripts/Sunset.sh index 96c27c5b..50e386d1 100755 --- a/config/hypr/UserScripts/Sunset.sh +++ b/config/hypr/UserScripts/Sunset.sh @@ -1,2 +1,7 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## + +# wlsunset project page +# https://sr.ht/~kennylevinsen/wlsunset/ + wlsunset -t 4000 -T 6500 -d 900 -S 07:00 -s 19:00
\ No newline at end of file diff --git a/config/hypr/scripts/WallpaperRandom.sh b/config/hypr/UserScripts/WallpaperAutoChange.sh index 13bd2995..56f2ee05 100755 --- a/config/hypr/scripts/WallpaperRandom.sh +++ b/config/hypr/UserScripts/WallpaperAutoChange.sh @@ -1,4 +1,6 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# source https://wiki.archlinux.org/title/Hyprland#Using_a_script_to_change_wallpaper_every_X_minutes # This script will randomly go through the files of a directory, setting it # up as the wallpaper at regular intervals diff --git a/config/hypr/UserScripts/WallpaperRandom.sh b/config/hypr/UserScripts/WallpaperRandom.sh new file mode 100755 index 00000000..f8cc54f9 --- /dev/null +++ b/config/hypr/UserScripts/WallpaperRandom.sh @@ -0,0 +1,26 @@ +#!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# Script for Random Wallpaper ( CTRL ALT W) + +wallDIR="$HOME/Pictures/wallpapers" +scriptsDir="$HOME/.config/hypr/scripts" + +PICS=($(find ${wallDIR} -type f \( -name "*.jpg" -o -name "*.jpeg" -o -name "*.png" -o -name "*.gif" \))) +RANDOMPICS=${PICS[ $RANDOM % ${#PICS[@]} ]} + + +# Transition config +FPS=60 +TYPE="random" +DURATION=1 +BEZIER=".43,1.19,1,.4" +SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION --transition-bezier $BEZIER" + + +swww query || swww init && swww img ${RANDOMPICS} $SWWW_PARAMS + + +${scriptsDir}/PywalSwww.sh +sleep 1 +${scriptsDir}/Refresh.sh + diff --git a/config/hypr/scripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh index 691b8fd2..663fb540 100755 --- a/config/hypr/scripts/WallpaperSelect.sh +++ b/config/hypr/UserScripts/WallpaperSelect.sh @@ -1,9 +1,11 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# This script for selecting wallpapers (SUPER W) SCRIPTSDIR="$HOME/.config/hypr/scripts" # WALLPAPERS PATH -DIR="$HOME/Pictures/wallpapers" +wallDIR="$HOME/Pictures/wallpapers" # Transition config FPS=30 @@ -18,18 +20,18 @@ if pidof swaybg > /dev/null; then fi # Retrieve image files -PICS=($(ls "${DIR}" | grep -E ".jpg$|.jpeg$|.png$|.gif$")) +PICS=($(ls "${wallDIR}" | grep -E ".jpg$|.jpeg$|.png$|.gif$")) RANDOM_PIC="${PICS[$((RANDOM % ${#PICS[@]}))]}" RANDOM_PIC_NAME="${#PICS[@]}. random" # Rofi command -rofi_command="rofi -dmenu -config ~/.config/rofi/config-wallpaper.rasi" +rofi_command="rofi -show -dmenu -config ~/.config/rofi/config-wallpaper.rasi" menu() { for i in "${!PICS[@]}"; do # Displaying .gif to indicate animated images if [[ -z $(echo "${PICS[$i]}" | grep .gif$) ]]; then - printf "$(echo "${PICS[$i]}" | cut -d. -f1)\n" + printf "$(echo "${PICS[$i]}" | cut -d. -f1)\x00icon\x1f${wallDIR}/${PICS[$i]}\n" else printf "${PICS[$i]}\n" fi @@ -50,7 +52,7 @@ main() { # Random choice case if [ "$choice" = "$RANDOM_PIC_NAME" ]; then - swww img "${DIR}/${RANDOM_PIC}" $SWWW_PARAMS + swww img "${wallDIR}/${RANDOM_PIC}" $SWWW_PARAMS exit 0 fi @@ -65,7 +67,7 @@ main() { done if [[ $pic_index -ne -1 ]]; then - swww img "${DIR}/${PICS[$pic_index]}" $SWWW_PARAMS + swww img "${wallDIR}/${PICS[$pic_index]}" $SWWW_PARAMS else echo "Image not found." exit 1 diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf index 84b78cff..1da7e9f7 100644 --- a/config/hypr/configs/Keybinds.conf +++ b/config/hypr/configs/Keybinds.conf @@ -1,34 +1,40 @@ ## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## # Default Keybinds +# visit https://wiki.hyprland.org/Configuring/Binds/ for more info $mainMod = SUPER +# Default $scriptsDir = $HOME/.config/hypr/scripts +$configs = $HOME/.config/hypr/configs +# User +$UserConfigs = $HOME/.config/hypr/UserConfigs +$UserScripts = $HOME/.config/hypr/UserScripts bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0 +bind = $mainMod, Q, killactive, +bind = $mainMod, F, fullscreen bind = $mainMod SHIFT, Q, closewindow, bind = $mainMod SHIFT, F, togglefloating, bind = $mainMod ALT, F, exec, hyprctl dispatch workspaceopt allfloat -bind = $mainMod, F, fullscreen -bind = $mainMod, Q, killactive, bind = CTRL ALT, L, exec, $scriptsDir/LockScreen.sh bind = CTRL ALT, P, exec, $scriptsDir/Wlogout.sh # FEATURES / EXTRAS +bind = $mainMod, H, exec, $scriptsDir/KeyHints.sh # Small help file bind = $mainMod ALT, R, exec, $scriptsDir/Refresh.sh # Refresh waybar, swaync, rofi -bind = $mainMod CTRL, S, exec, $scriptsDir/RofiBeats.sh # online music bind = $mainMod ALT, E, exec, $scriptsDir/RofiEmoji.sh # emoji -bind = $mainMod, H, exec, $scriptsDir/KeyHints.sh # Small help file -bind = $mainMod, E, exec, $scriptsDir/QuickEdit.sh # Quick Edit Hyprland Settings bind = $mainMod SHIFT, B, exec, $scriptsDir/ChangeBlur.sh # Toggle blur settings bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh # animations ON/OFF bind = $mainMod ALT, K, exec, $scriptsDir/SwitchKeyboardLayout.sh # Switch Keyboard Layout -bind = $mainMod, Space, exec, $scriptsDir/ChangeLayout.sh # Toggle Master or Dwindle Layout +bind = $mainMod ALT, L, exec, $scriptsDir/ChangeLayout.sh # Toggle Master or Dwindle Layout bind = $mainMod ALT, V, exec, $scriptsDir/ClipManager.sh # Clipboard Manager bind = $mainMod SHIFT, N, exec, swaync-client -t -sw # swayNC panel -# Wallpaper related keybinds -bind = $mainMod, W, exec, $scriptsDir/WallpaperSelect.sh # Select wallpaper to apply -bind = CTRL ALT, W, exec, $scriptsDir/Wallpaper.sh # Random wallpapers +# FEATURES / EXTRAS (UserScripts) +bind = $mainMod, E, exec, $UserScripts/QuickEdit.sh # Quick Edit Hyprland Settings +bind = $mainMod SHIFT, M, exec, $UserScripts/RofiBeats.sh # online music +bind = $mainMod, W, exec, $UserScripts/WallpaperSelect.sh # Select wallpaper to apply +bind = CTRL ALT, W, exec, $UserScripts/WallpaperRandom.sh # Random wallpapers # Waybar / Bar related bind = $mainMod, B, exec, killall -SIGUSR1 waybar # Toggle hide/show waybar @@ -43,7 +49,6 @@ bind = $mainMod, K, layoutmsg, cycleprev bind = $mainMod, M, exec, hyprctl dispatch splitratio 0.3 bind = $mainMod, P, pseudo, # dwindle bind = $mainMod CTRL, Return, layoutmsg, swapwithmaster -bind = $mainMod SHIFT, M, exec, hyprctl dispatch splitratio -0.3 # group bind = $mainMod, G, togglegroup diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index 24c0be6f..69f421cf 100644 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -11,12 +11,9 @@ $UserConfigs = $HOME/.config/hypr/UserConfigs source= $UserConfigs/Startup_Apps.conf source= $UserConfigs/ENVariables.conf -source= $UserConfigs/UserKeybinds.conf -source= $UserConfigs/UserSettings.conf source= $UserConfigs/Monitors.conf source= $UserConfigs/Laptops.conf source= $UserConfigs/LaptopDisplay.conf source= $UserConfigs/WindowRules.conf - - - +source= $UserConfigs/UserKeybinds.conf +source= $UserConfigs/UserSettings.conf
\ No newline at end of file diff --git a/config/hypr/scripts/AirplaneMode.sh b/config/hypr/scripts/AirplaneMode.sh index f3a50629..1176c80f 100755 --- a/config/hypr/scripts/AirplaneMode.sh +++ b/config/hypr/scripts/AirplaneMode.sh @@ -1,4 +1,6 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# Airplane Mode. Turning on or off all wifi using rfkill. notif="$HOME/.config/swaync/images/bell.png" diff --git a/config/hypr/scripts/Brightness.sh b/config/hypr/scripts/Brightness.sh index 14c03da5..04987ab1 100755 --- a/config/hypr/scripts/Brightness.sh +++ b/config/hypr/scripts/Brightness.sh @@ -1,4 +1,6 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# Script for Monitor backlights (if supported) using brightnessctl iDIR="$HOME/.config/swaync/icons" notification_timeout=1000 diff --git a/config/hypr/scripts/BrightnessKbd.sh b/config/hypr/scripts/BrightnessKbd.sh index 3bdcebcb..f96c6e08 100755 --- a/config/hypr/scripts/BrightnessKbd.sh +++ b/config/hypr/scripts/BrightnessKbd.sh @@ -1,4 +1,6 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# Script for keyboard backlights (if supported) using brightnessctl iDIR="$HOME/.config/swaync/icons" diff --git a/config/hypr/scripts/ChangeBlur.sh b/config/hypr/scripts/ChangeBlur.sh index 95789f5c..8ad0dd40 100755 --- a/config/hypr/scripts/ChangeBlur.sh +++ b/config/hypr/scripts/ChangeBlur.sh @@ -1,4 +1,6 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +## Script for changing blurs on the fly notif="$HOME/.config/swaync/images/bell.png" diff --git a/config/hypr/scripts/ChangeLayout.sh b/config/hypr/scripts/ChangeLayout.sh index 93bc2fe9..5981024a 100755 --- a/config/hypr/scripts/ChangeLayout.sh +++ b/config/hypr/scripts/ChangeLayout.sh @@ -1,4 +1,6 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# for changing Hyprland Layouts (Master or Dwindle) on the fly notif="$HOME/.config/swaync/images/bell.png" diff --git a/config/hypr/scripts/ClipManager.sh b/config/hypr/scripts/ClipManager.sh index eb717eaa..ee6b512f 100755 --- a/config/hypr/scripts/ClipManager.sh +++ b/config/hypr/scripts/ClipManager.sh @@ -1,6 +1,6 @@ #!/bin/bash -# -# Clipboard Manager +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# Clipboard Manager. This needed cliphist & wl-copy and of course rofi if [[ ! $(pidof rofi) ]]; then cliphist list | rofi -dmenu -config ~/.config/rofi/config-long.rasi | cliphist decode | wl-copy diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh index ec8c4473..dab6e816 100755 --- a/config/hypr/scripts/DarkLight.sh +++ b/config/hypr/scripts/DarkLight.sh @@ -1,5 +1,8 @@ #!/bin/bash -set -x +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# For Dark and Light switching +# Note: Scripts are looking for keywords Light or Dark except for wallpapers as the are in a separate folders + # Paths wallpaper_base_path="$HOME/Pictures/wallpapers/Dynamic-Wallpapers" dark_wallpapers="$wallpaper_base_path/Dark" diff --git a/config/hypr/scripts/GameMode.sh b/config/hypr/scripts/GameMode.sh index d53ec7d3..f05676eb 100755 --- a/config/hypr/scripts/GameMode.sh +++ b/config/hypr/scripts/GameMode.sh @@ -1,4 +1,6 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# Game Mode. Turning off all animations notif="$HOME/.config/swaync/images/bell.png" SCRIPTSDIR="$HOME/.config/hypr/scripts" diff --git a/config/hypr/scripts/KeyHints.sh b/config/hypr/scripts/KeyHints.sh index 180befa1..5b79cf06 100755 --- a/config/hypr/scripts/KeyHints.sh +++ b/config/hypr/scripts/KeyHints.sh @@ -1,4 +1,6 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# Keyhints. Idea got from Garuda Hyprland # Detect monitor resolution and scale x_mon=$(hyprctl -j monitors | jq '.[] | select(.focused==true) | .width') @@ -42,8 +44,8 @@ yad --width=$dynamic_width --height=$dynamic_height \ "๏
ผ Q" "close active window" "(not kill)" \ "๏
ผ Shift Q " "closes a specified window" "(window)" \ "๏
ผ Alt V" "Clipboard Manager" "(cliphist)" \ -"๏
ผ W" "Choose wallpaper" "(swww)" \ -"CTRL ALT W" "Random wallpaper" "(swww)" \ +"๏
ผ W" "Choose wallpaper" "(Wallpaper Menu)" \ +"CTRL ALT W" "Random wallpaper" "(via swww)" \ "๏
ผ B" "Hide/UnHide Waybar" "waybar" \ "๏
ผ CTRL B" "Choose waybar styles" "(waybar styles)" \ "๏
ผ ALT B" "Choose waybar layout" "(waybar layout)" \ @@ -57,11 +59,11 @@ yad --width=$dynamic_width --height=$dynamic_height \ "CTRL ALT L" "screen lock" "(swaylock)" \ "CTRL ALT Del" "Hyprland Exit" "(SAVE YOUR WORK!!!)" \ "๏
ผ F" "Fullscreen" "Toggles to full screen" \ -"๏
ผ Spacebar" "Toggle Dwindle | Master Layout" "Hyprland Layout" \ +"๏
ผ ALT L" "Toggle Dwindle | Master Layout" "Hyprland Layout" \ "๏
ผ Shift F" "Toggle float" "single window" \ "๏
ผ ALT F" "Toggle all windows to float" "all windows" \ "๏
ผ Shift B" "Toggle Blur" "normal or less blur" \ -"๏
ผ SHIFT G" "Gamemode! All animations off" "" \ +"๏
ผ SHIFT G" "Gamemode! All animations OFF or ON" "toggle" \ "๏
ผ H" "Launch this app" "" \ "๏
ผ E" "View or EDIT Keybinds, Settings, Monitor" "" \ "" "" "" \ diff --git a/config/hypr/scripts/LockScreen.sh b/config/hypr/scripts/LockScreen.sh index 538b6eff..1e676780 100755 --- a/config/hypr/scripts/LockScreen.sh +++ b/config/hypr/scripts/LockScreen.sh @@ -1,4 +1,6 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# For Swaylock CONFIG="$HOME/.config/swaylock/config" diff --git a/config/hypr/scripts/MediaCtrl.sh b/config/hypr/scripts/MediaCtrl.sh index 9d970443..d9855e4f 100755 --- a/config/hypr/scripts/MediaCtrl.sh +++ b/config/hypr/scripts/MediaCtrl.sh @@ -1,4 +1,6 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# Playerctl music_icon="$HOME/.config/swaync/icons/music.png" diff --git a/config/hypr/scripts/Polkit-NixOS.sh b/config/hypr/scripts/Polkit-NixOS.sh index ef5e74fd..048c1b02 100755 --- a/config/hypr/scripts/Polkit-NixOS.sh +++ b/config/hypr/scripts/Polkit-NixOS.sh @@ -1,4 +1,6 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# For NixOS starting of polkit-gnome. Dec 2023, the settings stated in NixOS wiki does not work so have to manual start it # Find all polkit-gnome executables in the Nix store polkit_gnome_paths=$(find /nix/store -name 'polkit-gnome-authentication-agent-1' -type f 2>/dev/null) diff --git a/config/hypr/scripts/Polkit.sh b/config/hypr/scripts/Polkit.sh index 031c74d6..07b1211d 100755 --- a/config/hypr/scripts/Polkit.sh +++ b/config/hypr/scripts/Polkit.sh @@ -1,4 +1,6 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# This is for polkits, it will start from top and will stop if the top is executed # Polkit possible paths files to check polkit=( diff --git a/config/hypr/scripts/PortalHyprland.sh b/config/hypr/scripts/PortalHyprland.sh index 70a994ed..389ec738 100755 --- a/config/hypr/scripts/PortalHyprland.sh +++ b/config/hypr/scripts/PortalHyprland.sh @@ -1,4 +1,7 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# For manually starting xdg-desktop-portal + sleep 1 killall xdg-desktop-portal-hyprland killall xdg-desktop-portal-wlr diff --git a/config/hypr/scripts/PywalSwww.sh b/config/hypr/scripts/PywalSwww.sh index d91d3f60..0cbadaf4 100755 --- a/config/hypr/scripts/PywalSwww.sh +++ b/config/hypr/scripts/PywalSwww.sh @@ -1,4 +1,6 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# Pywal Colors for current wallpaper # Define the path to the swww cache directory cache_dir="$HOME/.cache/swww/" diff --git a/config/hypr/scripts/Refresh.sh b/config/hypr/scripts/Refresh.sh index b5e0f556..a585eb84 100755 --- a/config/hypr/scripts/Refresh.sh +++ b/config/hypr/scripts/Refresh.sh @@ -1,7 +1,9 @@ -#!/usr/bin/env bash +#!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# Scripts for refreshing waybar, rofi, swaync, pywal colors SCRIPTSDIR=$HOME/.config/hypr/scripts -UserSCRIPTSDIR=$HOME/.config/hypr/UserScripts +UserScripts=$HOME/.config/hypr/UserScripts # Define file_exists function file_exists() { @@ -30,8 +32,8 @@ swaync > /dev/null 2>&1 & # Relaunching rainbow borders if the script exists sleep 1 -if file_exists "${UserSCRIPTSDIR}/RainbowBorders.sh"; then - ${UserSCRIPTSDIR}/RainbowBorders.sh & +if file_exists "${UserScripts}/RainbowBorders.sh"; then + ${UserScripts}/RainbowBorders.sh & fi # for cava-pywal (note, need to manually restart cava once wallpaper changes) diff --git a/config/hypr/scripts/RefreshNoWaybar.sh b/config/hypr/scripts/RefreshNoWaybar.sh index be06167c..f0c3d569 100755 --- a/config/hypr/scripts/RefreshNoWaybar.sh +++ b/config/hypr/scripts/RefreshNoWaybar.sh @@ -1,11 +1,12 @@ -#!/usr/bin/env bash +#!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## # Modified version of Refresh but no waybar refresh # Used by automatic wallpaper change -# Modified inorder to refresh rofi background, Pywal +# Modified inorder to refresh rofi background, Pywal, SwayNC SCRIPTSDIR=$HOME/.config/hypr/scripts -UserSCRIPTSDIR=$HOME/.config/hypr/UserScripts +UserScripts=$HOME/.config/hypr/UserScripts # Define file_exists function file_exists() { @@ -29,8 +30,8 @@ ${SCRIPTSDIR}/PywalSwww.sh & # Relaunching rainbow borders if the script exists sleep 1 -if file_exists "${UserSCRIPTSDIR}/RainbowBorders.sh"; then - ${UserSCRIPTSDIR}/RainbowBorders.sh & +if file_exists "${UserScripts}/RainbowBorders.sh"; then + ${UserScripts}/RainbowBorders.sh & fi # for cava-pywal (note, need to manually restart cava once wallpaper changes) diff --git a/config/hypr/scripts/RofiEmoji.sh b/config/hypr/scripts/RofiEmoji.sh index 6667cc53..4182a5a9 100755 --- a/config/hypr/scripts/RofiEmoji.sh +++ b/config/hypr/scripts/RofiEmoji.sh @@ -1,11 +1,12 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# Rofi Emoticons. Not my own. Cant remember the source sed '1,/^### DATA ###$/d' $0 | rofi -dmenu -config ~/.config/rofi/config-long.rasi| cut -d ' ' -f 1 | tr -d '\n' | wl-copy exit - ### DATA ### ๐ grinning face face smile happy joy :D grin ๐ grinning face with big eyes face happy joy haha :D :) smile funny diff --git a/config/hypr/scripts/ScreenShot.sh b/config/hypr/scripts/ScreenShot.sh index 1d5eeacf..ddf4398b 100755 --- a/config/hypr/scripts/ScreenShot.sh +++ b/config/hypr/scripts/ScreenShot.sh @@ -1,4 +1,6 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# Screenshots scripts iDIR="$HOME/.config/swaync/icons" notify_cmd_shot="notify-send -h string:x-canonical-private-synchronous:shot-notify -u low -i ${iDIR}/picture.png" diff --git a/config/hypr/scripts/SwitchKeyboardLayout.sh b/config/hypr/scripts/SwitchKeyboardLayout.sh index a53a567d..90451c67 100755 --- a/config/hypr/scripts/SwitchKeyboardLayout.sh +++ b/config/hypr/scripts/SwitchKeyboardLayout.sh @@ -1,4 +1,6 @@ -#!/usr/bin/env bash +#!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# This is for changing kb_layouts. Set kb_layouts in $settings_file layout_f="$HOME/.cache/kb_layout" settings_file="$HOME/.config/hypr/UserConfigs/UserSettings.conf" diff --git a/config/hypr/scripts/TouchPad.sh b/config/hypr/scripts/TouchPad.sh index 1fcb3249..47ad48f6 100755 --- a/config/hypr/scripts/TouchPad.sh +++ b/config/hypr/scripts/TouchPad.sh @@ -1,6 +1,8 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# For disabling touchpad. -HYPRLAND_DEVICE="asue1209:00-04f3:319f-touchpad" +Touchpad_Device="asue1209:00-04f3:319f-touchpad" notif="$HOME/.config/swaync/images/bell.png" XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR:-/run/user/$(id -u)} @@ -16,7 +18,7 @@ toggle_touchpad() { fi notify-send -u low -i "$notif" "Touchpad $action" - hyprctl keyword "device:$HYPRLAND_DEVICE:enabled" "$(cat "$STATUS_FILE")" + hyprctl keyword "device:$Touchpad_Device:enabled" "$(cat "$STATUS_FILE")" } toggle_touchpad diff --git a/config/hypr/scripts/Volume.sh b/config/hypr/scripts/Volume.sh index f68491cf..1c18211f 100755 --- a/config/hypr/scripts/Volume.sh +++ b/config/hypr/scripts/Volume.sh @@ -1,4 +1,6 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# Scripts for volume controls for audio and mic iDIR="$HOME/.config/swaync/icons" diff --git a/config/hypr/scripts/Wallpaper.sh b/config/hypr/scripts/Wallpaper.sh deleted file mode 100755 index d75d2eab..00000000 --- a/config/hypr/scripts/Wallpaper.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -DIR="$HOME/Pictures/wallpapers" -SCRIPTSDIR="$HOME/.config/hypr/scripts" - -PICS=($(find ${DIR} -type f \( -name "*.jpg" -o -name "*.jpeg" -o -name "*.png" -o -name "*.gif" \))) -RANDOMPICS=${PICS[ $RANDOM % ${#PICS[@]} ]} - - -# Transition config -FPS=60 -TYPE="random" -DURATION=1 -BEZIER=".43,1.19,1,.4" -SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION --transition-bezier $BEZIER" - - -swww query || swww init && swww img ${RANDOMPICS} $SWWW_PARAMS - - -${SCRIPTSDIR}/PywalSwww.sh -sleep 1 -${SCRIPTSDIR}/Refresh.sh - diff --git a/config/hypr/scripts/WaybarCava.sh b/config/hypr/scripts/WaybarCava.sh new file mode 100755 index 00000000..77fce82a --- /dev/null +++ b/config/hypr/scripts/WaybarCava.sh @@ -0,0 +1,32 @@ +# #! /bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## + +# Not my own work. This was added through Github PR. Credit to original author + +#----- Optimized bars animation without much CPU usage increase -------- +bar="โโโโโ
โโโ" +dict="s/;//g" + +# Calculate the length of the bar outside the loop +bar_length=${#bar} + +# Create dictionary to replace char with bar +for ((i = 0; i < bar_length; i++)); do + dict+=";s/$i/${bar:$i:1}/g" +done + +# Create cava config +config_file="/tmp/bar_cava_config" +cat >"$config_file" <<EOF +[general] +bars = 10 + +[output] +method = raw +raw_target = /dev/stdout +data_format = ascii +ascii_max_range = 7 +EOF + +# Read stdout from cava and perform substitution in a single sed command +cava -p "$config_file" | sed -u "$dict" diff --git a/config/hypr/scripts/WaybarLayout.sh b/config/hypr/scripts/WaybarLayout.sh index dbe0ee7f..31146b59 100755 --- a/config/hypr/scripts/WaybarLayout.sh +++ b/config/hypr/scripts/WaybarLayout.sh @@ -1,12 +1,14 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# Script for waybar layout or configs set -euo pipefail IFS=$'\n\t' # Define directories -config_dir="$HOME/.config/waybar/configs" +waybar_layouts="$HOME/.config/waybar/configs" waybar_config="$HOME/.config/waybar/config" -scripts_dir="$HOME/.config/hypr/scripts" +SCRIPTSDIR="$HOME/.config/hypr/scripts" rofi_config="$HOME/.config/rofi/config-waybar-layout.rasi" # Function to display menu options @@ -14,14 +16,14 @@ menu() { options=() while IFS= read -r file; do options+=("$(basename "$file")") - done < <(find "$config_dir" -maxdepth 1 -type f -exec basename {} \; | sort) + done < <(find "$waybar_layouts" -maxdepth 1 -type f -exec basename {} \; | sort) printf '%s\n' "${options[@]}" } # Apply selected configuration apply_config() { - ln -sf "$config_dir/$1" "$waybar_config" + ln -sf "$waybar_layouts/$1" "$waybar_config" restart_waybar_if_needed } @@ -31,7 +33,7 @@ restart_waybar_if_needed() { pkill waybar sleep 0.1 # Delay for Waybar to completely terminate fi - "${scripts_dir}/Refresh.sh" & + "${SCRIPTSDIR}/Refresh.sh" & } # Main function diff --git a/config/hypr/scripts/WaybarStyles.sh b/config/hypr/scripts/WaybarStyles.sh index 9395c528..bbcb6ea3 100755 --- a/config/hypr/scripts/WaybarStyles.sh +++ b/config/hypr/scripts/WaybarStyles.sh @@ -1,29 +1,31 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## +# Script for waybar styles set -euo pipefail IFS=$'\n\t' # Define directories -config_dir="$HOME/.config/waybar/style" -waybar_config="$HOME/.config/waybar/style.css" -scripts_dir="$HOME/.config/hypr/scripts" +waybar_styles="$HOME/.config/waybar/style" +waybar_style="$HOME/.config/waybar/style.css" +SCRIPTSDIR="$HOME/.config/hypr/scripts" rofi_config="$HOME/.config/rofi/config-waybar-style.rasi" # Function to display menu options menu() { options=() while IFS= read -r file; do - if [ -f "$config_dir/$file" ]; then + if [ -f "$waybar_styles/$file" ]; then options+=("$(basename "$file" .css)") fi - done < <(find "$config_dir" -maxdepth 1 -type f -name '*.css' -exec basename {} \; | sort) + done < <(find "$waybar_styles" -maxdepth 1 -type f -name '*.css' -exec basename {} \; | sort) printf '%s\n' "${options[@]}" } # Apply selected style apply_style() { - ln -sf "$config_dir/$1.css" "$waybar_config" + ln -sf "$waybar_styles/$1.css" "$waybar_style" restart_waybar_if_needed } @@ -33,7 +35,7 @@ restart_waybar_if_needed() { pkill waybar sleep 0.1 # Delay for Waybar to completely terminate fi - "${scripts_dir}/Refresh.sh" & + "${SCRIPTSDIR}/Refresh.sh" & } # Main function diff --git a/config/hypr/scripts/Wlogout.sh b/config/hypr/scripts/Wlogout.sh index 998d3fed..4c53c381 100755 --- a/config/hypr/scripts/Wlogout.sh +++ b/config/hypr/scripts/Wlogout.sh @@ -1,8 +1,11 @@ #!/bin/bash +## /* ---- ๐ซ https://github.com/JaKooLit ๐ซ ---- */ ## + +# wlogout (Power, Screen Lock, Suspend, etc) # Set variables for parameters -A_2160=2500 -B_2160=2700 +A_2160=680 +B_2160=750 A_1440=500 B_1440=550 A_1080=300 @@ -24,7 +27,7 @@ echo "Detected Resolution: $resolution" # Set parameters based on screen resolution and scaling factor if ((resolution >= 2160)); then - wlogout --protocol layer-shell -b 6 -T $(awk "BEGIN {printf \"%.0f\", $A_2160 * 2160 * $hypr_scale / $resolution}") -B $(awk "BEGIN {printf \"%.0f\", $B_2160 * 2160 * $hypr_scale / $resolution}") & + wlogout --protocol layer-shell -b 3 -T $(awk "BEGIN {printf \"%.0f\", $A_2160 * 2160 * $hypr_scale / $resolution}") -B $(awk "BEGIN {printf \"%.0f\", $B_2160 * 2160 * $hypr_scale / $resolution}") & echo "Setting parameters for resolution >= 2160p" elif ((resolution >= 1440)); then wlogout --protocol layer-shell -b 6 -T $(awk "BEGIN {printf \"%.0f\", $A_1440 * 1440 * $hypr_scale / $resolution}") -B $(awk "BEGIN {printf \"%.0f\", $B_1440 * 1440 * $hypr_scale / $resolution}") & @@ -38,4 +41,4 @@ elif ((resolution > 720)); then else wlogout & echo "Setting default parameters for resolution <= 720p" -fi +fi
\ No newline at end of file diff --git a/config/hypr/v2.2.2 b/config/hypr/v2.2.3 index 31b3414d..31b3414d 100644 --- a/config/hypr/v2.2.2 +++ b/config/hypr/v2.2.3 diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index a5e836f9..4b194464 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -1,8 +1,8 @@ #include ~/.cache/wal/colors-kitty.conf -font_family Fira Code SemiBold -font_size 13.0 -bold_font auto +font_family Fira Code SemiBold +font_size 13.0 +bold_font auto italic_font auto bold_italic_font auto diff --git a/config/rofi/config-wallpaper.rasi b/config/rofi/config-wallpaper.rasi index da47e90d..5f1cb172 100644 --- a/config/rofi/config-wallpaper.rasi +++ b/config/rofi/config-wallpaper.rasi @@ -3,19 +3,19 @@ /* ---- Configuration ---- */ configuration { - modi: "drun,run"; - font: "Fira Code SemiBold 12"; - show-icons: true; - display-drun: "๎ฏ"; - display-run: "๏ "; - display-filebrowser: "๎ซฐ"; - display-window: "๏"; - drun-display-format: "{name}"; - hover-select: true; - me-select-entry: "MouseSecondary"; - me-accept-entry: "MousePrimary"; - window-format: "{w} ยท {c} ยท {t}"; - dpi: 1; + modi: "drun,run,filebrowser"; + font: "Fira Code SemiBold 12"; + show-icons: true; + display-drun: "๎ฏ"; + display-run: "๏ "; + display-filebrowser: "๎ซฐ"; + display-window: "๏"; + drun-display-format: "{name}"; + hover-select: true; + me-select-entry: "MouseSecondary"; + me-accept-entry: "MousePrimary"; + window-format: "{w} ยท {c} ยท {t}"; + dpi: 1; } @@ -24,194 +24,197 @@ configuration { /* ---- Window ---- */ window { - width: 800px; - /*height: 450px;*/ - x-offset: 0px; - y-offset: 0px; - spacing: 0px; - padding: 2px; - margin: 0px; - border: 2px; - border-color: @active-background; - cursor: "default"; - location: center; - anchor: center; - fullscreen: false; - enabled: true; - border-radius: 12px; - border-radius: 12px; - background-color: @background-color; + width: 700px; + /*height: 450px;*/ + x-offset: 0px; + y-offset: 0px; + spacing: 0px; + padding: 2px; + margin: 0px; + border: 2px; + border-color: @active-background; + cursor: "default"; + location: center; + anchor: center; + fullscreen: false; + enabled: true; + border-radius: 12px; + border-radius: 12px; + background-color: transparent; + background-image: url("~/.config/rofi/.current_wallpaper", height); } /* ---- Mainbox ---- */ mainbox { - enabled: true; - orientation: horizontal; - padding: 8px; - background-image: url("~/.config/rofi/.current_wallpaper", width); - children: [ "imagebox"]; - border-radius: 12px; - background-color: @background; + enabled: true; + orientation: horizontal; + padding: 8px; + children: [ "imagebox"]; + border-radius: 12px; + background-color: transparent; } /* ---- Imagebox ---- */ imagebox { - background-color: transparent; - orientation: vertical; - children: [ "inputbar", "listbox"]; + background-color: transparent; + orientation: vertical; + children: [ "inputbar", "listbox"]; } /* ---- Listbox ---- */ listbox { - spacing: 4px; - orientation: vertical; - children: [ "listview" ]; - border-radius: 10px; - border: 1px; - border-color: @active-background; - background-color: @background; + spacing: 4px; + orientation: vertical; + children: [ "listview" ]; + border-radius: 10px; + border: 1px; + border-color: @active-background; + background-color: @background; } /* ---- Dummy ---- */ dummy { - background-color: transparent; + background-color: transparent; } /* ---- Inputbar ---- */ inputbar { - enabled: true; - text-color: @foreground; - spacing: 10px; - padding: 8px; - border-radius: 10px; - border-color: @foreground; - background-color: @background; - children: [ "textbox-prompt-colon", "entry" ]; - border: 1px; - border-color: @active-background; + enabled: true; + text-color: @foreground; + spacing: 10px; + padding: 8px; + border-radius: 10px; + border-color: @foreground; + background-color: @background; + children: [ "textbox-prompt-colon", "entry" ]; + border: 1px; + border-color: @active-background; } textbox-prompt-colon { - enabled: true; - expand: false; - str: "๓ฐธ "; - text-color: inherit; - background-color: transparent; + enabled: true; + expand: false; + str: "๓ฐธ "; + text-color: inherit; + background-color: transparent; } entry { - enabled: true; - text-color: inherit; - cursor: text; - placeholder: "Choose Wallpaper"; - placeholder-color: inherit; - background-color: transparent; + enabled: true; + text-color: inherit; + cursor: text; + placeholder: "Choose Wallpaper"; + placeholder-color: inherit; + background-color: transparent; } /* ---- Listview ---- */ listview { - enabled: true; - columns: 2; - lines: 8; - spacing: 4px; - dynamic: true; - cycle: true; - scrollbar: true; - layout: vertical; - reverse: false; - fixed-height: true; - fixed-columns: false; - background-color: transparent; - border-radius: 10px; + enabled: true; + columns: 4; + lines: 3; + spacing: 4px; + dynamic: true; + cycle: true; + scrollbar: true; + layout: vertical; + reverse: false; + fixed-height: true; + fixed-columns: false; + background-color: transparent; + border-radius: 10px; } /* ---- Element ---- */ element { - enabled: true; - padding: 5px; - margin: 2px; - cursor: pointer; - background-color: transparent; - border-radius: 10px; - border: 0px; + enabled: true; + padding: 5px; + margin: 2px; + cursor: pointer; + orientation: vertical; + background-color: transparent; + border-radius: 10px; + border: 0px; } element normal.normal { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element normal.urgent { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element normal.active { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element selected.normal { - background-color: @selected-normal-background; - text-color: @foreground; + background-color: @selected-normal-background; + text-color: @foreground; } element selected.urgent { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element selected.active { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element alternate.normal { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element alternate.urgent { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element alternate.active { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element-icon { - background-color: transparent; - text-color: inherit; - size: 32px; - cursor: inherit; + background-color: transparent; + text-color: inherit; + size: 130px; + cursor: inherit; } + element-text { - background-color: transparent; - text-color: inherit; - cursor: inherit; - vertical-align: 0.5; - horizontal-align: 0.0; + font: "Fira Code SemiBold 8"; + background-color: transparent; + text-color: inherit; + cursor: inherit; + vertical-align: 0.5; + horizontal-align: 0.5; } /*****----- Message -----*****/ message { - background-color: @background; - margin: 20px 0px 0px 0px; - border-radius: 10px; + background-color: @background; + margin: 20px 0px 0px 0px; + border-radius: 10px; } textbox { - padding: 15px; - background-color: @background; - text-color: @foreground; + padding: 15px; + background-color: @background; + text-color: @foreground; } error-message { - padding: 15px; - border-radius: 20px; - background-color: @background; - text-color: @foreground; + padding: 15px; + border-radius: 20px; + background-color: @background; + text-color: @foreground; } diff --git a/config/rofi/resolution/1080p/config-wallpaper.rasi b/config/rofi/resolution/1080p/config-wallpaper.rasi index da47e90d..5f1cb172 100644 --- a/config/rofi/resolution/1080p/config-wallpaper.rasi +++ b/config/rofi/resolution/1080p/config-wallpaper.rasi @@ -3,19 +3,19 @@ /* ---- Configuration ---- */ configuration { - modi: "drun,run"; - font: "Fira Code SemiBold 12"; - show-icons: true; - display-drun: "๎ฏ"; - display-run: "๏ "; - display-filebrowser: "๎ซฐ"; - display-window: "๏"; - drun-display-format: "{name}"; - hover-select: true; - me-select-entry: "MouseSecondary"; - me-accept-entry: "MousePrimary"; - window-format: "{w} ยท {c} ยท {t}"; - dpi: 1; + modi: "drun,run,filebrowser"; + font: "Fira Code SemiBold 12"; + show-icons: true; + display-drun: "๎ฏ"; + display-run: "๏ "; + display-filebrowser: "๎ซฐ"; + display-window: "๏"; + drun-display-format: "{name}"; + hover-select: true; + me-select-entry: "MouseSecondary"; + me-accept-entry: "MousePrimary"; + window-format: "{w} ยท {c} ยท {t}"; + dpi: 1; } @@ -24,194 +24,197 @@ configuration { /* ---- Window ---- */ window { - width: 800px; - /*height: 450px;*/ - x-offset: 0px; - y-offset: 0px; - spacing: 0px; - padding: 2px; - margin: 0px; - border: 2px; - border-color: @active-background; - cursor: "default"; - location: center; - anchor: center; - fullscreen: false; - enabled: true; - border-radius: 12px; - border-radius: 12px; - background-color: @background-color; + width: 700px; + /*height: 450px;*/ + x-offset: 0px; + y-offset: 0px; + spacing: 0px; + padding: 2px; + margin: 0px; + border: 2px; + border-color: @active-background; + cursor: "default"; + location: center; + anchor: center; + fullscreen: false; + enabled: true; + border-radius: 12px; + border-radius: 12px; + background-color: transparent; + background-image: url("~/.config/rofi/.current_wallpaper", height); } /* ---- Mainbox ---- */ mainbox { - enabled: true; - orientation: horizontal; - padding: 8px; - background-image: url("~/.config/rofi/.current_wallpaper", width); - children: [ "imagebox"]; - border-radius: 12px; - background-color: @background; + enabled: true; + orientation: horizontal; + padding: 8px; + children: [ "imagebox"]; + border-radius: 12px; + background-color: transparent; } /* ---- Imagebox ---- */ imagebox { - background-color: transparent; - orientation: vertical; - children: [ "inputbar", "listbox"]; + background-color: transparent; + orientation: vertical; + children: [ "inputbar", "listbox"]; } /* ---- Listbox ---- */ listbox { - spacing: 4px; - orientation: vertical; - children: [ "listview" ]; - border-radius: 10px; - border: 1px; - border-color: @active-background; - background-color: @background; + spacing: 4px; + orientation: vertical; + children: [ "listview" ]; + border-radius: 10px; + border: 1px; + border-color: @active-background; + background-color: @background; } /* ---- Dummy ---- */ dummy { - background-color: transparent; + background-color: transparent; } /* ---- Inputbar ---- */ inputbar { - enabled: true; - text-color: @foreground; - spacing: 10px; - padding: 8px; - border-radius: 10px; - border-color: @foreground; - background-color: @background; - children: [ "textbox-prompt-colon", "entry" ]; - border: 1px; - border-color: @active-background; + enabled: true; + text-color: @foreground; + spacing: 10px; + padding: 8px; + border-radius: 10px; + border-color: @foreground; + background-color: @background; + children: [ "textbox-prompt-colon", "entry" ]; + border: 1px; + border-color: @active-background; } textbox-prompt-colon { - enabled: true; - expand: false; - str: "๓ฐธ "; - text-color: inherit; - background-color: transparent; + enabled: true; + expand: false; + str: "๓ฐธ "; + text-color: inherit; + background-color: transparent; } entry { - enabled: true; - text-color: inherit; - cursor: text; - placeholder: "Choose Wallpaper"; - placeholder-color: inherit; - background-color: transparent; + enabled: true; + text-color: inherit; + cursor: text; + placeholder: "Choose Wallpaper"; + placeholder-color: inherit; + background-color: transparent; } /* ---- Listview ---- */ listview { - enabled: true; - columns: 2; - lines: 8; - spacing: 4px; - dynamic: true; - cycle: true; - scrollbar: true; - layout: vertical; - reverse: false; - fixed-height: true; - fixed-columns: false; - background-color: transparent; - border-radius: 10px; + enabled: true; + columns: 4; + lines: 3; + spacing: 4px; + dynamic: true; + cycle: true; + scrollbar: true; + layout: vertical; + reverse: false; + fixed-height: true; + fixed-columns: false; + background-color: transparent; + border-radius: 10px; } /* ---- Element ---- */ element { - enabled: true; - padding: 5px; - margin: 2px; - cursor: pointer; - background-color: transparent; - border-radius: 10px; - border: 0px; + enabled: true; + padding: 5px; + margin: 2px; + cursor: pointer; + orientation: vertical; + background-color: transparent; + border-radius: 10px; + border: 0px; } element normal.normal { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element normal.urgent { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element normal.active { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element selected.normal { - background-color: @selected-normal-background; - text-color: @foreground; + background-color: @selected-normal-background; + text-color: @foreground; } element selected.urgent { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element selected.active { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element alternate.normal { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element alternate.urgent { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element alternate.active { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element-icon { - background-color: transparent; - text-color: inherit; - size: 32px; - cursor: inherit; + background-color: transparent; + text-color: inherit; + size: 130px; + cursor: inherit; } + element-text { - background-color: transparent; - text-color: inherit; - cursor: inherit; - vertical-align: 0.5; - horizontal-align: 0.0; + font: "Fira Code SemiBold 8"; + background-color: transparent; + text-color: inherit; + cursor: inherit; + vertical-align: 0.5; + horizontal-align: 0.5; } /*****----- Message -----*****/ message { - background-color: @background; - margin: 20px 0px 0px 0px; - border-radius: 10px; + background-color: @background; + margin: 20px 0px 0px 0px; + border-radius: 10px; } textbox { - padding: 15px; - background-color: @background; - text-color: @foreground; + padding: 15px; + background-color: @background; + text-color: @foreground; } error-message { - padding: 15px; - border-radius: 20px; - background-color: @background; - text-color: @foreground; + padding: 15px; + border-radius: 20px; + background-color: @background; + text-color: @foreground; } diff --git a/config/rofi/resolution/1440p/config-wallpaper.rasi b/config/rofi/resolution/1440p/config-wallpaper.rasi index ef28039c..0bc3b106 100644 --- a/config/rofi/resolution/1440p/config-wallpaper.rasi +++ b/config/rofi/resolution/1440p/config-wallpaper.rasi @@ -3,19 +3,19 @@ /* ---- Configuration ---- */ configuration { - modi: "drun,run"; - font: "Fira Code SemiBold 14"; - show-icons: true; - display-drun: "๎ฏ"; - display-run: "๏ "; - display-filebrowser: "๎ซฐ"; - display-window: "๏"; - drun-display-format: "{name}"; - hover-select: true; - me-select-entry: "MouseSecondary"; - me-accept-entry: "MousePrimary"; - window-format: "{w} ยท {c} ยท {t}"; - dpi: 1; + modi: "drun,run,filebrowser"; + font: "Fira Code SemiBold 14"; + show-icons: true; + display-drun: "๎ฏ"; + display-run: "๏ "; + display-filebrowser: "๎ซฐ"; + display-window: "๏"; + drun-display-format: "{name}"; + hover-select: true; + me-select-entry: "MouseSecondary"; + me-accept-entry: "MousePrimary"; + window-format: "{w} ยท {c} ยท {t}"; + dpi: 1; } @@ -24,194 +24,197 @@ configuration { /* ---- Window ---- */ window { - width: 800px; - /*height: 450px;*/ - x-offset: 0px; - y-offset: 0px; - spacing: 0px; - padding: 2px; - margin: 0px; - border: 2px; - border-color: @active-background; - cursor: "default"; - location: center; - anchor: center; - fullscreen: false; - enabled: true; - border-radius: 12px; - border-radius: 12px; - background-color: @background-color; + width: 700px; + /*height: 450px;*/ + x-offset: 0px; + y-offset: 0px; + spacing: 0px; + padding: 2px; + margin: 0px; + border: 2px; + border-color: @active-background; + cursor: "default"; + location: center; + anchor: center; + fullscreen: false; + enabled: true; + border-radius: 12px; + border-radius: 12px; + background-color: transparent; + background-image: url("~/.config/rofi/.current_wallpaper", height); } /* ---- Mainbox ---- */ mainbox { - enabled: true; - orientation: horizontal; - padding: 8px; - background-image: url("~/.config/rofi/.current_wallpaper", width); - children: [ "imagebox"]; - border-radius: 12px; - background-color: @background; + enabled: true; + orientation: horizontal; + padding: 8px; + children: [ "imagebox"]; + border-radius: 12px; + background-color: transparent; } /* ---- Imagebox ---- */ imagebox { - background-color: transparent; - orientation: vertical; - children: [ "inputbar", "listbox"]; + background-color: transparent; + orientation: vertical; + children: [ "inputbar", "listbox"]; } /* ---- Listbox ---- */ listbox { - spacing: 4px; - orientation: vertical; - children: [ "listview" ]; - border-radius: 10px; - border: 1px; - border-color: @active-background; - background-color: @background; + spacing: 4px; + orientation: vertical; + children: [ "listview" ]; + border-radius: 10px; + border: 1px; + border-color: @active-background; + background-color: @background; } /* ---- Dummy ---- */ dummy { - background-color: transparent; + background-color: transparent; } /* ---- Inputbar ---- */ inputbar { - enabled: true; - text-color: @foreground; - spacing: 10px; - padding: 8px; - border-radius: 10px; - border-color: @foreground; - background-color: @background; - children: [ "textbox-prompt-colon", "entry" ]; - border: 1px; - border-color: @active-background; + enabled: true; + text-color: @foreground; + spacing: 10px; + padding: 8px; + border-radius: 10px; + border-color: @foreground; + background-color: @background; + children: [ "textbox-prompt-colon", "entry" ]; + border: 1px; + border-color: @active-background; } textbox-prompt-colon { - enabled: true; - expand: false; - str: "๓ฐธ "; - text-color: inherit; - background-color: transparent; + enabled: true; + expand: false; + str: "๓ฐธ "; + text-color: inherit; + background-color: transparent; } entry { - enabled: true; - text-color: inherit; - cursor: text; - placeholder: "Choose Wallpaper"; - placeholder-color: inherit; - background-color: transparent; + enabled: true; + text-color: inherit; + cursor: text; + placeholder: "Choose Wallpaper"; + placeholder-color: inherit; + background-color: transparent; } /* ---- Listview ---- */ listview { - enabled: true; - columns: 2; - lines: 8; - spacing: 4px; - dynamic: true; - cycle: true; - scrollbar: true; - layout: vertical; - reverse: false; - fixed-height: true; - fixed-columns: false; - background-color: transparent; - border-radius: 10px; + enabled: true; + columns: 4; + lines: 4; + spacing: 4px; + dynamic: true; + cycle: true; + scrollbar: true; + layout: vertical; + reverse: false; + fixed-height: true; + fixed-columns: false; + background-color: transparent; + border-radius: 10px; } /* ---- Element ---- */ element { - enabled: true; - padding: 5px; - margin: 2px; - cursor: pointer; - background-color: transparent; - border-radius: 10px; - border: 0px; + enabled: true; + padding: 5px; + margin: 2px; + cursor: pointer; + orientation: vertical; + background-color: transparent; + border-radius: 10px; + border: 0px; } element normal.normal { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element normal.urgent { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element normal.active { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element selected.normal { - background-color: @selected-normal-background; - text-color: @foreground; + background-color: @selected-normal-background; + text-color: @foreground; } element selected.urgent { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element selected.active { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element alternate.normal { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element alternate.urgent { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element alternate.active { - background-color: inherit; - text-color: @foreground; + background-color: inherit; + text-color: @foreground; } element-icon { - background-color: transparent; - text-color: inherit; - size: 32px; - cursor: inherit; + background-color: transparent; + text-color: inherit; + size: 130px; + cursor: inherit; } + element-text { - background-color: transparent; - text-color: inherit; - cursor: inherit; - vertical-align: 0.5; - horizontal-align: 0.0; + font: "Fira Code SemiBold 10"; + background-color: transparent; + text-color: inherit; + cursor: inherit; + vertical-align: 0.5; + horizontal-align: 0.5; } /*****----- Message -----*****/ message { - background-color: @background; - margin: 20px 0px 0px 0px; - border-radius: 10px; + background-color: @background; + margin: 20px 0px 0px 0px; + border-radius: 10px; } textbox { - padding: 15px; - background-color: @background; - text-color: @foreground; + padding: 15px; + background-color: @background; + text-color: @foreground; } error-message { - padding: 15px; - border-radius: 20px; - background-color: @background; - text-color: @foreground; + padding: 15px; + border-radius: 20px; + background-color: @background; + text-color: @foreground; } diff --git a/config/waybar/configs/[BOT] Default b/config/waybar/configs/[BOT] Default index eece9165..6cf3dd64 100644 --- a/config/waybar/configs/[BOT] Default +++ b/config/waybar/configs/[BOT] Default @@ -25,6 +25,8 @@ "memory", "custom/separator#dot-line", "custom/weather", + "custom/separator#blank_3", + "custom/cava_mviz", ], "modules-center": [ diff --git a/config/waybar/configs/[BOT] Default Laptop b/config/waybar/configs/[BOT] Default Laptop index 1268408b..501e0c85 100644 --- a/config/waybar/configs/[BOT] Default Laptop +++ b/config/waybar/configs/[BOT] Default Laptop @@ -25,6 +25,8 @@ "memory", "custom/separator#dot-line", "custom/weather", + "custom/separator#blank_3", + "custom/cava_mviz", ], "modules-center": [ diff --git a/config/waybar/configs/[TOP] Default b/config/waybar/configs/[TOP] Default index b40bc576..8ab71d6c 100644 --- a/config/waybar/configs/[TOP] Default +++ b/config/waybar/configs/[TOP] Default @@ -25,6 +25,8 @@ "memory", "custom/separator#dot-line", "custom/weather", + "custom/separator#blank_3", + "custom/cava_mviz", ], "modules-center": [ diff --git a/config/waybar/configs/[TOP] Default Laptop b/config/waybar/configs/[TOP] Default Laptop index 89f6bbbd..654fe5c6 100644 --- a/config/waybar/configs/[TOP] Default Laptop +++ b/config/waybar/configs/[TOP] Default Laptop @@ -25,6 +25,8 @@ "memory", "custom/separator#dot-line", "custom/weather", + "custom/separator#blank_3", + "custom/cava_mviz", ], "modules-center": [ diff --git a/config/waybar/modules b/config/waybar/modules index 2841dc36..1165211a 100644 --- a/config/waybar/modules +++ b/config/waybar/modules @@ -215,30 +215,7 @@ "tooltip": true, "on-click": "blueman-manager", }, - -"cava": { - //"cava_config": "$XDG_CONFIG_HOME/cava/cava.conf", - "framerate": 30, - "autosens": 1, - "sensitivity": 100, - "bars": 14, - "lower_cutoff_freq": 50, - "higher_cutoff_freq": 10000, - "method": "pulse", - "source": "auto", - "stereo": true, - "reverse": false, - "bar_delimiter": 0, - "monstercat": false, - "waves": false, - "noise_reduction": 0.77, - "input_delay": 2, - "format-icons" : ["โ", "โ", "โ", "โ", "โ
", "โ", "โ", "โ" ], - "actions": { - "on-click-right": "mode" - } -}, - + "clock": { "interval": 1, //"format": "๏ {:%I:%M %p}", // AM PM format @@ -530,6 +507,12 @@ "on-click-middle": "~/.config/hypr/scripts/WallpaperSelect.sh", "on-click-right": "~/.config/hypr/scripts/WaybarLayout.sh", }, + +// This is a custom cava visualizer +"custom/cava_mviz": { + "exec": "~/.config/hypr/scripts/WaybarCava.sh", + "format": "{}" +}, "custom/playerctl": { "format": "<span>{}</span>", @@ -545,6 +528,15 @@ "smooth-scrolling-threshold": 1, }, +"custom/power": { + "format": "โป ", + "exec": "echo ; echo ๓ฐก power // blur", + "on-click": "~/.config/hypr/scripts/Wlogout.sh", + "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh", + "interval" : 86400, // once every day + "tooltip": true, +}, + "custom/swaync": { "tooltip":true, "format": "{icon} {}", @@ -565,16 +557,7 @@ "on-click-right": "swaync-client -d -sw", "escape": true, }, - -"custom/power": { - "format": "โป ", - "exec": "echo ; echo ๓ฐก power // blur", - "on-click": "~/.config/hypr/scripts/Wlogout.sh", - "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh", - "interval" : 86400, // once every day - "tooltip": true, -}, - + // NOTE:! This is only for Arch and Arch Based Distros "custom/updater":{ "format": "๏ {}", @@ -627,6 +610,12 @@ "interval": "once", "tooltip": false }, + +"custom/separator#blank_3": { + "format": " ", + "interval": "once", + "tooltip": false +}, // Modules below are for vertical layout diff --git a/config/waybar/style/Catppuccin-Latte.css b/config/waybar/style/Catppuccin-Latte.css index 18b16633..187dac2f 100644 --- a/config/waybar/style/Catppuccin-Latte.css +++ b/config/waybar/style/Catppuccin-Latte.css @@ -48,7 +48,6 @@ window#waybar.hidden { #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, @@ -96,15 +95,15 @@ window#waybar.hidden { } #idle_inhibitor { - color: @blue; + color: @blue; } #backlight { - color: @blue; + color: @blue; } #battery { - color: @green; + color: @green; } @keyframes blink { @@ -114,14 +113,14 @@ window#waybar.hidden { } #battery.critical:not(.charging) { - background-color: @red; - color: @theme_text_color; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; - box-shadow: inset 0 -3px transparent; + background-color: @red; + color: @theme_text_color; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; + box-shadow: inset 0 -3px transparent; } #bluetooth { @@ -129,28 +128,28 @@ window#waybar.hidden { } #clock { - color: @yellow; + color: @yellow; } #cpu { - color: @green; + color: @green; } #custom-keyboard, #memory { - color: @sky; + color: @sky; } #disk { - color: @sapphire; + color: @sapphire; } #temperature { - color: @teal; + color: @teal; } #temperature.critical { - background-color: @red; + background-color: @red; } #tray > .passive { @@ -161,7 +160,7 @@ window#waybar.hidden { } #keyboard-state { - color: @flamingo; + color: @flamingo; } #workspaces button { @@ -217,57 +216,60 @@ window#waybar.hidden { animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } +#custom-cava_mviz { + color: @pink; +} #custom-menu { - color: @rosewater; + color: @rosewater; } #custom-power { - color: @red; + color: @red; } #custom-updater { - color: @red; + color: @red; } #custom-light_dark { - color: @blue; + color: @blue; } #custom-weather { - color: @lavender; + color: @lavender; } #custom-lock { - color: @maroon; + color: @maroon; } #pulseaudio { - color: @sapphire; + color: @sapphire; } #pulseaudio.bluetooth { - color: @pink; + color: @pink; } #pulseaudio.muted { - color: @red; + color: @red; } #window { - color: @mauve; + color: @mauve; } #custom-waybar-mpris { - color:@lavender; + color:@lavender; } #network { - color: @teal; + color: @teal; } #network.disconnected, #network.disabled { - background-color: @surface0; - color: @text; + background-color: @surface0; + color: @text; } #pulseaudio-slider slider { min-width: 0px; diff --git a/config/waybar/style/Catppuccin-Mocha.css b/config/waybar/style/Catppuccin-Mocha.css index 061106c5..5f74fe8c 100644 --- a/config/waybar/style/Catppuccin-Mocha.css +++ b/config/waybar/style/Catppuccin-Mocha.css @@ -54,7 +54,6 @@ window#waybar.hidden { #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, @@ -221,6 +220,10 @@ window#waybar.hidden { transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } +#custom-cava_mviz { + color: @pink; +} + #custom-menu { color: @rosewater; } diff --git a/config/waybar/style/Crimson.css b/config/waybar/style/Crimson.css index fcac5dc1..d08b53fe 100644 --- a/config/waybar/style/Crimson.css +++ b/config/waybar/style/Crimson.css @@ -110,7 +110,6 @@ tooltip { #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, diff --git a/config/waybar/style/Purpl.css b/config/waybar/style/Purpl.css index 0f97470f..2e0e4f8f 100644 --- a/config/waybar/style/Purpl.css +++ b/config/waybar/style/Purpl.css @@ -120,7 +120,6 @@ tooltip { #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, @@ -139,6 +138,7 @@ tooltip { #wireplumber, #workspaces, #custom-backlight, +#custom-cava_mviz, #custom-cycle_wall, #custom-keybinds, #custom-keyboard, diff --git a/config/waybar/style/Rose Pine.css b/config/waybar/style/Rose Pine.css index 4a15422b..bc9b202a 100644 --- a/config/waybar/style/Rose Pine.css +++ b/config/waybar/style/Rose Pine.css @@ -101,7 +101,6 @@ tooltip { #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, @@ -129,6 +128,7 @@ tooltip { #custom-swaync, #custom-updater, #custom-swaync, +#custom-cava_mviz, #custom-weather, #custom-weather.clearNight, #custom-weather.cloudyFoggyDay, diff --git a/config/waybar/style/Simple Pink.css b/config/waybar/style/Simple Pink.css index d306dd84..e60e275b 100644 --- a/config/waybar/style/Simple Pink.css +++ b/config/waybar/style/Simple Pink.css @@ -124,7 +124,6 @@ tooltip { #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, @@ -144,6 +143,7 @@ tooltip { #wireplumber, #workspaces, #custom-backlight, +#custom-cava_mviz, #custom-cycle_wall, #custom-keybinds, #custom-keyboard, diff --git a/config/waybar/style/[Black & White] Monochrome.css b/config/waybar/style/[Black & White] Monochrome.css index 143e887b..6c2af3c7 100644 --- a/config/waybar/style/[Black & White] Monochrome.css +++ b/config/waybar/style/[Black & White] Monochrome.css @@ -109,7 +109,6 @@ tooltip label{ #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, diff --git a/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css b/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css index 1a29c409..5c99c520 100644 --- a/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css +++ b/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css @@ -51,7 +51,6 @@ window#waybar.empty #window { #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, @@ -150,6 +149,9 @@ window#waybar.empty #window { color: @teal; } +#custom-cava_mviz{ + color: @color2; +} #workspaces { margin: 1px 1px 1px 1px; padding: 0px 1px; diff --git a/config/waybar/style/[Colored] Chroma Glow.css b/config/waybar/style/[Colored] Chroma Glow.css index f324bf3a..dcb5bbc8 100644 --- a/config/waybar/style/[Colored] Chroma Glow.css +++ b/config/waybar/style/[Colored] Chroma Glow.css @@ -97,7 +97,6 @@ tooltip label{ #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, diff --git a/config/waybar/style/[Colored] Translucent.css b/config/waybar/style/[Colored] Translucent.css index 0e3cbaf5..49f8dbf0 100644 --- a/config/waybar/style/[Colored] Translucent.css +++ b/config/waybar/style/[Colored] Translucent.css @@ -111,7 +111,6 @@ tooltip label{ #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, diff --git a/config/waybar/style/[Colorful] Aurora Blossom.css b/config/waybar/style/[Colorful] Aurora Blossom.css index 8a0f8522..3dd64b45 100644 --- a/config/waybar/style/[Colorful] Aurora Blossom.css +++ b/config/waybar/style/[Colorful] Aurora Blossom.css @@ -97,7 +97,6 @@ tooltip label{ #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, diff --git a/config/waybar/style/[Colorful] Aurora.css b/config/waybar/style/[Colorful] Aurora.css index a5e57cbd..c841c906 100644 --- a/config/waybar/style/[Colorful] Aurora.css +++ b/config/waybar/style/[Colorful] Aurora.css @@ -88,7 +88,6 @@ tooltip label{ #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, @@ -107,6 +106,7 @@ tooltip label{ #wireplumber, #workspaces, #custom-backlight, +#custom-cava_mviz, #custom-cycle_wall, #custom-keybinds, #custom-keyboard, diff --git a/config/waybar/style/[Colorful] Rainbow Spectrum.css b/config/waybar/style/[Colorful] Rainbow Spectrum.css index 333f798a..8caa5cb8 100644 --- a/config/waybar/style/[Colorful] Rainbow Spectrum.css +++ b/config/waybar/style/[Colorful] Rainbow Spectrum.css @@ -52,7 +52,6 @@ tooltip label{ #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, @@ -138,6 +137,10 @@ tooltip label{ background-color: #a6e3a1; } +#mpris { + background-color: #fab387; + color: black; +} #custom-keyboard, #keyboard-state, #keyboard-state label, diff --git a/config/waybar/style/[Dark] Golden Noir.css b/config/waybar/style/[Dark] Golden Noir.css index 667b06e7..75ba82b7 100644 --- a/config/waybar/style/[Dark] Golden Noir.css +++ b/config/waybar/style/[Dark] Golden Noir.css @@ -123,7 +123,6 @@ tooltip { #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, @@ -142,6 +141,7 @@ tooltip { #wireplumber, #workspaces, #custom-backlight, +#custom-cava_mviz, #custom-cycle_wall, #custom-keybinds, #custom-keyboard, diff --git a/config/waybar/style/[Dark] Obsidian Edge.css b/config/waybar/style/[Dark] Obsidian Edge.css index 8d21d72d..be74c6be 100644 --- a/config/waybar/style/[Dark] Obsidian Edge.css +++ b/config/waybar/style/[Dark] Obsidian Edge.css @@ -116,7 +116,6 @@ tooltip label { #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, @@ -135,6 +134,7 @@ tooltip label { #wireplumber, #workspaces, #custom-backlight, +#custom-cava_mviz, #custom-cycle_wall, #custom-keybinds, #custom-keyboard, diff --git a/config/waybar/style/[Light] Monochrome Contrast.css b/config/waybar/style/[Light] Monochrome Contrast.css index 34b579f9..25ccf5c7 100644 --- a/config/waybar/style/[Light] Monochrome Contrast.css +++ b/config/waybar/style/[Light] Monochrome Contrast.css @@ -110,7 +110,6 @@ tooltip label{ #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, diff --git a/config/waybar/style/[Light] Obsidian Glow.css b/config/waybar/style/[Light] Obsidian Glow.css index cd939b5d..f95daa0f 100644 --- a/config/waybar/style/[Light] Obsidian Glow.css +++ b/config/waybar/style/[Light] Obsidian Glow.css @@ -85,7 +85,6 @@ tooltip label { #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, @@ -104,6 +103,7 @@ tooltip label { #wireplumber, #workspaces, #custom-backlight, +#custom-cava_mviz, #custom-cycle_wall, #custom-keybinds, #custom-keyboard, diff --git a/config/waybar/style/[Pywal] Chroma Edge.css b/config/waybar/style/[Pywal] Chroma Edge.css index 282057c8..ba4e83ab 100644 --- a/config/waybar/style/[Pywal] Chroma Edge.css +++ b/config/waybar/style/[Pywal] Chroma Edge.css @@ -90,7 +90,6 @@ tooltip label{ #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, diff --git a/config/waybar/style/[Pywal] Chroma Fusion.css b/config/waybar/style/[Pywal] Chroma Fusion.css index 3f15037f..b1006398 100644 --- a/config/waybar/style/[Pywal] Chroma Fusion.css +++ b/config/waybar/style/[Pywal] Chroma Fusion.css @@ -50,7 +50,6 @@ window#waybar.empty #window { #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, @@ -143,6 +142,10 @@ window#waybar.empty #window { color: @lavender; } +#custom-cava_mviz { + color: @color2; +} + #custom-lock, #idle_inhibitor { color: @teal; diff --git a/config/waybar/style/[Pywal] Chroma Tally.css b/config/waybar/style/[Pywal] Chroma Tally.css index c3a38fb6..ace2ea35 100644 --- a/config/waybar/style/[Pywal] Chroma Tally.css +++ b/config/waybar/style/[Pywal] Chroma Tally.css @@ -55,7 +55,6 @@ window#waybar { #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, @@ -203,11 +202,15 @@ window#waybar { #custom-lock, #bluetooth{ - color:#d08770; + color:#d08770; } - + +#custom-cava_mviz{ + color: @color2; +} + #custom-weather{ - color:#d08770; + color:#d08770; } #taskbar button.active { diff --git a/config/waybar/style/[Pywal] Colored.css b/config/waybar/style/[Pywal] Colored.css index afb01280..aeccffb9 100644 --- a/config/waybar/style/[Pywal] Colored.css +++ b/config/waybar/style/[Pywal] Colored.css @@ -117,7 +117,6 @@ tooltip { #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, @@ -136,6 +135,7 @@ tooltip { #wireplumber, #workspaces, #custom-backlight, +#custom-cava_mviz, #custom-cycle_wall, #custom-keybinds, #custom-keyboard, @@ -236,4 +236,8 @@ tooltip { #backlight-slider highlight { min-width: 10px; border-radius: 5px; +} + +#custom-cava_mviz { + padding-right: 10px; }
\ No newline at end of file diff --git a/config/waybar/style/[Pywal] Simple.css b/config/waybar/style/[Pywal] Simple.css index 6acef45e..138e926b 100644 --- a/config/waybar/style/[Pywal] Simple.css +++ b/config/waybar/style/[Pywal] Simple.css @@ -104,7 +104,6 @@ tooltip { #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, @@ -124,6 +123,7 @@ tooltip { #wireplumber, #workspaces, #custom-backlight, +#custom-cava_mviz, #custom-cycle_wall, #custom-keybinds, #custom-keyboard, diff --git a/config/waybar/style/[Retro] Simple Style.css b/config/waybar/style/[Retro] Simple Style.css index aaf14d62..ea13145e 100644 --- a/config/waybar/style/[Retro] Simple Style.css +++ b/config/waybar/style/[Retro] Simple Style.css @@ -47,7 +47,6 @@ window#waybar { #backlight-slider, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, diff --git a/config/waybar/style/[Transparent] Crystal Clear.css b/config/waybar/style/[Transparent] Crystal Clear.css index 3f64235d..0f9b1760 100644 --- a/config/waybar/style/[Transparent] Crystal Clear.css +++ b/config/waybar/style/[Transparent] Crystal Clear.css @@ -97,7 +97,6 @@ tooltip { #backlight, #battery, #bluetooth, -#cava, #clock, #cpu, #disk, diff --git a/config/wlogout/layout b/config/wlogout/layout index 4c6b5c42..bbcb6257 100644 --- a/config/wlogout/layout +++ b/config/wlogout/layout @@ -30,7 +30,7 @@ } { "label" : "hibernate", - "action" : "systemctl hibernate", + "action" : "swaylock -f && systemctl hibernate", "text" : "Hibernate", "keybind" : "h" }
\ No newline at end of file @@ -50,25 +50,17 @@ if hostnamectl | grep -q 'Chassis: vm'; then sed -i '/monitor = Virtual-1, 1920x1080@60,auto,1/s/^#//' config/hypr/UserConfigs/Monitors.conf fi -# Preparing hyprland.conf to check for current keyboard layout -# Function to detect keyboard layout in an X server environment -detect_x_layout() { - if command -v setxkbmap >/dev/null 2>&1; then - layout=$(setxkbmap -query | grep layout | awk '{print $2}') +# Function to detect keyboard layout using localectl or setxkbmap +detect_layout() { + if command -v localectl >/dev/null 2>&1; then + layout=$(localectl status --no-pager | awk '/X11 Layout/ {print $3}') if [ -n "$layout" ]; then echo "$layout" else echo "unknown" fi - else - echo "unknown" - fi -} - -# Function to detect keyboard layout in a tty environment -detect_tty_layout() { - if command -v localectl >/dev/null 2>&1; then - layout=$(localectl status --no-pager | awk '/X11 Layout/ {print $3}') + elif command -v setxkbmap >/dev/null 2>&1; then + layout=$(setxkbmap -query | grep layout | awk '{print $2}') if [ -n "$layout" ]; then echo "$layout" else @@ -79,22 +71,14 @@ detect_tty_layout() { fi } -# Detect the current keyboard layout based on the environment -if [ -n "$DISPLAY" ]; then - # System is in an X server environment - layout=$(detect_x_layout) -else - # System is in a tty environment - layout=$(detect_tty_layout) -fi - -echo "Keyboard layout: $layout" +# Detect the current keyboard layout +layout=$(detect_layout) printf "${NOTE} Detecting keyboard layout to prepare necessary changes in hyprland.conf before copying\n\n" # Prompt the user to confirm whether the detected layout is correct while true; do - read -p "$ORANGE Detected keyboard layout or keymap: $layout. Is this correct? [y/n] " confirm + read -p "$ORANGE Detected current keyboard layout is: $layout. Is this correct? [y/n] " confirm case $confirm in [yY]) @@ -202,6 +186,18 @@ chmod +x ~/.config/hypr/scripts/* 2>&1 | tee -a "$LOG" chmod +x ~/.config/hypr/UserScripts/* 2>&1 | tee -a "$LOG" # Set executable for initial-boot.sh chmod +x ~/.config/hypr/initial-boot.sh 2>&1 | tee -a "$LOG" +printf "\n%.0s" {1..3} + +# Detect machine type and set Waybar configurations accordingly, logging the output +if hostnamectl | grep -q 'Chassis: desktop'; then + # Configurations for a desktop + ln -sf "$HOME/.config/waybar/configs/[TOP] Default" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" + rm -r "$HOME/.config/waybar/configs/[TOP] Default Laptop" "$HOME/.config/waybar/configs/[BOT] Default Laptop" 2>&1 | tee -a "$LOG" +else + # Configurations for a laptop or any system other than desktop + ln -sf "$HOME/.config/waybar/configs/[TOP] Default Laptop" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" + rm -r "$HOME/.config/waybar/configs/[TOP] Default" "$HOME/.config/waybar/configs/[BOT] Default" 2>&1 | tee -a "$LOG" +fi printf "\n%.0s" {1..3} @@ -238,20 +234,6 @@ while true; do esac done - -printf "\n%.0s" {1..3} - -# Detect machine type and set Waybar configurations accordingly, logging the output -if hostnamectl | grep -q 'Chassis: desktop'; then - # Configurations for a desktop - ln -sf "$HOME/.config/waybar/configs/[TOP] Default" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" - rm -r "$HOME/.config/waybar/configs/[TOP] Default Laptop" "$HOME/.config/waybar/configs/[BOT] Default Laptop" 2>&1 | tee -a "$LOG" -else - # Configurations for a laptop or any system other than desktop - ln -sf "$HOME/.config/waybar/configs/[TOP] Default Laptop" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" - rm -r "$HOME/.config/waybar/configs/[TOP] Default" "$HOME/.config/waybar/configs/[BOT] Default" 2>&1 | tee -a "$LOG" -fi - # symlinks for waybar style ln -sf "$Waybar_Style" "$HOME/.config/waybar/style.css" && \ @@ -261,6 +243,7 @@ wal -i $wallpaper -s -t 2>&1 | tee -a "$LOG" #initial symlink for Pywal Dark and Light for Rofi Themes ln -sf "$HOME/.cache/wal/colors-rofi-dark.rasi" "$HOME/.config/rofi/pywal-color/pywal-theme.rasi" + printf "\n%.0s" {1..2} printf "\n${OK} Copy Completed!\n\n\n" printf "${ORANGE} ATTENTION!!!! \n" |