diff --git a/.config/hypr/config/Keybinds.conf b/.config/hypr/config/Keybinds.conf index 05c1043..baf7aba 100644 --- a/.config/hypr/config/Keybinds.conf +++ b/.config/hypr/config/Keybinds.conf @@ -99,7 +99,7 @@ bind = $mainMod SHIFT, F, fullscreen, 0 $mainMod = SUPER $files = thunar -$term = kitty +$term = ghostty $scriptsDir = $HOME/.config/hypr/scripts # rofi App launcher diff --git a/.config/hypr/config/Monitors.conf b/.config/hypr/config/Monitors.conf new file mode 120000 index 0000000..ff8cb64 --- /dev/null +++ b/.config/hypr/config/Monitors.conf @@ -0,0 +1 @@ +Monitors.conf##class.PC,default \ No newline at end of file diff --git a/.config/hypr/config/WindowRules.conf b/.config/hypr/config/WindowRules.conf index 69df788..5dde0d8 100644 --- a/.config/hypr/config/WindowRules.conf +++ b/.config/hypr/config/WindowRules.conf @@ -32,6 +32,7 @@ windowrulev2 = workspace 1, class:^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$ windowrulev2 = workspace 1, class:^([Tt]horium-browser|[Cc]achy-browser)$ windowrulev2 = workspace 1, class:^(zen)$ # zen browser windowrulev2 = workspace 2, class:^(kitty)$ +windowrulev2 = workspace 2, class:^(com.mitchellh.ghostty)$ windowrulev2 = workspace 3, class:^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$ windowrulev2 = workspace 3, class:^([Bb]eeper)$ windowrulev2 = workspace 3, class:^([Ff]erdium)$ @@ -41,6 +42,8 @@ windowrulev2 = workspace 4 silent, class:^([Ss]team)$ windowrulev2 = workspace 4, class:^([Ll]utris)$ windowrulev2 = workspace 4, class:^([Hh]eroic)$ windowrulev2 = workspace 5, class:^(com.github.th_ch.youtube_music)$ +windowrulev2 = workspace 5, class:^(feishin)$ +windowrulev2 = workspace 5, class:^(Supersonic)$ # windowrule v2 - float windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$ @@ -73,7 +76,8 @@ windowrulev2 = float, title:^(ROG Control)$ #windowrulev2 = float, title:^(Firefox)$ windowrulev2 = float, title:^(hyprgui)$ windowrulev2 = float, class:^(io.ente.auth)$ - +windowrulev2 = float, class:^(org.rncbc.qjackctl)$ +windowrulev2 = float, class:^(blobdrop)$ # windowrule v2 - size windowrulev2 = size 70% 70%, class:^(gnome-system-monitor|org.gnome.SystemMonitor|io.missioncenter.MissionCenter)$ diff --git a/.config/hypr/config/WorkspaceRules.conf b/.config/hypr/config/WorkspaceRules.conf new file mode 120000 index 0000000..92e0593 --- /dev/null +++ b/.config/hypr/config/WorkspaceRules.conf @@ -0,0 +1 @@ +WorkspaceRules.conf##class.PC,default \ No newline at end of file diff --git a/.config/hypr/config/settings/Input.conf b/.config/hypr/config/settings/Input.conf new file mode 120000 index 0000000..25cb63b --- /dev/null +++ b/.config/hypr/config/settings/Input.conf @@ -0,0 +1 @@ +Input.conf##class.PC,default \ No newline at end of file diff --git a/.config/hypr/config/settings/Input.conf##class.PC,default b/.config/hypr/config/settings/Input.conf##class.PC,default index c78de83..d28447c 100644 --- a/.config/hypr/config/settings/Input.conf##class.PC,default +++ b/.config/hypr/config/settings/Input.conf##class.PC,default @@ -11,7 +11,7 @@ input { sensitivity = 0 #mouse sensitivity numlock_by_default = true left_handed = false - follow_mouse = 2 + follow_mouse = 1 float_switch_override_focus = false touchpad { diff --git a/.config/hypr/scripts/KeyBinds.sh b/.config/hypr/scripts/KeyBinds.sh index 9e01a7c..8fc6a6b 100755 --- a/.config/hypr/scripts/KeyBinds.sh +++ b/.config/hypr/scripts/KeyBinds.sh @@ -1,12 +1,11 @@ #!/bin/bash -# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## -# Searchable enabled keybinds using rofi +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## Searchable enabled keybinds using rofi # Kill yad to not interfere with this binds pkill yad || true # Check if rofi is already running -if pidof rofi > /dev/null; then +if pidof rofi >/dev/null; then pkill rofi fi @@ -20,15 +19,16 @@ KEYBINDS=$(cat "$KEYBINDS_CONF" "$USER_KEYBINDS_CONF" | grep -E '^(bind|bindl|bi # Check if Laptop.conf exists and add its keybinds if present if [[ -f "$LAPTOP_CONF" ]]; then - LAPTOP_BINDS=$(grep -E '^(bind|bindl|binde|bindm)' "$LAPTOP_CONF") - KEYBINDS+=$'\n'"$LAPTOP_BINDS" + LAPTOP_BINDS=$(grep -E '^(bind|bindl|binde|bindm)' "$LAPTOP_CONF") + KEYBINDS+=$'\n'"$LAPTOP_BINDS" fi # check for any keybinds to display if [[ -z "$KEYBINDS" ]]; then - echo "No keybinds found." - exit 1 + echo "No keybinds found." + exit 1 fi # Use rofi to display the keybinds -echo "$KEYBINDS" | rofi -dmenu -i -p "Keybinds" -config ~/.config/rofi/config-keybinds.rasi \ No newline at end of file +echo "$KEYBINDS" | rofi -dmenu -i -p "Keybinds" -config ~/.config/rofi/config-keybinds.rasi + diff --git a/.config/hypr/scripts/Volume.sh b/.config/hypr/scripts/Volume.sh new file mode 100755 index 0000000..2ab6a51 --- /dev/null +++ b/.config/hypr/scripts/Volume.sh @@ -0,0 +1,143 @@ +#!/bin/bash +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## +# Scripts for volume controls for audio and mic + +iDIR="$HOME/.config/swaync/icons" +sDIR="$HOME/.config/hypr/scripts" + +# Get Volume +get_volume() { + volume=$(pamixer --get-volume) + if [[ "$volume" -eq "0" ]]; then + echo "Muted" + else + echo "$volume %" + fi +} + +# Get icons +get_icon() { + current=$(get_volume) + if [[ "$current" == "Muted" ]]; then + echo "$iDIR/volume-mute.png" + elif [[ "${current%\%}" -le 30 ]]; then + echo "$iDIR/volume-low.png" + elif [[ "${current%\%}" -le 60 ]]; then + echo "$iDIR/volume-mid.png" + else + echo "$iDIR/volume-high.png" + fi +} + +# Notify +notify_user() { + if [[ "$(get_volume)" == "Muted" ]]; then + notify-send -e -h string:x-canonical-private-synchronous:volume_notif -u low -i "$(get_icon)" " Volume:" " Muted" + else + notify-send -e -h int:value:"$(get_volume | sed 's/%//')" -h string:x-canonical-private-synchronous:volume_notif -u low -i "$(get_icon)" " Volume Level:" " $(get_volume)" && + "$sDIR/Sounds.sh" --volume + fi +} + +# Increase Volume +inc_volume() { + if [ "$(pamixer --get-mute)" == "true" ]; then + toggle_mute + else + pamixer -i 5 --allow-boost --set-limit 150 && notify_user + fi +} + +# Decrease Volume +dec_volume() { + if [ "$(pamixer --get-mute)" == "true" ]; then + toggle_mute + else + pamixer -d 5 && notify_user + fi +} + +# Toggle Mute +toggle_mute() { + if [ "$(pamixer --get-mute)" == "false" ]; then + pamixer -m && notify-send -e -u low -i "$iDIR/volume-mute.png" " Mute" + elif [ "$(pamixer --get-mute)" == "true" ]; then + pamixer -u && notify-send -e -u low -i "$(get_icon)" " Volume:" " Switched ON" + fi +} + +# Toggle Mic +toggle_mic() { + if [ "$(pamixer --default-source --get-mute)" == "false" ]; then + pamixer --default-source -m && notify-send -e -u low -i "$iDIR/microphone-mute.png" " Microphone:" " Switched OFF" + elif [ "$(pamixer --default-source --get-mute)" == "true" ]; then + pamixer -u --default-source u && notify-send -e -u low -i "$iDIR/microphone.png" " Microphone:" " Switched ON" + fi +} +# Get Mic Icon +get_mic_icon() { + current=$(pamixer --default-source --get-volume) + if [[ "$current" -eq "0" ]]; then + echo "$iDIR/microphone-mute.png" + else + echo "$iDIR/microphone.png" + fi +} + +# Get Microphone Volume +get_mic_volume() { + volume=$(pamixer --default-source --get-volume) + if [[ "$volume" -eq "0" ]]; then + echo "Muted" + else + echo "$volume %" + fi +} + +# Notify for Microphone +notify_mic_user() { + volume=$(get_mic_volume) + icon=$(get_mic_icon) + notify-send -e -h int:value:"$volume" -h "string:x-canonical-private-synchronous:volume_notif" -u low -i "$icon" " Mic Level:" " $volume" +} + +# Increase MIC Volume +inc_mic_volume() { + if [ "$(pamixer --default-source --get-mute)" == "true" ]; then + toggle_mic + else + pamixer --default-source -i 5 && notify_mic_user + fi +} + +# Decrease MIC Volume +dec_mic_volume() { + if [ "$(pamixer --default-source --get-mute)" == "true" ]; then + toggle-mic + else + pamixer --default-source -d 5 && notify_mic_user + fi +} + +# Execute accordingly +if [[ "$1" == "--get" ]]; then + get_volume +elif [[ "$1" == "--inc" ]]; then + inc_volume +elif [[ "$1" == "--dec" ]]; then + dec_volume +elif [[ "$1" == "--toggle" ]]; then + toggle_mute +elif [[ "$1" == "--toggle-mic" ]]; then + toggle_mic +elif [[ "$1" == "--get-icon" ]]; then + get_icon +elif [[ "$1" == "--get-mic-icon" ]]; then + get_mic_icon +elif [[ "$1" == "--mic-inc" ]]; then + inc_mic_volume +elif [[ "$1" == "--mic-dec" ]]; then + dec_mic_volume +else + get_volume +fi