fix music scripts

etc/pacman.d/gnupg/gpg.conf

@@ -1,6 +1,5 @@
 no-greeting
 no-permission-warning
-lock-never
 #keyserver-options timeout=10
 keyserver hkps://hkps.pool.sks-keyservers.net:443
 #keyserver hkp://pgp.mit.edu:11371

etc/ssh/sshrc

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

etc/sudoers

@@ -27,11 +27,29 @@
 ## Groups of commands.  Often used to group related commands together.
 # Cmnd_Alias	PROCESSES = /usr/bin/nice, /bin/kill, /usr/bin/renice, \
 # 			    /usr/bin/pkill, /usr/bin/top
+#
 # Cmnd_Alias	REBOOT = /sbin/halt, /sbin/reboot, /sbin/poweroff
+#
+# Cmnd_Alias	DEBUGGERS = /usr/bin/gdb, /usr/bin/lldb, /usr/bin/strace, \
+# 			    /usr/bin/truss, /usr/bin/bpftrace, \
+# 			    /usr/bin/dtrace, /usr/bin/dtruss
+#
+# Cmnd_Alias	PKGMAN = /usr/bin/apt, /usr/bin/dpkg, /usr/bin/rpm, \
+# 			 /usr/bin/yum, /usr/bin/dnf,  /usr/bin/zypper, \
+# 			 /usr/bin/pacman
 
 ##
 ## Defaults specification
 ##
+## Preserve editor environment variables for visudo.
+## To preserve these for all commands, remove the "!visudo" qualifier.
+Defaults!/usr/bin/visudo env_keep += "SUDO_EDITOR EDITOR VISUAL"
+##
+## Use a hard-coded PATH instead of the user's to find commands.
+## This also helps prevent poorly written scripts from running
+## artbitrary commands under sudo.
+Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/bin"
+##
 ## You may wish to keep some of the following environment variables
 ## when running commands via sudo.
 ##
@@ -56,19 +74,39 @@
 ## this may allow users to subvert the command being run via sudo.
 # Defaults env_keep += "XMODIFIERS GTK_IM_MODULE QT_IM_MODULE QT_IM_SWITCHER"
 ##
-## Uncomment to use a hard-coded PATH instead of the user's to find commands
+## Uncomment to disable "use_pty" when running commands as root.
-# Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+## Commands run as non-root users will run in a pseudo-terminal,
+## not the user's own terminal, to prevent command injection.
+# Defaults>root !use_pty
+##
+## Uncomment to run commands in the background by default.
+## This can be used to prevent sudo from consuming user input while
+## a non-interactive command runs if "use_pty" or I/O logging are
+## enabled.  Some commands may not run properly in the background.
+# Defaults exec_background
 ##
 ## Uncomment to send mail if the user does not enter the correct password.
 # Defaults mail_badpass
 ##
 ## Uncomment to enable logging of a command's output, except for
 ## sudoreplay and reboot.  Use sudoreplay to play back logged sessions.
+## Sudo will create up to 2,176,782,336 I/O logs before recycling them.
+## Set maxseq to a smaller number if you don't have unlimited disk space.
 # Defaults log_output
 # Defaults!/usr/bin/sudoreplay !log_output
 # Defaults!/usr/local/bin/sudoreplay !log_output
 # Defaults!REBOOT !log_output
-Defaults env_reset,timestamp_timeout=1440
+# Defaults maxseq = 1000
+##
+## Uncomment to disable intercept and log_subcmds for debuggers and
+## tracers.  Otherwise, anything that uses ptrace(2) will be unable
+## to run under sudo if intercept_type is set to "trace".
+# Defaults!DEBUGGERS !intercept, !log_subcmds
+##
+## Uncomment to disable intercept and log_subcmds for package managers.
+## Some package scripts run a huge number of commands, which is made
+## slower by these options and also can clutter up the logs.
+# Defaults!PKGMAN !intercept, !log_subcmds
 
 ##
 ## Runas alias specification
@@ -77,23 +115,22 @@ Defaults env_reset,timestamp_timeout=1440
 ##
 ## User privilege specification
 ##
-root 		ALL=(ALL) ALL
+root ALL=(ALL:ALL) ALL
-default		ALL=(ALL) ALL
+default ALL=(ALL:ALL) ALL
 
 ## Uncomment to allow members of group wheel to execute any command
