From 78bfcb26dcbe7d95735f24c7ec121487fbd69283 Mon Sep 17 00:00:00 2001 From: Daniel <48409433+darkeddie@users.noreply.github.com> Date: Wed, 15 May 2024 01:20:32 +0000 Subject: Fix: error in line 25 of WindowRules.conf Changed incorrect ')' to ']' --- config/hypr/UserConfigs/WindowRules.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/hypr') diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf index 09cc8ec2..8a660e4c 100644 --- a/config/hypr/UserConfigs/WindowRules.conf +++ b/config/hypr/UserConfigs/WindowRules.conf @@ -22,7 +22,7 @@ windowrulev2 = workspace 9 silent, class:^([Aa]udacious)$ # windowrule v2 - float windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$ -windowrulev2 = float, class:([Zz)oom|onedriver|onedriver-launcher)$ +windowrulev2 = float, class:([Zz]oom|onedriver|onedriver-launcher)$ windowrulev2 = float, class:([Tt]hunar), title:(File Operation Progress) windowrulev2 = float, class:([Tt]hunar), title:(Confirm to replace files) windowrulev2 = float, class:(xdg-desktop-portal-gtk) -- cgit v1.2.3 From a3299f5e0e40eed223e815b5c9177cf4e023d7d6 Mon Sep 17 00:00:00 2001 From: Daniel <48409433+darkeddie@users.noreply.github.com> Date: Wed, 15 May 2024 03:12:06 +0000 Subject: Add floating window rules for non-main Steam windows Friends list and settings tiling can be annoying --- config/hypr/UserConfigs/WindowRules.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'config/hypr') diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf index 8a660e4c..8cae3eac 100644 --- a/config/hypr/UserConfigs/WindowRules.conf +++ b/config/hypr/UserConfigs/WindowRules.conf @@ -40,6 +40,7 @@ windowrulev2 = float, class:^(evince)$ # document viewer windowrulev2 = float, class:^(file-roller|org.gnome.FileRoller)$ # archive manager windowrulev2 = float, class:^([Bb]aobab|org.gnome.[Bb]aobab)$ # Disk usage analyzer windowrulev2 = float, title:(Kvantum Manager) +windowrulev2 = float, class:^([Ss]team)$,title:^((?![Ss]team).*|[Ss]team [Ss]ettings)$ # windowrule v2 - opacity #enable as desired windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$ -- cgit v1.2.3 From 2ec0ed3809171f08138be2020f97d500fff91667 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 15 May 2024 12:24:28 +0900 Subject: updated weather icons --- config/hypr/UserScripts/Weather.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'config/hypr') diff --git a/config/hypr/UserScripts/Weather.py b/config/hypr/UserScripts/Weather.py index 5cd11a66..b1b21fa3 100755 --- a/config/hypr/UserScripts/Weather.py +++ b/config/hypr/UserScripts/Weather.py @@ -8,12 +8,12 @@ import os # original code https://gist.github.com/Surendrajat/ff3876fd2166dd86fb71180f4e9342d7 # weather icons weather_icons = { - "sunnyDay": "", - "clearNight": "", - "cloudyFoggyDay": "", - "cloudyFoggyNight": "", - "rainyDay": "", - "rainyNight": "", + "sunnyDay": "󰖙", + "clearNight": "󰖔", + "cloudyFoggyDay": "", + "cloudyFoggyNight": "", + "rainyDay": "", + "rainyNight": "", "snowyIcyDay": "", "snowyIcyNight": "", "severe": "", -- cgit v1.2.3 From 899e6495867b77babf648f27cd50ad3df8b43133 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 15 May 2024 12:57:30 +0900 Subject: added a windows rule v2 position --- config/hypr/UserConfigs/WindowRules.conf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'config/hypr') diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf index 8a660e4c..bee65d94 100644 --- a/config/hypr/UserConfigs/WindowRules.conf +++ b/config/hypr/UserConfigs/WindowRules.conf @@ -22,7 +22,7 @@ windowrulev2 = workspace 9 silent, class:^([Aa]udacious)$ # windowrule v2 - float windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$ -windowrulev2 = float, class:([Zz]oom|onedriver|onedriver-launcher)$ +windowrulev2 = float, class:([Zz)oom|onedriver|onedriver-launcher)$ windowrulev2 = float, class:([Tt]hunar), title:(File Operation Progress) windowrulev2 = float, class:([Tt]hunar), title:(Confirm to replace files) windowrulev2 = float, class:(xdg-desktop-portal-gtk) @@ -41,6 +41,10 @@ windowrulev2 = float, class:^(file-roller|org.gnome.FileRoller)$ # archive manag windowrulev2 = float, class:^([Bb]aobab|org.gnome.[Bb]aobab)$ # Disk usage analyzer windowrulev2 = float, title:(Kvantum Manager) +# windowrule v2 - position +windowrulev2 = center, class:([Tt]hunar), title:(File Operation Progress) +windowrulev2 = center, class:([Tt]hunar), title:(Confirm to replace files) + # windowrule v2 - opacity #enable as desired windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$ windowrulev2 = opacity 0.9 0.7, class:^(Brave-browser(-beta|-dev)?)$ -- cgit v1.2.3 From cf4e7e595c5b4660d73be38324d78a31c0d36cc1 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 15 May 2024 13:31:07 +0900 Subject: Fixed alignment of Weather.py for hyprlock - Man this is getting annoying already lmao --- config/hypr/UserScripts/Weather.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/hypr') diff --git a/config/hypr/UserScripts/Weather.py b/config/hypr/UserScripts/Weather.py index b1b21fa3..39f823af 100755 --- a/config/hypr/UserScripts/Weather.py +++ b/config/hypr/UserScripts/Weather.py @@ -123,7 +123,7 @@ out_data = { } print(json.dumps(out_data)) -simple_weather =f"{icon} {status}\n" + \ +simple_weather =f"{icon} {status}\n" + \ f" {temp} ({temp_feel_text})\n" + \ f"{wind_text} \n" + \ f"{humidity_text} \n" + \ -- cgit v1.2.3 From eadfcd61790b1b01c2ff3147d8e9985b4b0449c1 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 15 May 2024 14:50:10 +0900 Subject: Updated windows rules.conf Create a category called windowrules v2 move to workspace (silent) --- config/hypr/UserConfigs/WindowRules.conf | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'config/hypr') diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf index ae3ef402..50db519d 100644 --- a/config/hypr/UserConfigs/WindowRules.conf +++ b/config/hypr/UserConfigs/WindowRules.conf @@ -13,16 +13,18 @@ windowrulev2 = workspace 2, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-es windowrulev2 = workspace 2, class:^([Mm]icrosoft-edge(-stable|-beta|-dev|-unstable)?)$ #windowrulev2 = workspace 3, class:^([Tt]hunar)$ windowrulev2 = workspace 4, class:^(com.obsproject.Studio)$ -windowrulev2 = workspace 5 silent, class:^([Ss]team)$,title:^([Ss]team)$ -windowrulev2 = workspace 5 silent, class:^(lutris)$ -windowrulev2 = workspace 6 silent, class:^(virt-manager)$ +windowrulev2 = workspace 5, class:^([Ss]team)$ +windowrulev2 = workspace 5, class:^([Ll]utris)$ windowrulev2 = workspace 7 silent, class:^(discord)$ windowrulev2 = workspace 7 silent, class:^(WebCord)$ + +# windowrule v2 move to workspace (silent) +windowrulev2 = workspace 6 silent, class:^(virt-manager)$ windowrulev2 = workspace 9 silent, class:^([Aa]udacious)$ # windowrule v2 - float windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$ -windowrulev2 = float, class:([Zz)oom|onedriver|onedriver-launcher)$ +windowrulev2 = float, class:([Zz]oom|onedriver|onedriver-launcher)$ windowrulev2 = float, class:([Tt]hunar), title:(File Operation Progress) windowrulev2 = float, class:([Tt]hunar), title:(Confirm to replace files) windowrulev2 = float, class:(xdg-desktop-portal-gtk) -- cgit v1.2.3 From 5009c4cb9b85f8de6b45d38dd7060b49e8919f6e Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 15 May 2024 14:50:59 +0900 Subject: Bumping to v2.2.12 for development --- config/hypr/v2.2.11 | 5 ----- config/hypr/v2.2.12 | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 config/hypr/v2.2.11 create mode 100644 config/hypr/v2.2.12 (limited to 'config/hypr') diff --git a/config/hypr/v2.2.11 b/config/hypr/v2.2.11 deleted file mode 100644 index 31b3414d..00000000 --- a/config/hypr/v2.2.11 +++ /dev/null @@ -1,5 +0,0 @@ -### https://github.com/JaKooLit ### -## https://github.com/JaKooLit/Hyprland-Dots -## This is to have a reference of which version would be - -## note that this will always be higher than the released versions \ No newline at end of file diff --git a/config/hypr/v2.2.12 b/config/hypr/v2.2.12 new file mode 100644 index 00000000..31b3414d --- /dev/null +++ b/config/hypr/v2.2.12 @@ -0,0 +1,5 @@ +### https://github.com/JaKooLit ### +## https://github.com/JaKooLit/Hyprland-Dots +## This is to have a reference of which version would be + +## note that this will always be higher than the released versions \ No newline at end of file -- cgit v1.2.3 From 06739c6b1fd121e9d3c53f907f4af4a096cb9a3b Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 16 May 2024 01:56:58 +0900 Subject: change some hyprland settings: dwindle default layout and changed animations. increased gaps in between windows --- config/hypr/UserConfigs/UserSettings.conf | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'config/hypr') diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf index b3193e49..f8c8c2a2 100644 --- a/config/hypr/UserConfigs/UserSettings.conf +++ b/config/hypr/UserConfigs/UserSettings.conf @@ -25,7 +25,7 @@ master { general { sensitivity=1.00 apply_sens_to_raw=1 - gaps_in = 4 + gaps_in = 6 gaps_out = 8 border_size = 2 resize_on_border = true @@ -33,7 +33,7 @@ general { col.active_border = $color0 $color2 $color9 $color12 $color15 90deg col.inactive_border = $backgroundCol - layout = master + layout = dwindle } group { @@ -45,7 +45,7 @@ group { } decoration { - rounding = 8 + rounding = 10 active_opacity = 1.0 inactive_opacity = 0.9 @@ -74,25 +74,19 @@ decoration { animations { enabled = yes - bezier = myBezier, 0.05, 0.9, 0.1, 1.05 - bezier = linear, 0.0, 0.0, 1.0, 1.0 bezier = wind, 0.05, 0.9, 0.1, 1.05 bezier = winIn, 0.1, 1.1, 0.1, 1.1 bezier = winOut, 0.3, -0.3, 0, 1 - bezier = slow, 0, 0.85, 0.3, 1 - bezier = overshot, 0.7, 0.6, 0.1, 1.1 - bezier = bounce, 1.1, 1.6, 0.1, 0.85 - bezier = sligshot, 1, -1, 0.15, 1.25 - bezier = nice, 0, 6.9, 0.5, -4.20 + bezier = liner, 1, 1, 1, 1 - animation = windowsIn, 1, 5, slow, popin - animation = windowsOut, 1, 5, winOut, popin + animation = windows, 1, 6, wind, slide + animation = windowsIn, 1, 6, winIn, slide + animation = windowsOut, 1, 5, winOut, slide animation = windowsMove, 1, 5, wind, slide - animation = border, 1, 10, linear - animation = borderangle, 1, 180, linear, loop #used by rainbow borders and rotating colors - animation = fade, 1, 5, overshot + animation = border, 1, 1, liner + animation = borderangle, 1, 180, liner, loop #used by rainbow borders and rotating colors + animation = fade, 1, 10, default animation = workspaces, 1, 5, wind - animation = windows, 1, 5, bounce, popin } input { -- cgit v1.2.3 From 62d1d91792fe258147dbd9454fd19722aef10ea6 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 16 May 2024 12:14:24 +0900 Subject: updated prinscr + 10 secs timer. It is now super CTRL SHIFT PrintScr --- config/hypr/configs/Keybinds.conf | 2 +- config/hypr/scripts/KeyHints.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'config/hypr') diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf index 2cdd9cde..56255087 100644 --- a/config/hypr/configs/Keybinds.conf +++ b/config/hypr/configs/Keybinds.conf @@ -75,7 +75,7 @@ bind = , xf86audiostop, exec, $scriptsDir/MediaCtrl.sh --stop bind = $mainMod, Print, exec, $scriptsDir/ScreenShot.sh --now bind = $mainMod SHIFT, Print, exec, $scriptsDir/ScreenShot.sh --area bind = $mainMod CTRL, Print, exec, $scriptsDir/ScreenShot.sh --in5 #screenshot in 5 secs -bind = $mainMod ALT, Print, exec, $scriptsDir/ScreenShot.sh --in10 #screenshot in 10 secs +bind = $mainMod CTRL SHIFT, Print, exec, $scriptsDir/ScreenShot.sh --in10 #screenshot in 10 secs bind = ALT, Print, exec, $scriptsDir/ScreenShot.sh --active #take screenshot of active window # screenshot with swappy (another screenshot tool) diff --git a/config/hypr/scripts/KeyHints.sh b/config/hypr/scripts/KeyHints.sh index d6dd4049..a6d13aa4 100755 --- a/config/hypr/scripts/KeyHints.sh +++ b/config/hypr/scripts/KeyHints.sh @@ -58,6 +58,8 @@ yad --width=$dynamic_width --height=$dynamic_height \ " Print" "screenshot" "(grim)" \ " Shift Print" "screenshot region" "(grim + slurp)" \ " Shift S" "screenshot region" "(swappy)" \ +" CTRL Print" "screenshot timer 5 secs " "(grim)" \ +" CTRL SHIFT Print" "screenshot timer 10 secs " "(grim)" \ "ALT Print" "Screenshot active window" "active window only" \ "CTRL ALT P" "power-menu" "(wlogout)" \ "CTRL ALT L" "screen lock" "(hyprlock)" \ -- cgit v1.2.3 From 988db9dc312d82066882ec210c88d7465687e3f4 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sun, 19 May 2024 17:04:00 +0900 Subject: initial-boot.sh adjust for easy setting of themes and icons in the future --- config/hypr/initial-boot.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'config/hypr') diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh index 162ad65f..794415aa 100755 --- a/config/hypr/initial-boot.sh +++ b/config/hypr/initial-boot.sh @@ -10,6 +10,11 @@ scriptsDir=$HOME/.config/hypr/scripts wallpaper=$HOME/Pictures/wallpapers/Fantasy-Waterfall.png waybar_style="$HOME/.config/waybar/style/[Dark] Latte-Wallust combined.css" kvantum_theme="Catppuccin-Mocha" +color_scheme="prefer-dark" +gtk_theme="Tokyonight-Dark-Moon-BL-LB" +icon_theme="Flat-Remix-Blue-Dark" +cursor_theme="Bibata-Modern-Ice" + swww="swww img" effect="--transition-bezier .43,1.19,1,.4 --transition-fps 30 --transition-type grow --transition-pos 0.925,0.977 --transition-duration 2" @@ -25,10 +30,10 @@ if [ ! -f ~/.config/hypr/.initial_startup_done ]; then fi # initiate GTK dark mode and apply icon and cursor theme - gsettings set org.gnome.desktop.interface color-scheme prefer-dark > /dev/null 2>&1 & - gsettings set org.gnome.desktop.interface gtk-theme Tokyonight-Dark-Moon-BL-LB > /dev/null 2>&1 & - gsettings set org.gnome.desktop.interface icon-theme Flat-Remix-Blue-Dark > /dev/null 2>&1 & - gsettings set org.gnome.desktop.interface cursor-theme Bibata-Modern-Ice > /dev/null 2>&1 & + gsettings set org.gnome.desktop.interface color-scheme $color_scheme > /dev/null 2>&1 & + gsettings set org.gnome.desktop.interface gtk-theme $gtk_theme > /dev/null 2>&1 & + gsettings set org.gnome.desktop.interface icon-theme $icon_theme > /dev/null 2>&1 & + gsettings set org.gnome.desktop.interface cursor-theme $cursor_theme > /dev/null 2>&1 & gsettings set org.gnome.desktop.interface cursor-size 24 > /dev/null 2>&1 & # initiate kvantum theme -- cgit v1.2.3 From f8571e98d90df097769efb9d8404806f413e438e Mon Sep 17 00:00:00 2001 From: Daniel <48409433+darkeddie@users.noreply.github.com> Date: Mon, 20 May 2024 02:30:01 +0000 Subject: Add Shuffle to RofiBeats.sh --- config/hypr/UserScripts/RofiBeats.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'config/hypr') diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh index 1cf2a445..5753857b 100755 --- a/config/hypr/UserScripts/RofiBeats.sh +++ b/config/hypr/UserScripts/RofiBeats.sh @@ -79,11 +79,19 @@ play_online_music() { mpv --shuffle --vid=no "$link" } +# Main function for shuffling local music +shuffle_local_music() { + notification "Shuffle local music" + + # Play music in $mDIR on shuffle + mpv --shuffle --vid=no "$mDIR" +} + # Check if an online music process is running and send a notification, otherwise run the main function -pkill mpv && notify-send -u low -i "$iDIR/music.png" "Online Music stopped" || { +pkill mpv && notify-send -u low -i "$iDIR/music.png" "Music stopped" || { # Prompt the user to choose between local and online music -user_choice=$(printf "Play from Online Stations\nPlay from Music Folder" | rofi -dmenu -config ~/.config/rofi/config-rofi-Beats-menu.rasi -p "Select music source") +user_choice=$(printf "Play from Online Stations\nPlay from Music Folder\nShuffle from Music Folder" | rofi -dmenu -config ~/.config/rofi/config-rofi-Beats-menu.rasi -p "Select music source") case "$user_choice" in "Play from Music Folder") @@ -92,6 +100,9 @@ user_choice=$(printf "Play from Online Stations\nPlay from Music Folder" | rofi "Play from Online Stations") play_online_music ;; + "Shuffle from Music Folder") + shuffle_local_music + ;; *) echo "Invalid choice" ;; -- cgit v1.2.3 From bbb2c6d524df11b439ab3f79b31a80b06635fda2 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 20 May 2024 12:21:33 +0900 Subject: tweaked Rofi-Beats --- config/hypr/UserScripts/RofiBeats.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'config/hypr') diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh index 5753857b..5349930e 100755 --- a/config/hypr/UserScripts/RofiBeats.sh +++ b/config/hypr/UserScripts/RofiBeats.sh @@ -1,12 +1,14 @@ #!/bin/bash +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## +# This script Rofi Beats (Super Shift M) -# Directory music folder +# Directory music folder for Local Music mDIR="$HOME/Music/" # Directory for icons iDIR="$HOME/.config/swaync/icons" -# Online Stations +# Online Stations. Edit as required / want here declare -A online_music=( ["AfroBeatz 2024 🎧"]="https://www.youtube.com/watch?v=7uB-Eh9XVZQ" ["Lofi Girl ☕️🎶"]="https://play.streamafrica.net/lofiradio" @@ -22,7 +24,6 @@ declare -A online_music=( ["Korean Drama OST 📻🎶"]="https://youtube.com/playlist?list=PLUge_o9AIFp4HuA-A3e3ZqENh63LuRRlQ" ) -# Local Music # Populate local_music array with files from music directory and subdirectories populate_local_music() { local_music=() @@ -60,7 +61,7 @@ play_local_music() { notification "$choice" # Play the selected local music file using mpv - mpv --shuffle --vid=no "$file" + mpv --vid=no "$file" } # Main function for playing online music @@ -81,7 +82,7 @@ play_online_music() { # Main function for shuffling local music shuffle_local_music() { - notification "Shuffle local music" + notification "Shuffle Play Local music" # Play music in $mDIR on shuffle mpv --shuffle --vid=no "$mDIR" @@ -91,7 +92,7 @@ shuffle_local_music() { pkill mpv && notify-send -u low -i "$iDIR/music.png" "Music stopped" || { # Prompt the user to choose between local and online music -user_choice=$(printf "Play from Online Stations\nPlay from Music Folder\nShuffle from Music Folder" | rofi -dmenu -config ~/.config/rofi/config-rofi-Beats-menu.rasi -p "Select music source") +user_choice=$(printf "Play from Online Stations\nPlay from Music Folder\nShuffle Play from Music Folder" | rofi -dmenu -config ~/.config/rofi/config-rofi-Beats-menu.rasi -p "Select music source") case "$user_choice" in "Play from Music Folder") @@ -100,7 +101,7 @@ user_choice=$(printf "Play from Online Stations\nPlay from Music Folder\nShuffle "Play from Online Stations") play_online_music ;; - "Shuffle from Music Folder") + "Shuffle Play from Music Folder") shuffle_local_music ;; *) -- cgit v1.2.3 From 1208d24200477a236e4ca04d8a248210e0af1040 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 20 May 2024 13:39:23 +0900 Subject: updated windowrules --- config/hypr/UserConfigs/WindowRules.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/hypr') diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf index 50db519d..65e44e98 100644 --- a/config/hypr/UserConfigs/WindowRules.conf +++ b/config/hypr/UserConfigs/WindowRules.conf @@ -15,8 +15,8 @@ windowrulev2 = workspace 2, class:^([Mm]icrosoft-edge(-stable|-beta|-dev|-unstab windowrulev2 = workspace 4, class:^(com.obsproject.Studio)$ windowrulev2 = workspace 5, class:^([Ss]team)$ windowrulev2 = workspace 5, class:^([Ll]utris)$ -windowrulev2 = workspace 7 silent, class:^(discord)$ -windowrulev2 = workspace 7 silent, class:^(WebCord)$ +windowrulev2 = workspace 7, class:^([Dd]iscord)$ +windowrulev2 = workspace 7, class:^([Ww]ebCord)$ # windowrule v2 move to workspace (silent) windowrulev2 = workspace 6 silent, class:^(virt-manager)$ -- cgit v1.2.3 From 5f8eeeb4419fb18acc02b9bf84d36caa94844aa8 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 20 May 2024 17:17:33 +0900 Subject: to resolve conflict --- config/hypr/UserScripts/RofiBeats.sh | 37 ++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) (limited to 'config/hypr') diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh index 5349930e..04af7222 100755 --- a/config/hypr/UserScripts/RofiBeats.sh +++ b/config/hypr/UserScripts/RofiBeats.sh @@ -1,14 +1,12 @@ #!/bin/bash -# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## -# This script Rofi Beats (Super Shift M) -# Directory music folder for Local Music +# Directory music folder mDIR="$HOME/Music/" # Directory for icons iDIR="$HOME/.config/swaync/icons" -# Online Stations. Edit as required / want here +# Online Stations declare -A online_music=( ["AfroBeatz 2024 🎧"]="https://www.youtube.com/watch?v=7uB-Eh9XVZQ" ["Lofi Girl ☕️🎶"]="https://play.streamafrica.net/lofiradio" @@ -24,6 +22,7 @@ declare -A online_music=( ["Korean Drama OST 📻🎶"]="https://youtube.com/playlist?list=PLUge_o9AIFp4HuA-A3e3ZqENh63LuRRlQ" ) +# Local Music # Populate local_music array with files from music directory and subdirectories populate_local_music() { local_music=() @@ -50,18 +49,24 @@ play_local_music() { exit 1 fi - # Find the corresponding file path based on user's choice - for (( i=0; i<"${#filenames[@]}"; i++ )); do + # Find the corresponding file path based on user's choice and set that to play the song then continue on the list + for (( i=0; i<"${#filenames[@]}"; ++i )); do if [ "${filenames[$i]}" = "$choice" ]; then - file="${local_music[$i]}" + + notification "$choice" + # For some reason wont start playlist at 0 + if [[ $i -eq 0 ]]; then + # Play the selected local music file using mpv + mpv --loop-playlist --vid=no "$mDIR" + + else + file=$i + # Play the selected local music file using mpv + mpv --playlist-start="$file" --loop-playlist --vid=no "$mDIR" + fi break fi done - - notification "$choice" - - # Play the selected local music file using mpv - mpv --vid=no "$file" } # Main function for playing online music @@ -82,17 +87,17 @@ play_online_music() { # Main function for shuffling local music shuffle_local_music() { - notification "Shuffle Play Local music" + notification "Shuffle local music" # Play music in $mDIR on shuffle - mpv --shuffle --vid=no "$mDIR" + mpv --shuffle --loop-playlist --vid=no "$mDIR" } # Check if an online music process is running and send a notification, otherwise run the main function pkill mpv && notify-send -u low -i "$iDIR/music.png" "Music stopped" || { # Prompt the user to choose between local and online music -user_choice=$(printf "Play from Online Stations\nPlay from Music Folder\nShuffle Play from Music Folder" | rofi -dmenu -config ~/.config/rofi/config-rofi-Beats-menu.rasi -p "Select music source") +user_choice=$(printf "Play from Online Stations\nPlay from Music Folder\nShuffle from Music Folder" | rofi -dmenu -config ~/.config/rofi/config-rofi-Beats-menu.rasi -p "Select music source") case "$user_choice" in "Play from Music Folder") @@ -101,7 +106,7 @@ user_choice=$(printf "Play from Online Stations\nPlay from Music Folder\nShuffle "Play from Online Stations") play_online_music ;; - "Shuffle Play from Music Folder") + "Shuffle from Music Folder") shuffle_local_music ;; *) -- cgit v1.2.3 From 8f5c2af4cff0e5fae763e3f65b2cf90bacc85647 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 20 May 2024 17:27:21 +0900 Subject: Tweaked Rofi Beats --- config/hypr/UserScripts/RofiBeats.sh | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'config/hypr') diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh index 04af7222..7fed687f 100755 --- a/config/hypr/UserScripts/RofiBeats.sh +++ b/config/hypr/UserScripts/RofiBeats.sh @@ -1,12 +1,14 @@ #!/bin/bash +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## +# For Rofi Beats to play online Music or Locally save media files -# Directory music folder +# Directory local music folder mDIR="$HOME/Music/" # Directory for icons iDIR="$HOME/.config/swaync/icons" -# Online Stations +# Online Stations. Edit as required declare -A online_music=( ["AfroBeatz 2024 🎧"]="https://www.youtube.com/watch?v=7uB-Eh9XVZQ" ["Lofi Girl ☕️🎶"]="https://play.streamafrica.net/lofiradio" @@ -22,7 +24,6 @@ declare -A online_music=( ["Korean Drama OST 📻🎶"]="https://youtube.com/playlist?list=PLUge_o9AIFp4HuA-A3e3ZqENh63LuRRlQ" ) -# Local Music # Populate local_music array with files from music directory and subdirectories populate_local_music() { local_music=() @@ -52,13 +53,14 @@ play_local_music() { # Find the corresponding file path based on user's choice and set that to play the song then continue on the list for (( i=0; i<"${#filenames[@]}"; ++i )); do if [ "${filenames[$i]}" = "$choice" ]; then + + notification "$choice" - notification "$choice" # For some reason wont start playlist at 0 if [[ $i -eq 0 ]]; then # Play the selected local music file using mpv - mpv --loop-playlist --vid=no "$mDIR" - + mpv --loop-playlist --vid=no "$mDIR" + else file=$i # Play the selected local music file using mpv @@ -69,6 +71,14 @@ play_local_music() { done } +# Main function for shuffling local music +shuffle_local_music() { + notification "Shuffle local music" + + # Play music in $mDIR on shuffle + mpv --shuffle --loop-playlist --vid=no "$mDIR" +} + # Main function for playing online music play_online_music() { choice=$(printf "%s\n" "${!online_music[@]}" | rofi -i -dmenu -config ~/.config/rofi/config-rofi-Beats.rasi -p "Online Music") @@ -85,19 +95,11 @@ play_online_music() { mpv --shuffle --vid=no "$link" } -# Main function for shuffling local music -shuffle_local_music() { - notification "Shuffle local music" - - # Play music in $mDIR on shuffle - mpv --shuffle --loop-playlist --vid=no "$mDIR" -} - # Check if an online music process is running and send a notification, otherwise run the main function pkill mpv && notify-send -u low -i "$iDIR/music.png" "Music stopped" || { # Prompt the user to choose between local and online music -user_choice=$(printf "Play from Online Stations\nPlay from Music Folder\nShuffle from Music Folder" | rofi -dmenu -config ~/.config/rofi/config-rofi-Beats-menu.rasi -p "Select music source") +user_choice=$(printf "Play from Online Stations\nPlay from Music Folder\nShuffle Play from Music Folder" | rofi -dmenu -config ~/.config/rofi/config-rofi-Beats-menu.rasi -p "Select music source") case "$user_choice" in "Play from Music Folder") @@ -106,7 +108,7 @@ user_choice=$(printf "Play from Online Stations\nPlay from Music Folder\nShuffle "Play from Online Stations") play_online_music ;; - "Shuffle from Music Folder") + "Shuffle Play from Music Folder") shuffle_local_music ;; *) -- cgit v1.2.3 From 67da07ee3fdaaf65123e52d1d596a70fc69f30bb Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 20 May 2024 23:22:46 +0900 Subject: Wallpaper menu tweaked. New swww animation + can now detect wallpapers inside directories like the Dynamic Wallpapers --- config/hypr/UserScripts/WallpaperSelect.sh | 46 +++++++++++++++++------------- 1 file changed, 26 insertions(+), 20 deletions(-) (limited to 'config/hypr') diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh index 9a087c7d..06859112 100755 --- a/config/hypr/UserScripts/WallpaperSelect.sh +++ b/config/hypr/UserScripts/WallpaperSelect.sh @@ -1,18 +1,18 @@ #!/bin/bash -# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # This script for selecting wallpapers (SUPER W) -SCRIPTSDIR="$HOME/.config/hypr/scripts" - -focused_monitor=$(hyprctl monitors | awk '/^Monitor/{name=$2} /focused: yes/{print name}') - # WALLPAPERS PATH wallDIR="$HOME/Pictures/wallpapers" -# Transition config -FPS=30 -TYPE="wipe" -DURATION=1 +# variables +SCRIPTSDIR="$HOME/.config/hypr/scripts" +focused_monitor=$(hyprctl monitors | awk '/^Monitor/{name=$2} /focused: yes/{print name}') + +# swww transition config +FPS=60 +TYPE="any" +DURATION=2 BEZIER=".43,1.19,1,.4" SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION" @@ -22,31 +22,36 @@ if pidof swaybg > /dev/null; then fi # Retrieve image files -PICS=($(ls "${wallDIR}" | grep -E ".jpg$|.jpeg$|.png$|.gif$")) +PICS=($(find "${wallDIR}" -type f \( -iname \*.jpg -o -iname \*.jpeg -o -iname \*.png -o -iname \*.gif \))) RANDOM_PIC="${PICS[$((RANDOM % ${#PICS[@]}))]}" -RANDOM_PIC_NAME="${#PICS[@]}. random" +RANDOM_PIC_NAME=". random" # Rofi command rofi_command="rofi -i -show -dmenu -config ~/.config/rofi/config-wallpaper.rasi" + +# Sorting Wallpapers menu() { - for i in "${!PICS[@]}"; do + sorted_options=($(printf '%s\n' "${PICS[@]}" | sort)) + # Place ". random" at the beginning + printf "%s\n" "$RANDOM_PIC_NAME" + for pic_path in "${sorted_options[@]}"; do + pic_name=$(basename "$pic_path") # Displaying .gif to indicate animated images - if [[ -z $(echo "${PICS[$i]}" | grep .gif$) ]]; then - printf "$(echo "${PICS[$i]}" | cut -d. -f1)\x00icon\x1f${wallDIR}/${PICS[$i]}\n" + if [[ -z $(echo "$pic_name" | grep -i "\.gif$") ]]; then + printf "%s\x00icon\x1f%s\n" "$(echo "$pic_name" | cut -d. -f1)" "$pic_path" else - printf "${PICS[$i]}\n" + printf "%s\n" "$pic_name" fi done - - printf "$RANDOM_PIC_NAME\n" } +# initiate swww if not running swww query || swww-daemon --format xrgb +# Choice of wallpapers main() { choice=$(menu | ${rofi_command}) - # No choice case if [[ -z $choice ]]; then exit 0 @@ -54,7 +59,8 @@ main() { # Random choice case if [ "$choice" = "$RANDOM_PIC_NAME" ]; then - swww img "${wallDIR}/${RANDOM_PIC}" $SWWW_PARAMS + RANDOM_PIC="${PICS[$((RANDOM % ${#PICS[@]}))]}" + swww img -o $focused_monitor "${RANDOM_PIC}" $SWWW_PARAMS exit 0 fi @@ -69,7 +75,7 @@ main() { done if [[ $pic_index -ne -1 ]]; then - swww img -o $focused_monitor "${wallDIR}/${PICS[$pic_index]}" $SWWW_PARAMS + swww img -o $focused_monitor "${PICS[$pic_index]}" $SWWW_PARAMS else echo "Image not found." exit 1 -- cgit v1.2.3 From e66c4e6047da7d2b5edaad31439bceb6c4000cbc Mon Sep 17 00:00:00 2001 From: GrafMonteCarlo <53829166+vailrahmatulin@users.noreply.github.com> Date: Tue, 21 May 2024 18:41:20 +0700 Subject: Update SwitchKeyboardLayout.sh Changing the keyboard layout for all keyboards connected to the computer. --- config/hypr/scripts/SwitchKeyboardLayout.sh | 37 +++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) (limited to 'config/hypr') diff --git a/config/hypr/scripts/SwitchKeyboardLayout.sh b/config/hypr/scripts/SwitchKeyboardLayout.sh index 0145e262..cbacd74f 100755 --- a/config/hypr/scripts/SwitchKeyboardLayout.sh +++ b/config/hypr/scripts/SwitchKeyboardLayout.sh @@ -41,5 +41,38 @@ new_layout="${layout_mapping[next_index]}" hyprctl switchxkblayout "at-translated-set-2-keyboard" "$new_layout" echo "$new_layout" > "$layout_f" -# Notification for the new keyboard layout -notify-send -u low -i "$notif" "new KB_Layout: $new_layout" +# Created by T-Crypt + +get_keyboard_names() { + hyprctl devices -j | jq -r '.keyboards[].name' +} + +change_layout() { + local got_error=false + + while read -r name; do + hyprctl switchxkblayout "$name" next + if [[ $? -eq 0 ]]; then + echo "Switched the layout for $name." + else + >&2 echo "Error while switching the layout for $name." + got_error=true + fi + done <<< "$(get_keyboard_names)" + + if [ "$got_error" = true ]; then + >&2 echo "Some errors were found during the process..." + return 1 + fi + + return 0 # All layouts had been cycled successfully +} + +if ! change_layout; then + notify-send -u low -t 2000 'Keyboard layout' 'Error: Layout change failed' + >&2 echo "Layout change failed." + exit 1 +else + # Notification for the new keyboard layout + notify-send -u low -i "$notif" "new KB_Layout: $new_layout" +fi -- cgit v1.2.3 From 1f38a5f7c1139de7720b6432316921c55a350913 Mon Sep 17 00:00:00 2001 From: GrafMonteCarlo <53829166+vailrahmatulin@users.noreply.github.com> Date: Tue, 21 May 2024 18:43:53 +0700 Subject: Update UserSettings.conf Disabling Alt+Shift key interception --- config/hypr/UserConfigs/UserSettings.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/hypr') diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf index b3193e49..3783d36b 100644 --- a/config/hypr/UserConfigs/UserSettings.conf +++ b/config/hypr/UserConfigs/UserSettings.conf @@ -99,7 +99,7 @@ input { kb_layout=us kb_variant= kb_model= - kb_options=grp:alt_shift_toggle + kb_options= kb_rules= repeat_rate=50 repeat_delay=300 -- cgit v1.2.3 From 51e9bd706830e920bc375983ab8599335a4ae37b Mon Sep 17 00:00:00 2001 From: GrafMonteCarlo <53829166+vailrahmatulin@users.noreply.github.com> Date: Tue, 21 May 2024 18:47:30 +0700 Subject: Update UserKeybinds.conf Assigning the Alt+Shift keys to trigger the script SwitchKeyboardLayouts.sh --- config/hypr/UserConfigs/UserKeybinds.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/hypr') diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf index eede1669..7026084d 100644 --- a/config/hypr/UserConfigs/UserKeybinds.conf +++ b/config/hypr/UserConfigs/UserKeybinds.conf @@ -27,7 +27,7 @@ bind = $mainMod, Z, exec, pypr zoom # Toggle Zoom # User Added Keybinds bind = $mainMod SHIFT, O, exec, $UserScripts/ZshChangeTheme.sh # Change oh-my-zsh theme - +bindn = ALT_L, SHIFT_L, exec, $scriptsDir/SwitchKeyboardLayout.sh # For passthrough keyboard into a VM # bind = $mainMod ALT, P, submap, passthru #submap = passthru -- cgit v1.2.3 From 543ac255b7387dd0d45d9b1dd8cbef78d49263dc Mon Sep 17 00:00:00 2001 From: GrafMonteCarlo <53829166+vailrahmatulin@users.noreply.github.com> Date: Tue, 21 May 2024 18:49:21 +0700 Subject: Update UserKeybinds.conf Assigning the Alt+Shift keys to trigger the script SwitchKeyboardLayouts.sh --- config/hypr/UserConfigs/UserKeybinds.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config/hypr') diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf index 7026084d..9858558f 100644 --- a/config/hypr/UserConfigs/UserKeybinds.conf +++ b/config/hypr/UserConfigs/UserKeybinds.conf @@ -27,7 +27,8 @@ bind = $mainMod, Z, exec, pypr zoom # Toggle Zoom # User Added Keybinds bind = $mainMod SHIFT, O, exec, $UserScripts/ZshChangeTheme.sh # Change oh-my-zsh theme -bindn = ALT_L, SHIFT_L, exec, $scriptsDir/SwitchKeyboardLayout.sh +bindn = ALT_L, SHIFT_L, exec, $scriptsDir/SwitchKeyboardLayout.sh # Changing the keyboard layout + # For passthrough keyboard into a VM # bind = $mainMod ALT, P, submap, passthru #submap = passthru -- cgit v1.2.3 From fa443703d830e47cf896ebeaad059593adc9a857 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 21 May 2024 22:13:45 +0900 Subject: remove keyboard switching layout from default keybinds --- config/hypr/configs/Keybinds.conf | 1 - 1 file changed, 1 deletion(-) (limited to 'config/hypr') diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf index 56255087..142de86a 100644 --- a/config/hypr/configs/Keybinds.conf +++ b/config/hypr/configs/Keybinds.conf @@ -29,7 +29,6 @@ bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh # animations ON/OFF 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 -bind = SHIFT, ALT_L, exec, $scriptsDir/SwitchKeyboardLayout.sh # Switch Keyboard Layout # FEATURES / EXTRAS (UserScripts) bind = $mainMod, E, exec, $UserScripts/QuickEdit.sh # Quick Edit Hyprland Settings -- cgit v1.2.3 From fdc820b82ce89a8aa8224d74c03454b79b799145 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 21 May 2024 22:21:28 +0900 Subject: added some links on the configs --- config/hypr/UserConfigs/ENVariables.conf | 1 + config/hypr/UserConfigs/UserSettings.conf | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'config/hypr') diff --git a/config/hypr/UserConfigs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf index 1d60c24b..8681eb30 100644 --- a/config/hypr/UserConfigs/ENVariables.conf +++ b/config/hypr/UserConfigs/ENVariables.conf @@ -1,4 +1,5 @@ # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # +# Environment variables. See https://wiki.hyprland.org/Configuring/Environment-variables/ #environment-variables env = CLUTTER_BACKEND,wayland diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf index 38c83f2c..a4065b4f 100644 --- a/config/hypr/UserConfigs/UserSettings.conf +++ b/config/hypr/UserConfigs/UserSettings.conf @@ -1,6 +1,7 @@ # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # # User Settings -# This is where you put your own settings as this will not be touched during update +# This is where you put your own settings as this will not be touched during update +# if the upgrade.sh is used. # refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables -- cgit v1.2.3 From a8146419132991d2d7ee0b94ce01771fc83cdffa Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 21 May 2024 22:53:32 +0900 Subject: default blur increase to 6 from 5 --- config/hypr/UserConfigs/UserSettings.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/hypr') diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf index a4065b4f..1ca9b5d8 100644 --- a/config/hypr/UserConfigs/UserSettings.conf +++ b/config/hypr/UserConfigs/UserSettings.conf @@ -64,7 +64,7 @@ decoration { blur { enabled = true - size = 5 + size = 6 passes = 2 ignore_opacity = true new_optimizations = true -- cgit v1.2.3 From a5d4d4ee9550b820c8106881c69d85a73eaf5493 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 22 May 2024 10:55:21 +0900 Subject: reduced padding rofi on master config added a space on weather.py waybar data for better output --- config/hypr/UserScripts/Weather.py | 2 +- config/rofi/master-config.rasi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'config/hypr') diff --git a/config/hypr/UserScripts/Weather.py b/config/hypr/UserScripts/Weather.py index 39f823af..1d2ea30b 100755 --- a/config/hypr/UserScripts/Weather.py +++ b/config/hypr/UserScripts/Weather.py @@ -116,7 +116,7 @@ tooltip_text = str.format( # print waybar module data out_data = { - "text": f"{icon} {temp}", + "text": f"{icon} {temp}", "alt": status, "tooltip": tooltip_text, "class": status_code, diff --git a/config/rofi/master-config.rasi b/config/rofi/master-config.rasi index 4ffa7ac8..fe24cd61 100644 --- a/config/rofi/master-config.rasi +++ b/config/rofi/master-config.rasi @@ -65,7 +65,7 @@ mainbox { /* ---- Inputbar ---- */ inputbar { enabled: true; - padding: 10px 10px 200px 10px; + padding: 10px 10px 100px 10px; margin: 10px; background-color: transparent; border-radius: 25px; -- cgit v1.2.3 From 40fb30c13b3e0e80174066b7ccf2dd88fe2a9666 Mon Sep 17 00:00:00 2001 From: JosephArmas Date: Wed, 22 May 2024 13:41:48 -0700 Subject: feat: Add rofi calculator using qalc command. Result of expression is automatically saved to clipboard. Default keybinding set to mod + alt + c. --- config/hypr/configs/Keybinds.conf | 1 + config/hypr/scripts/RofiCalc.sh | 21 +++++++++++++++++++++ config/rofi/config-calc.rasi | 7 +++++++ 3 files changed, 29 insertions(+) create mode 100755 config/hypr/scripts/RofiCalc.sh create mode 100644 config/rofi/config-calc.rasi (limited to 'config/hypr') diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf index 142de86a..bd6e0a9f 100644 --- a/config/hypr/configs/Keybinds.conf +++ b/config/hypr/configs/Keybinds.conf @@ -23,6 +23,7 @@ bind = CTRL ALT, P, exec, $scriptsDir/Wlogout.sh bind = $mainMod, H, exec, $scriptsDir/KeyHints.sh # Small help file bind = $mainMod ALT, R, exec, $scriptsDir/Refresh.sh # Refresh waybar, swaync, rofi bind = $mainMod ALT, E, exec, $scriptsDir/RofiEmoji.sh # emoji +bind = $mainMod ALT, C, exec, $scriptsDir/RofiEmoji.sh # calculator bind = $mainMod, S, exec, $scriptsDir/RofiSearch.sh # Google search from Rofi bind = $mainMod SHIFT, B, exec, $scriptsDir/ChangeBlur.sh # Toggle blur settings bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh # animations ON/OFF diff --git a/config/hypr/scripts/RofiCalc.sh b/config/hypr/scripts/RofiCalc.sh new file mode 100755 index 00000000..3589525f --- /dev/null +++ b/config/hypr/scripts/RofiCalc.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +rofi_config="$HOME/.config/rofi/config-calc.rasi" + + +while true; do + result=$( + rofi -i -dmenu \ + -config "$rofi_config" \ + -mesg "$result = $calc_result" + ) + + if [ $? -ne 0 ]; then + exit + fi + + if [ -n "$result" ]; then + calc_result=$(qalc -t "$result") + echo "$calc_result" | wl-copy + fi +done diff --git a/config/rofi/config-calc.rasi b/config/rofi/config-calc.rasi new file mode 100644 index 00000000..4c7cad2e --- /dev/null +++ b/config/rofi/config-calc.rasi @@ -0,0 +1,7 @@ +@import "~/.config/rofi/config-long.rasi" + +/* ---- Entry ---- */ +entry { + width: 45%; + placeholder: "🧮 Calculate"; +} -- cgit v1.2.3 From 9060d299cbb75d92ef442d8db4cf14f6387542dd Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" <85185940+JaKooLit@users.noreply.github.com> Date: Thu, 23 May 2024 12:08:55 +0900 Subject: Update Keybinds.conf --- config/hypr/configs/Keybinds.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/hypr') diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf index bd6e0a9f..16155903 100644 --- a/config/hypr/configs/Keybinds.conf +++ b/config/hypr/configs/Keybinds.conf @@ -23,7 +23,7 @@ bind = CTRL ALT, P, exec, $scriptsDir/Wlogout.sh bind = $mainMod, H, exec, $scriptsDir/KeyHints.sh # Small help file bind = $mainMod ALT, R, exec, $scriptsDir/Refresh.sh # Refresh waybar, swaync, rofi bind = $mainMod ALT, E, exec, $scriptsDir/RofiEmoji.sh # emoji -bind = $mainMod ALT, C, exec, $scriptsDir/RofiEmoji.sh # calculator +bind = $mainMod ALT, C, exec, $scriptsDir/RofiCalc.sh # calculator (qalculate) bind = $mainMod, S, exec, $scriptsDir/RofiSearch.sh # Google search from Rofi bind = $mainMod SHIFT, B, exec, $scriptsDir/ChangeBlur.sh # Toggle blur settings bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh # animations ON/OFF -- cgit v1.2.3 From a3bf20a92a091fe240d530c42b61437301571160 Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" <85185940+JaKooLit@users.noreply.github.com> Date: Thu, 23 May 2024 12:15:06 +0900 Subject: Update RofiCalc.sh --- config/hypr/scripts/RofiCalc.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'config/hypr') diff --git a/config/hypr/scripts/RofiCalc.sh b/config/hypr/scripts/RofiCalc.sh index 3589525f..d908e2b1 100755 --- a/config/hypr/scripts/RofiCalc.sh +++ b/config/hypr/scripts/RofiCalc.sh @@ -1,4 +1,7 @@ #!/bin/bash +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ +# /* Calculator (using qualculate) and rofi */ +# /* Submitted by: https://github.com/JosephArmas */ rofi_config="$HOME/.config/rofi/config-calc.rasi" -- cgit v1.2.3 From f34a6bf1006bcd3b2584ec69c2ca7ab30b517bc0 Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" <85185940+JaKooLit@users.noreply.github.com> Date: Thu, 23 May 2024 12:16:02 +0900 Subject: Update RofiCalc.sh --- config/hypr/scripts/RofiCalc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/hypr') diff --git a/config/hypr/scripts/RofiCalc.sh b/config/hypr/scripts/RofiCalc.sh index d908e2b1..ff96b3a8 100755 --- a/config/hypr/scripts/RofiCalc.sh +++ b/config/hypr/scripts/RofiCalc.sh @@ -1,6 +1,6 @@ #!/bin/bash # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ -# /* Calculator (using qualculate) and rofi */ +# /* Calculator (using qalculate) and rofi */ # /* Submitted by: https://github.com/JosephArmas */ rofi_config="$HOME/.config/rofi/config-calc.rasi" -- cgit v1.2.3 From 6780cd29054a5293ba68f6716eacc0cf70c6f543 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 23 May 2024 12:25:03 +0900 Subject: editing rofi calc to kill rofi first --- config/hypr/scripts/RofiCalc.sh | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'config/hypr') diff --git a/config/hypr/scripts/RofiCalc.sh b/config/hypr/scripts/RofiCalc.sh index ff96b3a8..355130de 100755 --- a/config/hypr/scripts/RofiCalc.sh +++ b/config/hypr/scripts/RofiCalc.sh @@ -5,6 +5,13 @@ rofi_config="$HOME/.config/rofi/config-calc.rasi" +# Kill Rofi if already running before execution +if pgrep -x "rofi" >/dev/null; then + pkill rofi + exit 0 +fi + +# main function while true; do result=$( -- cgit v1.2.3 From 877fd77aa557e036989bfa191e634b25089fecf1 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 23 May 2024 12:59:18 +0900 Subject: Move rofi-qalculate to userconfigs - keybinds --- config/hypr/UserConfigs/UserKeybinds.conf | 4 +++- config/hypr/UserConfigs/WindowRules.conf | 1 + config/hypr/configs/Keybinds.conf | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'config/hypr') diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf index 9858558f..f3d03df8 100644 --- a/config/hypr/UserConfigs/UserKeybinds.conf +++ b/config/hypr/UserConfigs/UserKeybinds.conf @@ -19,7 +19,9 @@ bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,r bind = $mainMod, A, exec, pkill rofi || true && ags -t 'overview' bind = $mainMod, Return, exec, $term # Launch terminal -bind = $mainMod, T, exec, $files +bind = $mainMod, T, exec, $files # Launch file manager + +bind = $mainMod ALT, C, exec, $scriptsDir/RofiCalc.sh # calculator (qalculate) # pyprland bind = $mainMod SHIFT, Return, exec, pypr toggle term # Dropdown terminal diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf index 65e44e98..3a04ba3b 100644 --- a/config/hypr/UserConfigs/WindowRules.conf +++ b/config/hypr/UserConfigs/WindowRules.conf @@ -43,6 +43,7 @@ windowrulev2 = float, class:^(file-roller|org.gnome.FileRoller)$ # archive manag windowrulev2 = float, class:^([Bb]aobab|org.gnome.[Bb]aobab)$ # Disk usage analyzer windowrulev2 = float, title:(Kvantum Manager) windowrulev2 = float, class:^([Ss]team)$,title:^((?![Ss]team).*|[Ss]team [Ss]ettings)$ +windowrulev2 = float, class:^([Qq]alculate-gtk)$ # windowrule v2 - position windowrulev2 = center, class:([Tt]hunar), title:(File Operation Progress) diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf index 16155903..142de86a 100644 --- a/config/hypr/configs/Keybinds.conf +++ b/config/hypr/configs/Keybinds.conf @@ -23,7 +23,6 @@ bind = CTRL ALT, P, exec, $scriptsDir/Wlogout.sh bind = $mainMod, H, exec, $scriptsDir/KeyHints.sh # Small help file bind = $mainMod ALT, R, exec, $scriptsDir/Refresh.sh # Refresh waybar, swaync, rofi bind = $mainMod ALT, E, exec, $scriptsDir/RofiEmoji.sh # emoji -bind = $mainMod ALT, C, exec, $scriptsDir/RofiCalc.sh # calculator (qalculate) bind = $mainMod, S, exec, $scriptsDir/RofiSearch.sh # Google search from Rofi bind = $mainMod SHIFT, B, exec, $scriptsDir/ChangeBlur.sh # Toggle blur settings bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh # animations ON/OFF -- cgit v1.2.3 From 57121a4bddf834545613b38dfa8510a1e7060d3c Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 23 May 2024 20:27:41 +0900 Subject: RofiCalc script moved to UserScripts --- config/hypr/UserConfigs/UserKeybinds.conf | 2 +- config/hypr/UserScripts/RofiCalc.sh | 31 +++++++++++++++++++++++++++++++ config/hypr/scripts/RofiCalc.sh | 31 ------------------------------- 3 files changed, 32 insertions(+), 32 deletions(-) create mode 100755 config/hypr/UserScripts/RofiCalc.sh delete mode 100755 config/hypr/scripts/RofiCalc.sh (limited to 'config/hypr') diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf index f3d03df8..85f3c1c3 100644 --- a/config/hypr/UserConfigs/UserKeybinds.conf +++ b/config/hypr/UserConfigs/UserKeybinds.conf @@ -21,7 +21,7 @@ bind = $mainMod, A, exec, pkill rofi || true && ags -t 'overview' bind = $mainMod, Return, exec, $term # Launch terminal bind = $mainMod, T, exec, $files # Launch file manager -bind = $mainMod ALT, C, exec, $scriptsDir/RofiCalc.sh # calculator (qalculate) +bind = $mainMod ALT, C, exec, $UserScripts/RofiCalc.sh # calculator (qalculate) # pyprland bind = $mainMod SHIFT, Return, exec, pypr toggle term # Dropdown terminal diff --git a/config/hypr/UserScripts/RofiCalc.sh b/config/hypr/UserScripts/RofiCalc.sh new file mode 100755 index 00000000..355130de --- /dev/null +++ b/config/hypr/UserScripts/RofiCalc.sh @@ -0,0 +1,31 @@ +#!/bin/bash +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ +# /* Calculator (using qalculate) and rofi */ +# /* Submitted by: https://github.com/JosephArmas */ + +rofi_config="$HOME/.config/rofi/config-calc.rasi" + +# Kill Rofi if already running before execution +if pgrep -x "rofi" >/dev/null; then + pkill rofi + exit 0 +fi + +# main function + +while true; do + result=$( + rofi -i -dmenu \ + -config "$rofi_config" \ + -mesg "$result = $calc_result" + ) + + if [ $? -ne 0 ]; then + exit + fi + + if [ -n "$result" ]; then + calc_result=$(qalc -t "$result") + echo "$calc_result" | wl-copy + fi +done diff --git a/config/hypr/scripts/RofiCalc.sh b/config/hypr/scripts/RofiCalc.sh deleted file mode 100755 index 355130de..00000000 --- a/config/hypr/scripts/RofiCalc.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ -# /* Calculator (using qalculate) and rofi */ -# /* Submitted by: https://github.com/JosephArmas */ - -rofi_config="$HOME/.config/rofi/config-calc.rasi" - -# Kill Rofi if already running before execution -if pgrep -x "rofi" >/dev/null; then - pkill rofi - exit 0 -fi - -# main function - -while true; do - result=$( - rofi -i -dmenu \ - -config "$rofi_config" \ - -mesg "$result = $calc_result" - ) - - if [ $? -ne 0 ]; then - exit - fi - - if [ -n "$result" ]; then - calc_result=$(qalc -t "$result") - echo "$calc_result" | wl-copy - fi -done -- cgit v1.2.3 From cfb76213a52940bedded3f55af1bf7c9296e1046 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 24 May 2024 00:43:56 +0900 Subject: updated copy.sh --- config/hypr/initial-boot.sh | 2 +- copy.sh | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'config/hypr') diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh index 794415aa..b05d6865 100755 --- a/config/hypr/initial-boot.sh +++ b/config/hypr/initial-boot.sh @@ -11,7 +11,7 @@ wallpaper=$HOME/Pictures/wallpapers/Fantasy-Waterfall.png waybar_style="$HOME/.config/waybar/style/[Dark] Latte-Wallust combined.css" kvantum_theme="Catppuccin-Mocha" color_scheme="prefer-dark" -gtk_theme="Tokyonight-Dark-Moon-BL-LB" +gtk_theme="Andromeda-dark" icon_theme="Flat-Remix-Blue-Dark" cursor_theme="Bibata-Modern-Ice" diff --git a/copy.sh b/copy.sh index e9039b69..e91e8f07 100755 --- a/copy.sh +++ b/copy.sh @@ -5,6 +5,8 @@ clear wallpaper=$HOME/Pictures/wallpapers/Fantasy-Waterfall.png waybar_style="$HOME/.config/waybar/style/[Dark] Latte-Wallust combined.css" +waybar_config="$HOME/.config/waybar/configs/[TOP] Default_v3" +waybar_config_laptop="$HOME/.config/waybar/configs/[TOP] Default Laptop_v3" # Check if running as root. If root, script will exit if [[ $EUID -eq 0 ]]; then @@ -249,12 +251,12 @@ printf "\n%.0s" {1..2} # 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_v2" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" + ln -sf $waybar_config "$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" rm -r "$HOME/.config/waybar/configs/[TOP] Default Laptop_v2" "$HOME/.config/waybar/configs/[TOP] Default Laptop_v3" 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_v2" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" + ln -sf $waybar_config_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" rm -r "$HOME/.config/waybar/configs/[TOP] Default_v2" "$HOME/.config/waybar/configs/[TOP] Default_v3" 2>&1 | tee -a "$LOG" fi -- cgit v1.2.3 From 7968e96b79b087f7db20d403ee4c53c1dc29410a Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Thu, 23 May 2024 21:26:12 +0530 Subject: window-rules: add Vesktop, JetBrains IDEs, and Warp file transfer --- config/hypr/UserConfigs/WindowRules.conf | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'config/hypr') diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf index 3a04ba3b..3193d26c 100644 --- a/config/hypr/UserConfigs/WindowRules.conf +++ b/config/hypr/UserConfigs/WindowRules.conf @@ -17,6 +17,7 @@ windowrulev2 = workspace 5, class:^([Ss]team)$ windowrulev2 = workspace 5, class:^([Ll]utris)$ windowrulev2 = workspace 7, class:^([Dd]iscord)$ windowrulev2 = workspace 7, class:^([Ww]ebCord)$ +windowrulev2 = workspace 7, class:^([Vv]esktop)$ # windowrule v2 move to workspace (silent) windowrulev2 = workspace 6 silent, class:^(virt-manager)$ @@ -70,12 +71,12 @@ windowrulev2 = opacity 0.9 0.7, class:^(com.obsproject.Studio)$ windowrulev2 = opacity 0.9 0.7, class:^([Aa]udacious)$ windowrulev2 = opacity 0.9 0.8, class:^(org.gnome.Nautilus)$ windowrulev2 = opacity 0.9 0.8, class:^(VSCode|code-url-handler)$ -windowrulev2 = opacity 0.9 0.8, class:^(jetbrains-studio)$ # Android Studio -windowrulev2 = opacity 0.9 0.8, class:^(jetbrains-phpstorm)$ # PHPStorm -windowrulev2 = opacity 0.94 0.86, class:^(discord)$ -windowrulev2 = opacity 0.9 0.8, class:^(org.telegram.desktop)$ +windowrulev2 = opacity 0.9 0.8, class:^(jetbrains-.+)$ # JetBrains IDEs +windowrulev2 = opacity 0.94 0.86, class:^([Dd]iscord|[Vv]esktop)$ +windowrulev2 = opacity 0.9 0.8, class:^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$ windowrulev2 = opacity 0.94 0.86, class:^(gnome-disks|evince|wihotspot-gui|org.gnome.baobab)$ windowrulev2 = opacity 0.9 0.8, class:^(file-roller|org.gnome.FileRoller)$ # archive manager +windowrulev2 = opacity 0.8 0.7, class:^(app.drey.Warp)$ # Warp file transfer windowrulev2 = opacity 0.9 0.8, class:^(seahorse)$ # gnome-keyring gui windowrulev2 = opacity 0.82 0.75, class:^(gnome-system-monitor|org.gnome.SystemMonitor)$ windowrulev2 = opacity 0.9 0.8, class:^(xdg-desktop-portal-gtk)$ # gnome-keyring gui -- cgit v1.2.3