From c25e598d559a3b42bb2b85902d94f61a1498083e Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 31 Jan 2025 12:06:33 +0900 Subject: minor update... dang I need to stop tweaking --- config/cava/config | 2 ++ config/fastfetch/config-compact.jsonc | 2 ++ config/fastfetch/config-v2.jsonc | 2 ++ config/fastfetch/config.jsonc | 1 + config/hypr/pyprland.toml | 2 ++ config/swaync/config.json | 2 ++ 6 files changed, 11 insertions(+) diff --git a/config/cava/config b/config/cava/config index 853a7055..31401d64 100644 --- a/config/cava/config +++ b/config/cava/config @@ -1,3 +1,5 @@ +# /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */ # + ## Configuration file for CAVA. Default values are commented out. Use either ';' or '#' for commenting. diff --git a/config/fastfetch/config-compact.jsonc b/config/fastfetch/config-compact.jsonc index f713a681..fc2c4884 100644 --- a/config/fastfetch/config-compact.jsonc +++ b/config/fastfetch/config-compact.jsonc @@ -1,3 +1,5 @@ +/* ----------- 💫 https://github.com/JaKooLit 💫 -------- */ + { "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", "logo": { diff --git a/config/fastfetch/config-v2.jsonc b/config/fastfetch/config-v2.jsonc index cee27fd0..59509fe7 100644 --- a/config/fastfetch/config-v2.jsonc +++ b/config/fastfetch/config-v2.jsonc @@ -1,3 +1,5 @@ +/* ----------- 💫 https://github.com/JaKooLit 💫 -------- */ + { "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", "logo": { diff --git a/config/fastfetch/config.jsonc b/config/fastfetch/config.jsonc index dfbe1c8d..e3f8c3c6 100644 --- a/config/fastfetch/config.jsonc +++ b/config/fastfetch/config.jsonc @@ -1,3 +1,4 @@ +/* ----------- 💫 https://github.com/JaKooLit 💫 -------- */ { "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", diff --git a/config/hypr/pyprland.toml b/config/hypr/pyprland.toml index 2ab74e86..731a8093 100644 --- a/config/hypr/pyprland.toml +++ b/config/hypr/pyprland.toml @@ -1,3 +1,5 @@ +# /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */ # + [pyprland] plugins = [ diff --git a/config/swaync/config.json b/config/swaync/config.json index 2ec0f771..c99195cb 100755 --- a/config/swaync/config.json +++ b/config/swaync/config.json @@ -1,3 +1,5 @@ +/* ----------- 💫 https://github.com/JaKooLit 💫 -------- */ + { "$schema": "/etc/xdg/swaync/configSchema.json", "positionX": "center", -- cgit v1.2.3 From dc4bd24a5a00b15ed293c9cb4981e69f701e17e6 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 31 Jan 2025 13:27:27 +0900 Subject: WaybarCustom modules fix!!! Not anymore hard coded to firefox and thunar but instead it will open your default file manager and default web browser :) Still hard coded to kitty though ( --- config/waybar/ModulesCustom | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/waybar/ModulesCustom b/config/waybar/ModulesCustom index f0f52f70..9d0e804a 100644 --- a/config/waybar/ModulesCustom +++ b/config/waybar/ModulesCustom @@ -19,21 +19,21 @@ "custom/file_manager": { "format": " ", - "on-click": "thunar", + "on-click": "xdg-open . &", "tooltip": true, "tooltip-format": "File Manager", }, "custom/tty": { "format": " ", - "on-click": "kitty", + "on-click": "kitty &", "tooltip": true, "tooltip-format": "Launch Terminal", }, "custom/browser": { "format": " ", - "on-click": "firefox", + "on-click": "xdg-open http:// &", "tooltip": true, "tooltip-format": "Launch Browser", }, -- cgit v1.2.3 From e43346ad850a454cf5bc587f1819475233ba298e Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 31 Jan 2025 13:37:11 +0900 Subject: Just a minor rofi configs tweak --- config/rofi/config-Animations.rasi | 2 +- config/rofi/config-calc.rasi | 2 +- config/rofi/config-clipboard.rasi | 2 +- config/rofi/config-compact.rasi | 2 +- config/rofi/config-emoji.rasi | 2 +- config/rofi/config-rofi-Beats-menu.rasi | 2 +- config/rofi/config-rofi-Beats.rasi | 2 +- config/rofi/config-search.rasi | 2 +- config/rofi/config-wallpaper-effect.rasi | 2 +- config/rofi/config-wallpaper.rasi | 2 +- config/rofi/config-waybar-layout.rasi | 2 +- config/rofi/config-waybar-style.rasi | 2 +- config/rofi/config-zsh-theme.rasi | 2 +- config/rofi/master-config.rasi | 2 +- config/rofi/resolution/1080p/master-config.rasi | 2 +- config/rofi/resolution/1440p/master-config.rasi | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/config/rofi/config-Animations.rasi b/config/rofi/config-Animations.rasi index 225b7d61..761c5322 100644 --- a/config/rofi/config-Animations.rasi +++ b/config/rofi/config-Animations.rasi @@ -11,7 +11,7 @@ window { /* ---- Entry ---- */ entry { width: 25%; - placeholder: "✨ Choose which Animations to load"; + placeholder: " ✨ Choose which Animations to load"; } /* ---- Listview ---- */ diff --git a/config/rofi/config-calc.rasi b/config/rofi/config-calc.rasi index 9f663e84..54653491 100644 --- a/config/rofi/config-calc.rasi +++ b/config/rofi/config-calc.rasi @@ -7,7 +7,7 @@ /* ---- Entry ---- */ entry { width: 27%; - placeholder: "🧮 Calculate"; + placeholder: " 🧮 Calculate"; } /* ---- Window ---- */ diff --git a/config/rofi/config-clipboard.rasi b/config/rofi/config-clipboard.rasi index 81362d22..7c6dd91e 100644 --- a/config/rofi/config-clipboard.rasi +++ b/config/rofi/config-clipboard.rasi @@ -6,7 +6,7 @@ /* ---- Entry ---- */ entry { width: 37%; - placeholder: "📋 Search Clipboard **note** 👀 CTRL Del - Cliphist del or Alt Del - cliphist wipe"; + placeholder: " 📋 Search Clipboard **note** 👀 CTRL Del - Cliphist del or Alt Del - cliphist wipe"; } /* ---- Listview ---- */ diff --git a/config/rofi/config-compact.rasi b/config/rofi/config-compact.rasi index 020bc959..0887a936 100644 --- a/config/rofi/config-compact.rasi +++ b/config/rofi/config-compact.rasi @@ -28,7 +28,7 @@ imagebox { /* ---- Entry input ---- */ entry { width: 23%; - placeholder: "👀 View / Edit Hyprland Configs"; + placeholder: " 👀 View / Edit Hyprland Configs"; } /* ---- Listview ---- */ diff --git a/config/rofi/config-emoji.rasi b/config/rofi/config-emoji.rasi index 0fe6e706..39eab54c 100644 --- a/config/rofi/config-emoji.rasi +++ b/config/rofi/config-emoji.rasi @@ -6,7 +6,7 @@ /* ---- Entry ---- */ entry { width: 37%; - placeholder: "💫 Search Emoji's **note** 👀 Click or Return to choose | Ctrl V to Paste"; + placeholder: " 💫 Search Emoji's **note** 👀 Click or Return to choose | Ctrl V to Paste"; } /* ---- Listview ---- */ diff --git a/config/rofi/config-rofi-Beats-menu.rasi b/config/rofi/config-rofi-Beats-menu.rasi index 896b3136..3e29881e 100644 --- a/config/rofi/config-rofi-Beats-menu.rasi +++ b/config/rofi/config-rofi-Beats-menu.rasi @@ -6,7 +6,7 @@ /* ---- Entry ---- */ entry { width: 20%; - placeholder: "📻 Choose Music Source"; + placeholder: " 📻 Choose Music Source"; } /* ---- Window ---- */ diff --git a/config/rofi/config-rofi-Beats.rasi b/config/rofi/config-rofi-Beats.rasi index 354ff5bb..97bb9643 100644 --- a/config/rofi/config-rofi-Beats.rasi +++ b/config/rofi/config-rofi-Beats.rasi @@ -5,7 +5,7 @@ /* ---- Entry ---- */ entry { - placeholder: "📻 Choose Media or Stations to play"; + placeholder: " 📻 Choose Media or Stations to play"; } /* ---- Listview ---- */ diff --git a/config/rofi/config-search.rasi b/config/rofi/config-search.rasi index a1f55763..70cb08f1 100644 --- a/config/rofi/config-search.rasi +++ b/config/rofi/config-search.rasi @@ -23,6 +23,6 @@ mainbox { /* ---- Entry ---- */ entry { - placeholder: "🔎 Google Search"; + placeholder: " 🔎 Google Search via web browser"; } diff --git a/config/rofi/config-wallpaper-effect.rasi b/config/rofi/config-wallpaper-effect.rasi index c499f2af..684c00a2 100644 --- a/config/rofi/config-wallpaper-effect.rasi +++ b/config/rofi/config-wallpaper-effect.rasi @@ -6,7 +6,7 @@ /* ---- Entry ---- */ entry { width: 20%; - placeholder: "🏙️ Choose desired wallpaper effect"; + placeholder: " 🏙️ Choose desired wallpaper effect"; } /* ---- Window ---- */ diff --git a/config/rofi/config-wallpaper.rasi b/config/rofi/config-wallpaper.rasi index 4f83c098..8665f6c0 100644 --- a/config/rofi/config-wallpaper.rasi +++ b/config/rofi/config-wallpaper.rasi @@ -22,7 +22,7 @@ imagebox { entry { expand: false; - placeholder: "🎞️ Choose Wallpaper"; + placeholder: " 🎞️ Choose Wallpaper"; } /* ---- Listview ---- */ diff --git a/config/rofi/config-waybar-layout.rasi b/config/rofi/config-waybar-layout.rasi index 6720fcc7..4dd06a1c 100644 --- a/config/rofi/config-waybar-layout.rasi +++ b/config/rofi/config-waybar-layout.rasi @@ -5,6 +5,6 @@ /* ---- Entry ---- */ entry { - placeholder: "🖼️ Choose Waybar Layout"; + placeholder: " 🖼️ Choose Waybar Layout"; } diff --git a/config/rofi/config-waybar-style.rasi b/config/rofi/config-waybar-style.rasi index ab150d0e..ee23793f 100644 --- a/config/rofi/config-waybar-style.rasi +++ b/config/rofi/config-waybar-style.rasi @@ -16,6 +16,6 @@ mainbox { entry { expand: true; - placeholder: "🖼️ Choose Waybar Style"; + placeholder: " 🖼️ Choose Waybar Style"; } diff --git a/config/rofi/config-zsh-theme.rasi b/config/rofi/config-zsh-theme.rasi index a735a7e6..b3aff7e8 100644 --- a/config/rofi/config-zsh-theme.rasi +++ b/config/rofi/config-zsh-theme.rasi @@ -33,7 +33,7 @@ inputbar { } entry { - placeholder: "󰸉 Choose ZSH theme"; + placeholder: " 󰸉 Choose ZSH theme"; } /* ---- Listview ---- */ diff --git a/config/rofi/master-config.rasi b/config/rofi/master-config.rasi index 8314381a..50198012 100644 --- a/config/rofi/master-config.rasi +++ b/config/rofi/master-config.rasi @@ -85,7 +85,7 @@ entry { background-color: @selected; text-color: @text-selected; cursor: text; - placeholder: "🖥️ Search "; // << Search symbol + placeholder: " 🖥️ Search "; // << Search symbol placeholder-color: inherit; } diff --git a/config/rofi/resolution/1080p/master-config.rasi b/config/rofi/resolution/1080p/master-config.rasi index 8314381a..50198012 100644 --- a/config/rofi/resolution/1080p/master-config.rasi +++ b/config/rofi/resolution/1080p/master-config.rasi @@ -85,7 +85,7 @@ entry { background-color: @selected; text-color: @text-selected; cursor: text; - placeholder: "🖥️ Search "; // << Search symbol + placeholder: " 🖥️ Search "; // << Search symbol placeholder-color: inherit; } diff --git a/config/rofi/resolution/1440p/master-config.rasi b/config/rofi/resolution/1440p/master-config.rasi index 430dff61..076fe70a 100644 --- a/config/rofi/resolution/1440p/master-config.rasi +++ b/config/rofi/resolution/1440p/master-config.rasi @@ -85,7 +85,7 @@ entry { background-color: @selected; text-color: @text-selected; cursor: text; - placeholder: "🖥️ Search "; // << Search symbol + placeholder: " 🖥️ Search "; // << Search symbol placeholder-color: inherit; } -- cgit v1.2.3 From 370e364607fd585c9a0cd85f77cffdf9ce4debc7 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 31 Jan 2025 21:19:11 +0900 Subject: updated window rule re: discord attaching some files --- config/hypr/UserConfigs/WindowRules.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf index 35d549f6..660ebe76 100644 --- a/config/hypr/UserConfigs/WindowRules.conf +++ b/config/hypr/UserConfigs/WindowRules.conf @@ -124,6 +124,8 @@ windowrulev2 = float, class:^(com.heroicgameslauncher.hgl)$, title:negative:(Her windowrulev2 = float, class:^([Ss]team)$, title:negative:^([Ss]team)$ windowrulev2 = float, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*) windowrulev2 = float, class:(electron), title:(Add Folder to Workspace) +windowrulev2 = float, class:^([Dd]iscord)$, title:(Open Files) +windowrulev2 = size 70% 70%, class:^([Dd]iscord)$, title:(Open Files) # OPACITY windowrulev2 = opacity 0.9 0.7, tag:browser* -- cgit v1.2.3 From 7b5c96dc5ed91eef106918f0ec99701ad8574948 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 31 Jan 2025 23:36:37 +0900 Subject: updated some color coding. Will probably tweak more later --- copy.sh | 53 +++++++++++++++++++++++++++-------------------------- release.sh | 3 ++- upgrade.sh | 5 +++-- 3 files changed, 32 insertions(+), 29 deletions(-) diff --git a/copy.sh b/copy.sh index 18220c07..014563cd 100755 --- a/copy.sh +++ b/copy.sh @@ -26,7 +26,8 @@ NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)" INFO="$(tput setaf 4)[INFO]$(tput sgr0)" WARN="$(tput setaf 1)[WARN]$(tput sgr0)" CAT="$(tput setaf 6)[ACTION]$(tput sgr0)" -ORANGE=$(tput setaf 5) +MAGENTA=$(tput setaf 5) +WARNING=$(tput setaf 1) YELLOW=$(tput setaf 3) BLUE=$(tput setaf 4) RESET=$(tput sgr0) @@ -113,7 +114,7 @@ layout=$(detect_layout) if [ "$layout" = "(unset)" ]; then while true; do printf "\n%.0s" {1..1} - print_color $ORANGE " + print_color $WARNING " █▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀█ STOP AND READ █▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█ @@ -149,7 +150,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 - printf "${INFO} Current keyboard layout is ${ORANGE}$layout${RESET}\n" + printf "${INFO} Current keyboard layout is ${MAGENTA}$layout${RESET}\n" read -p "${CAT} Is this correct? [y/n] " keyboard_layout case $keyboard_layout in @@ -158,11 +159,11 @@ while true; do awk -v layout="$layout" '/kb_layout/ {$0 = " kb_layout = " layout} 1' config/hypr/UserConfigs/UserSettings.conf > temp.conf mv temp.conf config/hypr/UserConfigs/UserSettings.conf - echo "${NOTE} kb_layout ${ORANGE}$layout${RESET} configured in settings." 2>&1 | tee -a "$LOG" + echo "${NOTE} kb_layout ${MAGENTA}$layout${RESET} configured in settings." 2>&1 | tee -a "$LOG" break ;; [nN]) printf "\n%.0s" {1..2} - print_color $ORANGE " + print_color $WARNING " █▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀█ STOP AND READ █▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█ @@ -220,14 +221,14 @@ printf "\n" update_editor() { local editor=$1 sed -i "s/#env = EDITOR,.*/env = EDITOR,$editor #default editor/" config/hypr/UserConfigs/ENVariables.conf - echo "${OK} Default editor set to ${ORANGE}$editor${RESET}." 2>&1 | tee -a "$LOG" + echo "${OK} Default editor set to ${MAGENTA}$editor${RESET}." 2>&1 | tee -a "$LOG" } EDITOR_SET=0 # Check for neovim if installed if command -v nvim &> /dev/null; then - printf "${INFO} ${ORANGE}neovim${RESET} is detected as installed\n" - read -p "${CAT} Do you want to make ${ORANGE}neovim${RESET} the default editor? (y/N): " EDITOR_CHOICE + printf "${INFO} ${MAGENTA}neovim${RESET} is detected as installed\n" + read -p "${CAT} Do you want to make ${MAGENTA}neovim${RESET} the default editor? (y/N): " EDITOR_CHOICE if [[ "$EDITOR_CHOICE" == "y" ]]; then update_editor "nvim" EDITOR_SET=1 @@ -238,8 +239,8 @@ printf "\n" # Check for vim if installed, but only if neovim wasn't chosen if [[ "$EDITOR_SET" -eq 0 ]] && command -v vim &> /dev/null; then - printf "${INFO} ${ORANGE}vim${RESET} is detected as installed\n" - read -p "${CAT} Do you want to make ${ORANGE}vim${RESET} the default editor? (y/N): " EDITOR_CHOICE + printf "${INFO} ${MAGENTA}vim${RESET} is detected as installed\n" + read -p "${CAT} Do you want to make ${MAGENTA}vim${RESET} the default editor? (y/N): " EDITOR_CHOICE if [[ "$EDITOR_CHOICE" == "y" ]]; then update_editor "vim" EDITOR_SET=1 @@ -247,14 +248,14 @@ if [[ "$EDITOR_SET" -eq 0 ]] && command -v vim &> /dev/null; then fi if [[ "$EDITOR_SET" -eq 0 ]]; then - echo "${ORANGE} Neither neovim nor vim is installed or selected as default." + echo "${YELLOW} Neither neovim nor vim is installed or selected as default." 2>&1 | tee -a "$LOG" fi printf "\n" # Action to do for better rofi and kitty appearance while true; do - echo "$ORANGE Select monitor resolution to properly configure appearance and fonts:" + echo "$MAGENTA Select monitor resolution to properly configure appearance and fonts:" echo "$YELLOW -- Enter 1. for monitor res 1440p or less (< 1440p)" echo "$YELLOW -- Enter 2. for monitors res higher than 1440p (≥ 1440p)" read -p "$CAT Enter the number of your choice (1 or 2): " res_choice @@ -294,7 +295,7 @@ printf "\n" # Ask whether to change to 12hr format while true; do - echo -e "$ORANGE By default, configs are in 24H format." + echo -e "$MAGENTA By default, configs are in 24H format." read -p "$CAT Do you want to change to 12H format (AM/PM)? (y/n): " answer # Convert the answer to lowercase for comparison @@ -366,7 +367,7 @@ done printf "\n" # Check if the user wants to disable Rainbow borders -printf "${ORANGE} By default, Rainbow Borders animation is enabled.\n" +printf "${MAGENTA} By default, Rainbow Borders animation is enabled.\n" printf "${WARN} - However, this uses a bit more CPU and Memory resources.\n" read -p "${CAT} Do you want to disable Rainbow Borders animation? (y/N): " border_choice @@ -412,7 +413,7 @@ for DIR2 in $DIRS; do if [ -d "$DIRPATH" ]; then while true; do - read -p "${CAT} ${ORANGE}$DIR2${RESET} config found in ~/.config/ Do you want to replace ${ORANGE}$DIR2${RESET} config? (y/n): " DIR1_CHOICE + read -p "${CAT} ${MAGENTA}$DIR2${RESET} config found in ~/.config/ Do you want to replace ${MAGENTA}$DIR2${RESET} config? (y/n): " DIR1_CHOICE case "$DIR1_CHOICE" in [Yy]* ) BACKUP_DIR=$(get_backup_dirname) @@ -437,7 +438,7 @@ for DIR2 in $DIRS; do ;; [Nn]* ) # Skip the directory - echo -e "${NOTE} - Skipping ${ORANGE}$DIR2${RESET} " 2>&1 | tee -a "$LOG" + echo -e "${NOTE} - Skipping ${MAGENTA}$DIR2${RESET} " 2>&1 | tee -a "$LOG" break ;; * ) @@ -484,7 +485,7 @@ for DIR_NAME in $DIR; do # Backup the existing directory if it exists if [ -d "$DIRPATH" ]; then - echo -e "${NOTE} - Config for ${ORANGE}$DIR_NAME${RESET} found, attempting to back up." + echo -e "${NOTE} - Config for ${MAGENTA}$DIR_NAME${RESET} found, attempting to back up." BACKUP_DIR=$(get_backup_dirname) # Backup the existing directory @@ -539,7 +540,7 @@ if [ -z "$BACKUP_DIR" ]; then fi if [ -d "$BACKUP_DIR_PATH" ]; then - echo -e "${NOTE} Restoring previous ${ORANGE}User-Configs${RESET}... " + echo -e "${NOTE} Restoring previous ${MAGENTA}User-Configs${RESET}... " echo -e "${WARN} If you decide to restore the old configs, make sure to handle the updates or changes manually." echo -e "${INFO} Kindly Visit and check KooL's Hyprland-Dots GitHub page for the commits." @@ -547,7 +548,7 @@ if [ -d "$BACKUP_DIR_PATH" ]; then BACKUP_FILE="$BACKUP_DIR_PATH/$FILE_NAME" if [ -f "$BACKUP_FILE" ]; then printf "\n${INFO} Found ${YELLOW}$FILE_NAME${RESET} in hypr backup...\n" - read -p "${CAT} Do you want to restore ${ORANGE}$FILE_NAME${RESET} from backup? (y/N): " file_restore + read -p "${CAT} Do you want to restore ${MAGENTA}$FILE_NAME${RESET} from backup? (y/N): " file_restore if [[ "$file_restore" == [Yy]* ]]; then if cp "$BACKUP_FILE" "$DIRPATH/UserConfigs/$FILE_NAME"; then @@ -576,14 +577,14 @@ DIRSHPATH=~/.config/"$DIRSH" BACKUP_DIR_PATH="$DIRSHPATH-backup-$BACKUP_DIR/UserScripts" if [ -d "$BACKUP_DIR_PATH" ]; then - echo -e "${NOTE} Restoring previous ${ORANGE}User-Scripts${RESET}..." + echo -e "${NOTE} Restoring previous ${MAGENTA}User-Scripts${RESET}..." for SCRIPT_NAME in "${SCRIPTS_TO_RESTORE[@]}"; do BACKUP_SCRIPT="$BACKUP_DIR_PATH/$SCRIPT_NAME" if [ -f "$BACKUP_SCRIPT" ]; then printf "\n${INFO} Found ${YELLOW}$SCRIPT_NAME${RESET} in hypr backup...\n" - read -p "${CAT} Do you want to restore ${ORANGE}$SCRIPT_NAME${RESET} from backup? (y/N): " script_restore + read -p "${CAT} Do you want to restore ${MAGENTA}$SCRIPT_NAME${RESET} from backup? (y/N): " script_restore if [[ "$script_restore" == [Yy]* ]]; then if cp "$BACKUP_SCRIPT" "$DIRSHPATH/UserScripts/$SCRIPT_NAME"; then echo "${OK} - $SCRIPT_NAME restored!" 2>&1 | tee -a "$LOG" @@ -690,9 +691,9 @@ cleanup_backups() { # If more than one backup found if [ ${#BACKUP_DIRS[@]} -gt 1 ]; then - printf "\n\n ${INFO} Performing clean up for ${ORANGE}${DIR##*/}${RESET}\n" + printf "\n\n ${INFO} Performing clean up for ${MAGENTA}${DIR##*/}${RESET}\n" - echo -e "${NOTE} Found multiple backups for: ${ORANGE}${DIR##*/}${RESET}" + echo -e "${NOTE} Found multiple backups for: ${MAGENTA}${DIR##*/}${RESET}" echo "${YELLOW}Backups: ${RESET}" # List the backups @@ -700,7 +701,7 @@ cleanup_backups() { echo " - ${BACKUP##*/}" done - read -p "${CAT} Do you want to delete the older backups of ${ORANGE}${DIR##*/}${RESET} and keep the latest backup only? (y/N): " back_choice + read -p "${CAT} Do you want to delete the older backups of ${MAGENTA}${DIR##*/}${RESET} and keep the latest backup only? (y/N): " back_choice if [[ "$back_choice" == [Yy]* ]]; then # Sort backups by modification time latest_backup="${BACKUP_DIRS[0]}" @@ -716,7 +717,7 @@ cleanup_backups() { rm -rf "$BACKUP" fi done - echo "Old backups of ${ORANGE}${DIR##*/}${RESET} deleted, keeping: ${YELLOW}${latest_backup##*/}${RESET}" + echo "Old backups of ${MAGENTA}${DIR##*/}${RESET} deleted, keeping: ${YELLOW}${latest_backup##*/}${RESET}" fi fi fi @@ -736,4 +737,4 @@ wallust run -s $wallpaper 2>&1 | tee -a "$LOG" printf "\n%.0s" {1..4} printf "${OK} GREAT! KooL's Hyprland-Dots is now Loaded & Ready !!!" printf "\n%.0s" {1..1} -printf "${ORANGE} HOWEVER I HIGHLY SUGGEST to logout and re-login or better reboot to avoid any issues\n\n" +printf "${MAGENTA} HOWEVER I HIGHLY SUGGEST to logout and re-login or better reboot to avoid any issues\n\n" diff --git a/release.sh b/release.sh index 016125a6..66224972 100755 --- a/release.sh +++ b/release.sh @@ -8,7 +8,8 @@ ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)" NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)" WARN="$(tput setaf 1)[WARN]$(tput sgr0)" CAT="$(tput setaf 6)[ACTION]$(tput sgr0)" -ORANGE=$(tput setaf 5) +MAGENTA=$(tput setaf 5) +WARNING=$(tput setaf 1) YELLOW=$(tput setaf 3) RESET=$(tput sgr0) diff --git a/upgrade.sh b/upgrade.sh index a094a58a..687ba69f 100755 --- a/upgrade.sh +++ b/upgrade.sh @@ -10,7 +10,8 @@ ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)" NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)" WARN="$(tput setaf 1)[WARN]$(tput sgr0)" CAT="$(tput setaf 6)[ACTION]$(tput sgr0)" -ORANGE=$(tput setaf 5) +MAGENTA=$(tput setaf 5) +WARNING=$(tput setaf 1) YELLOW=$(tput setaf 3) RESET=$(tput sgr0) @@ -146,7 +147,7 @@ if version_gt "$latest_version" "$stored_version"; then chmod +x ~/.config/hypr/initial-boot.sh 2>&1 | tee -a "$LOG" else - echo "$ORANGE Upgrade declined. No files or folders changed" 2>&1 | tee -a "$LOG" + echo "$MAGENTA Upgrade declined. No files or folders changed" 2>&1 | tee -a "$LOG" fi else echo "$OK No upgrade found. The installed version ($stored_version) is up to date with the Hyprland-Dots version ($latest_version)." 2>&1 | tee -a "$LOG" -- cgit v1.2.3 From 90d3a2bed11a84dcf0ef6e1937b9d1e5f22412be Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 31 Jan 2025 23:52:17 +0900 Subject: minor tweak --- copy.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/copy.sh b/copy.sh index 014563cd..b37d1edd 100755 --- a/copy.sh +++ b/copy.sh @@ -413,7 +413,7 @@ for DIR2 in $DIRS; do if [ -d "$DIRPATH" ]; then while true; do - read -p "${CAT} ${MAGENTA}$DIR2${RESET} config found in ~/.config/ Do you want to replace ${MAGENTA}$DIR2${RESET} config? (y/n): " DIR1_CHOICE + read -p "\n${CAT} ${MAGENTA}$DIR2${RESET} config found in ~/.config/ Do you want to replace ${MAGENTA}$DIR2${RESET} config? (y/n): " DIR1_CHOICE case "$DIR1_CHOICE" in [Yy]* ) BACKUP_DIR=$(get_backup_dirname) @@ -485,7 +485,7 @@ for DIR_NAME in $DIR; do # Backup the existing directory if it exists if [ -d "$DIRPATH" ]; then - echo -e "${NOTE} - Config for ${MAGENTA}$DIR_NAME${RESET} found, attempting to back up." + echo -e "\n${NOTE} - Config for ${MAGENTA}$DIR_NAME${RESET} found, attempting to back up." BACKUP_DIR=$(get_backup_dirname) # Backup the existing directory @@ -635,7 +635,7 @@ fi # additional wallpapers echo "$(tput setaf 6) By default only a few wallpapers are copied...$(tput sgr0)" -printf "\n" +printf "\n%.0s" {1..1} while true; do read -rp "${CAT} Would you like to download additional wallpapers? ${WARN} This is more than 800 MB (y/n)" WALL @@ -737,4 +737,5 @@ wallust run -s $wallpaper 2>&1 | tee -a "$LOG" printf "\n%.0s" {1..4} printf "${OK} GREAT! KooL's Hyprland-Dots is now Loaded & Ready !!!" printf "\n%.0s" {1..1} -printf "${MAGENTA} HOWEVER I HIGHLY SUGGEST to logout and re-login or better reboot to avoid any issues\n\n" +printf "${MAGENTA} However, it is HIGHLY SUGGESTED to logout and re-login or better reboot to avoid any issues\n\n" +printf "${BLUE} Thank you for using KooL's Hyprland Configuration... ENJOY!!!\n" -- cgit v1.2.3 From 940b0853483d3ea0c86dce3a02533b21aac38e1a Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 1 Feb 2025 00:00:41 +0900 Subject: inutil --- copy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/copy.sh b/copy.sh index b37d1edd..5b387095 100755 --- a/copy.sh +++ b/copy.sh @@ -413,11 +413,11 @@ for DIR2 in $DIRS; do if [ -d "$DIRPATH" ]; then while true; do - read -p "\n${CAT} ${MAGENTA}$DIR2${RESET} config found in ~/.config/ Do you want to replace ${MAGENTA}$DIR2${RESET} config? (y/n): " DIR1_CHOICE + printf "\n${INFO} Found ${MAGENTA}$DIR2${RESET} config found in ~/.config/\n" + read -p "${CAT} Do you want to replace ${MAGENTA}$DIR2${RESET} config? (y/n): " DIR1_CHOICE case "$DIR1_CHOICE" in [Yy]* ) BACKUP_DIR=$(get_backup_dirname) - echo -e "${NOTE} - Config for ${YELLOW}$DIR2${RESET} found, attempting to back up." mv "$DIRPATH" "$DIRPATH-backup-$BACKUP_DIR" 2>&1 | tee -a "$LOG" if [ $? -eq 0 ]; then -- cgit v1.2.3 From b6c78db8963784b190c406419b7d042b1ca7cab9 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 1 Feb 2025 00:20:31 +0900 Subject: uploaded own use config as someone asked :) --- config/waybar/configs/[TOP] 0Ja0 | 51 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 config/waybar/configs/[TOP] 0Ja0 diff --git a/config/waybar/configs/[TOP] 0Ja0 b/config/waybar/configs/[TOP] 0Ja0 new file mode 100644 index 00000000..98345c32 --- /dev/null +++ b/config/waybar/configs/[TOP] 0Ja0 @@ -0,0 +1,51 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +/* My Mostly Used waybar config incase you wonder :) */ +{ +"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": [ + "idle_inhibitor", + "custom/separator#blank", + "tray", + "custom/separator#blank", + "clock", + "custom/playerctl", + "custom/separator#blank_2", + "hyprland/window", + ], + +"modules-center": [ + "group/app_drawer", + "custom/separator#dot-line", + "hyprland/workspaces#rw", + "custom/separator#dot-line", + "custom/swaync", + ], + +"modules-right": [ + "group/laptop", + "custom/separator#dot-line", + "group/mobo_drawer", + "custom/separator#line", + "group/audio", + "custom/separator#dot-line", + "group/status", + ], +} \ No newline at end of file -- cgit v1.2.3