diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml
new file mode 100644
index 0000000..eed7df9
--- /dev/null
+++ b/alacritty/alacritty.toml
@@ -0,0 +1,14 @@
+[font]
+size = 8.0
+
+[font.bold]
+family = "MesloLGL Nerd Font Mono"
+style = "Bold"
+
+[font.italic]
+family = "MesloLGL Nerd Font Mono"
+style = "Italic"
+
+[font.normal]
+family = "MesloLGL Nerd Font Mono"
+style = "Regular"
diff --git a/home/.zshrc b/home/.zshrc
index 710ab0e..ed80ba8 100644
--- a/home/.zshrc
+++ b/home/.zshrc
@@ -63,3 +63,17 @@ alias lsgit='git status --porcelain | cut -c 4- | xargs ls -l'
 
 # Alias: wifi to print qr code in terminal from file (device adjustable)
 alias wifi='cat /Users/agres/Projects/python_lang/wifi_qr/wifi_password.txt | qr --asci'
+
+# Alias: connect and disconnect bluetooth headphones
+#alias airpods-connect='bluetoothctl --controller 6C:2F:80:E0:88:8B connect 80:95:3A:DC:8E:41'
+alias airpods-connect='echo -e "select 12:34:56:78:9A:BC\nconnect 80:95:3A:DC:8E:41" | bluetoothctl >> /dev/null'
+#alias airpods-disconnect='bluetoothctl --controller 6C:2F:80:E0:88:8B disconnect 80:95:3A:DC:8E:41'
+alias airpods-disconnect='echo -e "select 12:34:56:78:9A:BC\ndisconnect 80:95:3A:DC:8E:41" | bluetoothctl >> /dev/null'
+alias airpods='echo -e "select 12:34:56:78:9A:BC\ninfo 80:95:3A:DC:8E:41" | bluetoothctl | grep "Connected: "'
+
+# Alias: avoid nano
+alias nano=nvim
+
+# Alias quick mount network smdb drive
+alias md0='sudo mount --mkdir -t cifs //192.168.0.200/MD0 /mnt/md0 -o username=agres'
+
diff --git a/i3/config b/i3/config
index 0a4fcc6..82734f9 100755
--- a/i3/config
+++ b/i3/config
@@ -7,8 +7,9 @@ font pango:MesloLGL Nerd Font Mono 8
 
 
 exec --no-startup-id dex --autostart --environment i3
-exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
+#exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
 exec --no-startup-id nm-applet
+exec --no-startup-id xautolock -time 30 -locker "/home/agres/.config/i3/scripts/lock.sh"
 
 # Keyboard quick buttons
 set $refresh_i3status killall -SIGUSR1 i3status
@@ -122,7 +123,7 @@ bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
 # Locking the screen with i3lock
-bindsym $mod+q exec --no-startup-id "i3lock --show-failed-attempts --color 00b5af"  
+bindsym $mod+q exec --no-startup-id "/home/agres/.config/i3/scripts/lock.sh"  
 
 # resize window (you can also use the mouse for that)
 mode "resize" {
diff --git a/i3/scripts/gpu_usage.sh b/i3/scripts/gpu_usage.sh
index af023f2..5d49d45 100755
--- a/i3/scripts/gpu_usage.sh
+++ b/i3/scripts/gpu_usage.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if [ -f /sys/module/amdgpu/drivers/pci:amdgpu/0000:28:00.0/gpu_busy_percent ]; then
-	usage=$(awk '{print $1}' /sys/module/amdgpu/drivers/pci:amdgpu/0000:28:00.0/gpu_busy_percent)
+if [ -f /sys/module/amdgpu/drivers/pci:amdgpu/0000:2b:00.0/gpu_busy_percent ]; then
+	usage=$(awk '{print $1}' /sys/module/amdgpu/drivers/pci:amdgpu/0000:2b:00.0/gpu_busy_percent)
 	echo "${usage}%"
 else
 	echo "N/A"
diff --git a/i3/scripts/keyboard_battery.sh b/i3/scripts/keyboard_battery.sh
new file mode 100755
index 0000000..3aa20ed
--- /dev/null
+++ b/i3/scripts/keyboard_battery.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+KBD_PATH="/org/freedesktop/UPower/devices/keyboard_dev_D7_E8_29_FA_0F_CF"
+
+if upower -i "$KBD_PATH" 2>/dev/null | grep -q "present:.*yes"; then
+    perc=$(upower -i "$KBD_PATH" | awk '/percentage:/ {print $2}')
+    echo "KBD:$perc"
+else
+    echo ""
+fi
+
diff --git a/i3/scripts/mouse_battery.sh b/i3/scripts/mouse_battery.sh
new file mode 100755
index 0000000..6e61983
--- /dev/null
+++ b/i3/scripts/mouse_battery.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+MOUSE_PATH=$(upower -e | grep -E 'hidpp_battery_[0-9]+$' | head -n 1)
+
+if [[ -n "$MOUSE_PATH" ]] && upower -i "$MOUSE_PATH" 2>/dev/null | grep -q "present:.*yes"; then
+    perc=$(upower -i "$MOUSE_PATH" | awk '/percentage:/ {print $2}')
+    echo "MOUSE:$perc"
+else
+    echo ""
+fi
+