From 45f1f3aa35003a7cad30331dc8b9955ded7ba90e Mon Sep 17 00:00:00 2001
From: Yuri Zamyatin <yuri@yrz.am>
Date: Mon, 6 Jan 2025 04:01:16 +0000
Subject: [PATCH] wip

---
 arch-root/install.sh              | 4 ++--
 arch-user/bin/i3blocks/battery.sh | 4 ++--
 arch-user/bin/i3blocks/volume.sh  | 3 +++
 arch-user/config/bash/bashrc      | 2 +-
 arch-user/config/i3blocks/config  | 4 ++--
 arch-user/config/xkb/symbols/ru   | 2 +-
 arch-user/config/xkb/symbols/us   | 2 +-
 7 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 arch-user/bin/i3blocks/volume.sh

diff --git a/arch-root/install.sh b/arch-root/install.sh
index 59114ed..2d4baec 100644
--- a/arch-root/install.sh
+++ b/arch-root/install.sh
@@ -6,7 +6,7 @@ PACKAGES=(
 	
 	# system
 	linux base linux-firmware lvm2 sudo polkit # base
-	pulseaudio pamixer networkmanager # system
+	pulseaudio networkmanager # system
 	openssh man-db restic htop  # admin utils
 
 	# cli programs
@@ -21,7 +21,7 @@ PACKAGES=(
 	greetd sway swaybg swayidle xorg-xwayland # basic
 	foot bemenu-wayland i3blocks mako libnotify # terminals, ui
 	wev wl-clipboard wtype slurp grim # interaction
-	ttf-roboto ttf-roboto-mono # fonts
+	ttf-roboto ttf-roboto-mono ttf-font-awesome # fonts
 
 	# gui apps
 	imv mpv gimp # media
diff --git a/arch-user/bin/i3blocks/battery.sh b/arch-user/bin/i3blocks/battery.sh
index eac2276..698eb87 100755
--- a/arch-user/bin/i3blocks/battery.sh
+++ b/arch-user/bin/i3blocks/battery.sh
@@ -7,8 +7,8 @@ read -r curr </sys/class/power_supply/BAT1/current_now
 
 w=$((volt*curr/1000000000000))
 if [ "$stat" = "1" ]; then
-	echo "$cap%▴${w}W"
+	echo "🔌 $cap% ${w}W"
 else
-	echo "$cap%▾${w}W"
+	echo "🔋 $cap% ${w}W"
 	[ "$cap" -lt "15" ] && exit 33
 fi
diff --git a/arch-user/bin/i3blocks/volume.sh b/arch-user/bin/i3blocks/volume.sh
new file mode 100644
index 0000000..9483b65
--- /dev/null
+++ b/arch-user/bin/i3blocks/volume.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "🔈 100% 🎙 MUT"
+
diff --git a/arch-user/config/bash/bashrc b/arch-user/config/bash/bashrc
index f467250..b0d400f 100644
--- a/arch-user/config/bash/bashrc
+++ b/arch-user/config/bash/bashrc
@@ -13,4 +13,4 @@ export GPG_TTY=$(tty)
 gpg-connect-agent updatestartuptty /bye >/dev/null
 
 export EDITOR=vim
-PS1='\u@\h:\w> '
+PS1='\u@\h:\W> '
diff --git a/arch-user/config/i3blocks/config b/arch-user/config/i3blocks/config
index c648bd5..748ab5f 100644
--- a/arch-user/config/i3blocks/config
+++ b/arch-user/config/i3blocks/config
@@ -2,11 +2,10 @@ separator_block_width=15
 command=~/.local/bin/i3blocks/$BLOCK_NAME.sh
 
 [weather]
-label=☀
+label=⛅ 
 interval=3600
 
 [battery]
-label=⚡
 interval=10
 
 [volume]
@@ -19,6 +18,7 @@ interval=once
 signal=1
 
 [time]
+label=🕓 
 command=date +"%Y-%m-%dT%H:%M:%SZ"
 interval=1
 
diff --git a/arch-user/config/xkb/symbols/ru b/arch-user/config/xkb/symbols/ru
index 11be703..654142f 100644
--- a/arch-user/config/xkb/symbols/ru
+++ b/arch-user/config/xkb/symbols/ru
@@ -1,7 +1,7 @@
 xkb_symbols "yz" {
 	
 	include "ru(common)"
-	name[Group1]= "ru-yz";
+	name[Group1]= "RU-yz";
 	
 	# functional
 	key.type = "ONE_LEVEL";
diff --git a/arch-user/config/xkb/symbols/us b/arch-user/config/xkb/symbols/us
index 0f5ebac..7b1d5a3 100644
--- a/arch-user/config/xkb/symbols/us
+++ b/arch-user/config/xkb/symbols/us
@@ -1,7 +1,7 @@
 xkb_symbols "yz" {
 	
 	include "us(colemak_dh)"
-	name[Group1]= "en-yz";
+	name[Group1]= "EN-yz";
 	
 	# functional
 	key.type = "ONE_LEVEL";