Merge branch 'dev' into replace-cat-with-bat

Author: kRHYME7

Configs/.config/satty/config.toml

@@ -0,0 +1,40 @@
+[general]
+# Start Satty in fullscreen mode
+fullscreen = false
+# Exit directly after copy/save action
+early-exit = true
+# Draw corners of rectangles round if the value is greater than 0 (0 disables rounded corners)
+corner-roundness = 12
+# Select the tool on startup [possible values: pointer, crop, line, arrow, rectangle, text, marker, blur, brush]
+initial-tool = "brush"
+# Configure the command to be called on copy, for example `wl-copy`
+copy-command = "wl-copy"
+# Increase or decrease the size of the annotations
+annotation-size-factor = 1
+# Filename to use for saving action. Omit to disable saving to file. Might contain format specifiers: https://docs.rs/chrono/latest/chrono/format/strftime/index.html
+output-filename = "/tmp/test-%Y-%m-%d_%H:%M:%S.png"
+# Action to perform when the Enter key is pressed [possible values: save-to-clipboard, save-to-file]
+action-on-enter = "save-to-clipboard"
+# After copying the screenshot, save it to a file as well
+save-after-copy = false
+# Hide toolbars by default
+default-hide-toolbars = false
+# The primary highlighter to use, the other is accessible by holding CTRL at the start of a highlight [possible values: block, freehand]
+primary-highlighter = "block"
+disable-notifications = false
+
+# Font to use for text annotations
+[font]
+family = "Roboto"
+style = "Bold"
+
+# Custom colours for the colour palette
+[color-palette]
+# These will be shown in the toolbar for quick selection
+palette = [
+    "#dc143c",
+    "#00ffff",
+    "#ff1493",
+    "#ffd700",
+    "#008000",
+]

Configs/.local/lib/hyde/battery.sh

@@ -25,6 +25,15 @@ fi
 total_capacity=0
 battery_count=0
 
+# Find the first available battery
+battery_path=""
+for bat in /sys/class/power_supply/BAT*; do
+    if [[ -d "$bat" ]]; then
+        battery_path="$bat"
+        break
+    fi
+done
+
 for capacity in /sys/class/power_supply/BAT*/capacity; do
     if [[ -f "$capacity" ]]; then
         total_capacity=$((total_capacity + $(<"$capacity")))
@@ -42,11 +51,12 @@ average_capacity=$((total_capacity / battery_count))
 index=$((average_capacity / 10))
 
 # Define icons for charging, discharging, and status
-charging_icons=(" " " " " " " " " " " " " ")
+# Charging icons from 0% to 100% (last icons repeated to fill 11 levels)
+charging_icons=(" " " " " " " " " " " " " " " " " " " " " ") 
 discharging_icons=("󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹")
 status_icons=("" "X" "󰂇") # Add appropriate icons for different statuses
 
-battery_status=$(cat /sys/class/power_supply/BAT0/status)
+battery_status=$(cat "$battery_path/status")
 
 # Parse format options
 formats=("$@")

Configs/.local/lib/hyde/hyprlock.sh

@@ -320,9 +320,6 @@ if [ -z "${*}" ]; then
     print_log -sec "hyprlock" -stat "setting" " $HYDE_CACHE_HOME/wallpapers/hyprlock.png"
     "${scrDir}/wallpaper.sh" -s "$(readlink "${HYDE_THEME_DIR}/wall.set")" --backend hyprlock
   fi
-  # A simple cleanup as hyprlock fragments memory after sleep
-  pkill -x hyprlock >/dev/null 2>&1
-  trap 'pkill -x hyprlock' EXIT
   uwsm app -- hyprlock || hyprlock
   exit 0
 fi

Configs/.local/share/waybar/modules/hyprland-window.jsonc

