xdg

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

@@ -1,5 +1,5 @@
 #!/bin/bash
-pacman -S --needed brightnessctl intel-media-driver intel-ucode mesa tlp libreoffice-still 
+pacman -S --needed brightnessctl intel-media-driver intel-ucode mesa tlp libreoffice-still sof-firmware
 cp_chown custom/laptop-tlp.conf /etc/tlp.conf root:root 644
 systemctl restart tlp
 file_has_line "/etc/profile" "export FEAT_BRIGHTNESS=brightnessctl"

arch-root/install.sh

@@ -5,8 +5,9 @@ cd "$(dirname "$0")/_install"
 PACKAGES=(
 	
 	# system
-	linux base linux-firmware lvm2 sudo polkit # basic
-	openssh networkmanager man-db restic htop  # admin utils
+	linux base linux-firmware lvm2 sudo polkit # base
+	pulseaudio pamixer networkmanager # system
+	openssh man-db restic htop  # admin utils
 
 	# cli programs
 	vifm vim # navigation & editors 

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

arch-user/bin/i3blocks/weather.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
-curl "https://wttr.in/?format=%l;%t%20%p" --silent | sed 's/^\(.\{3\}\)\(.*\);/☀\1 /'
+curl "https://wttr.in/?format=%l;%t%20%p" --silent | sed 's/^\(.\{3\}\)\(.*\);/\1 /'
 echo

arch-user/bin/i3blocks/xkb_layout.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+swaymsg -t get_inputs | jq -r 'map(select(has("xkb_active_layout_name")))[0].xkb_active_layout_name'

arch-user/config/i3blocks/config

@@ -1,15 +1,20 @@
 separator_block_width=15
+command=~/.local/bin/i3blocks/$BLOCK_NAME.sh
 
 [weather]
-command=~/.config/i3blocks/weather
+label=☀
 interval=3600
 
 [battery]
-command=~/.config/i3blocks/battery
+label=⚡
 interval=10
 
+[volume]
+interval=once
+signal=2
+
 [xkb_layout]
-command=~/.config/i3blocks/xkb_layout
+label=⌨ 
 interval=once
 signal=1
 

arch-user/config/i3blocks/xkb_layout

@@ -1,2 +0,0 @@
-#!/bin/sh
-swaymsg -t get_inputs | jq '"⌨ "+map(select(has("xkb_active_layout_name")))[0].xkb_active_layout_name'

arch-user/config/profile.part

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

arch-user/config/qutebrowser/config.py.tmpl

@@ -17,5 +17,5 @@ config.set('fonts.default_family','Roboto')
 config.set('url.searchengines', {
     'DEFAULT':  'https://lite.duckduckgo.com/lite?&q={}'
 })
-config.set('url.default_page', 'file:///home/yrzam/.config/qutebrowser/start.html')
-config.set('url.start_pages', ['file:///home/yrzam/.config/qutebrowser/start.html'])
+config.set('url.default_page', 'file:///home/yrzam/.local/share/qutebrowser/start.html')
+config.set('url.start_pages', ['file:///home/yrzam/.local/share/qutebrowser/start.html'])

arch-user/config/sway/config.tmpl

@@ -71,8 +71,9 @@ 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
+bindsym --to-code $mod+j split none
+bindsym --to-code $mod+l split v
+bindsym --to-code $mod+u split h
 bindsym --to-code $mod+y resize shrink height 4ppt or 40px
 bindsym --to-code $mod+Semicolon resize grow height 4ppt or 40px
 bindsym --to-code $mod+Bracketleft resize shrink width 2ppt or 40px
@@ -105,8 +106,8 @@ bindsym --to-code $mod+c exec wtype -P XF86Cut
 bindsym --to-code $mod+d exec wtype -P XF86Copy
 bindsym --to-code $mod+v exec wtype -P XF86Paste
 # media
-bindsym --to-code XF86MonBrightnessDown exec ~/.config/sway/brightness-set-and-notify.sh 5%-
-bindsym --to-code XF86MonBrightnessUp exec ~/.config/sway/brightness-set-and-notify.sh 5%+
+bindsym --to-code XF86MonBrightnessDown exec ~/.local/bin/sway/brightness-set-and-notify.sh 5%-
+bindsym --to-code XF86MonBrightnessUp exec ~/.local/bin/sway/brightness-set-and-notify.sh 5%+
 bindsym --to-code XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle
 bindsym --to-code XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5%
 bindsym --to-code XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5%

arch-user/install.sh

@@ -1,15 +1,22 @@
 #!/bin/bash
+
+# config/ - configuration files (including shell and profile)
+# data/ - resource files used by configured system
+# bin/ - scripts used either by configured system or by user
+
 set -e
 cd "$(dirname "$0")"
 umask 002
 [[ "$(id -u)" == "0" ]] && echo "ERROR: wrong user" >&1 && exit 1
 
 ####### file structure #########
-mkdir -p ~/tmp ~/know ~/scripts ~/dev
+mkdir -p \
+	~/.local/bin ~/.local/share \
+	~/tmp ~/know ~/dev ~/dl
 ################################
 
 ########## scripts #############
-cp -rf scripts/* ~/scripts
+cp -rf bin/* ~/.local/bin
 ################################
 
 ########### config #############
@@ -23,29 +30,29 @@ cp_subst() {
 	envsubst "$VARS" < "$1" > "$2"
 }
 
-# xdg simple
+# simple
 cp -rf config/i3blocks ~/.config
 cp -rf config/git ~/.config
 cp -rf config/vim ~/.config
 cp -rf config/xkb ~/.config
-
-# non-xdg
 cp -rf config/bash/bashrc ~/.bashrc
 
 # templated
 cp_subst config/sway/config.tmpl ~/.config/sway/config
-cp -rf config/sway/*.sh ~/.config/sway
 cp_subst config/foot/foot.ini.tmpl ~/.config/foot/foot.ini
 cp_subst config/mako/config.tmpl ~/.config/mako/config
 cp_subst config/qutebrowser/config.py.tmpl ~/.config/qutebrowser/config.py
-cp_subst config/qutebrowser/start.html.tmpl ~/.config/qutebrowser/start.html
 
 # dynamic
-cp -rf config/profile ~/.profile
+cp -rf config/profile.part ~/.profile
 # shellcheck disable=SC2129
 echo -e "\n# GENERATED" >> ~/.profile
 sed '/^#/d' config/theme.sh >> ~/.profile
 sed '/^#/d' config/bemenu/config.sh >> ~/.profile
 ################################
 
+############# data ############
+cp_subst data/qutebrowser/start.html.tmpl ~/.local/share/qutebrowser/start.html
+###############################
+
 swaymsg reload