-# %wheel ALL=(ALL) ALL
+%wheel ALL=(ALL:ALL) ALL
 
 ## Same thing without a password
-# %wheel ALL=(ALL) NOPASSWD: ALL
+# %wheel ALL=(ALL:ALL) NOPASSWD: ALL
 
 ## Uncomment to allow members of group sudo to execute any command
-# %sudo	ALL=(ALL) ALL
+# %sudo	ALL=(ALL:ALL) ALL
 
 ## Uncomment to allow any user to run sudo if they know the password
 ## of the user they are running the command as (root by default).
 # Defaults targetpw  # Ask for the password of the target user
-# ALL ALL=(ALL) ALL  # WARNING: only use this together with 'Defaults targetpw'
+# ALL ALL=(ALL:ALL) ALL  # WARNING: only use this together with 'Defaults targetpw'
 
 ## Read drop-in files from /etc/sudoers.d
-## (the '#' here does not indicate a comment)
+@includedir /etc/sudoers.d
-#includedir /etc/sudoers.d

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/kanshi/config

@@ -1,4 +1,4 @@
 profile {
-	output "LG Electronics LG IPS QHD 201NTPCGD520" enable scale 1.30 position 0,0 mode 2560x1440@60Hz
+	output "LG Electronics LG IPS QHD 201NTPCGD520" enable scale 1.30 position 0,0 mode 2560x1440@75Hz
-	output "LG Electronics LG ULTRAWIDE 0x01010101" enable position 1968,0 mode 2560x1080@60Hz
+	output "LG Electronics LG IPS QHD 309NTABDW064" enable scale 1.30 position 1974,0 mode 2560x1440@75Hz
 }

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"'
@@ -228,7 +230,7 @@ bindsym $mod+m exec makoctl dismiss
 bindsym $mod+n exec makoctl restore
 
 # wayvnc
-bindsym $mod+Shift+p exec wayvncctl output-cycle
+bindsym $mod+Shift+o exec wayvncctl output-cycle
 
 ### styles
 
@@ -240,6 +242,13 @@ client.unfocused	#222222	#222222 #AAAAAA
 # font
 font pango: IBMPlexMono Regular 10
 
