Compare commits

..

No commits in common. "acab78d596365edd9d9136368861c6ac1b5b99e0" and "ec66d6308906198ca7385db27a35ad09898bf35f" have entirely different histories.

10 changed files with 41 additions and 82 deletions

View File

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

View File

@ -27,29 +27,11 @@
## Groups of commands. Often used to group related commands together. ## Groups of commands. Often used to group related commands together.
# Cmnd_Alias PROCESSES = /usr/bin/nice, /bin/kill, /usr/bin/renice, \ # Cmnd_Alias PROCESSES = /usr/bin/nice, /bin/kill, /usr/bin/renice, \
# /usr/bin/pkill, /usr/bin/top # /usr/bin/pkill, /usr/bin/top
#
# Cmnd_Alias REBOOT = /sbin/halt, /sbin/reboot, /sbin/poweroff # 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 ## 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 ## You may wish to keep some of the following environment variables
## when running commands via sudo. ## when running commands via sudo.
## ##
@ -74,39 +56,19 @@ Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/bin"
## this may allow users to subvert the command being run via sudo. ## 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" # Defaults env_keep += "XMODIFIERS GTK_IM_MODULE QT_IM_MODULE QT_IM_SWITCHER"
## ##
## Uncomment to disable "use_pty" when running commands as root. ## Uncomment to use a hard-coded PATH instead of the user's to find commands
## Commands run as non-root users will run in a pseudo-terminal, # Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
## 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. ## Uncomment to send mail if the user does not enter the correct password.
# Defaults mail_badpass # Defaults mail_badpass
## ##
## Uncomment to enable logging of a command's output, except for ## Uncomment to enable logging of a command's output, except for
## sudoreplay and reboot. Use sudoreplay to play back logged sessions. ## 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 log_output
# Defaults!/usr/bin/sudoreplay !log_output # Defaults!/usr/bin/sudoreplay !log_output
# Defaults!/usr/local/bin/sudoreplay !log_output # Defaults!/usr/local/bin/sudoreplay !log_output
# Defaults!REBOOT !log_output # Defaults!REBOOT !log_output
# Defaults maxseq = 1000 Defaults env_reset,timestamp_timeout=1440
##
## 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 ## Runas alias specification
@ -115,22 +77,23 @@ Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/bin"
## ##
## User privilege specification ## User privilege specification
## ##
root ALL=(ALL:ALL) ALL root ALL=(ALL) ALL
default ALL=(ALL:ALL) ALL default ALL=(ALL) ALL
## Uncomment to allow members of group wheel to execute any command ## Uncomment to allow members of group wheel to execute any command
%wheel ALL=(ALL:ALL) ALL # %wheel ALL=(ALL) ALL
## Same thing without a password ## Same thing without a password
# %wheel ALL=(ALL:ALL) NOPASSWD: ALL # %wheel ALL=(ALL) NOPASSWD: ALL
## Uncomment to allow members of group sudo to execute any command ## Uncomment to allow members of group sudo to execute any command
# %sudo ALL=(ALL:ALL) ALL # %sudo ALL=(ALL) ALL
## Uncomment to allow any user to run sudo if they know the password ## 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). ## of the user they are running the command as (root by default).
# Defaults targetpw # Ask for the password of the target user # Defaults targetpw # Ask for the password of the target user
# ALL ALL=(ALL:ALL) ALL # WARNING: only use this together with 'Defaults targetpw' # ALL ALL=(ALL) ALL # WARNING: only use this together with 'Defaults targetpw'
## Read drop-in files from /etc/sudoers.d ## Read drop-in files from /etc/sudoers.d
@includedir /etc/sudoers.d ## (the '#' here does not indicate a comment)
#includedir /etc/sudoers.d

0
home/default/.bashrc Executable file → Normal file
View File

View File

@ -230,7 +230,7 @@ bindsym $mod+m exec makoctl dismiss
bindsym $mod+n exec makoctl restore bindsym $mod+n exec makoctl restore
# wayvnc # wayvnc
bindsym $mod+Shift+o exec wayvncctl output-cycle bindsym $mod+Shift+p exec wayvncctl output-cycle
### styles ### styles

View File

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

View File

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

View File

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

View File

