arch-root/_install/custom/laptop.sh.yrz.am.sh

@@ -10,5 +10,8 @@ file_has_line "/etc/profile" "export FEAT_BRIGHTNESS=brightnessctl"
 # power
 install tlp
 systemctl enable tlp --now
-cp_chown custom/_laptop.sh.yrz.am/tlp.conf /etc/tlp.conf root:root 644
+cp_chown custom/laptop-tlp.conf /etc/tlp.conf root:root 644
 systemctl restart tlp
+
+# apps
+install libreoffice-still

arch-root/_install/greetd.toml

@@ -1,7 +0,0 @@
-[terminal]
-vt = 1
-
-[default_session]
-command = "agreety --cmd .local/bin/init"
-source_profile = false
-user = "greeter"

arch-root/install.sh

@@ -9,19 +9,16 @@ PACKAGES=(
 	pulseaudio pulseaudio-bluetooth bluez bluez-utils  networkmanager udisks2 # system
 	openssh man-db restic htop  # admin utils
 
-	# generic runtime
-	nodejs dash
-
 	# cli programs
 	vifm vim # navigation & editors 
-	shellcheck # shell scripting
+	dash shellcheck # shell scripting
 	hugo miniserve neomutt translate-shell # www
 	gnupg pass pass-otp # crypt
 	jq libqalculate imagemagick # data processing
 	git zip # others
 	
 	# desktop env
-	greetd wlr-randr sway swaybg swayidle # basic
+	greetd wlr-randr 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 ttf-font-awesome # fonts
@@ -34,9 +31,6 @@ PACKAGES=(
 	# extensions 
 	vim-ale vim-fugitive
 
-	# not so good
-	telegram-desktop libreoffice-still 
-
 )
 
 install() {
@@ -95,8 +89,6 @@ while read -r entity; do
 	fi
 done </root/users.conf
 
-cp_chown greetd.toml /etc/greetd/config.toml root:root 644
-
 custom_script="./custom/$(cat /etc/hostname).sh"
 if [ -f "$custom_script" ]; then
 	echo "Executing host-specific $custom_script"

arch-user/bin/init

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-. /etc/profile
-. ~/.profile
-
-sway --unsupported-gpu >>~/.local/state/sway/out.log 2>>~/.local/state/sway/err.log

arch-user/bin/run.sh

@@ -14,7 +14,6 @@ else
 	)
 fi
 LIST+=(
-	"gui"		"telegram-desktop"
 	"gui"		"gimp"
 	"gui"		"sqlitebrowser"
 # tui
@@ -24,7 +23,6 @@ LIST+=(
 	"float_tui"	"nmtui"
 	"float_tui"	"bluetoothctl"
 	"man"		"man"
-	"float_tui"	"node"
 	"term"		"term"
 # native
 	"screen_pick"	"screenshot output"

arch-user/bin/sway/brightness-set-and-notify.sh

@@ -1,4 +1,6 @@
 #!/bin/sh
 brig="$(brightnessctl set "$1" -m | sed -e 's/.*,\([0-9]*\)%.*/\1/')"
+notif_id_file=/dev/shm/workspace-$USER-notify-brig
+read -r notif_id < "$notif_id_file"
 notify-send -t 2000 -h "int:value:$brig" -a "brightness" "$brig%" \
-	-h string:x-canonical-private-synchronous:brightness
+	--replace-id="${notif_id:-99999999}" --print-id > "$notif_id_file"

arch-user/config/profile.part

@@ -1,3 +1,4 @@
 #!/bin/bash
 
+export SESSION_START_COMMAND=sway
 export PATH=$PATH:~/.local/bin

arch-user/config/sway/config.tmpl

@@ -3,7 +3,6 @@
 set $mod Mod4
 set $altmod Mod4+Mod5
 set $altmod2 Mod4+Shift
-set $kbmod Alt_R
 set $fwd m
 set $left n
 set $up e
@@ -45,7 +44,7 @@ input "type:keyboard" {
 	xkb_layout us(yz),ru(yz)
 	repeat_rate 50
 }
-bindsym --to-code $kbmod input "type:keyboard" xkb_switch_layout next; exec pkill -SIGRTMIN+1 i3blocks
+bindsym --to-code Shift+ISO_Level3_Shift input "type:keyboard" xkb_switch_layout next; exec pkill -SIGRTMIN+1 i3blocks
 input "type:touchpad" {
 	tap enabled
 	natural_scroll enabled
@@ -53,90 +52,81 @@ input "type:touchpad" {
 ############################################
 
 ############### workspaces #################
-bindsym --to-code {
+bindsym --to-code $mod+a workspace 1:a
-	$mod+a workspace 1:a
+bindsym --to-code $mod+r workspace 2:r
-	$mod+r workspace 2:r
+bindsym --to-code $mod+s workspace 3:s
-	$mod+s workspace 3:s
+bindsym --to-code $mod+t workspace 4:t
-	$mod+t workspace 4:t
+bindsym --to-code $mod+g workspace 5:g
-	$mod+g workspace 5:g
+bindsym --to-code $altmod+a move container to workspace 1:a
-	$altmod+a move container to workspace 1:a
+bindsym --to-code $altmod+r move container to workspace 2:r
-	$altmod+r move container to workspace 2:r
+bindsym --to-code $altmod+s move container to workspace 3:s
-	$altmod+s move container to workspace 3:s
+bindsym --to-code $altmod+t move container to workspace 4:t
-	$altmod+t move container to workspace 4:t
+bindsym --to-code $altmod+g move container to workspace 5:g
-	$altmod+g move container to workspace 5:g
-}
 bindgesture swipe:right workspace prev
 bindgesture swipe:left workspace next
 ############################################
 
 ############### containers #################
 # top row - layout modes, resize
-bindsym --to-code {
+bindsym --to-code $mod+q layout stacking
-	$mod+q layout stacking
+bindsym --to-code $mod+w layout tabbed
-	$mod+w layout tabbed
+bindsym --to-code $mod+f fullscreen
-	$mod+f fullscreen
+bindsym --to-code $mod+p layout toggle split
-	$mod+p layout toggle split
+bindsym --to-code $mod+l split v
-	$mod+l split v
+bindsym --to-code $mod+u split h
-	$mod+u split h
+bindsym --to-code $mod+y split none
-	$mod+y split none
-}
 # mid row - focus, movement
-bindsym --to-code {
+bindsym --to-code $mod+$fwd focus child
-	$mod+$fwd focus child
+bindsym --to-code $mod+$left focus left
-	$mod+$left focus left
+bindsym --to-code $mod+$up focus up
-	$mod+$up focus up
+bindsym --to-code $mod+$down focus down
-	$mod+$down focus down
+bindsym --to-code $mod+$right focus right
-	$mod+$right focus right
+bindsym --to-code $mod+$bwd focus parent
-	$mod+$bwd focus parent
+bindsym --to-code $altmod+$left move left 40px
-	$altmod+$left move left 40px
+bindsym --to-code $altmod+$up move up 40px
-	$altmod+$up move up 40px
+bindsym --to-code $altmod+$down move down 40px
-	$altmod+$down move down 40px
+bindsym --to-code $altmod+$right move right 40px
-	$altmod+$right move right 40px
+bindsym --to-code $altmod2+$left resize shrink width 2ppt or 40px
-	$altmod2+$left resize shrink width 2ppt or 40px
+bindsym --to-code $altmod2+$up resize shrink height 4ppt or 40px
-	$altmod2+$up resize shrink height 4ppt or 40px
+bindsym --to-code $altmod2+$down resize grow height 4ppt or 40px
-	$altmod2+$down resize grow height 4ppt or 40px
+bindsym --to-code $altmod2+$right resize grow width 2ppt or 40px
-	$altmod2+$right resize grow width 2ppt or 40px
-}
 # bottom row - modeless, extra focus
-bindsym --to-code {
-	$altmod+x move scratchpad
-	$mod+x scratchpad show
-	$altmod+z floating toggle
-	$mod+z focus mode_toggle	
-	$mod+k focus prev sibling
-	$mod+h sticky toggle
-	$mod+Comma opacity minus 0.1
-	$mod+Period opacity plus 0.1
-	$mod+slash focus next sibling
-}
 floating_modifier $mod normal
+bindsym --to-code $altmod+x move scratchpad
+bindsym --to-code $mod+x scratchpad show
+bindsym --to-code $altmod+z floating toggle
+bindsym --to-code $mod+z focus mode_toggle	
+bindsym --to-code $mod+k focus prev sibling
+bindsym --to-code $mod+h sticky toggle
+bindsym --to-code $mod+Comma opacity minus 0.1
+bindsym --to-code $mod+Period opacity plus 0.1
+bindsym --to-code $mod+slash focus next sibling
 ############################################
 
 ################## actions ####################
-bindsym --to-code {
-	# generic
-	$mod+Escape kill
 # copy paste
-	$mod+d exec wtype -P XF86Cut
+bindsym --to-code $mod+d exec wtype -P XF86Cut
-	$mod+c exec wtype -P XF86Copy
+bindsym --to-code $mod+c exec wtype -P XF86Copy
-	$mod+v exec wtype -P XF86Paste
+bindsym --to-code $mod+v exec wtype -P XF86Paste
 # media
-	XF86MonBrightnessDown exec ~/.local/bin/sway/brightness-set-and-notify.sh 5%-
+bindsym --to-code XF86MonBrightnessDown exec ~/.local/bin/sway/brightness-set-and-notify.sh 5%- && pkill -SIGRTMIN+2 i3blocks
-	XF86MonBrightnessUp exec ~/.local/bin/sway/brightness-set-and-notify.sh 5%
+bindsym --to-code XF86MonBrightnessUp exec ~/.local/bin/sway/brightness-set-and-notify.sh 5%+ && pkill -SIGRTMIN+2 i3blocks
-	XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle && pkill -SIGRTMIN+2 i3blocks
+bindsym --to-code XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle && pkill -SIGRTMIN+2 i3blocks
-	XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5% && pkill -SIGRTMIN+2 i3blocks
+bindsym --to-code XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5% && pkill -SIGRTMIN+2 i3blocks
-	XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5% && pkill -SIGRTMIN+2 i3blocks
+bindsym --to-code XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5% && pkill -SIGRTMIN+2 i3blocks
-	XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle && pkill -SIGRTMIN+2 i3blocks
+bindsym --to-code XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle && pkill -SIGRTMIN+2 i3blocks
 # basic scripts
-	$mod+Return exec footclient
+bindsym --to-code $mod+Escape kill
-	$mod+Space exec run.sh
+bindsym --to-code $mod+Return exec footclient
-}
+bindsym --to-code $mod+Space exec run.sh
 ##############################################
 
 ################# daemons ####################
+exec swayidle -w \
+	timeout 280 'notify-send "Suspend in 20s" "Produce some acivity or run inhibit to cancel" -a "swayidle" -t 20000' \
+	timeout 300 'systemctl suspend'
 exec foot -s
-exec ~/.local/bin/mako/init.sh
+exec mako
-exec swayidle
 ##############################################
 
 ############## app-specific ##################

arch-user/config/swayidle/config

@@ -1,2 +0,0 @@
-timeout 280 'notify-send "Suspend in 20s" "Produce some acivity or run inhibit to cancel" -a "idle" -t 20000'
-timeout 300 'systemctl suspend'

arch-user/config/theme.sh

@@ -10,7 +10,7 @@ export THEME_OPACITY_LOW=0.2
 export THEME_OPACITY_MID=0.55
 export THEME_OPACITY_HIGH=0.85
 export THEME_SIZE_FONT_BASE_PX=16
-export THEME_SIZE_FONT_SMALL_MULT=0.875
+export THEME_SiZE_FONT_SMALL_MULT=0.875
 export THEME_SIZE_FONT_LARGE_MULT=1.1125
 export THEME_FONT_REGULAR=Roboto
 export THEME_FONT_MONO="Roboto Mono"

arch-user/config/xkb/symbols/us

@@ -14,7 +14,7 @@ xkb_symbols "yz" {
 	replace key <LCTL> { [ Super_L ] };
 	replace key <LALT> { [ ISO_Level3_Shift ] };
 	replace key <RCTL> { [ Alt_L ] };
-	replace key <LWIN> { [ Alt_R ] };
+	
 	# layer3
 	# TODO: migrate to type=ALPHANUMERIC
 	# This would fix caps lock which i dont use anyway

arch-user/install.sh

@@ -10,30 +10,9 @@ umask 002
 [[ "$(id -u)" == "0" ]] && echo "ERROR: wrong user" >&1 && exit 1
 
 ####### file structure #########
-USER_DIRS=(
+mkdir -p \
-	##### xdg #####
+	~/.config ~/.local/bin ~/.local/share ~/.cache \
-	~/.config
+	~/tmp ~/know ~/dev ~/dl
-	~/.local/bin	# bkp=weak
-	~/.local/share	# bkp=weak
-	~/.local/state 
-	~/.cache
-	# app
-	~/.local/state/sway
-	################
-	##### user #####
-	# core knowledge base 
-	~/know		# bkp=true,roam=true
-	# large blobs for knowledge base
-	~/know-lfs	# Large blobs for knowledge base. bkp=weak
-	# temp files with manual bulk cleanup
-	~/tmp
-	# downloads
-	~/dl		# bkp=weak
-	# development - external vcs, tons of deps, etc.
-	~/dev		# bkp=weak
-	################
-)
-mkdir -p "${USER_DIRS[@]}"
 ################################
 
 ########## scripts #############
@@ -56,7 +35,6 @@ cp -rf config/i3blocks ~/.config
 cp -rf config/git ~/.config
 cp -rf config/vim ~/.config
 cp -rf config/xkb ~/.config
-cp -rf config/swayidle ~/.config
 
 # non-xdg
 cp -rf config/bash ~/.config
@@ -80,6 +58,4 @@ sed '/^#/d' config/bemenu/config.sh >> ~/.profile
 cp_subst data/qutebrowser/start.html.tmpl ~/.local/share/qutebrowser/start.html
 ###############################
 
-swaymsg reload || true
+swaymsg reload
-
-echo ok