+input "5215:621:SINO_WEALTH_GXT_144_Gaming_Mouse" {
+    accel_profile "flat"
+    dwt disabled 
+    left_handed disabled
+    pointer_accel -0.78
+}
+
 # wacom
 input "1386:770:Wacom_Intuos_PT_S_Pen" {
     accel_profile "flat"

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
+ls -Art | tail -n 1 | xargs -d '\n' kid3
+standardize-music

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 && echo "#EXTM3U" > "$name.m3u" && 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/list-packages

@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
 set -eou pipefail
 
-echo $(pacman -Qqe) | \
+sudo bash -c 'echo $(pacman -Qqe) | tr " " "\n" | sort > /packages.txt'
-    tr " " "\n" | \
-    sort \
-    > /packages.txt

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

@@ -6,11 +6,17 @@ if [ $count != 0 ]; then
   rename JPG jpg *.JPG
 fi
   
+# rename .jpeg -> .jpg
+count=`ls -1 *.jpeg 2>/dev/null | wc -l`
+if [ $count != 0 ]; then
+  rename jpeg jpg *.jpeg
+fi
+  
 # remove exif except orientation from .jpg
 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 +30,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" -map_metadata 0:s:a:0 "${i%.*}.mp3" && 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" -map_metadata 0:s:a:0 "${i%.*}.mp3" && rm "$i"
     done
 fi
 
@@ -35,7 +33,21 @@ 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" -map_metadata 0:s:a:0 "${i%.*}.mp3" && rm "$i"
     done
 fi
 
+count=`ls -1 *.M4A 2>/dev/null | wc -l`
+if [ $count != 0 ]; then
+  rename M4A m4a *.M4A
+fi
+  
+count=`ls -1 *.m4a 2>/dev/null | wc -l`
+if [ $count != 0 ]; then
+    for i in *.m4a; do
+        ffmpeg -y  -i "$i" -map_metadata 0:s:a:0 "${i%.*}.mp3" && rm "$i"
+    done
+fi
+
+shopt -s nullglob
+rsgain custom --skip-existing --lowercase --tagmode=i *.mp3 *.flac

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 || true
+sudo mount -U E6F8-C183 /run/media/default/MUSIC 
+
+echo "syncing music..."
+sudo rsync --info=progress2 -W -r --delete /home/default/Music/* /run/media/default/MUSIC/
+sudo sync /run/media/default/MUSIC/
+
+cd /run/media/default/MUSIC
+sudo /home/default/scripts/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/4619-9B49 || true
+sudo mkdir -p /run/media/default/MUSIC || true
+sudo mount -U 4619-9B49 /run/media/default/MUSIC 
+
+echo "syncing music..."
+sudo rsync --info=progress2 -W -r --delete /home/default/Music/* /run/media/default/MUSIC/
+sudo sync /run/media/default/MUSIC/
+
+cd /run/media/default/MUSIC
+sudo /home/default/scripts/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

@@ -31,13 +31,11 @@ ccache
 cheese
 chromium
 cnrdrvcups-lb
+corectrl
 coreutils
 cowsay
-cpupower
-cpupower-gui
 cryptsetup
 cups
-cups-pdf
 darktable
 device-mapper
 dhcpcd
@@ -54,7 +52,6 @@ elinks
 esptool
 etcher-bin
 evince
-evolution
 f2fs-tools
 fail2ban
 fakeroot
@@ -82,6 +79,7 @@ fortune-mod-matrix
 fortune-mod-portal-game
 fortune-mod-starwars
 freecad
+freerdp
 fwbuilder
 fwupd
 gamemode
@@ -89,6 +87,7 @@ gawk
 gcc
 gcc-libs
 gdlauncher-bin
+gdm
 gedit
 geoclue
 gettext
@@ -115,7 +114,6 @@ gst-plugins-bad
 gst-plugins-ugly
 gstreamer-vaapi
 gtk-engine-murrine
-gutenprint
 gvfs-gphoto2
 gwakeonlan
 gzip
@@ -129,6 +127,7 @@ hunspell-en_us
 inkscape
 inotify-tools
 iotop
+iperf
 iproute2
 iputils
 itstool
@@ -137,7 +136,6 @@ jammr
 jansson
 jq
 kanshi
-kdocker
 keepassxc
 kid3
 kitty
@@ -150,11 +148,7 @@ lib32-gamemode
 lib32-giflib
 lib32-gnutls
 lib32-gst-plugins-base-libs
-lib32-gtk3
-lib32-libappindicator-gtk2
-lib32-libappindicator-gtk3
 lib32-libgpg-error
-lib32-libjpeg-turbo
 lib32-libldap
 lib32-libpng
 lib32-libpulse
@@ -168,7 +162,6 @@ lib32-mpg123
 lib32-ocl-icd
 lib32-openal
 lib32-sqlite
-lib32-v4l-utils
 lib32-vkd3d
 lib32-vulkan-icd-loader
 libappindicator-gtk3
@@ -213,7 +206,6 @@ mcomix
 mcpp
 mdadm
 mediainfo
-merkuro
 mesa
 minecraft-launcher
 mixxx
@@ -230,6 +222,7 @@ neofetch
 neovim
 networkmanager
 network-manager-applet
+networkmanager-openvpn
 nmap
 nomacs
 noto-fonts-cjk
@@ -242,6 +235,7 @@ ocl-icd
 odt2txt
 opencc
 opendesktop-fonts
+openh264
 openshot
 opustags
 overdue
@@ -294,6 +288,7 @@ remmina
 retroarch
 retroarch-assets-xmb
 rofi
+rsgain
 rsnapshot
 rsync
 samsung_magician-consumer-ssd
@@ -302,6 +297,7 @@ sed
 shadow
 shellcheck
 shotcut
+signal-desktop
 simple-scan
 slurp
 smartmontools
@@ -312,22 +308,24 @@ ssh-audit
 sshpass
 stalonetray
 steam
-steam-native-runtime
 sudo
 sway
 swaybg
 swayidle
 swaylock
+swayrst-git
 syncplay
 syncthing
 syncthing-gtk
 sysfsutils
+systemd-resolvconf
 systemd-sysvcompat
 systemd-ui
 tar
 telegram-desktop
 texinfo
 texlive-bin
+thunderbird
 tlp
 tmux
 traceroute
@@ -385,6 +383,6 @@ xorg-xinput
 xorg-xwayland
 xsel
 xterm
-yay-bin
+yay
 yt-dlp
 zimg