@@ -4,24 +4,24 @@
         "rotate": 0,
         "separate-outputs": true,
         "rewrite": {
-            "(.*)@archlinux:(.*)": "$1 \uf489",
-            "(.*) \u2014 Mozilla Firefox": "$1 \udb80\ude39",
-            "(.*)Mozilla Firefox": "Firefox \udb80\ude39",
-            "(.*) - Visual Studio Code": "$1 \udb82\ude1e",
-            "(.*)Visual Studio Code": "Code \udb82\ude1e",
-            "(.*) - Code - OSS": "$1 \udb82\ude1e",
-            "(.*)Code - OSS": "Code \udb82\ude1e",
-            "(.*) \u2014 Dolphin": "$1 \udb80\ude4b",
-            "(.*)Spotify": "Spotify \udb81\udcc7",
-            "(.*)Steam": "Steam \udb81\udcd3",
-            "(.*) - Discord": "$1 \uf1ff ",
-            "(.*)Netflix": "Netflix \udb81\udf46 ",
-            "(.*) \u2014 Google chrome": "$1 \ue743 ",
-            "(.*)Google chrome": "Google chrome \ue743 ",
-            "(.*) \u2014 Github": "$1 \ue709 ",
-            "(.*)Github": "Github \ue709",
-            "(.*)Spotify Free": "Spotify \udb81\udcc7",
-            "(.*)Spotify Premiun": "Spotify \udb81\udcc7"
+            "(.*)@archlinux:(.*)": "$1 \uf489 ",
+            "(.*) \u2014 Mozilla Firefox": "$1 \udb80\ude39 ",
+            "(.*)Mozilla Firefox": "Firefox \udb80\ude39 ",
+            "(.*) - Visual Studio Code": "$1 \udb82\ude1e ",
+            "(.*)Visual Studio Code": "Code \udb82\ude1e ",
+            "(.*) - Code - OSS": "$1 \udb82\ude1e ",
+            "(.*)Code - OSS": "Code \udb82\ude1e ",
+            "(.*) \u2014 Dolphin": "$1 \udb80\ude4b ",
+            "(.*)Spotify": "Spotify \udb81\udcc7 ",
+            "(.*)Steam": "Steam \udb81\udcd3 ",
+            "(.*) - Discord": "$1 \uf1ff ",
+            "(.*)Netflix": "Netflix \udb81\udf46 ",
+            "(.*) \u2014 Google chrome": "$1 \ue743 ",
+            "(.*)Google chrome": "Google chrome \ue743 ",
+            "(.*) \u2014 Github": "$1 \ue709 ",
+            "(.*)Github": "Github \ue709 ",
+            "(.*)Spotify Free": "Spotify \udb81\udcc7 ",
+            "(.*)Spotify Premiun": "Spotify \udb81\udcc7 "
         },
         "max-length": 50
     }

Configs/.zshrc

@@ -5,7 +5,7 @@
 # 2. ~/.zshenv - for updating the zsh environment variables handled by HyDE // this will be modified across updates
 
 #  Plugins 
-# oh-my-zsh plugins are loaded  in ~/.hyde.zshrc file, see the file for more information
+# oh-my-zsh plugins are loaded  in ~/.user.zsh file, see the file for more information
 
 #  Aliases 
 # Add aliases here

Scripts/install_aur.sh

@@ -17,8 +17,6 @@ if chk_list "aurhlpr" "${aurList[@]}"; then
     exit 0
 fi
 
-echo "llego aqui :O"
-exit 1
 aurhlpr="${1:-yay-bin}"
 
 if [ -d "$HOME/Clone" ]; then

Scripts/restore_cfg.psv

@@ -59,8 +59,8 @@ P|${HOME}/.config/Code/User|settings.json|visual-studio-code-bin
 P|${HOME}/.config/VSCodium/User|settings.json|vscodium
 
  Bar 
-P|${HOME}/.config/waybar|user-style.css|waybar
-S|${HOME}/.config/waybar|modules styles layouts menus config.jsonc theme.css style.css|waybar
+P|${HOME}/.config/waybar|user-style.css config.jsonc theme.css style.css|waybar
+I|${HOME}/.config/waybar|modules styles layouts menus|waybar
 S|${HOME}/.local/share|waybar|waybar
 
  Terminal 