add laptop changes

etc/fwupd/fwupd.conf

@@ -1,8 +0,0 @@
-# use `man 5 fwupd.conf` for documentation
-[fwupd]
-DisabledPlugins=test;test_ble
-OnlyTrusted=true
-AllowEmulation=false
-
-[uefi_capsule]
-DisableCapsuleUpdateOnDisk=true

etc/pacman.d/gnupg/gpg.conf

@@ -1,10 +1,7 @@
 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
 #keyserver hkp://keyserver.ubuntu.com
 keyserver hkps://keyserver.ubuntu.com
-keyserver-options import-clean
-keyserver-options no-self-sigs-only

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/.bashrc

@@ -4,9 +4,6 @@
 # add environment vars
 . ~/.profile
 
-# add exiftool to path
-export PATH="/usr/bin/vendor_perl/:$PATH"
-
 # add scripts folder to path
 export PATH="/home/default/scripts:$PATH"
 
@@ -30,7 +27,4 @@ eval "$(direnv hook bash)"
 # asdf-vm
 . /opt/asdf-vm/asdf.sh
 
-# esp-idf
-# . /opt/esp-idf/export.sh
-
 proverb

home/default/.config/sway/config

@@ -45,13 +45,13 @@ exec_always {
 exec swayidle -w \
     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' \
-    timeout 600 'swaymsg "output * power off"' \
     before-sleep 'playerctl -a pause' \
     lock 'swaylock' \
-    resume 'swaymsg "output * power on"'
+    resume 'swaymsg "output * dpms on"'
 
-# system lock
+# screen lock
 bindsym Ctrl+Shift+l exec "playerctl -a pause; \
     systemctl suspend && \
     swaylock"
@@ -230,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
 

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/generate-playlists

@@ -3,6 +3,6 @@ set -ou pipefail
 
 for dir in */; do
 	name=`echo "$dir" | sed 's/\/$//g'`
-	(cd $dir && ls | grep -v -E '\.txt|\.m3u' > "$name.m3u")
+	(cd $dir && echo "#EXTM3U" > "$name.m3u" && ls | grep -v -E '\.txt|\.m3u' >> "$name.m3u")
 done
 

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

@@ -9,7 +9,7 @@ fi
 count=`ls -1 *.ogg 2>/dev/null | wc -l`
 if [ $count != 0 ]; then
     for i in *.ogg; do
-        ffmpeg -y -i "$i" "${i%.*}.m4a" -map_metadata 0:s:a:0 && rm "$i"
+        ffmpeg -y -i "$i" "${i%.*}.mp3" && rm "$i"
     done
 fi
 
@@ -21,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%.*}.m4a" -map_metadata 0:s:a:0 && rm "$i"
+        ffmpeg -y -i "$i" "${i%.*}.mp3" && rm "$i"
     done
 fi
 
@@ -33,9 +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%.*}.m4a" -map_metadata 0:s:a:0 && rm "$i"
+        ffmpeg -y -i "$i" "${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" "${i%.*}.mp3" && rm "$i"
     done
 fi
 
 shopt -s nullglob
-rsgain custom -a -s i -L -S *.m4a *.mp3 *.ogg *.opus
+rsgain custom -S -L -a -s i *.mp3 *.flac

home/default/scripts/sync-car

@@ -5,15 +5,15 @@ 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 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 ~/Music/* /run/media/default/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 generate-playlists
+sudo /home/default/scripts/generate-playlists
 cd /home/default
 
 echo "unmounting /run/media/default/MUSIC"

home/default/scripts/sync-mp3-player

@@ -4,16 +4,16 @@ 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 fsck -fy /dev/disk/by-uuid/4619-9B49 || true
-sudo mkdir /run/media/default/MUSIC
+sudo mkdir -p /run/media/default/MUSIC || true
-sudo mount -U DB09-89C3 /run/media/default/MUSIC 
+sudo mount -U 4619-9B49 /run/media/default/MUSIC 
 
 echo "syncing music..."
-sudo rsync --info=progress2 -W -r --delete ~/Music/* /run/media/default/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 generate-playlists
+sudo /home/default/scripts/generate-playlists
 cd /home/default
 
 echo "unmounting /run/media/default/MUSIC"

packages.txt

@@ -25,7 +25,6 @@ code
 cowsay
 cpupower
 cpupower-gui
-cups-pdf
 darktable
 dhcpcd
 dialog
@@ -87,7 +86,6 @@ gst-plugins-ugly
 gstreamer-vaapi
 gtk-engine-murrine
 gtk-vnc
-gutenprint
 gvfs-gphoto2
 gwakeonlan
 hamradio-menus
@@ -107,7 +105,6 @@ iw
 jammr
 jq
 kanshi
-kdocker
 keepassxc
 kid3
 kitty
@@ -173,6 +170,7 @@ neofetch
 neovim
 networkmanager
 network-manager-applet
+networkmanager-openvpn
 nmap
 nomacs
 noto-fonts-cjk
@@ -185,6 +183,7 @@ odt2txt
 opendesktop-fonts
 openh264
 openshot
+openvpn
 opustags
 overdue
 p7zip