From 3056d2060700d35b37b05634e226c734304a5efe Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 20 Sep 2024 02:23:55 +0900 Subject: Added Searchable Keybinds using rofi Default Keybind SUPER SHIFT K --- config/hypr/scripts/KeyBinds.sh | 27 +++++++++++++++++++++++++++ config/hypr/scripts/KeyHints.sh | 1 + 2 files changed, 28 insertions(+) create mode 100755 config/hypr/scripts/KeyBinds.sh (limited to 'config/hypr/scripts') diff --git a/config/hypr/scripts/KeyBinds.sh b/config/hypr/scripts/KeyBinds.sh new file mode 100755 index 00000000..29217910 --- /dev/null +++ b/config/hypr/scripts/KeyBinds.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## +# Searchable enabled keybinds using rofi + +# Define the config files +KEYBINDS_CONF="$HOME/.config/hypr/configs/Keybinds.conf" +USER_KEYBINDS_CONF="$HOME/.config/hypr/UserConfigs/UserKeybinds.conf" +LAPTOP_CONF="$HOME/.config/hypr/UserConfigs/Laptop.conf" + +# Combine the contents of the keybinds files and filter for keybinds +KEYBINDS=$(cat "$KEYBINDS_CONF" "$USER_KEYBINDS_CONF" | grep -E '^(bind|bindl|binde|bindm)') + +# 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" +fi + +# Check if we have any keybinds to display +if [[ -z "$KEYBINDS" ]]; then + 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 diff --git a/config/hypr/scripts/KeyHints.sh b/config/hypr/scripts/KeyHints.sh index 0f8a989a..3534f2e4 100755 --- a/config/hypr/scripts/KeyHints.sh +++ b/config/hypr/scripts/KeyHints.sh @@ -43,6 +43,7 @@ GDK_BACKEND=$BACKEND yad --width=$dynamic_width --height=$dynamic_height \ "ESC" "close this app" "" "=" "SUPER KEY (Windows Key)" "(SUPER KEY)" \ " enter" "Terminal" "(kitty)" \ " SHIFT enter" "DropDown Terminal" "(kitty-pyprland)" \ +" SHIFT K" "Searchable Keybinds" "(Keybinds)" \ " A" "Desktop Overview" "(AGS Overview)" \ " D" "App Launcher" "(rofi-wayland)" \ " T" "Open File Manager" "(Thunar)" \ -- cgit v1.2.3 From 7d376633842c143e658a3900c1d7fb10f8af4033 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 20 Sep 2024 12:46:32 +0900 Subject: updates: Keybinds added in Hint button (right click), Added Default_v4 waybar for non-laptop. Minor ags style tweak. Minor tweak on config-keybinds.rasi --- config/ags/user/style.css | 16 +++++----- config/hypr/scripts/KeyBinds.sh | 5 +++ config/hypr/scripts/KeyHints.sh | 5 +++ config/rofi/config-keybinds.rasi | 2 +- config/waybar/ModulesCustom | 19 ++++++------ config/waybar/configs/[TOP] Default_v4 | 53 +++++++++++++++++++++++++++++++ copy.sh | 57 ++++++++++++++++++---------------- 7 files changed, 112 insertions(+), 45 deletions(-) create mode 100644 config/waybar/configs/[TOP] Default_v4 (limited to 'config/hypr/scripts') diff --git a/config/ags/user/style.css b/config/ags/user/style.css index 49d44ad8..13410ea4 100644 --- a/config/ags/user/style.css +++ b/config/ags/user/style.css @@ -6,7 +6,7 @@ /* define some colors */ @define-color border-color @color12; -@define-color border-color-alt @color1; +@define-color border-color-alt @color9; @define-color text-color rgba(255, 255, 255, 0.7); @define-color noti-bg rgba(0, 0, 0, 0.4); @define-color noti-bg-alt #111111; @@ -24,11 +24,11 @@ widget { transition: 300ms cubic-bezier(0, 0.55, 0.45, 1); border-radius: 1.705rem; -gtk-outline-radius: 1.705rem; - border-top: 2px solid @border-color; + border-top: 4px solid @border-color; border-left: 1px solid @border-color-alt; border-right: 1px solid @border-color-alt; - border-bottom: 2px solid @border-color; - /*box-shadow: 0px 2px 3px alpha(@color0, 0.45); */ + border-bottom: 4px solid @border-color; + box-shadow: 0px 2px 3px alpha(@color12, 0.45); margin: 0.476rem; min-width: 13.636rem; min-height: 3.409rem; @@ -70,10 +70,10 @@ widget { .overview-search-results { border-radius: 1.705rem; -gtk-outline-radius: 1.705rem; - border-top: 2px solid @border-color; + border-top: 4px solid @border-color; border-left: 1px solid @border-color-alt; border-right: 1px solid @border-color-alt; - border-bottom: 2px solid @border-color; + border-bottom: 4px solid @border-color; box-shadow: 0px 2px 3px @color9; margin: 0.476rem; min-width: 28.773rem; @@ -123,10 +123,10 @@ widget { .overview-tasks { border-radius: 1.705rem; -gtk-outline-radius: 1.705rem; - border-top: 2px solid @border-color; + border-top: 4px solid @border-color; border-left: 1px solid @border-color-alt; border-right: 1px solid @border-color-alt; - border-bottom: 2px solid @border-color; + border-bottom: 4px solid @border-color; box-shadow: 0px 2px 3px @color5; margin: 0.476rem; padding: 0.341rem; diff --git a/config/hypr/scripts/KeyBinds.sh b/config/hypr/scripts/KeyBinds.sh index 29217910..01764f0f 100755 --- a/config/hypr/scripts/KeyBinds.sh +++ b/config/hypr/scripts/KeyBinds.sh @@ -3,6 +3,11 @@ # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## # Searchable enabled keybinds using rofi +# Check if yad is running and kill it if it is +if pgrep -x "yad" > /dev/null; then + pkill yad +fi + # Define the config files KEYBINDS_CONF="$HOME/.config/hypr/configs/Keybinds.conf" USER_KEYBINDS_CONF="$HOME/.config/hypr/UserConfigs/UserKeybinds.conf" diff --git a/config/hypr/scripts/KeyHints.sh b/config/hypr/scripts/KeyHints.sh index 3534f2e4..e2e12634 100755 --- a/config/hypr/scripts/KeyHints.sh +++ b/config/hypr/scripts/KeyHints.sh @@ -5,6 +5,11 @@ # GDK BACKEND. Change to either wayland or x11 if having issues BACKEND=wayland +# Check if rofi is running and kill it if it is +if pgrep -x "rofi" > /dev/null; then + pkill rofi +fi + # Detect monitor resolution and scale x_mon=$(hyprctl -j monitors | jq '.[] | select(.focused==true) | .width') y_mon=$(hyprctl -j monitors | jq '.[] | select(.focused==true) | .height') diff --git a/config/rofi/config-keybinds.rasi b/config/rofi/config-keybinds.rasi index 13a070a0..964b37d1 100644 --- a/config/rofi/config-keybinds.rasi +++ b/config/rofi/config-keybinds.rasi @@ -6,7 +6,7 @@ /* ---- Entry ---- */ entry { width: 80%; - placeholder: "⌨ Search Keybinds - NOTE: Clicking with Mouse or Pressing ENTER will have NO function"; + placeholder: " 🧮 Search Keybinds ☣️ NOTE ☣️: Clicking with Mouse or Pressing ENTER will have NO function"; } /* ---- Listview ---- */ diff --git a/config/waybar/ModulesCustom b/config/waybar/ModulesCustom index 201c97b7..d0c8e506 100644 --- a/config/waybar/ModulesCustom +++ b/config/waybar/ModulesCustom @@ -57,20 +57,21 @@ "custom/hint": { "format": "󰺁 HINT!", "on-click": "$HOME/.config/hypr/scripts/KeyHints.sh", + "on-click-right": "$HOME/.config/hypr/scripts/KeyBinds.sh", "tooltip": true, - "tooltip-format": "󱧣 Quick Tips", + "tooltip-format": "Left Click: Quick Tips\nRight Click: Keybinds", }, // Hypridle inhibitor "custom/hypridle": { - "format": "󱫗 ", - "return-type": "json", - "escape": true, - "exec-on-event": true, - "interval": 60, - "exec": "$HOME/.config/hypr/scripts/Hypridle.sh status", - "on-click": "$HOME/.config/hypr/scripts/Hypridle.sh toggle", - "on-click-right": "hyprlock" + "format": "󱫗 ", + "return-type": "json", + "escape": true, + "exec-on-event": true, + "interval": 60, + "exec": "$HOME/.config/hypr/scripts/Hypridle.sh status", + "on-click": "$HOME/.config/hypr/scripts/Hypridle.sh toggle", + "on-click-right": "hyprlock" }, "custom/keyboard": { diff --git a/config/waybar/configs/[TOP] Default_v4 b/config/waybar/configs/[TOP] Default_v4 new file mode 100644 index 00000000..051aa848 --- /dev/null +++ b/config/waybar/configs/[TOP] Default_v4 @@ -0,0 +1,53 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### DEFAULT v4 (Laptop) - Top ### // +{ +"include": [ + "$HOME/.config/waybar/Modules", + "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", + ], +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "top", +"spacing": 3, +"fixed-center": true, +"ipc": true, +"margin-top": 3, +"margin-left": 8, +"margin-right": 8, + +"modules-left": [ + "group/app_drawer", + "custom/separator#dot-line", + "group/mobo_drawer", + "custom/separator#line", + "custom/weather", + ], + +"modules-center": [ + "custom/swaync", + "custom/cava_mviz", + "custom/separator#dot-line", + "clock", + "custom/separator#line", + "hyprland/workspaces#kanji", + "custom/separator#dot-line", + "idle_inhibitor", + "custom/hint", + ], + +"modules-right": [ + "network#speed", + "group/connections", + "custom/separator#line", + "tray", + "mpris", + "group/audio", + "custom/separator#dot-line", + "group/status", + ], +} \ No newline at end of file diff --git a/copy.sh b/copy.sh index eda9e57e..e611b8ba 100755 --- a/copy.sh +++ b/copy.sh @@ -122,7 +122,7 @@ If you are not sure, just type us NOTE: • You can also set more than 2 keyboard layouts -• For example us,kr,gb,ru +• For example us, kr, gb, ru " printf "\n%.0s" {1..1} read -p "${CAT} - Please enter the correct keyboard layout: " new_layout @@ -140,7 +140,7 @@ printf "${NOTE} Detecting keyboard layout to prepare proper Hyprland Settings\n\ # Prompt the user to confirm whether the detected layout is correct while true; do - read -p "$ORANGE Current keyboard layout is: $layout. Is this correct? [y/n] " confirm + read -p "$ORANGE Current keyboard layout is: $layout ${CAT} Is this correct? [y/n] " confirm case $confirm in [yY]) @@ -170,7 +170,7 @@ If you are not sure, just type us NOTE: • You can also set more than 2 keyboard layouts -• For example us,kr,gb,ru +• For example us, kr, gb, ru " printf "\n%.0s" {1..1} @@ -218,7 +218,7 @@ while true; do done # Use the selected resolution in your existing script -echo "You chose $resolution resolution." 2>&1 | tee -a "$LOG" +echo "${OK} You have chosen $resolution resolution." 2>&1 | tee -a "$LOG" # Add your commands based on the resolution choice if [ "$resolution" == "≤ 1080p" ]; then @@ -244,34 +244,35 @@ while true; do # Convert the answer to lowercase for comparison answer=$(echo "$answer" | tr '[:upper:]' '[:lower:]') - # Check if the answer is valid - if [[ "$answer" == "y" ]]; then +# Check if the answer is valid +if [[ "$answer" == "y" ]]; then # Modify waybar config if 12hr is selected # Clock 1 - sed -i 's#^ \/\/"format": " {:%I:%M %p}", // AM PM format# "format": " {:%I:%M %p}", // AM PM format#' config/waybar/Modules 2>&1 | tee -a "$LOG" - sed -i 's#^ "format": " {:%H:%M:%S}", // 24H# \/\/"format": " {:%H:%M:%S}", // 24H#' config/waybar/Modules 2>&1 | tee -a "$LOG" + sed -i 's#^\(\s*\)//"format": " {:%I:%M %p}", // AM PM format#\1"format": " {:%I:%M %p}", // AM PM format#' config/waybar/Modules 2>&1 | tee -a "$LOG" + sed -i 's#^\(\s*\) "format": " {:%H:%M:%S}", // 24H#\1// "format": " {:%H:%M:%S}", // 24H#' config/waybar/Modules 2>&1 | tee -a "$LOG" # Clock 2 - sed -i 's#^ "format": " {:%H:%M}", // 24H# \/\/"format": " {:%H:%M}", // 24H#' config/waybar/Modules 2>&1 | tee -a "$LOG" + sed -i 's#^\(\s*\) "format": " {:%H:%M}", // 24H#\1// "format": " {:%H:%M}", // 24H#' config/waybar/Modules 2>&1 | tee -a "$LOG" # Clock 3 - sed -i 's#^ \/\/"format": "{:%I:%M %p - %d/%b}", //for AM/PM# "format": "{:%I:%M %p - %d/%b}", //for AM/PM#' config/waybar/Modules 2>&1 | tee -a "$LOG" - sed -i 's#^ "format": "{:%H:%M - %d/%b}", // 24H# \/\/"format": "{:%H:%M - %d/%b}", // 24H#' config/waybar/Modules 2>&1 | tee -a "$LOG" + sed -i 's#^\(\s*\)//"format": "{:%I:%M %p - %d/%b}", //for AM/PM#\1"format": "{:%I:%M %p - %d/%b}", //for AM/PM#' config/waybar/Modules 2>&1 | tee -a "$LOG" + sed -i 's#^\(\s*\) "format": "{:%H:%M - %d/%b}", // 24H#\1// "format": "{:%H:%M - %d/%b}", // 24H#' config/waybar/Modules 2>&1 | tee -a "$LOG" # Clock 4 - sed -i 's#^ \/\/"format": "{:%B | %a %d, %Y | %I:%M %p}", // AM PM format# "format": "{:%B | %a %d, %Y | %I:%M %p}", // AM PM format#' config/waybar/Modules 2>&1 | tee -a "$LOG" - sed -i 's#^ "format": "{:%B | %a %d, %Y | %H:%M}", // 24H# \/\/"format": "{:%B | %a %d, %Y | %H:%M}", // 24H#' config/waybar/Modules 2>&1 | tee -a "$LOG" + sed -i 's#^\(\s*\)//"format": "{:%B | %a %d, %Y | %I:%M %p}", // AM PM format#\1"format": "{:%B | %a %d, %Y | %I:%M %p}", // AM PM format#' config/waybar/Modules 2>&1 | tee -a "$LOG" + sed -i 's#^\(\s*\) "format": "{:%B | %a %d, %Y | %H:%M}", // 24H#\1// "format": "{:%B | %a %d, %Y | %H:%M}", // 24H#' config/waybar/Modules 2>&1 | tee -a "$LOG" # Clock 5 - sed -i 's#^ \/\/"format": "{:%A, %I:%M %P}", // AM PM format# "format": "{:%A, %I:%M %P}", // AM PM format#' config/waybar/Modules 2>&1 | tee -a "$LOG" - sed -i 's#^ "format": "{:%a %d | %H:%M}", // 24H# \/\/"format": "{:%a %d | %H:%M}", // 24H#' config/waybar/Modules 2>&1 | tee -a "$LOG" + sed -i 's#^\(\s*\)//"format": "{:%A, %I:%M %P}", // AM PM format#\1"format": "{:%A, %I:%M %P}", // AM PM format#' config/waybar/Modules 2>&1 | tee -a "$LOG" + sed -i 's#^\(\s*\) "format": "{:%a %d | %H:%M}", // 24H#\1// "format": "{:%a %d | %H:%M}", // 24H#' config/waybar/Modules 2>&1 | tee -a "$LOG" # for hyprlock - sed -i 's/^ text = cmd\[update:1000\] echo "\$(date +"%H")"/# &/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" - sed -i 's/^# *text = cmd\[update:1000\] echo "\$(date +"%I")" #AM\/PM/ text = cmd\[update:1000\] echo "\$(date +"%I")" #AM\/PM/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" + sed -i 's/^\s*text = cmd\[update:1000\] echo "\$(date +"%H")"/# &/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" + sed -i 's/^\(\s*\)# *text = cmd\[update:1000\] echo "\$(date +"%I")" #AM\/PM/\1 text = cmd\[update:1000\] echo "\$(date +"%I")" #AM\/PM/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" + + sed -i 's/^\s*text = cmd\[update:1000\] echo "\$(date +"%S")"/# &/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" + sed -i 's/^\(\s*\)# *text = cmd\[update:1000\] echo "\$(date +"%S %p")" #AM\/PM/\1 text = cmd\[update:1000\] echo "\$(date +"%S %p")" #AM\/PM/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" - sed -i 's/^ text = cmd\[update:1000\] echo "\$(date +"%S")"/# &/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" - sed -i 's/^# *text = cmd\[update:1000\] echo "\$(date +"%S %p")" #AM\/PM/ text = cmd\[update:1000\] echo "\$(date +"%S %p")" #AM\/PM/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" # for SDDM (simple-sddm) sddm_folder="/usr/share/sddm/themes/simple-sddm" @@ -281,7 +282,7 @@ while true; do sudo sed -i 's|^## HourFormat="hh:mm AP"|HourFormat="hh:mm AP"|' "$sddm_folder/theme.conf" 2>&1 | tee -a "$LOG" || true sudo sed -i 's|^HourFormat="HH:mm"|## HourFormat="HH:mm"|' "$sddm_folder/theme.conf" 2>&1 | tee -a "$LOG" || true - echo "12H format set to SDDM theme successfully." 2>&1 | tee -a "$LOG" + echo "${OK} 12H format set to SDDM theme successfully." 2>&1 | tee -a "$LOG" fi # for SDDM (simple-sddm-2) @@ -297,7 +298,7 @@ while true; do break elif [[ "$answer" == "n" ]]; then - echo "You chose not to change to 12H format." 2>&1 | tee -a "$LOG" + echo "${NOTE} You chose not to change to 12H format." 2>&1 | tee -a "$LOG" break else echo "${ERROR} Invalid choice. Please enter y for yes or n for no." @@ -313,7 +314,7 @@ printf "${NOTE} - By default, Rainbow Borders animation is enabled.\n" printf "${NOTE} - However, this uses a bit more CPU and Memory resources.\n" # Prompt user to disable Rainbow Borders -read -p "Do you want to disable Rainbow Borders animation? (Y/N): " choice +read -p "${CAT} Do you want to disable Rainbow Borders animation? (Y/N): " choice if [[ "$choice" =~ ^[Yy]$ ]]; then # Move RainbowBorders.sh script to backup location mv config/hypr/UserScripts/RainbowBorders.sh config/hypr/UserScripts/RainbowBorders.bak.sh @@ -324,9 +325,9 @@ if [[ "$choice" =~ ^[Yy]$ ]]; then # Comment out the line animation = borderangle, 1, 180, liner, loop sed -i '/ animation = borderangle, 1, 180, liner, loop/s/^/#/' config/hypr/UserConfigs/UserDecorAnimations.conf - echo "Rainbow borders is now disabled." 2>&1 | tee -a "$LOG" + echo "${OK} Rainbow borders is now disabled." 2>&1 | tee -a "$LOG" else - echo "No changes made. Rainbow borders remain enabled." 2>&1 | tee -a "$LOG" + echo "${NOTE} No changes made. Rainbow borders remain enabled." 2>&1 | tee -a "$LOG" fi printf "\n" @@ -477,7 +478,8 @@ if hostnamectl | grep -q 'Chassis: desktop'; then rm -rf "$HOME/.config/waybar/configs/[TOP] Default Laptop" \ "$HOME/.config/waybar/configs/[BOT] Default Laptop" \ "$HOME/.config/waybar/configs/[TOP] Default Laptop_v2" \ - "$HOME/.config/waybar/configs/[TOP] Default Laptop_v3" 2>&1 | tee -a "$LOG" || true + "$HOME/.config/waybar/configs/[TOP] Default Laptop_v3" \ + "$HOME/.config/waybar/configs/[TOP] Default Laptop_v4" 2>&1 | tee -a "$LOG" || true else # Configurations for a laptop or any system other than desktop ln -sf "$waybar_config_laptop" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" @@ -485,7 +487,8 @@ else rm -rf "$HOME/.config/waybar/configs/[TOP] Default" \ "$HOME/.config/waybar/configs/[BOT] Default" \ "$HOME/.config/waybar/configs/[TOP] Default_v2" \ - "$HOME/.config/waybar/configs/[TOP] Default_v3" 2>&1 | tee -a "$LOG" || true + "$HOME/.config/waybar/configs/[TOP] Default_v3" \ + "$HOME/.config/waybar/configs/[TOP] Default_v4" 2>&1 | tee -a "$LOG" || true fi # additional wallpapers @@ -493,7 +496,7 @@ echo "$(tput setaf 6) By default only a few wallpapers are copied...$(tput sgr0) printf "\n" while true; do - read -rp "${CAT} Would you like to download additional wallpapers? ${WARN} This is more than >600mb (y/n)" WALL + read -rp "${CAT} Would you like to download additional wallpapers? ${WARN} This is more than >700mb (y/n)" WALL case $WALL in [Yy]) echo "${NOTE} Downloading additional wallpapers..." -- cgit v1.2.3 From 765642c6beff60ccc75e56512a33fc3b6ef47a74 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 20 Sep 2024 13:59:54 +0900 Subject: it seems pgrep aint working properly in nixos. So ultimately, just adding pkill yad when launching KeyBinds.sh --- config/hypr/scripts/KeyBinds.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'config/hypr/scripts') diff --git a/config/hypr/scripts/KeyBinds.sh b/config/hypr/scripts/KeyBinds.sh index 01764f0f..10cb0f51 100755 --- a/config/hypr/scripts/KeyBinds.sh +++ b/config/hypr/scripts/KeyBinds.sh @@ -3,10 +3,9 @@ # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## # Searchable enabled keybinds using rofi -# Check if yad is running and kill it if it is -if pgrep -x "yad" > /dev/null; then - pkill yad -fi +# Kill yad to not interfere with this binds +pkill yad || true + # Define the config files KEYBINDS_CONF="$HOME/.config/hypr/configs/Keybinds.conf" -- cgit v1.2.3 From ac636784948045854be19dc8a2f347480fd85671 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 20 Sep 2024 14:19:06 +0900 Subject: Some formatting, header adjustments on conf and scripts --- config/hypr/UserConfigs/00-Readme | 2 +- config/hypr/UserConfigs/WorkspaceRules.conf | 10 ++++++++-- config/hypr/UserScripts/00-Readme | 4 +++- config/hypr/UserScripts/QuickEdit.sh | 1 - config/hypr/UserScripts/RainbowBorders.sh | 1 - config/hypr/UserScripts/Weather.py | 1 - config/hypr/UserScripts/Weather.sh | 1 - config/hypr/UserScripts/ZshChangeTheme.sh | 1 - config/hypr/hyprland.conf | 1 + config/hypr/initial-boot.sh | 4 +++- config/hypr/scripts/KeyBinds.sh | 1 - config/hypr/scripts/PortalHyprland.sh | 2 +- config/hypr/scripts/RefreshNoWaybar.sh | 4 ++-- config/hypr/scripts/WaybarCava.sh | 1 - config/hypr/scripts/Wlogout.sh | 4 ++-- config/kitty/kitty.conf | 2 ++ config/rofi/config-keybinds.rasi | 2 +- config/rofi/config-rofi-Beats-menu.rasi | 2 +- copy.sh | 2 +- release.sh | 4 +++- upgrade.sh | 9 ++++++--- 21 files changed, 35 insertions(+), 24 deletions(-) (limited to 'config/hypr/scripts') diff --git a/config/hypr/UserConfigs/00-Readme b/config/hypr/UserConfigs/00-Readme index 481eeace..fa4b9b85 100644 --- a/config/hypr/UserConfigs/00-Readme +++ b/config/hypr/UserConfigs/00-Readme @@ -4,7 +4,7 @@ Hyprland-Dots v2.2.2 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. +2.) This folder, along with UserScripts folder will NOT be touch when running upgrade.sh 3.) However, if hyprland has a big change in settings, i.e., blur section is moved into another group, you should managed the change. diff --git a/config/hypr/UserConfigs/WorkspaceRules.conf b/config/hypr/UserConfigs/WorkspaceRules.conf index 8e98244a..350022b1 100644 --- a/config/hypr/UserConfigs/WorkspaceRules.conf +++ b/config/hypr/UserConfigs/WorkspaceRules.conf @@ -5,9 +5,15 @@ # https://wiki.hyprland.org/Configuring/Workspace-Rules/ -# Assigning workspace to a certain monitor +# Assigning workspace to a certain monitor. Below are just examples # workspace = 1, monitor:eDP-1 -# workspace = 2, monitor:DP-2 +# workspace = 2, monitor:eDP-1 +# workspace = 3, monitor:eDP-1 +# workspace = 4, monitor:eDP-1 +# workspace = 5, monitor:DP-2 +# workspace = 6, monitor:DP-2 +# workspace = 7, monitor:DP-2 +# workspace = 8, monitor:DP-2 # example rules (from wiki) diff --git a/config/hypr/UserScripts/00-Readme b/config/hypr/UserScripts/00-Readme index de251df0..1b6688f4 100755 --- a/config/hypr/UserScripts/00-Readme +++ b/config/hypr/UserScripts/00-Readme @@ -1 +1,3 @@ -a) Place your new scripts here. If you need to edit a script from main script (~/.config/hypr/scripts), copy it on this folder, and edit. Make sure to update as well the keybinds in ~/.config/hypr/UserConfigs folder if any script is attached to it \ No newline at end of file +# Place your new scripts here. +# If you need to edit a script from main script (~/.config/hypr/scripts), copy it on this folder, and edit. +# Make sure to update as well the keybinds in ~/.config/hypr/UserConfigs folder if any script is attached to it \ No newline at end of file diff --git a/config/hypr/UserScripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh index 2a860464..ed5a4e1c 100755 --- a/config/hypr/UserScripts/QuickEdit.sh +++ b/config/hypr/UserScripts/QuickEdit.sh @@ -1,5 +1,4 @@ #!/bin/bash - # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## # Rofi menu for Quick Edit/View of Settings (SUPER E) diff --git a/config/hypr/UserScripts/RainbowBorders.sh b/config/hypr/UserScripts/RainbowBorders.sh index 93536c2c..cc1419fb 100755 --- a/config/hypr/UserScripts/RainbowBorders.sh +++ b/config/hypr/UserScripts/RainbowBorders.sh @@ -1,5 +1,4 @@ #!/bin/bash - # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## # for rainbow borders animation diff --git a/config/hypr/UserScripts/Weather.py b/config/hypr/UserScripts/Weather.py index eb81b9ea..e3a6c538 100755 --- a/config/hypr/UserScripts/Weather.py +++ b/config/hypr/UserScripts/Weather.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 - # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # # weather using python diff --git a/config/hypr/UserScripts/Weather.sh b/config/hypr/UserScripts/Weather.sh index 0ecb791b..65613fca 100755 --- a/config/hypr/UserScripts/Weather.sh +++ b/config/hypr/UserScripts/Weather.sh @@ -1,5 +1,4 @@ #!/bin/bash - # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## # weather info from wttr. https://github.com/chubin/wttr.in # Remember to add city diff --git a/config/hypr/UserScripts/ZshChangeTheme.sh b/config/hypr/UserScripts/ZshChangeTheme.sh index f06f2b60..57fbf37d 100755 --- a/config/hypr/UserScripts/ZshChangeTheme.sh +++ b/config/hypr/UserScripts/ZshChangeTheme.sh @@ -3,7 +3,6 @@ # Script for Oh my ZSH theme ( CTRL SHIFT O) # preview of theme can be view here: https://github.com/ohmyzsh/ohmyzsh/wiki/Themes - # after choosing theme, TTY need to be closed and re-open themes_dir="$HOME/.oh-my-zsh/themes" diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index 15a0b26d..57ab705d 100644 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -1,3 +1,4 @@ +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # # Sourcing external config files # Default Configs diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh index e077d151..fb9cf574 100755 --- a/config/hypr/initial-boot.sh +++ b/config/hypr/initial-boot.sh @@ -1,8 +1,10 @@ #!/bin/bash +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # # A bash script designed to run only once dotfiles installed # THIS SCRIPT CAN BE DELETED ONCE SUCCESSFULLY BOOTED!! And also, edit ~/.config/hypr/configs/Settings.conf -# not necessary to do since this script is only designed to run only once as long as the marker exists +# NOT necessary to do since this script is only designed to run only once as long as the marker exists +# marker file is located at ~/.config/hypr/.initial_startup_done # However, I do highly suggest not to touch it since again, as long as the marker exist, script wont run # Variables diff --git a/config/hypr/scripts/KeyBinds.sh b/config/hypr/scripts/KeyBinds.sh index 10cb0f51..ccbb18a8 100755 --- a/config/hypr/scripts/KeyBinds.sh +++ b/config/hypr/scripts/KeyBinds.sh @@ -1,5 +1,4 @@ #!/bin/bash - # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## # Searchable enabled keybinds using rofi diff --git a/config/hypr/scripts/PortalHyprland.sh b/config/hypr/scripts/PortalHyprland.sh index d40f02ed..9bdf4b8c 100755 --- a/config/hypr/scripts/PortalHyprland.sh +++ b/config/hypr/scripts/PortalHyprland.sh @@ -1,6 +1,6 @@ #!/bin/bash # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## -# For manually starting xdg-desktop-portal +# For manually starting xdg-desktop-portal-hyprland sleep 1 killall xdg-desktop-portal-hyprland diff --git a/config/hypr/scripts/RefreshNoWaybar.sh b/config/hypr/scripts/RefreshNoWaybar.sh index 70a4aeb3..8e20766b 100755 --- a/config/hypr/scripts/RefreshNoWaybar.sh +++ b/config/hypr/scripts/RefreshNoWaybar.sh @@ -1,9 +1,9 @@ #!/bin/bash # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## -# Modified version of Refresh but no waybar refresh +# Modified version of Refresh.sh but no waybar refreshing # Used by automatic wallpaper change -# Modified inorder to refresh rofi background, Wallust, SwayNC +# Modified inorder to refresh rofi background, Wallust, SwayNC only SCRIPTSDIR=$HOME/.config/hypr/scripts UserScripts=$HOME/.config/hypr/UserScripts diff --git a/config/hypr/scripts/WaybarCava.sh b/config/hypr/scripts/WaybarCava.sh index 3c4b0f53..99261387 100755 --- a/config/hypr/scripts/WaybarCava.sh +++ b/config/hypr/scripts/WaybarCava.sh @@ -1,6 +1,5 @@ #!/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 -------- diff --git a/config/hypr/scripts/Wlogout.sh b/config/hypr/scripts/Wlogout.sh index 531c7c66..b7cc220d 100755 --- a/config/hypr/scripts/Wlogout.sh +++ b/config/hypr/scripts/Wlogout.sh @@ -1,9 +1,9 @@ #!/bin/bash # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## - # wlogout (Power, Screen Lock, Suspend, etc) -# Set variables for parameters +# Set variables for parameters. First numbers corresponts to Monitor Resolution +# i.e 2160 means 2160p A_2160=700 B_2160=700 A_1600=480 diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index e2785941..4e57fe7f 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -1,3 +1,5 @@ +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # + font_family Fira Code SemiBold font_size 16.0 bold_font auto diff --git a/config/rofi/config-keybinds.rasi b/config/rofi/config-keybinds.rasi index 964b37d1..37aba113 100644 --- a/config/rofi/config-keybinds.rasi +++ b/config/rofi/config-keybinds.rasi @@ -1,5 +1,5 @@ /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ -/* Keybinds Config - For Keybinds generation */ +/* Main Config - For Keybinds generation */ @import "~/.config/rofi/master-config.rasi" diff --git a/config/rofi/config-rofi-Beats-menu.rasi b/config/rofi/config-rofi-Beats-menu.rasi index af81e57d..896b3136 100644 --- a/config/rofi/config-rofi-Beats-menu.rasi +++ b/config/rofi/config-rofi-Beats-menu.rasi @@ -1,5 +1,5 @@ /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ -/* Rofi Beats Config (compact) */ +/* Main config Rofi Beats Config (compact) */ @import "~/.config/rofi/master-config.rasi" diff --git a/copy.sh b/copy.sh index 8abafbb9..b3dfd524 100755 --- a/copy.sh +++ b/copy.sh @@ -1,5 +1,5 @@ #!/bin/bash -### https://github.com/JaKooLit/JaKooLit +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # clear diff --git a/release.sh b/release.sh index 06e57168..84005628 100755 --- a/release.sh +++ b/release.sh @@ -1,10 +1,12 @@ #!/bin/bash +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # +# For downloading dots from releases # Set some colors for output messages OK="$(tput setaf 2)[OK]$(tput sgr0)" ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)" NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)" -WARN="$(tput setaf 166)[WARN]$(tput sgr0)" +WARN="$(tput setaf 5)[WARN]$(tput sgr0)" CAT="$(tput setaf 6)[ACTION]$(tput sgr0)" ORANGE=$(tput setaf 166) YELLOW=$(tput setaf 3) diff --git a/upgrade.sh b/upgrade.sh index 29697820..d3f68d64 100755 --- a/upgrade.sh +++ b/upgrade.sh @@ -1,11 +1,14 @@ #!/bin/bash -### https://github.com/JaKooLit/JaKooLit +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # +# for Semi-Manual upgrading your system. +# NOTE: requires rsync + # Set some colors for output messages OK="$(tput setaf 2)[OK]$(tput sgr0)" ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)" NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)" -WARN="$(tput setaf 166)[WARN]$(tput sgr0)" +WARN="$(tput setaf 5)[WARN]$(tput sgr0)" CAT="$(tput setaf 6)[ACTION]$(tput sgr0)" ORANGE=$(tput setaf 166) YELLOW=$(tput setaf 3) @@ -17,7 +20,7 @@ if [ ! -d Upgrade-Logs ]; then mkdir Upgrade-Logs fi -LOG="Upgrade-Logs/upgrade-$(date +%d-%H%M%S)_dotfiles.log" +LOG="Upgrade-Logs/upgrade-$(date +%d-%H%M%S)_upgrade_dotfiles.log" # source and target versions source_dir="config" -- cgit v1.2.3