@ -5,15 +5,15 @@ sudo mkdir -p /run/media/default
echo "mounting /run/media/default/MUSIC" echo "mounting /run/media/default/MUSIC"
sudo fsck -fy /dev/disk/by-uuid/E6F8-C183 || true sudo fsck -fy /dev/disk/by-uuid/E6F8-C183 || true
sudo mkdir /run/media/default/MUSIC || true sudo mkdir /run/media/default/MUSIC
sudo mount -U E6F8-C183 /run/media/default/MUSIC sudo mount -U E6F8-C183 /run/media/default/MUSIC
echo "syncing music..." echo "syncing music..."
sudo rsync --info=progress2 -W -r --delete /home/default/Music/* /run/media/default/MUSIC/ sudo rsync --info=progress2 -W -r --delete ~/Music/* /run/media/default/MUSIC/
sudo sync /run/media/default/MUSIC/ sudo sync /run/media/default/MUSIC/
cd /run/media/default/MUSIC cd /run/media/default/MUSIC
sudo /home/default/scripts/generate-playlists sudo generate-playlists
cd /home/default cd /home/default
echo "unmounting /run/media/default/MUSIC" echo "unmounting /run/media/default/MUSIC"

View File

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

View File

@ -31,11 +31,11 @@ ccache
cheese cheese
chromium chromium
cnrdrvcups-lb cnrdrvcups-lb
corectrl
coreutils coreutils
cowsay cowsay
cryptsetup cryptsetup
cups cups
cups-pdf
darktable darktable
device-mapper device-mapper
dhcpcd dhcpcd
@ -52,6 +52,7 @@ elinks
esptool esptool
etcher-bin etcher-bin
evince evince
evolution
f2fs-tools f2fs-tools
fail2ban fail2ban
fakeroot fakeroot
@ -79,7 +80,6 @@ fortune-mod-matrix
fortune-mod-portal-game fortune-mod-portal-game
fortune-mod-starwars fortune-mod-starwars
freecad freecad
freerdp
fwbuilder fwbuilder
fwupd fwupd
gamemode gamemode
@ -114,6 +114,7 @@ gst-plugins-bad
gst-plugins-ugly gst-plugins-ugly
gstreamer-vaapi gstreamer-vaapi
gtk-engine-murrine gtk-engine-murrine
gutenprint
gvfs-gphoto2 gvfs-gphoto2
gwakeonlan gwakeonlan
gzip gzip
@ -127,7 +128,6 @@ hunspell-en_us
inkscape inkscape
inotify-tools inotify-tools
iotop iotop
iperf
iproute2 iproute2
iputils iputils
itstool itstool
@ -136,6 +136,7 @@ jammr
jansson jansson
jq jq
kanshi kanshi
kdocker
keepassxc keepassxc
kid3 kid3
kitty kitty
@ -148,7 +149,11 @@ lib32-gamemode
lib32-giflib lib32-giflib
lib32-gnutls lib32-gnutls
lib32-gst-plugins-base-libs lib32-gst-plugins-base-libs
lib32-gtk3
lib32-libappindicator-gtk2
lib32-libappindicator-gtk3
lib32-libgpg-error lib32-libgpg-error
lib32-libjpeg-turbo
lib32-libldap lib32-libldap
lib32-libpng lib32-libpng
lib32-libpulse lib32-libpulse
@ -162,6 +167,7 @@ lib32-mpg123
lib32-ocl-icd lib32-ocl-icd
lib32-openal lib32-openal
lib32-sqlite lib32-sqlite
lib32-v4l-utils
lib32-vkd3d lib32-vkd3d
lib32-vulkan-icd-loader lib32-vulkan-icd-loader
libappindicator-gtk3 libappindicator-gtk3
@ -222,7 +228,6 @@ neofetch
neovim neovim
networkmanager networkmanager
network-manager-applet network-manager-applet
networkmanager-openvpn
nmap nmap
nomacs nomacs
noto-fonts-cjk noto-fonts-cjk
@ -297,7 +302,6 @@ sed
shadow shadow
shellcheck shellcheck
shotcut shotcut
signal-desktop
simple-scan simple-scan
slurp slurp
smartmontools smartmontools
@ -308,6 +312,7 @@ ssh-audit
sshpass sshpass
stalonetray stalonetray
steam steam
steam-native-runtime
sudo sudo
sway sway
swaybg swaybg
@ -318,7 +323,6 @@ syncplay
syncthing syncthing
syncthing-gtk syncthing-gtk
sysfsutils sysfsutils
systemd-resolvconf
systemd-sysvcompat systemd-sysvcompat
systemd-ui systemd-ui
tar tar
@ -383,6 +387,6 @@ xorg-xinput
xorg-xwayland xorg-xwayland
xsel xsel
xterm xterm
yay yay-bin
yt-dlp yt-dlp
zimg zimg