update packages

etc/ssh/sshrc

@@ -0,0 +1 @@
+/home/default/syncthing/default/scripts/login-notify

home/default/.config/fcitx5/conf/pinyin.conf

@@ -70,6 +70,20 @@ FirstRun=False
 [NextCandidate]
 0=Tab
 
+[CurrentCandidate]
+0=space
+1=KP_Space
+
+[CommitRawInput]
+0=Return
+1=KP_Enter
+2=Control+Return
+3=Control+KP_Enter
+4=Shift+Return
+5=Shift+KP_Enter
+6=Control+Shift+Return
+7=Control+Shift+KP_Enter
+
 [ChooseCharFromPhrase]
 0=bracketleft
 1=bracketright

home/default/.config/sway/config

@@ -43,8 +43,10 @@ exec_always {
 
 # timeout
 exec swayidle -w \
-    timeout 300 'playerctl -a pause && swaylock' \
+    timeout 300 'playerctl -a pause' \
+    timeout 300 'swaylock' \
     timeout 600 'swaymsg "output * dpms off"' \
+    timeout 15 'if pgrep -x swaylock; then swaymsg "output * dpms off"; fi' \
     before-sleep 'playerctl -a pause' \
     lock 'swaylock' \
     resume 'swaymsg "output * dpms on"'

home/default/scripts/add-song

@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+set -eou pipefail
+
+echo "$1" | wget-titles-from-urls >> titles.txt
+echo "$1" | youtube-audio
+standardize-music
+ls -Art | tail -n 1 | xargs -d '\n' kid3

home/default/scripts/append-urls-to-titles

@@ -1,25 +0,0 @@
-#!/usr/bin/env sh
-set -eou pipefail
-
-# Old script to get json url for some reason? Don't know why I did this
-# youtube-dl -j --flat-playlist -a - | \
-# jq -r '.id' | \
-# sed 's_^_https://youtu.be/_' | \
-# wget-titles-from-urls >> titles.txt
-
-test -f append.txt
-if [[ $? -ne 0 ]]; then
-    echo No append.txt found! Cannot append
-    exit
-fi
-
-if [[ ! -s append.txt ]]; then
-    echo append.txt is empty
-    exit
-fi
-
-cat append.txt | wget-titles-from-urls >> titles.txt
-cat append.txt | youtube-audio
-> append.txt
-
-standardize-music

home/default/scripts/generate-playlists

@@ -1,64 +1,8 @@
 #!/usr/bin/env sh
 set -ou pipefail
 
-# Generates playlists for all mp3 and flac files in a directory, ignoring itself in the "parent" folder
+for dir in */; do
-
+	name=`echo "$dir" | sed 's/\/$//g'`
-PLAYLIST_FOLDER="/home/default/Music/playlists/mpd"     # Playlist folder for mpd
+	(cd $dir && ls | grep -v -E '\.txt|\.m3u' > "$name.m3u")
-PREFIX="music/playlists"                                # relative links to add to playlists, based on mpd virtual file structure
-EXTENSIONS=("mp3" "opus" "flac" "m4a" "mkv" "webm")
-
-# Disable nullglob and set pattern matching to fix spaces
-shopt -s nullglob
-SAVEIFS=$IFS
-IFS=$(echo -en "\n\b")
-
-cd $PLAYLIST_FOLDER || { echo "Could not cd into PLAYLIST_FOLDER"; exit 1; }
-parent=`basename $PWD`
-
-# Delete old generated playlists
-if [[ -f "*.gen.m3u" ]]; then
-    rm *.gen.m3u
-fi
-if [[ -f ".trackNames" ]]; then
-    rm .trackNames
-fi
-
-# For all playlist directories to generate
-for playlistDir in ../*; do
-    if [[ -d "$playlistDir" ]] && [[ "$playlistDir" != "../$parent" ]]; then
-	# playlist filename needed for mpd
-    playlist=`echo "$playlistDir" | sed "s/^\.\.\///g"`
-	# escaped version of filename needed for bash
-    escaped=`printf '%q\n' "$playlist"`
-
-    # echo "playlist=$playlist"
-    # echo "escaped=$escaped"  
-
-	# touch file
-    > "$playlist.gen.m3u"
-        
-	# write all files with newlines
-    > .track-names
-
-    for EXT in ${EXTENSIONS[@]}; do
-        # echo `find "../$playlist" -mindepth 1 -type f -name "*.$EXT" -printf x | wc -c`
-        if [[ `find "../$playlist" -mindepth 1 -type f -name "*.$EXT" -printf x | wc -c` != 0 ]]; then
-            ls -1 ../$escaped/*.$EXT >> .track-names 2> /dev/null
-            # echo `ls -1 ../$playlist/*.$EXT >> 2> /dev/null`
-        fi
 done
 
-    # echo `cat .track-names` 
-    cat .track-names | while IFS="" read -r song || [ -n "$song" ] ; do
-        unprefixed=`echo "$song" | sed "s/^\.\.\///g"`
-        # echo "$PREFIX/$unprefixed"
-        echo "$PREFIX/$unprefixed" >> "$playlist.gen.m3u"
-    done < .track-names
-    
-    if [[ -f ".track-names" ]]; then
-        rm .track-names
-    fi
-fi
-done
-
-IFS=$SAVEIFS

home/default/scripts/record-screen

@@ -2,5 +2,5 @@
 
 # record video
 dir=~/Downloads/temp
-(cd $dir && wf-recorder -g "$(slurp)" --audio --file=$(date +%Y-%m-%d_%H-%m-%s).mp4)
+(cd $dir && wf-recorder -g "$(slurp)" -a alsa_output.pci-0000_0b_00.4.analog-stereo.monitor --file=$(date +%Y-%m-%d_%H-%m-%s).mp4)
 xdg-open $dir

home/default/scripts/remove-exif

@@ -10,7 +10,7 @@ fi
 count=`ls -1 *.jpg 2>/dev/null | wc -l`
 if [ $count != 0 ]; then
   for i in *.jpg; do
-    exiftool -all= -overwrite_original -tagsfromfile @ -Orientation "$i"
+    /usr/bin/vendor_perl/exiftool -all= -overwrite_original -tagsfromfile @ -Orientation "$i"
   done
 fi
 
@@ -24,7 +24,7 @@ fi
 count=`ls -1 *.png 2>/dev/null | wc -l`
 if [ $count != 0 ]; then
   for i in *.png; do
-    exiftool -all= -overwrite_original -tagsfromfile @ -Orientation "$i"
+    /usr/bin/vendor_perl/exiftool -all= -overwrite_original -tagsfromfile @ -Orientation "$i"
   done
 fi 
 

home/default/scripts/standardize-music

@@ -1,17 +1,15 @@
 #!/usr/bin/env sh
-set -oux pipefail
+set -ou pipefail
 
-# removes more modern codecs to just files that can fit on my mp3 player
+count=`ls -1 *.OGG 2>/dev/null | wc -l`
-
-count=`ls -1 *.M4A 2>/dev/null | wc -l`
 if [ $count != 0 ]; then
-  rename M4A m4a *.M4A
+  rename OGG ogg *.OGG
 fi
   
-count=`ls -1 *.m4a 2>/dev/null | wc -l`
+count=`ls -1 *.ogg 2>/dev/null | wc -l`
 if [ $count != 0 ]; then
-    for i in *.m4a; do
+    for i in *.ogg; do
-        ffmpeg -y -i "$i" "${i%.*}.ogg" && rm "$i"
+        ffmpeg -y -i "$i" "${i%.*}.m4a" -map_metadata 0:s:a:0 && rm "$i"
     done
 fi
 
@@ -23,7 +21,7 @@ fi
 count=`ls -1 *.webm 2>/dev/null | wc -l`
 if [ $count != 0 ]; then
     for i in *.webm; do
-        ffmpeg -y -i "$i" "${i%.*}.ogg" && rm "$i"
+        ffmpeg -y -i "$i" "${i%.*}.m4a" -map_metadata 0:s:a:0 && rm "$i"
     done
 fi
 
@@ -35,7 +33,9 @@ fi
 count=`ls -1 *.opus 2>/dev/null | wc -l`
 if [ $count != 0 ]; then
     for i in *.opus; do
-        ffmpeg -y -i "$i" "${i%.*}.ogg" && rm "$i"
+        ffmpeg -y -i "$i" "${i%.*}.m4a" -map_metadata 0:s:a:0 && rm "$i"
     done
 fi
 
+shopt -s nullglob
+rsgain custom -a -s i -L -S *.m4a *.mp3 *.ogg *.opus

home/default/scripts/sync-car

@@ -0,0 +1,21 @@
+#!/usr/bin/env sh
+set -eou pipefail
+
+sudo mkdir -p /run/media/default
+
+echo "mounting /run/media/default/MUSIC"
+sudo fsck -fy /dev/disk/by-uuid/E6F8-C183 || true
+sudo mkdir /run/media/default/MUSIC
+sudo mount -U E6F8-C183 /run/media/default/MUSIC 
+
+echo "syncing music..."
+sudo rsync --info=progress2 -W -r --delete ~/Music/* /run/media/default/MUSIC/
+sudo sync /run/media/default/MUSIC/
+
+cd /run/media/default/MUSIC
+sudo generate-playlists
+cd /home/default
+
+echo "unmounting /run/media/default/MUSIC"
+sudo umount /dev/disk/by-uuid/E6F8-C183
+sudo rmdir /run/media/default/MUSIC

home/default/scripts/sync-mp3-player

@@ -0,0 +1,21 @@
+#!/usr/bin/env sh
+set -eou pipefail
+
+sudo mkdir -p /run/media/default
+
+echo "mounting /run/media/default/MUSIC"
+sudo fsck -fy /dev/disk/by-uuid/DB09-89C3
+sudo mkdir /run/media/default/MUSIC
+sudo mount -U DB09-89C3 /run/media/default/MUSIC 
+
+echo "syncing music..."
+sudo rsync --info=progress2 -W -r --delete ~/Music/* /run/media/default/MUSIC/
+sudo sync /run/media/default/MUSIC/
+
+cd /run/media/default/MUSIC
+sudo generate-playlists
+cd /home/default
+
+echo "unmounting /run/media/default/MUSIC"
+sudo umount /run/media/default/MUSIC
+sudo rmdir /run/media/default/MUSIC

home/default/scripts/syncthing-rm-stversions

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+if compgen -G "/home/default/syncthing/*/.stversions/*" > /dev/null; then
+	rm -rf /home/default/syncthing/*/.stversions/*
+	echo "deleted all .stversions"
+else
+	echo "no .stversions to remove"
+fi

home/default/scripts/system-download

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+set -eou pipefail
+
+system-update-mirrors
+pacman -Syuw --noconfirm

home/default/scripts/system-free-space

@@ -1,6 +1,8 @@
 #!/usr/bin/env sh
 set -eoux pipefail
 
+rm -rf ~/.cache
+sudo rm -rf /var/cache/pacman/pkg/*
 yay -Sc --noconfirm
 sudo pacman -Sc --noconfirm
 sudo journalctl --vacuum-size=1G

home/default/scripts/system-update

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -eoux pipefail
+
+system-free-space
+yay --noconfirm -Syu --overwrite \*
+system-free-space

packages.txt

@@ -33,8 +33,6 @@ chromium
 cnrdrvcups-lb
 coreutils
 cowsay
-cpupower
-cpupower-gui
 cryptsetup
 cups
 cups-pdf
@@ -89,6 +87,7 @@ gawk
 gcc
 gcc-libs
 gdlauncher-bin
+gdm
 gedit
 geoclue
 gettext
@@ -213,7 +212,6 @@ mcomix
 mcpp
 mdadm
 mediainfo
-merkuro
 mesa
 minecraft-launcher
 mixxx
@@ -242,6 +240,7 @@ ocl-icd
 odt2txt
 opencc
 opendesktop-fonts
+openh264
 openshot
 opustags
 overdue
@@ -294,6 +293,7 @@ remmina
 retroarch
 retroarch-assets-xmb
 rofi
+rsgain
 rsnapshot
 rsync
 samsung_magician-consumer-ssd
@@ -318,6 +318,7 @@ sway
 swaybg
 swayidle
 swaylock
+swayrst-git
 syncplay
 syncthing
 syncthing-gtk
@@ -328,6 +329,7 @@ tar
 telegram-desktop
 texinfo
 texlive-bin
+thunderbird
 tlp
 tmux
 traceroute