From a566b1b9ddccc719f3e616165b272ce1fadec293 Mon Sep 17 00:00:00 2001
From: Yuri Zamyatin <yuri@yrz.am>
Date: Sat, 28 Dec 2024 02:12:24 +0000
Subject: [PATCH] wip

---
 arch-root/install.sh              |  4 +-
 arch-user/config/i3blocks/battery | 14 ++---
 arch-user/config/i3blocks/config  |  6 ++-
 arch-user/config/i3blocks/weather |  3 ++
 arch-user/config/sway/config.tmpl | 87 ++++++++++++++++++-------------
 arch-user/config/theme.sh         |  4 ++
 arch-user/config/xkb/symbols/ru   |  4 --
 arch-user/config/xkb/symbols/us   |  4 --
 8 files changed, 72 insertions(+), 54 deletions(-)
 create mode 100755 arch-user/config/i3blocks/weather

diff --git a/arch-root/install.sh b/arch-root/install.sh
index 603c199..4ba3ebb 100644
--- a/arch-root/install.sh
+++ b/arch-root/install.sh
@@ -4,7 +4,7 @@ set -e
 PACKAGES=(
 	
 	# system
-	base apparmor lvm2 greetd sudo # system
+	linux base linux-firmware lvm2 sudo polkit greetd # basic
 	openssh networkmanager man-db restic htop  # admin utils
 
 	# cli programs
@@ -37,7 +37,7 @@ file_has_line() {
 
 pacman -Syu
 pacman -S --needed "${PACKAGES[@]}"
-pacman -S --needed brightnessctl sof-firmware intel-media-driver intel-ucode mesa
+pacman -S --needed brightnessctl intel-media-driver intel-ucode mesa tlp
 pacman -S --needed libreoffice-still
 
 file_has_line "/etc/profile" "umask 002"
diff --git a/arch-user/config/i3blocks/battery b/arch-user/config/i3blocks/battery
index 0081394..06fd309 100755
--- a/arch-user/config/i3blocks/battery
+++ b/arch-user/config/i3blocks/battery
@@ -1,12 +1,14 @@
 #!/bin/sh
 
-set -- /sys/class/power_supply/*/capacity;
-read cap < "$1"
-read st < "/sys/class/power_supply/ACAD/online" || true
+read -r stat </sys/class/power_supply/ACAD/online
+read -r cap </sys/class/power_supply/BAT1/capacity
+read -r volt </sys/class/power_supply/BAT1/voltage_now
+read -r curr </sys/class/power_supply/BAT1/current_now
 
-if [ "$st" = "1" ]; then
-	echo "⚡$cap▴"
+w=$(($volt*$curr/1000000000000))
+if [ "$stat" = "1" ]; then
+	echo "⚡$cap%▴${w}W"
 else
-	echo "⚡$cap▾"
+	echo "⚡$cap%▾${w}W"
 	[ "$cap" -lt "15" ] && exit 33
 fi
diff --git a/arch-user/config/i3blocks/config b/arch-user/config/i3blocks/config
index 3d6df1c..18d63e2 100644
--- a/arch-user/config/i3blocks/config
+++ b/arch-user/config/i3blocks/config
@@ -1,6 +1,10 @@
 separator_block_width=15
 
-[batterybar]
+[weather]
+command=~/.config/i3blocks/weather
+interval=10
+
+[battery]
 command=~/.config/i3blocks/battery
 interval=10
 
diff --git a/arch-user/config/i3blocks/weather b/arch-user/config/i3blocks/weather
new file mode 100755
index 0000000..9379594
--- /dev/null
+++ b/arch-user/config/i3blocks/weather
@@ -0,0 +1,3 @@
+#!/bin/bash
+curl "https://wttr.in/?format=%l:%t,%p" --silent | sed 's/^\(.\{3\}\)\(.*\):/☀\1 /'
+echo
diff --git a/arch-user/config/sway/config.tmpl b/arch-user/config/sway/config.tmpl
index 047c1ff..6b5e085 100644
--- a/arch-user/config/sway/config.tmpl
+++ b/arch-user/config/sway/config.tmpl
@@ -1,16 +1,19 @@
 # vim: filetype=swayconfig
 
 set $mod Mod4
+set $altmod Mod4+Mod5
+set $fwd m
 set $left n
 set $up e
 set $down i
 set $right o
+set $bwd apostrophe
 
 ################ inputs ####################
 input "type:keyboard" {
-	xkb_layout us(yz),ru(yz)
+	xkb_layout us(yz),us(basic),ru(yz)
 }
-bindsym --to-code ISO_Level3_Shift+Shift input "type:keyboard" xkb_switch_layout next
+bindsym --to-code Shift+ISO_Level3_Shift input "type:keyboard" xkb_switch_layout next
 input "type:touchpad" {
 	dwt enabled
 	tap enabled
@@ -20,50 +23,54 @@ input "type:touchpad" {
 ############################################
 
 ############### workspaces #################
-bindsym --to-code $mod+a workspace a
-bindsym --to-code $mod+r workspace r
-bindsym --to-code $mod+s workspace s
-bindsym --to-code $mod+t workspace t
-bindsym --to-code $mod+g workspace g
-bindsym --to-code $mod+m workspace m
-bindsym --to-code $mod+Shift+a move container to workspace a
-bindsym --to-code $mod+Shift+r move container to workspace r
-bindsym --to-code $mod+Shift+s move container to workspace s
-bindsym --to-code $mod+Shift+t move container to workspace t
-bindsym --to-code $mod+Shift+g move container to workspace g
-bindsym --to-code $mod+Shift+m move container to workspace m
+bindsym --to-code $mod+a workspace 1:a
+bindsym --to-code $mod+r workspace 2:r
+bindsym --to-code $mod+s workspace 3:s
+bindsym --to-code $mod+t workspace 4:t
+bindsym --to-code $mod+g workspace 5:g
+bindsym --to-code $altmod+a move container to workspace 1:a
+bindsym --to-code $altmod+r move container to workspace 2:r
+bindsym --to-code $altmod+s move container to workspace 3:s
+bindsym --to-code $altmod+t move container to workspace 4:t
+bindsym --to-code $altmod+g move container to workspace 5:g
 bindgesture swipe:right workspace prev
 bindgesture swipe:left workspace next
 ############################################
 
 ############### containers #################
+# top row
+bindsym --to-code $mod+q layout stacking
+bindsym --to-code $mod+w layout tabbed
+bindsym --to-code $mod+f fullscreen
+bindsym --to-code $mod+p layout toggle split
+bindsym --to-code $mod+l splitv
+bindsym --to-code $mod+u splith
+# mid row - workspaces (see section), focus/move directions
+bindsym --to-code $mod+$fwd focus child
 bindsym --to-code $mod+$left focus left
 bindsym --to-code $mod+$down focus down
 bindsym --to-code $mod+$up focus up
 bindsym --to-code $mod+$right focus right
-bindsym --to-code $mod+Shift+$left move left
-bindsym --to-code $mod+Shift+$down move down
-bindsym --to-code $mod+Shift+$up move up
-bindsym --to-code $mod+Shift+$right move right
-	bindsym --to-code $mod+7 mode "resize"
+bindsym --to-code $mod+$bwd focus parent
+bindsym --to-code $altmod+$left move left
+bindsym --to-code $altmod+$up move up
+bindsym --to-code $altmod+$down move down
+bindsym --to-code $altmod+$right move right
 mode "resize" {
-	bindsym $left resize shrink width 5ppt
-	bindsym $down resize grow height 5ppt
-	bindsym $up resize shrink height 5ppt
-	bindsym $right resize grow width 5ppt
-	bindsym Escape mode "default"
+	bindsym --to-code $left resize shrink width 2ppt or 40px
+	bindsym --to-code $up resize shrink height 2ppt or 40px
+	bindsym --to-code $down resize grow height 2ppt or 40px
+	bindsym --to-code $right resize grow width 2ppt or 40px
+	bindsym --to-code Escape mode "default"
+	bindsym --to-code a move left 40px
 }
-bindsym --to-code $mod+f fullscreen
-
-    floating_modifier $mod normal
-    bindsym --to-code $mod+b splith
-    bindsym --to-code $mod+6 splitv
-    bindsym --to-code $mod+5 layout stacking
-    bindsym --to-code $mod+w layout tabbed
-    bindsym --to-code $mod+9 layout toggle split
-    bindsym --to-code $mod+8 focus parent
-    bindsym --to-code $mod+Shift+d move scratchpad
-    bindsym --to-code $mod+d scratchpad show
+# bottom row - copy paste (see section keys), floating
+floating_modifier $mod normal
+bindsym --to-code $altmod+d move scratchpad
+bindsym --to-code $mod+d scratchpad show
+bindsym --to-code $altmod+z floating toggle
+bindsym --to-code $mod+z focus mode_toggle	
+bindsym --to-code $mod+k mode "resize"
 ############################################
 
 ################## keys ####################
@@ -74,15 +81,21 @@ bindsym --to-code $mod+v exec wtype -P XF86Paste
 
 ################ styles ####################
 default_border pixel 1
+smart_borders on
+title_align center
 output * bg #$THEME_COLOR_BG solid_color
-client.focused #$THEME_COLOR_BG_ACCENT_LIGHT #$THEME_COLOR_BG_ACCENT_LIGHT #$THEME_COLOR_BG_ACCENT_LIGHT
+client.focused #$THEME_COLOR_BG_ACCENT_LIGHT #$THEME_COLOR_BG_ACCENT_LIGHT #$THEME_COLOR_FG #$THEME_COLOR_FG_ACCENT
+client.focused_inactive #$THEME_COLOR_BG_ACCENT_DARK #$THEME_COLOR_BG_ACCENT_DARK #$THEME_COLOR_FG #$THEME_COLOR_FG_ACCENT
+client.unfocused #$THEME_COLOR_BG_ACCENT_DARK #$THEME_COLOR_BG_ACCENT_DARK #$THEME_COLOR_FG #$THEME_COLOR_FG_ACCENT
+client.focused_tab_title #$THEME_COLOR_BG_ACCENT_LIGHT$THEME_OPACITY_MID_HEX $THEME_COLOR_BG_ACCENT_LIGHT$THEME_OPACITY_MID_HEX #$THEME_COLOR_FG #$THEME_COLOR_FG_ACCENT
 ############################################
 
 ################## bar #####################
 bar {
 	position top
-	font "Roboto Mono 12"
+	font pango:"Roboto Mono 12"
 	status_command i3blocks
+	strip_workspace_numbers yes
 	colors {
 		statusline #$THEME_COLOR_FG
 		background #$THEME_COLOR_BG
diff --git a/arch-user/config/theme.sh b/arch-user/config/theme.sh
index 50215df..481484e 100644
--- a/arch-user/config/theme.sh
+++ b/arch-user/config/theme.sh
@@ -8,3 +8,7 @@ export THEME_COLOR_BG_ACCENT_DARK=020030 # alt bg
 export THEME_OPACITY_LOW=0.2
 export THEME_OPACITY_MID=0.55
 export THEME_OPACITY_HIGH=0.85
+
+export THEME_OPACITY_LOW_HEX=33
+export THEME_OPACITY_MID_HEX=8C
+export THEME_OPACITY_HIGH_HEX=D9
diff --git a/arch-user/config/xkb/symbols/ru b/arch-user/config/xkb/symbols/ru
index b4da06e..abaf238 100644
--- a/arch-user/config/xkb/symbols/ru
+++ b/arch-user/config/xkb/symbols/ru
@@ -10,13 +10,9 @@ xkb_symbols "yz" {
 	# modifiers
 	key.type = "ONE_LEVEL";
 	replace key <RTSH> { [ Control_L ] };
-	modifier_map Control { <RTSH> };
 	replace key <LCTL> { [ Super_L ] };
-	modifier_map Mod4 { <LCTL> };
 	replace key <LALT> { [ ISO_Level3_Shift ] };
-	modifier_map Mod3 { <LALT> };
 	replace key <RCTL> { [ Alt_L ] };
-	modifier_map Mod1 { <RCTL> };
 	
 	# layer3
 	# TODO: migrate to type=ALPHANUMERIC
diff --git a/arch-user/config/xkb/symbols/us b/arch-user/config/xkb/symbols/us
index 56daf4f..79b4499 100644
--- a/arch-user/config/xkb/symbols/us
+++ b/arch-user/config/xkb/symbols/us
@@ -10,13 +10,9 @@ xkb_symbols "yz" {
 	# modifiers
 	key.type = "ONE_LEVEL";
 	replace key <RTSH> { [ Control_L ] };
-	modifier_map Control { <RTSH> };
 	replace key <LCTL> { [ Super_L ] };
-	modifier_map Mod4 { <LCTL> };
 	replace key <LALT> { [ ISO_Level3_Shift ] };
-	modifier_map Mod3 { <LALT> };
 	replace key <RCTL> { [ Alt_L ] };
-	modifier_map Mod1 { <RCTL> };
 	
 	# layer3
 	# TODO: migrate to type=ALPHANUMERIC