From f79f0a1dad43628eea867ca433fa13edd2296936 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 20 Feb 2025 10:25:02 +0900 Subject: integrated nwg-display --- copy.sh | 52 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 7 deletions(-) (limited to 'copy.sh') diff --git a/copy.sh b/copy.sh index 8225349e..edf5a05f 100755 --- a/copy.sh +++ b/copy.sh @@ -104,7 +104,7 @@ if hostnamectl | grep -q 'Chassis: vm'; then sed -i 's/^\([[:space:]]*no_hardware_cursors[[:space:]]*=[[:space:]]*\)false/\1true/' config/hypr/UserConfigs/UserSettings.conf sed -i '/env = WLR_RENDERER_ALLOW_SOFTWARE,1/s/^#//' config/hypr/UserConfigs/ENVariables.conf #sed -i '/env = LIBGL_ALWAYS_SOFTWARE,1/s/^#//' config/hypr/UserConfigs/ENVariables.conf - sed -i '/monitor = Virtual-1, 1920x1080@60,auto,1/s/^#//' config/hypr/UserConfigs/Monitors.conf + sed -i '/monitor = Virtual-1, 1920x1080@60,auto,1/s/^#//' config/hypr/monitors.conf fi # Proper Polkit for NixOS @@ -114,7 +114,7 @@ if hostnamectl | grep -q 'Operating System: NixOS'; then sed -i '/^exec-once = \$scriptsDir\/Polkit\.sh$/ s/^#*/#/' config/hypr/UserConfigs/Startup_Apps.conf fi -# Check if dpkg is installed (use to check if Debian or Ubuntu or based distros +# to check if Debian or Ubuntu or based distros if grep -iq '^\(ID_LIKE\|ID\)=.*\(debian\|ubuntu\)' /etc/os-release >/dev/null 2>&1; then echo "${INFO} Debian/Ubuntu based distro. Disabling pyprland since it does not work properly" 2>&1 | tee -a "$LOG" || true # disabling pyprland as causing issues @@ -583,14 +583,12 @@ FILES_TO_RESTORE=( "ENVariables.conf" "LaptopDisplay.conf" "Laptops.conf" - "Monitors.conf" "Startup_Apps.conf" "UserDecorations.conf" "UserAnimations.conf" "UserKeybinds.conf" "UserSettings.conf" "WindowRules.conf" - "WorkspaceRules.conf" ) DIRPATH=~/.config/"$DIRH" @@ -637,13 +635,13 @@ SCRIPTS_TO_RESTORE=( ) DIRSHPATH=~/.config/"$DIRSH" -BACKUP_DIR_PATH="$DIRSHPATH-backup-$BACKUP_DIR/UserScripts" +BACKUP_DIR_PATH_S="$DIRSHPATH-backup-$BACKUP_DIR/UserScripts" -if [ -d "$BACKUP_DIR_PATH" ]; then +if [ -d "$BACKUP_DIR_PATH_S" ]; then echo -e "${NOTE} Restoring previous ${MAGENTA}User-Scripts${RESET}..." for SCRIPT_NAME in "${SCRIPTS_TO_RESTORE[@]}"; do - BACKUP_SCRIPT="$BACKUP_DIR_PATH/$SCRIPT_NAME" + BACKUP_SCRIPT="$BACKUP_DIR_PATH_S/$SCRIPT_NAME" if [ -f "$BACKUP_SCRIPT" ]; then printf "\n${INFO} Found ${YELLOW}$SCRIPT_NAME${RESET} in hypr backup...\n" @@ -663,6 +661,46 @@ fi printf "\n%.0s" {1..1} +# restoring some files in ~/.config/hypr +DIR_H="hypr" +FILES_2_RESTORE=( + "hyprlock.conf" + "hypridle.conf" + "monitors.conf" + "workspaces.conf" +) + +DIRPATH=~/.config/"$DIR_H" +BACKUP_DIR=$(get_backup_dirname) +BACKUP_DIR_PATH_F="$DIRPATH-backup-$BACKUP_DIR" + +if [ -d "$BACKUP_DIR_PATH_F" ]; then + echo -e "${NOTE} Restoring some files in ${MAGENTA}~/.config/hypr directory${RESET}..." + + for FILE_RESTORE in "${FILES_2_RESTORE[@]}"; do + BACKUP_FILE="$BACKUP_DIR_PATH_F/$FILE_RESTORE" + + if [ -f "$BACKUP_FILE" ]; then + echo -e "\n${INFO} Found ${YELLOW}$FILE_RESTORE${RESET} in hypr backup..." + read -p "${CAT} Do you want to restore ${YELLOW}$FILE_RESTORE${RESET} from backup? (y/N): " file2restore + + if [[ "$file2restore" == [Yy]* ]]; then + if cp "$BACKUP_FILE" "$DIRPATH/$FILE_RESTORE"; then + echo "${OK} - $FILE_RESTORE restored!" 2>&1 | tee -a "$LOG" + else + echo "${ERROR} - Failed to restore $FILE_RESTORE!" 2>&1 | tee -a "$LOG" + fi + else + echo "${NOTE} - Skipped restoring $FILE_RESTORE." + fi + else + echo "${ERROR} - Backup file $BACKUP_FILE does not exist." + fi + done +fi + +printf "\n%.0s" {1..1} + # Define the target directory for rofi themes rofi_DIR="$HOME/.local/share/rofi/themes" -- cgit v1.2.3 From 7c580b07c5fde91f1b03893a282f2c575819ce77 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 21 Feb 2025 19:20:39 +0900 Subject: adjusted copy.sh to restore Animations and Monitors directories automatically --- config/waybar/configs/[LEFT] WestWing v2 | 2 +- config/waybar/configs/[RIGHT] EastWing v2 | 2 +- copy.sh | 38 +++++++++++++++++++++++++++++-- 3 files changed, 38 insertions(+), 4 deletions(-) (limited to 'copy.sh') diff --git a/config/waybar/configs/[LEFT] WestWing v2 b/config/waybar/configs/[LEFT] WestWing v2 index e5e2fca4..2d90643d 100644 --- a/config/waybar/configs/[LEFT] WestWing v2 +++ b/config/waybar/configs/[LEFT] WestWing v2 @@ -29,7 +29,7 @@ ], "modules-center": [ - "hyprland/workspaces", + "hyprland/workspaces#numbers", ], "modules-right": [ diff --git a/config/waybar/configs/[RIGHT] EastWing v2 b/config/waybar/configs/[RIGHT] EastWing v2 index 134dc18d..ae8581ce 100644 --- a/config/waybar/configs/[RIGHT] EastWing v2 +++ b/config/waybar/configs/[RIGHT] EastWing v2 @@ -29,7 +29,7 @@ ], "modules-center": [ - "hyprland/workspaces", + "hyprland/workspaces#numbers", ], "modules-right": [ diff --git a/copy.sh b/copy.sh index edf5a05f..6f29f750 100755 --- a/copy.sh +++ b/copy.sh @@ -577,6 +577,42 @@ done printf "\n%.0s" {1..1} +# Restore automatically Animations and Monitor-Profiles +# including monitors.conf and workspaces.conf +HYPR_DIR="$HOME/.config/hypr" +BACKUP_DIR=$(get_backup_dirname) +BACKUP_HYPR_PATH="$HYPR_DIR-backup-$BACKUP_DIR" + +if [ ! -d "$BACKUP_HYPR_PATH" ]; then + exit 0 +fi + +echo -e "\n${NOTE} Restoring ${SKY_BLUE}Animations & Monitor Profiles${RESET} directories into ${YELLOW}$HYPR_DIR${RESET}..." + +DIR_B=("Monitor_Profiles" "animations") +# Restore directories automatically +for DIR_RESTORE in "${DIR_B[@]}"; do + BACKUP_SUBDIR="$BACKUP_HYPR_PATH/$DIR_RESTORE" + + if [ -d "$BACKUP_SUBDIR" ]; then + cp -r "$BACKUP_SUBDIR" "$HYPR_DIR/" + echo "${OK} - Restored directory: ${MAGENTA}$DIR_RESTORE${RESET}" 2>&1 | tee -a "$LOG" + fi +done + +# Restore files automatically +FILE_B=("monitors.conf" "workspaces.conf") +for FILE_RESTORE in "${FILE_B[@]}"; do + BACKUP_FILE="$BACKUP_HYPR_PATH/$FILE_RESTORE" + + if [ -f "$BACKUP_FILE" ]; then + cp "$BACKUP_FILE" "$HYPR_DIR/$FILE_RESTORE" + echo "${OK} - Restored file: ${MAGENTA}$FILE_RESTORE${RESET}" 2>&1 | tee -a "$LOG" + fi +done + +printf "\n%.0s" {1..1} + # Restoring UserConfigs and UserScripts DIRH="hypr" FILES_TO_RESTORE=( @@ -666,8 +702,6 @@ DIR_H="hypr" FILES_2_RESTORE=( "hyprlock.conf" "hypridle.conf" - "monitors.conf" - "workspaces.conf" ) DIRPATH=~/.config/"$DIR_H" -- cgit v1.2.3 From d676acab0742932e0f52f4816a308abc043eec30 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 21 Feb 2025 21:59:54 +0900 Subject: updated --- copy.sh | 4 ---- 1 file changed, 4 deletions(-) (limited to 'copy.sh') diff --git a/copy.sh b/copy.sh index 6f29f750..3fdd7f25 100755 --- a/copy.sh +++ b/copy.sh @@ -583,10 +583,6 @@ HYPR_DIR="$HOME/.config/hypr" BACKUP_DIR=$(get_backup_dirname) BACKUP_HYPR_PATH="$HYPR_DIR-backup-$BACKUP_DIR" -if [ ! -d "$BACKUP_HYPR_PATH" ]; then - exit 0 -fi - echo -e "\n${NOTE} Restoring ${SKY_BLUE}Animations & Monitor Profiles${RESET} directories into ${YELLOW}$HYPR_DIR${RESET}..." DIR_B=("Monitor_Profiles" "animations") -- cgit v1.2.3 From 32954ef25b2eb8081587e7ea9e3c6e4c5388cd57 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 21 Feb 2025 22:12:09 +0900 Subject: updated copy.sh --- copy.sh | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) (limited to 'copy.sh') diff --git a/copy.sh b/copy.sh index 3fdd7f25..b1344b2b 100755 --- a/copy.sh +++ b/copy.sh @@ -583,29 +583,31 @@ HYPR_DIR="$HOME/.config/hypr" BACKUP_DIR=$(get_backup_dirname) BACKUP_HYPR_PATH="$HYPR_DIR-backup-$BACKUP_DIR" -echo -e "\n${NOTE} Restoring ${SKY_BLUE}Animations & Monitor Profiles${RESET} directories into ${YELLOW}$HYPR_DIR${RESET}..." - -DIR_B=("Monitor_Profiles" "animations") -# Restore directories automatically -for DIR_RESTORE in "${DIR_B[@]}"; do - BACKUP_SUBDIR="$BACKUP_HYPR_PATH/$DIR_RESTORE" +if [ -d "$BACKUP_HYPR_PATH" ]; then + echo -e "\n${NOTE} Restoring ${SKY_BLUE}Animations & Monitor Profiles${RESET} directories into ${YELLOW}$HYPR_DIR${RESET}..." - if [ -d "$BACKUP_SUBDIR" ]; then - cp -r "$BACKUP_SUBDIR" "$HYPR_DIR/" - echo "${OK} - Restored directory: ${MAGENTA}$DIR_RESTORE${RESET}" 2>&1 | tee -a "$LOG" - fi -done + DIR_B=("Monitor_Profiles" "animations") + # Restore directories automatically + for DIR_RESTORE in "${DIR_B[@]}"; do + BACKUP_SUBDIR="$BACKUP_HYPR_PATH/$DIR_RESTORE" + + if [ -d "$BACKUP_SUBDIR" ]; then + cp -r "$BACKUP_SUBDIR" "$HYPR_DIR/" + echo "${OK} - Restored directory: ${MAGENTA}$DIR_RESTORE${RESET}" 2>&1 | tee -a "$LOG" + fi + done -# Restore files automatically -FILE_B=("monitors.conf" "workspaces.conf") -for FILE_RESTORE in "${FILE_B[@]}"; do - BACKUP_FILE="$BACKUP_HYPR_PATH/$FILE_RESTORE" + # Restore files automatically + FILE_B=("monitors.conf" "workspaces.conf") + for FILE_RESTORE in "${FILE_B[@]}"; do + BACKUP_FILE="$BACKUP_HYPR_PATH/$FILE_RESTORE" - if [ -f "$BACKUP_FILE" ]; then - cp "$BACKUP_FILE" "$HYPR_DIR/$FILE_RESTORE" - echo "${OK} - Restored file: ${MAGENTA}$FILE_RESTORE${RESET}" 2>&1 | tee -a "$LOG" - fi -done + if [ -f "$BACKUP_FILE" ]; then + cp "$BACKUP_FILE" "$HYPR_DIR/$FILE_RESTORE" + echo "${OK} - Restored file: ${MAGENTA}$FILE_RESTORE${RESET}" 2>&1 | tee -a "$LOG" + fi + done +fi printf "\n%.0s" {1..1} -- cgit v1.2.3 From eb18f06d8cb34b529567016812c9b3a454280859 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 22 Feb 2025 01:02:43 +0900 Subject: wallpapers and waybar config and styles will be restored automatically --- config/hypr/UserConfigs/UserKeybinds.conf | 2 +- copy.sh | 39 +++++++++++++------------------ 2 files changed, 17 insertions(+), 24 deletions(-) (limited to 'copy.sh') diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf index 16557059..58fb80ac 100644 --- a/config/hypr/UserConfigs/UserKeybinds.conf +++ b/config/hypr/UserConfigs/UserKeybinds.conf @@ -53,7 +53,7 @@ bind = $mainMod CTRL, O, exec, hyprctl setprop active opaque toggle # disable op bind = $mainMod SHIFT, K, exec, $scriptsDir/KeyBinds.sh # search keybinds via rofi bind = $mainMod SHIFT, A, exec, $scriptsDir/Animations.sh #hyprland animations menu bind = $mainMod SHIFT, O, exec, $UserScripts/ZshChangeTheme.sh # Change oh-my-zsh theme -bindn = ALT_L, SHIFT_L, exec, $scriptsDir/SwitchKeyboardLayout.sh # Change keyboard layout +bindln = ALT_L, SHIFT_L, exec, $scriptsDir/SwitchKeyboardLayout.sh # Change keyboard layout bind = $mainMod ALT, C, exec, $UserScripts/RofiCalc.sh # calculator (qalculate) # pyprland (This is not available in Debian and Ubuntu) diff --git a/copy.sh b/copy.sh index b1344b2b..97240e2b 100755 --- a/copy.sh +++ b/copy.sh @@ -483,26 +483,23 @@ for DIR2 in $DIRS; do [Yy]* ) BACKUP_DIR=$(get_backup_dirname) + # Backup the existing directory mv "$DIRPATH" "$DIRPATH-backup-$BACKUP_DIR" 2>&1 | tee -a "$LOG" - if [ $? -eq 0 ]; then - echo -e "${NOTE} - Backed up $DIR2 to $DIRPATH-backup-$BACKUP_DIR." 2>&1 | tee -a "$LOG" - - cp -r config/"$DIR2" ~/.config/"$DIR2" - if [ $? -eq 0 ]; then - echo -e "${OK} - Replaced $DIR2 with new configuration." 2>&1 | tee -a "$LOG" - else - echo "${ERROR} - Failed to copy $DIR2." 2>&1 | tee -a "$LOG" - exit 1 - fi - else - echo "${ERROR} - Failed to back up $DIR2." 2>&1 | tee -a "$LOG" - exit 1 + echo -e "${NOTE} - Backed up $DIR2 to $DIRPATH-backup-$BACKUP_DIR." 2>&1 | tee -a "$LOG" + + # Copy the new config + cp -r config/"$DIR2" ~/.config/"$DIR2" 2>&1 | tee -a "$LOG" + echo -e "${OK} - Replaced $DIR2 with new configuration." 2>&1 | tee -a "$LOG" + + # restoring waybar config and style automatically + if [ "$DIR2" = "waybar" ]; then + cp "$DIRPATH-backup-$BACKUP_DIR/config" ~/.config/waybar/ && cp "$DIRPATH-backup-$BACKUP_DIR/style.css" ~/.config/waybar/ + echo -e "${OK} - waybar config and style restored automatically" 2>&1 | tee -a "$LOG" fi break ;; [Nn]* ) - # Skip the directory - echo -e "${NOTE} - Skipping ${YELLOW}$DIR2${RESET} " 2>&1 | tee -a "$LOG" + echo -e "${NOTE} - Skipping ${YELLOW}$DIR2${RESET}" 2>&1 | tee -a "$LOG" break ;; * ) @@ -513,14 +510,10 @@ for DIR2 in $DIRS; do else # Copy new config if directory does not exist cp -r config/"$DIR2" ~/.config/"$DIR2" 2>&1 | tee -a "$LOG" - if [ $? -eq 0 ]; then - echo "${OK} - Copy completed for ${YELLOW}$DIR2${RESET}" 2>&1 | tee -a "$LOG" - else - echo "${ERROR} - Failed to copy ${YELLOW}$DIR2${RESET}" 2>&1 | tee -a "$LOG" - exit 1 - fi + echo "${OK} - Copy completed for ${YELLOW}$DIR2${RESET}" 2>&1 | tee -a "$LOG" fi done + printf "\n%.0s" {1..1} printf "${INFO} - Copying dotfiles ${SKY_BLUE}second${RESET} part\n" @@ -586,7 +579,7 @@ BACKUP_HYPR_PATH="$HYPR_DIR-backup-$BACKUP_DIR" if [ -d "$BACKUP_HYPR_PATH" ]; then echo -e "\n${NOTE} Restoring ${SKY_BLUE}Animations & Monitor Profiles${RESET} directories into ${YELLOW}$HYPR_DIR${RESET}..." - DIR_B=("Monitor_Profiles" "animations") + DIR_B=("Monitor_Profiles" "animations" "wallpaper_effects") # Restore directories automatically for DIR_RESTORE in "${DIR_B[@]}"; do BACKUP_SUBDIR="$BACKUP_HYPR_PATH/$DIR_RESTORE" @@ -598,7 +591,7 @@ if [ -d "$BACKUP_HYPR_PATH" ]; then done # Restore files automatically - FILE_B=("monitors.conf" "workspaces.conf") + FILE_B=("monitors.conf" "workspaces.conf" "pyprland.toml") for FILE_RESTORE in "${FILE_B[@]}"; do BACKUP_FILE="$BACKUP_HYPR_PATH/$FILE_RESTORE" -- cgit v1.2.3 From 7d89d2547c00a32f102292f31e2fa1ad89b5461b Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 22 Feb 2025 02:09:23 +0900 Subject: improved copy.sh. Will restore previous waybar styles and layouts --- config/hypr/initial-boot.sh | 11 +++++------ copy.sh | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 10 deletions(-) (limited to 'copy.sh') diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh index b2d5bce5..43856e04 100755 --- a/config/hypr/initial-boot.sh +++ b/config/hypr/initial-boot.sh @@ -52,14 +52,13 @@ if [ ! -f ~/.config/hypr/.initial_startup_done ]; then # initiate the kb_layout (for some reason) waybar cant launch it "$scriptsDir/SwitchKeyboardLayout.sh" > /dev/null 2>&1 & - # Initial waybar style - if [ -f "$waybar_style" ]; then - ln -sf "$waybar_style" "$HOME/.config/waybar/style.css" - - # Refreshing waybar, swaync, rofi etc. - "$scriptsDir/Refresh.sh" > /dev/null 2>&1 & + # waybar style + if [ -L "$HOME/.config/waybar/config" ]; then + ln -sf "$waybar_style" "$HOME/.config/waybar/style.css" + "$scriptsDir/Refresh.sh" > /dev/null 2>&1 & fi + # Create a marker file to indicate that the script has been executed. touch ~/.config/hypr/.initial_startup_done diff --git a/copy.sh b/copy.sh index 97240e2b..ddac1208 100755 --- a/copy.sh +++ b/copy.sh @@ -493,7 +493,10 @@ for DIR2 in $DIRS; do # restoring waybar config and style automatically if [ "$DIR2" = "waybar" ]; then - cp "$DIRPATH-backup-$BACKUP_DIR/config" ~/.config/waybar/ && cp "$DIRPATH-backup-$BACKUP_DIR/style.css" ~/.config/waybar/ + rm -f "$HOME/.config/waybar/config" "$HOME/.config/waybar/style.css" || true + cp -L "$DIRPATH-backup-$BACKUP_DIR/config" "$HOME/.config/waybar/config" || true + cp -L "$DIRPATH-backup-$BACKUP_DIR/style.css" "$HOME/.config/waybar/style.css" || true + echo -e "${OK} - waybar config and style restored automatically" 2>&1 | tee -a "$LOG" fi break @@ -768,7 +771,10 @@ else config_remove="" fi -ln -sf "$config_file" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" || true +# Check if ~/.config/waybar/config is a symlink +if [ -L "$HOME/.config/waybar/config" ]; then + ln -sf "$config_file" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" +fi # Remove inappropriate waybar configs rm -rf "$HOME/.config/waybar/configs/[TOP] Default$config_remove" \ @@ -900,8 +906,10 @@ cleanup_backups() { # Execute the cleanup function cleanup_backups -# symlinks for waybar style -ln -sf "$waybar_style" "$HOME/.config/waybar/style.css" && \ +# Check if ~/.config/waybar/style is a symlink +if [ -L "$HOME/.config/waybar/style.css" ]; then + ln -sf "$waybar_style" "$HOME/.config/waybar/style.css" 2>&1 | tee -a "$LOG" +fi printf "\n%.0s" {1..1} -- cgit v1.2.3 From 1584abe49686f4d868ebc2f247a07b5e6ecabc26 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 22 Feb 2025 15:28:48 +0900 Subject: updated copy.sh to restore modified or unique files in waybar configs and style. Updated initial-boot.sh to not do anything on waybar --- config/hypr/initial-boot.sh | 8 ++++---- copy.sh | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'copy.sh') diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh index 43856e04..4d62775d 100755 --- a/config/hypr/initial-boot.sh +++ b/config/hypr/initial-boot.sh @@ -53,10 +53,10 @@ if [ ! -f ~/.config/hypr/.initial_startup_done ]; then "$scriptsDir/SwitchKeyboardLayout.sh" > /dev/null 2>&1 & # waybar style - if [ -L "$HOME/.config/waybar/config" ]; then - ln -sf "$waybar_style" "$HOME/.config/waybar/style.css" - "$scriptsDir/Refresh.sh" > /dev/null 2>&1 & - fi + #if [ -L "$HOME/.config/waybar/config" ]; then + ## ln -sf "$waybar_style" "$HOME/.config/waybar/style.css" + # "$scriptsDir/Refresh.sh" > /dev/null 2>&1 & + #fi # Create a marker file to indicate that the script has been executed. diff --git a/copy.sh b/copy.sh index ddac1208..3e93e2da 100755 --- a/copy.sh +++ b/copy.sh @@ -497,7 +497,10 @@ for DIR2 in $DIRS; do cp -L "$DIRPATH-backup-$BACKUP_DIR/config" "$HOME/.config/waybar/config" || true cp -L "$DIRPATH-backup-$BACKUP_DIR/style.css" "$HOME/.config/waybar/style.css" || true - echo -e "${OK} - waybar config and style restored automatically" 2>&1 | tee -a "$LOG" + find "$DIRPATH-backup-$BACKUP_DIR/configs" -type f -exec cp -n "{}" "$HOME/.config/waybar/configs/" \; + find "$DIRPATH-backup-$BACKUP_DIR/style" -type f -exec cp -n "{}" "$HOME/.config/waybar/style/" \; + + echo -e "${OK} - waybar configs and styles restored automatically" 2>&1 | tee -a "$LOG" fi break ;; -- cgit v1.2.3 From d9257e3377abba6fe81edd5876dc432b8218df48 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 22 Feb 2025 21:46:08 +0900 Subject: some final changes for next release --- config/hypr/UserScripts/RofiBeats.sh | 5 +++- config/hypr/scripts/RofiThemeSelector.sh | 4 ++-- config/hypr/scripts/WaybarLayout.sh | 2 +- config/hypr/scripts/WaybarStyles.sh | 2 +- config/rofi/themes/KooL_style-1.rasi | 2 +- config/rofi/themes/KooL_style-10-Fancy-v2.rasi | 5 ++++ config/rofi/themes/KooL_style-10-Fancy.rasi | 2 +- .../rofi/themes/KooL_style-11-Win11-list-dark.rasi | 2 +- .../themes/KooL_style-11-Win11-list-light.rasi | 2 +- config/rofi/themes/KooL_style-12-TOP-Docu.rasi | 2 +- config/rofi/themes/KooL_style-13-Vertical.rasi | 2 +- config/rofi/themes/KooL_style-2-Dark.rasi | 2 +- config/rofi/themes/KooL_style-2-Light.rasi | 2 +- config/rofi/themes/KooL_style-3-FullScreen-v1.rasi | 2 +- config/rofi/themes/KooL_style-3-Fullscreen-v2.rasi | 2 +- config/rofi/themes/KooL_style-4.rasi | 2 +- config/rofi/themes/KooL_style-5.rasi | 2 +- config/rofi/themes/KooL_style-6.rasi | 2 +- config/rofi/themes/KooL_style-7.rasi | 2 +- config/rofi/themes/KooL_style-8.rasi | 2 +- config/rofi/themes/KooL_style-9.rasi | 2 +- copy.sh | 28 ++++++++++++++-------- 22 files changed, 47 insertions(+), 31 deletions(-) (limited to 'copy.sh') diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh index 1f2f3e48..74a8fe54 100755 --- a/config/hypr/UserScripts/RofiBeats.sh +++ b/config/hypr/UserScripts/RofiBeats.sh @@ -79,7 +79,9 @@ shuffle_local_music() { # Main function for playing online music play_online_music() { - choice=$(printf "%s\n" "${!online_music[@]}" | rofi -i -dmenu -config $rofi_theme) + choice=$(for online in "${!online_music[@]}"; do + echo "$online" + done | sort | rofi -i -dmenu -config "$rofi_theme") if [ -z "$choice" ]; then exit 1 @@ -93,6 +95,7 @@ play_online_music() { mpv --shuffle --vid=no "$link" } + # 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" || { diff --git a/config/hypr/scripts/RofiThemeSelector.sh b/config/hypr/scripts/RofiThemeSelector.sh index 2e840ea1..6fd8a6f8 100755 --- a/config/hypr/scripts/RofiThemeSelector.sh +++ b/config/hypr/scripts/RofiThemeSelector.sh @@ -15,8 +15,8 @@ rofi_theme="$HOME/.config/rofi/config-rofi-theme.rasi" menu() { options=() while IFS= read -r file; do - options+=("$(basename "$file")") - done < <(find -L "$rofi_theme_dir" -maxdepth 1 -type f -exec basename {} \; | sort) + options+=("$file") + done < <(find -L "$rofi_theme_dir" -maxdepth 1 -type f -exec basename {} \; | sort -V) printf '%s\n' "${options[@]}" } diff --git a/config/hypr/scripts/WaybarLayout.sh b/config/hypr/scripts/WaybarLayout.sh index 604ec3af..0bea6ffe 100755 --- a/config/hypr/scripts/WaybarLayout.sh +++ b/config/hypr/scripts/WaybarLayout.sh @@ -16,7 +16,7 @@ menu() { options=() while IFS= read -r file; do options+=("$(basename "$file")") - done < <(find -L "$waybar_layouts" -maxdepth 1 -type f -exec basename {} \; | sort) + done < <(find -L "$waybar_layouts" -maxdepth 1 -type f -exec basename {} \; | sort ) printf '%s\n' "${options[@]}" } diff --git a/config/hypr/scripts/WaybarStyles.sh b/config/hypr/scripts/WaybarStyles.sh index 5cba7d6a..246a66a2 100755 --- a/config/hypr/scripts/WaybarStyles.sh +++ b/config/hypr/scripts/WaybarStyles.sh @@ -18,7 +18,7 @@ menu() { if [ -f "$waybar_styles/$file" ]; then options+=("$(basename "$file" .css)") fi - done < <(find -L "$waybar_styles" -maxdepth 1 -type f -name '*.css' -exec basename {} \; | sort) + done < <(find -L "$waybar_styles" -maxdepth 1 -type f -name '*.css' -exec basename {} \; | sort ) printf '%s\n' "${options[@]}" } diff --git a/config/rofi/themes/KooL_style-1.rasi b/config/rofi/themes/KooL_style-1.rasi index 444807d8..1bae71f3 100644 --- a/config/rofi/themes/KooL_style-1.rasi +++ b/config/rofi/themes/KooL_style-1.rasi @@ -35,7 +35,7 @@ configuration { /*****-- Elements Font Size -----*****/ element-text { - font: "JetBrainsMono Nerd Font SemiBold 12"; + font: "JetBrainsMono Nerd Font SemiBold 13"; } /* ---- Window ---- */ window { diff --git a/config/rofi/themes/KooL_style-10-Fancy-v2.rasi b/config/rofi/themes/KooL_style-10-Fancy-v2.rasi index 654428b4..fe5afcdb 100644 --- a/config/rofi/themes/KooL_style-10-Fancy-v2.rasi +++ b/config/rofi/themes/KooL_style-10-Fancy-v2.rasi @@ -24,6 +24,11 @@ line-style: "none"; } +/*****-- Elements Font Size -----*****/ +element-text { + font: "JetBrainsMono Nerd Font SemiBold 13"; +} + prompt-box { background-color : transparent; } diff --git a/config/rofi/themes/KooL_style-10-Fancy.rasi b/config/rofi/themes/KooL_style-10-Fancy.rasi index a4045a73..52c9363f 100644 --- a/config/rofi/themes/KooL_style-10-Fancy.rasi +++ b/config/rofi/themes/KooL_style-10-Fancy.rasi @@ -44,7 +44,7 @@ configuration { /*****-- Elements Font Size -----*****/ element-text { - font: "JetBrainsMono Nerd Font SemiBold 12"; + font: "JetBrainsMono Nerd Font SemiBold 13"; } window { diff --git a/config/rofi/themes/KooL_style-11-Win11-list-dark.rasi b/config/rofi/themes/KooL_style-11-Win11-list-dark.rasi index a34ba1af..44532d76 100644 --- a/config/rofi/themes/KooL_style-11-Win11-list-dark.rasi +++ b/config/rofi/themes/KooL_style-11-Win11-list-dark.rasi @@ -34,7 +34,7 @@ configuration { /*****-- Elements Font Size -----*****/ element-text { - font: "JetBrainsMono Nerd Font SemiBold 12"; + font: "JetBrainsMono Nerd Font SemiBold 13"; } element-icon, element-text, scrollbar { diff --git a/config/rofi/themes/KooL_style-11-Win11-list-light.rasi b/config/rofi/themes/KooL_style-11-Win11-list-light.rasi index 8ad7504a..fdcd4f1a 100644 --- a/config/rofi/themes/KooL_style-11-Win11-list-light.rasi +++ b/config/rofi/themes/KooL_style-11-Win11-list-light.rasi @@ -34,7 +34,7 @@ configuration { /*****-- Elements Font Size -----*****/ element-text { - font: "JetBrainsMono Nerd Font SemiBold 12"; + font: "JetBrainsMono Nerd Font SemiBold 13"; } element-icon, element-text, scrollbar { diff --git a/config/rofi/themes/KooL_style-12-TOP-Docu.rasi b/config/rofi/themes/KooL_style-12-TOP-Docu.rasi index 77d0754e..824eb543 100644 --- a/config/rofi/themes/KooL_style-12-TOP-Docu.rasi +++ b/config/rofi/themes/KooL_style-12-TOP-Docu.rasi @@ -40,7 +40,7 @@ entry { /*****-- Elements Font Size -----*****/ element-text { - font: "JetBrainsMono Nerd Font SemiBold 12"; + font: "JetBrainsMono Nerd Font SemiBold 13"; } inputbar { diff --git a/config/rofi/themes/KooL_style-13-Vertical.rasi b/config/rofi/themes/KooL_style-13-Vertical.rasi index d8464177..a7cb340a 100644 --- a/config/rofi/themes/KooL_style-13-Vertical.rasi +++ b/config/rofi/themes/KooL_style-13-Vertical.rasi @@ -35,7 +35,7 @@ configuration { /*****-- Elements Font Size -----*****/ element-text { - font: "JetBrainsMono Nerd Font SemiBold 12"; + font: "JetBrainsMono Nerd Font SemiBold 13"; } /* ---- Window ---- */ diff --git a/config/rofi/themes/KooL_style-2-Dark.rasi b/config/rofi/themes/KooL_style-2-Dark.rasi index 45afe5b2..957bf8a9 100644 --- a/config/rofi/themes/KooL_style-2-Dark.rasi +++ b/config/rofi/themes/KooL_style-2-Dark.rasi @@ -25,7 +25,7 @@ configuration { } /*****-- Elements Font Size -----*****/ element-text { - font: "JetBrainsMono Nerd Font SemiBold 12"; + font: "JetBrainsMono Nerd Font SemiBold 13"; } /*****----- Main Window -----*****/ diff --git a/config/rofi/themes/KooL_style-2-Light.rasi b/config/rofi/themes/KooL_style-2-Light.rasi index 9b9280ce..93f68908 100644 --- a/config/rofi/themes/KooL_style-2-Light.rasi +++ b/config/rofi/themes/KooL_style-2-Light.rasi @@ -25,7 +25,7 @@ configuration { } /*****-- Elements Font Size -----*****/ element-text { - font: "JetBrainsMono Nerd Font SemiBold 12"; + font: "JetBrainsMono Nerd Font SemiBold 13"; } /*****----- Main Window -----*****/ diff --git a/config/rofi/themes/KooL_style-3-FullScreen-v1.rasi b/config/rofi/themes/KooL_style-3-FullScreen-v1.rasi index fa419d56..79b68c65 100644 --- a/config/rofi/themes/KooL_style-3-FullScreen-v1.rasi +++ b/config/rofi/themes/KooL_style-3-FullScreen-v1.rasi @@ -36,7 +36,7 @@ configuration { /*****-- Elements Font Size -----*****/ element-text { - font: "JetBrainsMono Nerd Font SemiBold 12"; + font: "JetBrainsMono Nerd Font SemiBold 13"; } /* ---- Global Properties ---- */ diff --git a/config/rofi/themes/KooL_style-3-Fullscreen-v2.rasi b/config/rofi/themes/KooL_style-3-Fullscreen-v2.rasi index 5fb434c1..807a57c3 100644 --- a/config/rofi/themes/KooL_style-3-Fullscreen-v2.rasi +++ b/config/rofi/themes/KooL_style-3-Fullscreen-v2.rasi @@ -58,7 +58,7 @@ configuration { /*****-- Elements Font Size -----*****/ element-text { - font: "JetBrainsMono Nerd Font SemiBold 12"; + font: "JetBrainsMono Nerd Font SemiBold 13"; } /*****----- Main Window -----*****/ diff --git a/config/rofi/themes/KooL_style-4.rasi b/config/rofi/themes/KooL_style-4.rasi index 07cbd5fe..8a7b8ed7 100644 --- a/config/rofi/themes/KooL_style-4.rasi +++ b/config/rofi/themes/KooL_style-4.rasi @@ -57,7 +57,7 @@ configuration { /*****-- Elements Font Size -----*****/ element-text { - font: "JetBrainsMono Nerd Font SemiBold 12"; + font: "JetBrainsMono Nerd Font SemiBold 13"; } /*****----- Main Window -----*****/ diff --git a/config/rofi/themes/KooL_style-5.rasi b/config/rofi/themes/KooL_style-5.rasi index d2b8161f..44f6da65 100644 --- a/config/rofi/themes/KooL_style-5.rasi +++ b/config/rofi/themes/KooL_style-5.rasi @@ -36,7 +36,7 @@ configuration { /*****-- Elements Font Size -----*****/ element-text { - font: "JetBrainsMono Nerd Font SemiBold 12"; + font: "JetBrainsMono Nerd Font SemiBold 13"; } /* ---- Window ---- */ diff --git a/config/rofi/themes/KooL_style-6.rasi b/config/rofi/themes/KooL_style-6.rasi index 4b8b3dd6..255554cf 100644 --- a/config/rofi/themes/KooL_style-6.rasi +++ b/config/rofi/themes/KooL_style-6.rasi @@ -36,7 +36,7 @@ configuration { /*****-- Elements Font Size -----*****/ element-text { - font: "JetBrainsMono Nerd Font SemiBold 12"; + font: "JetBrainsMono Nerd Font SemiBold 13"; } /* ---- Window ---- */ diff --git a/config/rofi/themes/KooL_style-7.rasi b/config/rofi/themes/KooL_style-7.rasi index cc8731d1..89e9af48 100644 --- a/config/rofi/themes/KooL_style-7.rasi +++ b/config/rofi/themes/KooL_style-7.rasi @@ -31,7 +31,7 @@ configuration { } /*****-- Elements Font Size -----*****/ element-text { - font: "JetBrainsMono Nerd Font SemiBold 12"; + font: "JetBrainsMono Nerd Font SemiBold 13"; } /*****----- Main Window -----*****/ diff --git a/config/rofi/themes/KooL_style-8.rasi b/config/rofi/themes/KooL_style-8.rasi index 516d4d22..ead645bb 100644 --- a/config/rofi/themes/KooL_style-8.rasi +++ b/config/rofi/themes/KooL_style-8.rasi @@ -30,7 +30,7 @@ configuration { /*****-- Elements Font Size -----*****/ element-text { - font: "JetBrainsMono Nerd Font SemiBold 12"; + font: "JetBrainsMono Nerd Font SemiBold 13"; } /* ---- Window ---- */ diff --git a/config/rofi/themes/KooL_style-9.rasi b/config/rofi/themes/KooL_style-9.rasi index db7f8b50..95507ea8 100644 --- a/config/rofi/themes/KooL_style-9.rasi +++ b/config/rofi/themes/KooL_style-9.rasi @@ -37,7 +37,7 @@ configuration { /*****-- Elements Font Size -----*****/ element-text { - font: "JetBrainsMono Nerd Font SemiBold 12"; + font: "JetBrainsMono Nerd Font SemiBold 13"; } /* ---- Window ---- */ diff --git a/copy.sh b/copy.sh index 3e93e2da..9a186ca2 100755 --- a/copy.sh +++ b/copy.sh @@ -63,10 +63,10 @@ echo -e "\e[35m printf "\n%.0s" {1..1} ####### Announcement -echo "${WARNING} A T T E N T I O N !${RESET}" -echo "${SKY_BLUE}KooL Hyprland v2.3.11 have some Minor Keybinds changes!${RESET}" -echo "${YELLOW}SUPER H for Keyhints and/or SUPER SHIFT K to search for Keybinds ${RESET}" -echo "${MAGENTA} Once Logged in to Kool Hyprland! ${RESET}" +echo "${YELLOW}A T T E N T I O N !${RESET}" +echo "${SKY_BLUE}This version requires nwg-displays!${RESET}" +echo "${YELLOW}previous version: Some Keybinds changes${RESET}" +echo "${MAGENTA}Kindly visit KooL Hyprland Own Wiki for the changelog${RESET}" printf "\n%.0s" {1..1} # Create Directory for Copy Logs @@ -332,8 +332,8 @@ if [ "$resolution" == "< 1440p" ]; then # Change rofi font size find "$themes_dir" -type f | while read -r file; do - if grep -Pzoq 'element-text {\n font: "JetBrainsMono Nerd Font SemiBold 12";\n}' "$file"; then - sed -i 's/font: "JetBrainsMono Nerd Font SemiBold 12"/font: "JetBrainsMono Nerd Font SemiBold 10"/' "$file" + if grep -Pzoq 'element-text {\n font: "JetBrainsMono Nerd Font SemiBold 13";\n}' "$file"; then + sed -i 's/font: "JetBrainsMono Nerd Font SemiBold 13"/font: "JetBrainsMono Nerd Font SemiBold 11"/' "$file" fi done @@ -493,15 +493,23 @@ for DIR2 in $DIRS; do # restoring waybar config and style automatically if [ "$DIR2" = "waybar" ]; then - rm -f "$HOME/.config/waybar/config" "$HOME/.config/waybar/style.css" || true - cp -L "$DIRPATH-backup-$BACKUP_DIR/config" "$HOME/.config/waybar/config" || true - cp -L "$DIRPATH-backup-$BACKUP_DIR/style.css" "$HOME/.config/waybar/style.css" || true + rm -f "$HOME/.config/waybar/config" "$HOME/.config/waybar/style.css" + cp -L "$DIRPATH-backup-$BACKUP_DIR/config" "$HOME/.config/waybar/config" + cp -L "$DIRPATH-backup-$BACKUP_DIR/style.css" "$HOME/.config/waybar/style.css" find "$DIRPATH-backup-$BACKUP_DIR/configs" -type f -exec cp -n "{}" "$HOME/.config/waybar/configs/" \; find "$DIRPATH-backup-$BACKUP_DIR/style" -type f -exec cp -n "{}" "$HOME/.config/waybar/style/" \; - echo -e "${OK} - waybar configs and styles restored automatically" 2>&1 | tee -a "$LOG" + echo -e "${OK} - unique waybar configs and styles restored automatically" 2>&1 | tee -a "$LOG" fi + + # restoring rofi themes + if [ "$DIR2" = "rofi" ]; then + find "$DIRPATH-backup-$BACKUP_DIR/themes" -type f -exec cp -n "{}" "$HOME/.config/rofi/themes/" \; + + echo -e "${OK} - unique rofi themes restored automatically" 2>&1 | tee -a "$LOG" + fi + break ;; [Nn]* ) -- cgit v1.2.3 From 76351b68bf8656f7da43d504e734349051fb203c Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 22 Feb 2025 21:56:30 +0900 Subject: improvement of copy.sh --- copy.sh | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'copy.sh') diff --git a/copy.sh b/copy.sh index 9a186ca2..93263578 100755 --- a/copy.sh +++ b/copy.sh @@ -493,19 +493,19 @@ for DIR2 in $DIRS; do # restoring waybar config and style automatically if [ "$DIR2" = "waybar" ]; then - rm -f "$HOME/.config/waybar/config" "$HOME/.config/waybar/style.css" - cp -L "$DIRPATH-backup-$BACKUP_DIR/config" "$HOME/.config/waybar/config" - cp -L "$DIRPATH-backup-$BACKUP_DIR/style.css" "$HOME/.config/waybar/style.css" + rm -f "$HOME/.config/waybar/config" "$HOME/.config/waybar/style.css" || true + cp -L "$DIRPATH-backup-$BACKUP_DIR/config" "$HOME/.config/waybar/config" || true + cp -L "$DIRPATH-backup-$BACKUP_DIR/style.css" "$HOME/.config/waybar/style.css" || true - find "$DIRPATH-backup-$BACKUP_DIR/configs" -type f -exec cp -n "{}" "$HOME/.config/waybar/configs/" \; - find "$DIRPATH-backup-$BACKUP_DIR/style" -type f -exec cp -n "{}" "$HOME/.config/waybar/style/" \; + find "$DIRPATH-backup-$BACKUP_DIR/configs" -type f -exec cp -n "{}" "$HOME/.config/waybar/configs/" \; || true + find "$DIRPATH-backup-$BACKUP_DIR/style" -type f -exec cp -n "{}" "$HOME/.config/waybar/style/" \; || true echo -e "${OK} - unique waybar configs and styles restored automatically" 2>&1 | tee -a "$LOG" fi # restoring rofi themes if [ "$DIR2" = "rofi" ]; then - find "$DIRPATH-backup-$BACKUP_DIR/themes" -type f -exec cp -n "{}" "$HOME/.config/rofi/themes/" \; + find "$DIRPATH-backup-$BACKUP_DIR/themes" -type f -exec cp -n "{}" "$HOME/.config/rofi/themes/" \; || true echo -e "${OK} - unique rofi themes restored automatically" 2>&1 | tee -a "$LOG" fi @@ -782,11 +782,12 @@ else config_remove="" fi -# Check if ~/.config/waybar/config is a symlink -if [ -L "$HOME/.config/waybar/config" ]; then - ln -sf "$config_file" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" +# Check if ~/.config/waybar/config does not exist or is a symlink +if [ ! -e "$HOME/.config/waybar/config" ] || [ -L "$HOME/.config/waybar/config" ]; then + ln -sf "$config_file" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" fi + # Remove inappropriate waybar configs rm -rf "$HOME/.config/waybar/configs/[TOP] Default$config_remove" \ "$HOME/.config/waybar/configs/[BOT] Default$config_remove" \ @@ -917,9 +918,9 @@ cleanup_backups() { # Execute the cleanup function cleanup_backups -# Check if ~/.config/waybar/style is a symlink -if [ -L "$HOME/.config/waybar/style.css" ]; then - ln -sf "$waybar_style" "$HOME/.config/waybar/style.css" 2>&1 | tee -a "$LOG" +# Check if ~/.config/waybar/style.css does not exist or is a symlink +if [ ! -e "$HOME/.config/waybar/style.css" ] || [ -L "$HOME/.config/waybar/style.css" ]; then + ln -sf "$waybar_style" "$HOME/.config/waybar/style.css" 2>&1 | tee -a "$LOG" fi printf "\n%.0s" {1..1} -- cgit v1.2.3 From 6e08eee21598d2791b09593ed6a43b679f8b95a0 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 22 Feb 2025 23:14:23 +0900 Subject: finally got it.. waybar will be restored now woohooo!!! --- copy.sh | 69 ++++++++++++++++++++++++++++++----------------------------------- 1 file changed, 32 insertions(+), 37 deletions(-) (limited to 'copy.sh') diff --git a/copy.sh b/copy.sh index 93263578..07911d72 100755 --- a/copy.sh +++ b/copy.sh @@ -464,16 +464,10 @@ fi printf "${INFO} - copying dotfiles ${SKY_BLUE}first${RESET} part\n" # Config directories which will ask the user whether to replace or not -DIRS=" - ags - fastfetch - kitty - rofi - swaync - waybar -" +DIRS="ags fastfetch kitty rofi swaync waybar" + for DIR2 in $DIRS; do - DIRPATH=~/.config/"$DIR2" + DIRPATH="$HOME/.config/$DIR2" if [ -d "$DIRPATH" ]; then while true; do @@ -483,31 +477,42 @@ for DIR2 in $DIRS; do [Yy]* ) BACKUP_DIR=$(get_backup_dirname) + # special handling for waybar since it contains symlinks + if [ "$DIR2" = "waybar" ]; then + for symlink in "$HOME/.config/waybar/config" "$HOME/.config/waybar/style.css"; do + if [ -L "$symlink" ]; then + symlink_target=$(readlink "$symlink") + temp_file="${symlink}_2" + cp -f "$symlink_target" "$temp_file" + fi + done + fi + # Backup the existing directory mv "$DIRPATH" "$DIRPATH-backup-$BACKUP_DIR" 2>&1 | tee -a "$LOG" echo -e "${NOTE} - Backed up $DIR2 to $DIRPATH-backup-$BACKUP_DIR." 2>&1 | tee -a "$LOG" - + # Copy the new config - cp -r config/"$DIR2" ~/.config/"$DIR2" 2>&1 | tee -a "$LOG" + cp -r "config/$DIR2" "$HOME/.config/$DIR2" 2>&1 | tee -a "$LOG" echo -e "${OK} - Replaced $DIR2 with new configuration." 2>&1 | tee -a "$LOG" - - # restoring waybar config and style automatically + + # Restoring waybar config and style automatically if [ "$DIR2" = "waybar" ]; then - rm -f "$HOME/.config/waybar/config" "$HOME/.config/waybar/style.css" || true - cp -L "$DIRPATH-backup-$BACKUP_DIR/config" "$HOME/.config/waybar/config" || true - cp -L "$DIRPATH-backup-$BACKUP_DIR/style.css" "$HOME/.config/waybar/style.css" || true - - find "$DIRPATH-backup-$BACKUP_DIR/configs" -type f -exec cp -n "{}" "$HOME/.config/waybar/configs/" \; || true - find "$DIRPATH-backup-$BACKUP_DIR/style" -type f -exec cp -n "{}" "$HOME/.config/waybar/style/" \; || true - - echo -e "${OK} - unique waybar configs and styles restored automatically" 2>&1 | tee -a "$LOG" + rm -rf "$HOME/.config/waybar/config" "$HOME/.config/waybar/style.css" + + cp "$DIRPATH-backup-$BACKUP_DIR/config_2" "$HOME/.config/waybar/config" + cp "$DIRPATH-backup-$BACKUP_DIR/style.css_2" "$HOME/.config/waybar/style.css" + + find "$DIRPATH-backup-$BACKUP_DIR/configs" -type f -exec cp -n "{}" "$HOME/.config/waybar/configs/" \; || true + find "$DIRPATH-backup-$BACKUP_DIR/style" -type f -exec cp -n "{}" "$HOME/.config/waybar/style/" \; || true + + echo -e "${OK} - Unique waybar configs and styles restored automatically" 2>&1 | tee -a "$LOG" fi - # restoring rofi themes + # Restoring rofi themes if [ "$DIR2" = "rofi" ]; then find "$DIRPATH-backup-$BACKUP_DIR/themes" -type f -exec cp -n "{}" "$HOME/.config/rofi/themes/" \; || true - - echo -e "${OK} - unique rofi themes restored automatically" 2>&1 | tee -a "$LOG" + echo -e "${OK} - Unique rofi themes restored automatically" 2>&1 | tee -a "$LOG" fi break @@ -523,8 +528,8 @@ for DIR2 in $DIRS; do done else # Copy new config if directory does not exist - cp -r config/"$DIR2" ~/.config/"$DIR2" 2>&1 | tee -a "$LOG" - echo "${OK} - Copy completed for ${YELLOW}$DIR2${RESET}" 2>&1 | tee -a "$LOG" + cp -r "config/$DIR2" "$HOME/.config/$DIR2" 2>&1 | tee -a "$LOG" + echo -e "${OK} - Copy completed for ${YELLOW}$DIR2${RESET}" 2>&1 | tee -a "$LOG" fi done @@ -538,17 +543,7 @@ if [ ! -d "config" ]; then exit 1 fi -DIR=" - btop - cava - hypr - Kvantum - qt5ct - qt6ct - swappy - wallust - wlogout -" +DIR="btop cava hypr Kvantum qt5ct qt6ct swappy wallust wlogout" for DIR_NAME in $DIR; do DIRPATH=~/.config/"$DIR_NAME" -- cgit v1.2.3 From 792d18822c6dabdfa1782dcbe1d0dd163bac9f98 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sun, 23 Feb 2025 09:08:32 +0900 Subject: updated copy.sh --- copy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'copy.sh') diff --git a/copy.sh b/copy.sh index 07911d72..7e2dfb75 100755 --- a/copy.sh +++ b/copy.sh @@ -500,8 +500,8 @@ for DIR2 in $DIRS; do if [ "$DIR2" = "waybar" ]; then rm -rf "$HOME/.config/waybar/config" "$HOME/.config/waybar/style.css" - cp "$DIRPATH-backup-$BACKUP_DIR/config_2" "$HOME/.config/waybar/config" - cp "$DIRPATH-backup-$BACKUP_DIR/style.css_2" "$HOME/.config/waybar/style.css" + cp "$DIRPATH-backup-$BACKUP_DIR/config_2" "$HOME/.config/waybar/config" || true + cp "$DIRPATH-backup-$BACKUP_DIR/style.css_2" "$HOME/.config/waybar/style.css" || true find "$DIRPATH-backup-$BACKUP_DIR/configs" -type f -exec cp -n "{}" "$HOME/.config/waybar/configs/" \; || true find "$DIRPATH-backup-$BACKUP_DIR/style" -type f -exec cp -n "{}" "$HOME/.config/waybar/style/" \; || true -- cgit v1.2.3 From 4e622c1766d19737098b28f1a74c7a79cafcbf9e Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sun, 23 Feb 2025 09:35:18 +0900 Subject: updated copy.sh --- copy.sh | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) (limited to 'copy.sh') diff --git a/copy.sh b/copy.sh index 7e2dfb75..d22d0fce 100755 --- a/copy.sh +++ b/copy.sh @@ -498,21 +498,36 @@ for DIR2 in $DIRS; do # Restoring waybar config and style automatically if [ "$DIR2" = "waybar" ]; then + # Remove existing symlinks first before copying. rm -rf "$HOME/.config/waybar/config" "$HOME/.config/waybar/style.css" + # Copy the temp files (config_2 and style.css_2) from the backup and restore them cp "$DIRPATH-backup-$BACKUP_DIR/config_2" "$HOME/.config/waybar/config" || true cp "$DIRPATH-backup-$BACKUP_DIR/style.css_2" "$HOME/.config/waybar/style.css" || true - find "$DIRPATH-backup-$BACKUP_DIR/configs" -type f -exec cp -n "{}" "$HOME/.config/waybar/configs/" \; || true - find "$DIRPATH-backup-$BACKUP_DIR/style" -type f -exec cp -n "{}" "$HOME/.config/waybar/style/" \; || true - - echo -e "${OK} - Unique waybar configs and styles restored automatically" 2>&1 | tee -a "$LOG" + echo -e "${OK} - previous waybar configs and styles restored automatically" 2>&1 | tee -a "$LOG" + + # Optionally restore other waybar configuration and style files if present + find "$DIRPATH-backup-$BACKUP_DIR/configs" -type f -exec sh -c ' + echo "Copying {} to $HOME/.config/waybar/configs/" >> "$LOG" + cp -n "{}" "$HOME/.config/waybar/configs/" + ' \; || true + + find "$DIRPATH-backup-$BACKUP_DIR/style" -type f -exec sh -c ' + echo "Copying {} to $HOME/.config/waybar/style/" >> "$LOG" + cp -n "{}" "$HOME/.config/waybar/style/" + ' \; || true fi + - # Restoring rofi themes - if [ "$DIR2" = "rofi" ]; then - find "$DIRPATH-backup-$BACKUP_DIR/themes" -type f -exec cp -n "{}" "$HOME/.config/rofi/themes/" \; || true - echo -e "${OK} - Unique rofi themes restored automatically" 2>&1 | tee -a "$LOG" + # Restoring rofi themes directory unique themes + if [ "$DIR2" = "rofi" ]; then + if [ -d "$DIRPATH-backup-$BACKUP_DIR/themes" ]; then + find "$DIRPATH-backup-$BACKUP_DIR/themes" -type f -exec sh -c ' + echo "Copying {} to $HOME/.config/rofi/themes/" >> "$LOG" + cp -n "{}" "$HOME/.config/rofi/themes/" + ' \; || true + fi fi break -- cgit v1.2.3 From 4363e9c1a995b82db5b2c96e58dc64e1fd81bb34 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sun, 23 Feb 2025 09:44:55 +0900 Subject: anothe copy.sh changes for waybar and rofi handling --- copy.sh | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) (limited to 'copy.sh') diff --git a/copy.sh b/copy.sh index d22d0fce..f3a6b9dd 100755 --- a/copy.sh +++ b/copy.sh @@ -507,29 +507,31 @@ for DIR2 in $DIRS; do echo -e "${OK} - previous waybar configs and styles restored automatically" 2>&1 | tee -a "$LOG" - # Optionally restore other waybar configuration and style files if present - find "$DIRPATH-backup-$BACKUP_DIR/configs" -type f -exec sh -c ' - echo "Copying {} to $HOME/.config/waybar/configs/" >> "$LOG" - cp -n "{}" "$HOME/.config/waybar/configs/" - ' \; || true - - find "$DIRPATH-backup-$BACKUP_DIR/style" -type f -exec sh -c ' - echo "Copying {} to $HOME/.config/waybar/style/" >> "$LOG" - cp -n "{}" "$HOME/.config/waybar/style/" - ' \; || true + # Optionally restore other waybar configuration and style files if present + for file in "$DIRPATH-backup-$BACKUP_DIR/configs"/*; do + [ -e "$file" ] || continue # Skip if no files are found + echo "Copying $file to $HOME/.config/waybar/configs/" >> "$LOG" + cp -n "$file" "$HOME/.config/waybar/configs/" + done || true + + for file in "$DIRPATH-backup-$BACKUP_DIR/style"/*; do + [ -e "$file" ] || continue # Skip if no files are found + echo "Copying $file to $HOME/.config/waybar/style/" >> "$LOG" + cp -n "$file" "$HOME/.config/waybar/style/" + done || true fi - - + # Restoring rofi themes directory unique themes if [ "$DIR2" = "rofi" ]; then if [ -d "$DIRPATH-backup-$BACKUP_DIR/themes" ]; then - find "$DIRPATH-backup-$BACKUP_DIR/themes" -type f -exec sh -c ' - echo "Copying {} to $HOME/.config/rofi/themes/" >> "$LOG" - cp -n "{}" "$HOME/.config/rofi/themes/" - ' \; || true + for file in "$DIRPATH-backup-$BACKUP_DIR/themes"/*; do + [ -e "$file" ] || continue # Skip if no files are found + echo "Copying $file to $HOME/.config/rofi/themes/" >> "$LOG" + cp -n "$file" "$HOME/.config/rofi/themes/" + done || true fi fi - + break ;; [Nn]* ) -- cgit v1.2.3 From 97ec35823c87109dc7f1d250eae8eb4e67fc7200 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sun, 23 Feb 2025 11:56:42 +0900 Subject: I hope this is a final change before merging to main --- README.md | 3 ++ config/hypr/hyprlock-1080p.conf | 68 +++++++++++++++++++++-------------------- config/hypr/hyprlock.conf | 68 +++++++++++++++++++++-------------------- copy.sh | 4 +-- 4 files changed, 75 insertions(+), 68 deletions(-) mode change 100755 => 100644 config/hypr/hyprlock-1080p.conf (limited to 'copy.sh') diff --git a/README.md b/README.md index 49ca0eb0..b6858135 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,9 @@ https://github.com/user-attachments/assets/49bc12b2-abaf-45de-a21c-67aacd9bb872 ### πŸ“¦ Whats new? - To easily track changes, I will be updating the [CHANGELOGS](https://github.com/JaKooLit/Hyprland-Dots/wiki/Changelogs) Screenshots will be included if worth mentioning the changes! +> [!NOTE] +> Kindly note that by defeault, Kools Dots are adjusted / configured for 2k (1440p) display without scaling. + ### πŸ’₯ Copying / Installation / Update instructions πŸ’₯ - [`MORE INFO HERE`](https://github.com/JaKooLit/Hyprland-Dots/wiki/Install_&_Update) > [!Note] diff --git a/config/hypr/hyprlock-1080p.conf b/config/hypr/hyprlock-1080p.conf old mode 100755 new mode 100644 index 7d2566a7..acd3258c --- a/config/hypr/hyprlock-1080p.conf +++ b/config/hypr/hyprlock-1080p.conf @@ -8,6 +8,7 @@ $Scripts = $HOME/.config/hypr/scripts general { grace = 1 + fractional_scaling = 2 } background { @@ -20,8 +21,8 @@ background { #color = $color7 # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations - blur_size = 2 - blur_passes = 1 # 0 disables blurring + blur_size = 3 + blur_passes = 2 # 0 disables blurring noise = 0.0117 contrast = 1.3000 # Vibrant!!! brightness = 0.8000 @@ -34,12 +35,12 @@ background { label { monitor = text = cmd[update:18000000] echo " "$(date +'%A, %-d %B')" " - color = $color12 - font_size = 24 - font_family = JetBrainsMono Nerd Font ExtraBold - position = 0, -50 + color = $color13 + font_size = 16 + font_family = Victor Mono Bold Italic + position = 0, -120 halign = center - valign = top + valign = center } # Hour-Time @@ -49,9 +50,9 @@ label { # text = cmd[update:1000] echo "$(date +"%I")" #AM/PM #color = rgba(255, 185, 0, .8) color = $color13 - font_size = 160 + font_size = 200 font_family = JetBrainsMono Nerd Font ExtraBold - position = 0, -100 + position = 0, -60 halign = center valign = top } @@ -62,7 +63,7 @@ label { text = cmd[update:1000] echo "$(date +"%M")" #color = rgba(15, 10, 222, .8) color = $color12 - font_size = 160 + font_size = 200 font_family = JetBrainsMono Nerd Font ExtraBold position = 0, -320 halign = center @@ -77,24 +78,24 @@ label { color = $color11 font_size = 35 font_family = JetBrainsMono Nerd Font ExtraBold - position = 0, -325 + position = 0, -350 halign = center valign = top } # Put a picture of choice here. Default is the current wallpaper -image { - monitor = - path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current - size = 160 - rounding = -1 - border_size = 0 - border_color = $color11 - rotate = 0 - reload_time = -1 - position = 0, 280 - halign = center - valign = bottom +#image { +# monitor = +# path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current +# size = 160 +# rounding = -1 +# border_size = 0 +# border_color = $color11 +# rotate = 0 +# reload_time = -1 +# position = 0, 280 +# halign = center +# valign = bottom } # USER @@ -107,8 +108,8 @@ label { dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0 dots_center = true font_size = 24 - font_family = JetBrainsMono Nerd Font ExtraBold - position = 0, 80 + font_family = Victor Mono Bold Oblique + position = 0, 150 halign = center valign = bottom } @@ -122,14 +123,15 @@ input-field { dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8 dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0 dots_center = true - outer_color = rgba(0, 0, 0, 0) + outer_color = $color11 inner_color = rgba(255, 255, 255, 0.1) - font_color = $color11 + capslock_color = rgba(255, 0, 0) + font_color = $color13 fade_on_empty = false - font_family = JetBrainsMono Nerd Font ExtraBold + font_family = Victor Mono Bold Oblique placeholder_text = πŸ”’ Type Password hide_input = false - position = 0, 180 + position = 0, 50 halign = center valign = bottom } @@ -139,8 +141,8 @@ label { monitor = text = cmd[update:60000] echo " "$(uptime -p || $Scripts/UptimeNixOS.sh)" " color = $color13 - font_size = 18 - font_family = JetBrainsMono Nerd Font ExtraBold + font_size = 16 + font_family = Victor Mono Bold Oblique position = 0, 0 halign = right valign = bottom @@ -153,8 +155,8 @@ label { monitor = text = cmd[update:3600000] [ -f ~/.cache/.weather_cache ] && cat ~/.cache/.weather_cache color = $color13 - font_size = 18 - font_family = JetBrainsMono Nerd Font ExtraBold + font_size = 16 + font_family = Victor Mono Bold Oblique position = 50, 0 halign = left valign = bottom diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf index 975b5d62..9edb3088 100644 --- a/config/hypr/hyprlock.conf +++ b/config/hypr/hyprlock.conf @@ -8,6 +8,7 @@ $Scripts = $HOME/.config/hypr/scripts general { grace = 1 + fractional_scaling = 2 } background { @@ -20,8 +21,8 @@ background { #color = $color7 # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations - blur_size = 2 - blur_passes = 1 # 0 disables blurring + blur_size = 3 + blur_passes = 2 # 0 disables blurring noise = 0.0117 contrast = 1.3000 # Vibrant!!! brightness = 0.8000 @@ -34,12 +35,12 @@ background { label { monitor = text = cmd[update:18000000] echo " "$(date +'%A, %-d %B')" " - color = $color12 - font_size = 24 - font_family = JetBrainsMono Nerd Font ExtraBold - position = 0, -100 + color = $color13 + font_size = 18 + font_family = Victor Mono Bold Italic + position = 0, -120 halign = center - valign = top + valign = center } # Hour-Time @@ -49,9 +50,9 @@ label { # text = cmd[update:1000] echo "$(date +"%I")" #AM/PM #color = rgba(255, 185, 0, .8) color = $color13 - font_size = 200 + font_size = 240 font_family = JetBrainsMono Nerd Font ExtraBold - position = 0, -150 + position = 0, -100 halign = center valign = top } @@ -62,9 +63,9 @@ label { text = cmd[update:1000] echo "$(date +"%M")" #color = rgba(15, 10, 222, .8) color = $color12 - font_size = 200 + font_size = 240 font_family = JetBrainsMono Nerd Font ExtraBold - position = 0, -475 + position = 0, -450 halign = center valign = top } @@ -75,26 +76,26 @@ label { text = cmd[update:1000] echo "$(date +"%S")" # text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM color = $color11 - font_size = 40 + font_size = 50 font_family = JetBrainsMono Nerd Font ExtraBold - position = 0, -460 + position = 0, -450 halign = center valign = top } # Put a picture of choice here. Default is the current wallpaper -image { - monitor = - path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current - size = 160 - rounding = -1 - border_size = 0 - border_color = $color11 - rotate = 0 - reload_time = -1 - position = 0, 400 - halign = center - valign = bottom +#image { +# monitor = +# #path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current +# size = 160 +# rounding = -1 +# border_size = 0 +# border_color = $color11 +# rotate = 0 +# reload_time = -1 +# position = 0, 400 +# halign = center +# valign = bottom } # USER @@ -107,8 +108,8 @@ label { dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0 dots_center = true font_size = 24 - font_family = JetBrainsMono Nerd Font ExtraBold - position = 0, 150 + font_family = Victor Mono Bold Oblique + position = 0, 200 halign = center valign = bottom } @@ -122,14 +123,15 @@ input-field { dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8 dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0 dots_center = true - outer_color = rgba(0, 0, 0, 0) + outer_color = $color11 inner_color = rgba(255, 255, 255, 0.1) - font_color = $color11 + font_color = $color13 + capslock_color = rgba(255, 0, 0) fade_on_empty = false - font_family = JetBrainsMono Nerd Font ExtraBold + font_family = Victor Mono Bold Oblique placeholder_text = πŸ”’ Type Password hide_input = false - position = 0, 250 + position = 0, 100 halign = center valign = bottom } @@ -140,7 +142,7 @@ label { text = cmd[update:60000] echo " "$(uptime -p || $Scripts/UptimeNixOS.sh)" " color = $color13 font_size = 18 - font_family = JetBrainsMono Nerd Font ExtraBold + font_family = Victor Mono Bold Oblique position = 0, 0 halign = right valign = bottom @@ -154,7 +156,7 @@ label { text = cmd[update:3600000] [ -f ~/.cache/.weather_cache ] && cat ~/.cache/.weather_cache color = $color13 font_size = 18 - font_family = JetBrainsMono Nerd Font ExtraBold + font_family = Victor Mono Bold Oblique position = 50, 0 halign = left valign = bottom diff --git a/copy.sh b/copy.sh index f3a6b9dd..fa8915f8 100755 --- a/copy.sh +++ b/copy.sh @@ -63,8 +63,8 @@ echo -e "\e[35m printf "\n%.0s" {1..1} ####### Announcement -echo "${YELLOW}A T T E N T I O N !${RESET}" -echo "${SKY_BLUE}This version requires nwg-displays!${RESET}" +echo "${WARNING}A T T E N T I O N !${RESET}" +echo "${SKY_BLUE}This version (v2.3.12) requires nwg-displays!${RESET}" echo "${YELLOW}previous version: Some Keybinds changes${RESET}" echo "${MAGENTA}Kindly visit KooL Hyprland Own Wiki for the changelog${RESET}" printf "\n%.0s" {1..1} -- cgit v1.2.3 From c449e25686c2b35f751c7ae4cb620fb8e29c243c Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sun, 23 Feb 2025 12:36:22 +0900 Subject: added Fantasque Sans Mono Nerd for Kitty --- config/kitty/kitty.conf | 4 ++-- copy.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'copy.sh') diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index bee54706..34bc3414 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -3,8 +3,8 @@ # wallust-colors #include kitty-colors.conf -font_family Fira Code SemiBold -font_size 16.0 +font_family FantasqueSansM Nerd Font Mono Bold +font_size 15.0 bold_font auto italic_font auto bold_italic_font auto diff --git a/copy.sh b/copy.sh index fa8915f8..ed6cd8b3 100755 --- a/copy.sh +++ b/copy.sh @@ -320,7 +320,7 @@ echo "${OK} You have chosen $resolution resolution." 2>&1 | tee -a "$LOG" # Add your commands based on the resolution choice if [ "$resolution" == "< 1440p" ]; then #cp -r config/rofi/resolution/1080p/* config/rofi/ 10-Feb-2025 - sed -i 's/font_size 16.0/font_size 12.0/' config/kitty/kitty.conf + sed -i 's/font_size 15.0/font_size 13.0/' config/kitty/kitty.conf # hyprlock matters mv config/hypr/hyprlock.conf config/hypr/hyprlock-2k.conf && -- cgit v1.2.3 From 9df8836dc8bf17a86990bbf659105626138552cb Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sun, 23 Feb 2025 13:15:07 +0900 Subject: Not sure if important.. but whatever --- README.md | 2 +- config/hypr/UserScripts/Kool_Quick_Settings.sh | 2 +- config/hypr/UserScripts/RofiBeats.sh | 4 +-- config/hypr/UserScripts/WallpaperEffects.sh | 2 +- config/hypr/UserScripts/WallpaperSelect.sh | 2 +- config/hypr/UserScripts/Weather.py | 2 +- config/hypr/UserScripts/Weather.sh | 4 +-- config/hypr/UserScripts/ZshChangeTheme.sh | 2 +- config/hypr/hyprlock-1080p.conf | 2 +- config/hypr/hyprlock.conf | 2 +- config/hypr/initial-boot.sh | 4 +-- config/hypr/scripts/Animations.sh | 2 +- config/hypr/scripts/ClipManager.sh | 2 +- config/hypr/scripts/DarkLight.sh | 2 +- config/hypr/scripts/MonitorProfiles.sh | 4 +-- config/hypr/scripts/RofiEmoji.sh | 2 +- config/waybar/configs/[TOP] Everforest | 4 +-- copy.sh | 43 +++++++++++++------------- upgrade.sh | 10 +++--- 19 files changed, 49 insertions(+), 48 deletions(-) (limited to 'copy.sh') diff --git a/README.md b/README.md index b6858135..58f5e712 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ chmod +x upgrade.sh ## ⚠️⚠️⚠️ ATTENTION - BACKUPS CREATED by SCRIPT > [!CAUTION] > copy.sh, release.sh and even upgrade.sh creates a backup! -> Kindly investigate manually contents on your ~/.config +> Kindly investigate manually contents on your $HOME/.config > Delete manually all the backups which you dont need #### πŸ›ŽοΈ a small note on wallpapers diff --git a/config/hypr/UserScripts/Kool_Quick_Settings.sh b/config/hypr/UserScripts/Kool_Quick_Settings.sh index a6dc2885..88e26089 100755 --- a/config/hypr/UserScripts/Kool_Quick_Settings.sh +++ b/config/hypr/UserScripts/Kool_Quick_Settings.sh @@ -9,7 +9,7 @@ tty=kitty # variables configs="$HOME/.config/hypr/configs" UserConfigs="$HOME/.config/hypr/UserConfigs" -rofi_theme="~/.config/rofi/config-edit.rasi" +rofi_theme="$HOME/.config/rofi/config-edit.rasi" msg=' ⁉️ Choose what to do ⁉️' iDIR="$HOME/.config/swaync/images" scriptsDir="$HOME/.config/hypr/scripts" diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh index 74a8fe54..4587e720 100755 --- a/config/hypr/UserScripts/RofiBeats.sh +++ b/config/hypr/UserScripts/RofiBeats.sh @@ -5,8 +5,8 @@ # Variables mDIR="$HOME/Music/" iDIR="$HOME/.config/swaync/icons" -rofi_theme="~/.config/rofi/config-rofi-Beats.rasi" -rofi_theme_1="~/.config/rofi/config-rofi-Beats-menu.rasi" +rofi_theme="$HOME/.config/rofi/config-rofi-Beats.rasi" +rofi_theme_1="$HOME/.config/rofi/config-rofi-Beats-menu.rasi" # Online Stations. Edit as required declare -A online_music=( diff --git a/config/hypr/UserScripts/WallpaperEffects.sh b/config/hypr/UserScripts/WallpaperEffects.sh index c98400d2..948c637c 100755 --- a/config/hypr/UserScripts/WallpaperEffects.sh +++ b/config/hypr/UserScripts/WallpaperEffects.sh @@ -8,7 +8,7 @@ wallpaper_current="$HOME/.config/hypr/wallpaper_effects/.wallpaper_current" wallpaper_output="$HOME/.config/hypr/wallpaper_effects/.wallpaper_modified" SCRIPTSDIR="$HOME/.config/hypr/scripts" focused_monitor=$(hyprctl monitors -j | jq -r '.[] | select(.focused) | .name') -rofi_theme="~/.config/rofi/config-wallpaper-effect.rasi" +rofi_theme="$HOME/.config/rofi/config-wallpaper-effect.rasi" # Directory for swaync iDIR="$HOME/.config/swaync/images" diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh index 86b7dfa2..78bf8d2f 100755 --- a/config/hypr/UserScripts/WallpaperSelect.sh +++ b/config/hypr/UserScripts/WallpaperSelect.sh @@ -15,7 +15,7 @@ iDIR="$HOME/.config/swaync/images" iDIRi="$HOME/.config/swaync/icons" # variables -rofi_theme="~/.config/rofi/config-wallpaper.rasi" +rofi_theme="$HOME/.config/rofi/config-wallpaper.rasi" focused_monitor=$(hyprctl monitors -j | jq -r '.[] | select(.focused) | .name') # Get monitor width and DPI diff --git a/config/hypr/UserScripts/Weather.py b/config/hypr/UserScripts/Weather.py index b9efe4e4..a2ad98b5 100755 --- a/config/hypr/UserScripts/Weather.py +++ b/config/hypr/UserScripts/Weather.py @@ -138,7 +138,7 @@ simple_weather = ( ) try: - with open(os.path.expanduser("~/.cache/.weather_cache"), "w") as file: + with open(os.path.expanduser("$HOME/.cache/.weather_cache"), "w") as file: file.write(simple_weather) except Exception as e: print(f"Error writing to cache: {e}") diff --git a/config/hypr/UserScripts/Weather.sh b/config/hypr/UserScripts/Weather.sh index 65613fca..9bdaff4a 100755 --- a/config/hypr/UserScripts/Weather.sh +++ b/config/hypr/UserScripts/Weather.sh @@ -4,7 +4,7 @@ # Remember to add city city= -cachedir=~/.cache/rbn +cachedir="$HOME/.cache/rbn" cachefile=${0##*/}-$1 if [ ! -d $cachedir ]; then @@ -84,4 +84,4 @@ echo -e "{\"text\":\""$temperature $condition"\", \"alt\":\""${weather[0]}"\", \ cached_weather=" $temperature \n$condition ${weather[1]}" -echo -e $cached_weather > ~/.cache/.weather_cache \ No newline at end of file +echo -e $cached_weather > "$HOME/.cache/.weather_cache" \ No newline at end of file diff --git a/config/hypr/UserScripts/ZshChangeTheme.sh b/config/hypr/UserScripts/ZshChangeTheme.sh index 4ff43557..fafd7fb0 100755 --- a/config/hypr/UserScripts/ZshChangeTheme.sh +++ b/config/hypr/UserScripts/ZshChangeTheme.sh @@ -10,7 +10,7 @@ file_extension=".zsh-theme" # Variables iDIR="$HOME/.config/swaync/images" -rofi_theme="~/.config/rofi/config-zsh-theme.rasi" +rofi_theme="$HOME/.config/rofi/config-zsh-theme.rasi" themes_array=($(find -L "$themes_dir" -type f -name "*$file_extension" -exec basename {} \; | sed -e "s/$file_extension//")) diff --git a/config/hypr/hyprlock-1080p.conf b/config/hypr/hyprlock-1080p.conf index acd3258c..9fcac975 100644 --- a/config/hypr/hyprlock-1080p.conf +++ b/config/hypr/hyprlock-1080p.conf @@ -153,7 +153,7 @@ label { # see https://github.com/JaKooLit/Hyprland-Dots/wiki/TIPS#%EF%B8%8F-weather-app-related-for-waybar-and-hyprlock label { monitor = - text = cmd[update:3600000] [ -f ~/.cache/.weather_cache ] && cat ~/.cache/.weather_cache + text = cmd[update:3600000] [ -f "$HOME/.cache/.weather_cache" ] && cat "$HOME/.cache/.weather_cache" color = $color13 font_size = 16 font_family = Victor Mono Bold Oblique diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf index 9edb3088..bfeda4ab 100644 --- a/config/hypr/hyprlock.conf +++ b/config/hypr/hyprlock.conf @@ -153,7 +153,7 @@ label { # see https://github.com/JaKooLit/Hyprland-Dots/wiki/TIPS#%EF%B8%8F-weather-app-related-for-waybar-and-hyprlock label { monitor = - text = cmd[update:3600000] [ -f ~/.cache/.weather_cache ] && cat ~/.cache/.weather_cache + text = cmd[update:3600000] [ -f "$HOME/.cache/.weather_cache" ] && cat "$HOME/.cache/.weather_cache" color = $color13 font_size = 18 font_family = Victor Mono Bold Oblique diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh index 4d62775d..7f92ce7d 100755 --- a/config/hypr/initial-boot.sh +++ b/config/hypr/initial-boot.sh @@ -21,7 +21,7 @@ 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" # Check if a marker file exists. -if [ ! -f ~/.config/hypr/.initial_startup_done ]; then +if [ ! -f "$HOME/.config/hypr/.initial_startup_done" ]; then sleep 1 # Initialize wallust and wallpaper if [ -f "$wallpaper" ]; then @@ -60,7 +60,7 @@ if [ ! -f ~/.config/hypr/.initial_startup_done ]; then # Create a marker file to indicate that the script has been executed. - touch ~/.config/hypr/.initial_startup_done + touch "$HOME/.config/hypr/.initial_startup_done" exit fi diff --git a/config/hypr/scripts/Animations.sh b/config/hypr/scripts/Animations.sh index 4f49d47a..477e5cd3 100755 --- a/config/hypr/scripts/Animations.sh +++ b/config/hypr/scripts/Animations.sh @@ -12,7 +12,7 @@ iDIR="$HOME/.config/swaync/images" SCRIPTSDIR="$HOME/.config/hypr/scripts" animations_dir="$HOME/.config/hypr/animations" UserConfigs="$HOME/.config/hypr/UserConfigs" -rofi_theme="~/.config/rofi/config-Animations.rasi" +rofi_theme="$HOME/.config/rofi/config-Animations.rasi" msg='❗NOTE:❗ This will copy animations into UserAnimations.conf' # list of animation files, sorted alphabetically with numbers first animations_list=$(find -L "$animations_dir" -maxdepth 1 -type f | sed 's/.*\///' | sed 's/\.conf$//' | sort -V) diff --git a/config/hypr/scripts/ClipManager.sh b/config/hypr/scripts/ClipManager.sh index 1f82c616..9937b6f4 100755 --- a/config/hypr/scripts/ClipManager.sh +++ b/config/hypr/scripts/ClipManager.sh @@ -3,7 +3,7 @@ # Clipboard Manager. This script uses cliphist, rofi, and wl-copy. # Variables -rofi_theme="~/.config/rofi/config-clipboard.rasi" +rofi_theme="$HOME/.config/rofi/config-clipboard.rasi" msg='πŸ‘€ **note** CTRL DEL = cliphist del (entry) or ALT DEL - cliphist wipe (all)' # Actions: # CTRL Del to delete an entry diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh index 662e1954..6ce1526e 100755 --- a/config/hypr/scripts/DarkLight.sh +++ b/config/hypr/scripts/DarkLight.sh @@ -46,7 +46,7 @@ fi # Function to update theme mode for the next cycle update_theme_mode() { - echo "$next_mode" > ~/.cache/.theme_mode + echo "$next_mode" > "$HOME/.cache/.theme_mode" } # Function to notify user diff --git a/config/hypr/scripts/MonitorProfiles.sh b/config/hypr/scripts/MonitorProfiles.sh index ebab0144..ab124335 100755 --- a/config/hypr/scripts/MonitorProfiles.sh +++ b/config/hypr/scripts/MonitorProfiles.sh @@ -12,8 +12,8 @@ iDIR="$HOME/.config/swaync/images" SCRIPTSDIR="$HOME/.config/hypr/scripts" monitor_dir="$HOME/.config/hypr/Monitor_Profiles" target="$HOME/.config/hypr/monitors.conf" -rofi_theme="~/.config/rofi/config-Monitors.rasi" -msg='❗NOTE:❗ This will overwrite ~/.config/hypr/monitors.conf' +rofi_theme="$HOME/.config/rofi/config-Monitors.rasi" +msg='❗NOTE:❗ This will overwrite $HOME/.config/hypr/monitors.conf' # Define the list of files to ignore ignore_files=( diff --git a/config/hypr/scripts/RofiEmoji.sh b/config/hypr/scripts/RofiEmoji.sh index 3d85d6a3..da9da61f 100755 --- a/config/hypr/scripts/RofiEmoji.sh +++ b/config/hypr/scripts/RofiEmoji.sh @@ -2,7 +2,7 @@ # /* ---- πŸ’« https://github.com/JaKooLit πŸ’« ---- */ ## # Variables -rofi_theme="~/.config/rofi/config-emoji.rasi" +rofi_theme="$HOME/.config/rofi/config-emoji.rasi" msg='** note ** πŸ‘€ Click or Return to choose || Ctrl V to Paste' # Check if rofi is already running diff --git a/config/waybar/configs/[TOP] Everforest b/config/waybar/configs/[TOP] Everforest index 6663425b..9d2786c6 100644 --- a/config/waybar/configs/[TOP] Everforest +++ b/config/waybar/configs/[TOP] Everforest @@ -89,8 +89,8 @@ "format-time": "{H}h {M}min", "tooltip": true, "tooltip-format": "{timeTo} {power}w", - "on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh", - "on-click-right": "~/.config/hypr/scripts/Wlogout.sh", + "on-click-middle": "$HOME/.config/hypr/scripts/ChangeBlur.sh", + "on-click-right": "$HOME/.config/hypr/scripts/Wlogout.sh", }, "cpu#forest": { diff --git a/copy.sh b/copy.sh index ed6cd8b3..5d0013db 100755 --- a/copy.sh +++ b/copy.sh @@ -64,9 +64,10 @@ printf "\n%.0s" {1..1} ####### Announcement echo "${WARNING}A T T E N T I O N !${RESET}" -echo "${SKY_BLUE}This version (v2.3.12) requires nwg-displays!${RESET}" +echo "${SKY_BLUE}This version (v2.3.12) requires nwg-displays and some fonts!${RESET}" +echo "${SKY_BLUE}If you ran through (Distro-Hyprland install scripts), no need to do anything${RESET}" echo "${YELLOW}previous version: Some Keybinds changes${RESET}" -echo "${MAGENTA}Kindly visit KooL Hyprland Own Wiki for the changelog${RESET}" +echo "${MAGENTA}Kindly visit KooL Hyprland Own Wiki for changelogs${RESET}" printf "\n%.0s" {1..1} # Create Directory for Copy Logs @@ -458,8 +459,8 @@ get_backup_dirname() { # Check if the ~/.config/ directory exists if [ ! -d "$HOME/.config" ]; then - echo "${ERROR} - The ~/.config directory does not exist." - exit 1 + echo "${ERROR} - $HOME/.config directory does not exist. Creating it now." + mkdir -p "$HOME/.config" && echo "Directory created successfully." || echo "Failed to create directory." fi printf "${INFO} - copying dotfiles ${SKY_BLUE}first${RESET} part\n" @@ -563,7 +564,7 @@ fi DIR="btop cava hypr Kvantum qt5ct qt6ct swappy wallust wlogout" for DIR_NAME in $DIR; do - DIRPATH=~/.config/"$DIR_NAME" + DIRPATH="$HOME/.config/$DIR_NAME" # Backup the existing directory if it exists if [ -d "$DIRPATH" ]; then @@ -582,7 +583,7 @@ for DIR_NAME in $DIR; do # Copy the new config if [ -d "config/$DIR_NAME" ]; then - cp -r "config/$DIR_NAME/" ~/.config/"$DIR_NAME" 2>&1 | tee -a "$LOG" + cp -r "config/$DIR_NAME/" "$HOME/.config/$DIR_NAME" 2>&1 | tee -a "$LOG" if [ $? -eq 0 ]; then echo "${OK} - Copy of config for ${YELLOW}$DIR_NAME${RESET} completed!" else @@ -644,7 +645,7 @@ FILES_TO_RESTORE=( "WindowRules.conf" ) -DIRPATH=~/.config/"$DIRH" +DIRPATH="$HOME/.config/$DIRH" BACKUP_DIR=$(get_backup_dirname) BACKUP_DIR_PATH="$DIRPATH-backup-$BACKUP_DIR/UserConfigs" @@ -687,7 +688,7 @@ SCRIPTS_TO_RESTORE=( "Weather.sh" ) -DIRSHPATH=~/.config/"$DIRSH" +DIRSHPATH="$HOME/.config/$DIRSH" BACKUP_DIR_PATH_S="$DIRSHPATH-backup-$BACKUP_DIR/UserScripts" if [ -d "$BACKUP_DIR_PATH_S" ]; then @@ -721,12 +722,12 @@ FILES_2_RESTORE=( "hypridle.conf" ) -DIRPATH=~/.config/"$DIR_H" +DIRPATH="$HOME/.config/$DIR_H" BACKUP_DIR=$(get_backup_dirname) BACKUP_DIR_PATH_F="$DIRPATH-backup-$BACKUP_DIR" if [ -d "$BACKUP_DIR_PATH_F" ]; then - echo -e "${NOTE} Restoring some files in ${MAGENTA}~/.config/hypr directory${RESET}..." + echo -e "${NOTE} Restoring some files in ${MAGENTA}$HOME/.config/hypr directory${RESET}..." for FILE_RESTORE in "${FILES_2_RESTORE[@]}"; do BACKUP_FILE="$BACKUP_DIR_PATH_F/$FILE_RESTORE" @@ -762,7 +763,7 @@ if [ -d "$HOME/.config/rofi/themes" ]; then if [ -z "$(ls -A $HOME/.config/rofi/themes)" ]; then echo '/* Dummy Rofi theme */' > "$HOME/.config/rofi/themes/dummy.rasi" fi - ln -snf ~/.config/rofi/themes/* ~/.local/share/rofi/themes/ + ln -snf "$HOME/.config/rofi/themes/"* "$HOME/.local/share/rofi/themes/" # Delete the dummy file if it was created if [ -f "$HOME/.config/rofi/themes/dummy.rasi" ]; then rm "$HOME/.config/rofi/themes/dummy.rasi" @@ -772,18 +773,18 @@ fi printf "\n%.0s" {1..1} # wallpaper stuff -mkdir -p ~/Pictures/wallpapers -if cp -r wallpapers ~/Pictures/; then +mkdir -p $HOME/Pictures/wallpapers +if cp -r wallpapers $HOME/Pictures/; then echo "${OK} Some ${MAGENTA}wallpapers${RESET} copied successfully!" | tee -a "$LOG" else echo "${ERROR} Failed to copy some ${YELLOW}wallpapers${RESET}" | tee -a "$LOG" fi # Set some files as executable -chmod +x ~/.config/hypr/scripts/* 2>&1 | tee -a "$LOG" -chmod +x ~/.config/hypr/UserScripts/* 2>&1 | tee -a "$LOG" +chmod +x "$HOME/.config/hypr/scripts/"* 2>&1 | tee -a "$LOG" +chmod +x "$HOME/.config/hypr/UserScripts/"* 2>&1 | tee -a "$LOG" # Set executable for initial-boot.sh -chmod +x ~/.config/hypr/initial-boot.sh 2>&1 | tee -a "$LOG" +chmod +x "$HOME/.config/hypr/initial-boot.sh" 2>&1 | tee -a "$LOG" # Waybar config to symlink & retain based on machine type if hostnamectl | grep -q 'Chassis: desktop'; then @@ -850,12 +851,12 @@ while true; do echo "${OK} Wallpapers downloaded successfully." 2>&1 | tee -a "$LOG" # Check if wallpapers directory exists and create it if not - if [ ! -d ~/Pictures/wallpapers ]; then - mkdir -p ~/Pictures/wallpapers + if [ ! -d "$HOME/Pictures/wallpapers" ]; then + mkdir -p "$HOME/Pictures/wallpapers" echo "${OK} Created wallpapers directory." 2>&1 | tee -a "$LOG" fi - if cp -R Wallpaper-Bank/wallpapers/* ~/Pictures/wallpapers/ >> "$LOG" 2>&1; then + if cp -R Wallpaper-Bank/wallpapers/* "$HOME/Pictures/wallpapers/" >> "$LOG" 2>&1; then echo "${OK} Wallpapers copied successfully." 2>&1 | tee -a "$LOG" rm -rf Wallpaper-Bank 2>&1 # Remove cloned repository after copying wallpapers break @@ -878,10 +879,10 @@ done # CLeaning up of ~/.config/ backups cleanup_backups() { - CONFIG_DIR=~/.config + CONFIG_DIR="$HOME/.config" BACKUP_PREFIX="-backup" - # Loop through directories in ~/.config + # Loop through directories in $HOME/.config for DIR in "$CONFIG_DIR"/*; do if [ -d "$DIR" ]; then BACKUP_DIRS=() diff --git a/upgrade.sh b/upgrade.sh index 687ba69f..8c900f44 100755 --- a/upgrade.sh +++ b/upgrade.sh @@ -141,11 +141,11 @@ if version_gt "$latest_version" "$stored_version"; then printf "\n%.0s" {1..2} echo "$NOTE Files or Folders updated successfully to version $latest_version" 2>&1 | tee -a "$LOG" - # Set some files as executable - chmod +x ~/.config/hypr/scripts/* 2>&1 | tee -a "$LOG" - chmod +x ~/.config/hypr/UserScripts/* 2>&1 | tee -a "$LOG" - chmod +x ~/.config/hypr/initial-boot.sh 2>&1 | tee -a "$LOG" - + # Set some files as executable + chmod +x "$HOME/.config/hypr/scripts/"* 2>&1 | tee -a "$LOG" + chmod +x "$HOME/.config/hypr/UserScripts/"* 2>&1 | tee -a "$LOG" + # Set executable for initial-boot.sh + chmod +x "$HOME/.config/hypr/initial-boot.sh" 2>&1 | tee -a "$LOG" else echo "$MAGENTA Upgrade declined. No files or folders changed" 2>&1 | tee -a "$LOG" fi -- cgit v1.2.3