Compare commits

...

9 Commits

Author SHA1 Message Date
4b1ac85994 update laptop packages 2024-06-28 15:20:39 -04:00
15812b1a76 update laptop boot entries 2024-06-28 15:20:39 -04:00
8516b30031 add additional gpg settings 2024-06-28 15:20:39 -04:00
b778a19d74 tweak sway config for idle 2024-06-28 15:20:38 -04:00
e6b7d99fed add fwupdmgr settings 2024-06-28 15:18:45 -04:00
abe68ecaef add framework screen to kanshi 2024-06-28 15:18:45 -04:00
fab166035f use sd-encrypt and lvm 2024-06-28 15:18:45 -04:00
dc1e46e4a7 improve sway locking 2024-06-28 15:17:56 -04:00
257b4060c0 improve scripts 2024-06-28 15:17:43 -04:00
19 changed files with 124 additions and 186 deletions

View File

@ -2,4 +2,4 @@ title Arch Linux
linux /vmlinuz-linux
initrd /amd-ucode.img
initrd /initramfs-linux-fallback.img
options rd.luks.name=3927d3f3-175f-4b72-9e05-395ef5664c81=cryptlvm rd.luks.options=discard root=/dev/ssd1/root resume=/dev/ssd1/swap rw add_efi_memmap kernel=30
options rd.luks.name=e7ff5b82-f145-4fae-be2a-388314977783=cryptlvm rd.luks.options=discard root=/dev/ssd/root resume=/dev/ssd/swap rw add_efi_memmap kernel=30

View File

@ -2,4 +2,4 @@ title Arch Linux
linux /vmlinuz-linux
initrd /amd-ucode.img
initrd /initramfs-linux.img
options rd.luks.name=3927d3f3-175f-4b72-9e05-395ef5664c81=cryptlvm rd.luks.options=discard root=/dev/ssd1/root resume=/dev/ssd1/swap rw add_efi_memmap kernel=30
options rd.luks.name=e7ff5b82-f145-4fae-be2a-388314977783=cryptlvm rd.luks.options=discard root=/dev/ssd/root resume=/dev/ssd/swap rw add_efi_memmap kernel=30

8
etc/fwupd/fwupd.conf Normal file
View File

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

View File

@ -3,7 +3,7 @@
# The following modules are loaded before any boot hooks are
# run. Advanced users may wish to specify all system modules
# in this array. For instance:
# MODULES=(piix ide_disk reiserfs)
# MODULES=(usbhid xhci_hcd)
MODULES=()
# BINARIES
@ -29,31 +29,32 @@ FILES=()
# 'filesystems' is _required_ unless you specify your fs modules in MODULES
# Examples:
## This setup specifies all modules in the MODULES setting above.
## No raid, lvm2, or encrypted root is needed.
## No RAID, lvm2, or encrypted root is needed.
# HOOKS=(base)
#
## This setup will autodetect all modules for your system and should
## work as a sane default
# HOOKS=(base udev autodetect block filesystems)
# HOOKS=(base udev autodetect modconf block filesystems fsck)
#
## This setup will generate a 'full' image which supports most systems.
## No autodetection is done.
# HOOKS=(base udev block filesystems)
# HOOKS=(base udev modconf block filesystems fsck)
#
## This setup assembles a pata mdadm array with an encrypted root FS.
## Note: See 'mkinitcpio -H mdadm' for more information on raid devices.
# HOOKS=(base udev block mdadm encrypt filesystems)
## This setup assembles a mdadm array with an encrypted root file system.
## Note: See 'mkinitcpio -H mdadm_udev' for more information on RAID devices.
# HOOKS=(base udev modconf keyboard keymap consolefont block mdadm_udev encrypt filesystems fsck)
#
## This setup loads an lvm2 volume group on a usb device.
# HOOKS=(base udev block lvm2 filesystems)
## This setup loads an lvm2 volume group.
# HOOKS=(base udev modconf block lvm2 filesystems fsck)
#
## NOTE: If you have /usr on a separate partition, you MUST include the
# usr, fsck and shutdown hooks.
HOOKS=(base udev systemd autodetect keyboard sd-vconsole modconf block sd-encrypt lvm2 filesystems resume fsck)
# usr and fsck hooks.
HOOKS=(base udev systemd autodetect modconf keyboard keymap block sd-encrypt lvm2 filesystems fsck)
# COMPRESSION
# Use this to compress the initramfs image. By default, gzip compression
# Use this to compress the initramfs image. By default, zstd compression
# is used. Use 'cat' to create an uncompressed image.
#COMPRESSION="zstd"
#COMPRESSION="gzip"
#COMPRESSION="bzip2"
#COMPRESSION="lzma"
@ -64,3 +65,9 @@ HOOKS=(base udev systemd autodetect keyboard sd-vconsole modconf block sd-encryp
# COMPRESSION_OPTIONS
# Additional options for the compressor
#COMPRESSION_OPTIONS=()
# MODULES_DECOMPRESS
# Decompress kernel modules during initramfs creation.
# Enable to speedup boot process, disable to save RAM
# during early userspace. Switch (yes/no).
#MODULES_DECOMPRESS="yes"

View File

@ -6,3 +6,5 @@ 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

1
etc/ssh/sshrc Normal file
View File

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

View File

@ -2,3 +2,7 @@ profile {
output "LG Electronics LG IPS QHD 201NTPCGD520" enable scale 1.30 position 0,0 mode 2560x1440@60Hz
output "LG Electronics LG ULTRAWIDE 0x01010101" enable position 1968,0 mode 2560x1080@60Hz
}
profile {
output "BOE 0x0BCA Unknown" enable scale 1.75 position 0,0 mode 2256x1504@59.999Hz
}

View File

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

View File

@ -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
PLAYLIST_FOLDER="/home/default/Music/playlists/mpd" # Playlist folder for mpd
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
for dir in */; do
name=`echo "$dir" | sed 's/\/$//g'`
(cd $dir && ls | grep -v -E '\.txt|\.m3u' > "$name.m3u")
done
IFS=$SAVEIFS

View File

@ -1,17 +1,15 @@
#!/usr/bin/env sh
set -oux pipefail
# removes more modern codecs to just files that can fit on my mp3 player
count=`ls -1 *.M4A 2>/dev/null | wc -l`
count=`ls -1 *.OGG 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
ffmpeg -y -i "$i" "${i%.*}.ogg" && rm "$i"
for i in *.ogg; do
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,7 @@ 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

20
home/default/scripts/sync-car Executable file
View File

@ -0,0 +1,20 @@
#!/usr/bin/env sh
set -eou pipefail
sudo mkdir -p /run/media/default/
if [[ ! -d /run/media/default/MUSIC ]]; then
echo "mounting /run/media/default/MUSIC"
sudo mkdir /run/media/default/MUSIC
sudo mount -U E6F8-C183 /run/media/default/MUSIC
fi
echo "syncing music..."
sudo rsync --info=progress2 -W -r --delete ~/Music/* /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

View File

@ -0,0 +1,19 @@
#!/usr/bin/env sh
set -eou pipefail
if [[ ! -d /run/media/default/MUSIC ]]; then
echo "mounting /run/media/default/MUSIC"
sudo mkdir /run/media/default/MUSIC
sudo mount -U DB09-89C3 /run/media/default/MUSIC
fi
echo "syncing music..."
sudo rsync --info=progress2 -W -r --delete ~/Music/* /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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,7 +1,6 @@
acpi
adobe-source-han-sans-jp-fonts
adobe-source-han-sans-kr-fonts
adwaita-qt5-git
adwaita-qt6-git
aic94xx-firmware
alacritty
amd-ucode
@ -12,64 +11,43 @@ arduino-ide-bin
asdf-vm
atomicparsley
atool
autoconf
automake
base
base-devel
bash
bash-completion
beets
bind
binutils
bison
blueman
brightnessctl
bzip2
calibre
cbonsai
ccache
cheese
chromium
cnrdrvcups-lb
coreutils
cowsay
cpupower
cpupower-gui
cryptsetup
cups
cups-pdf
darktable
device-mapper
dhcpcd
dialog
diffutils
dino
direnv
downgrade
dxvk-bin
e2fsprogs
efibootmgr
electrum
elinks
esptool
etcher-bin
evince
evolution
f2fs-tools
fail2ban
fakeroot
fcitx5
fcitx5-chinese-addons
fcitx5-configtool
fcitx5-gtk
fcitx5-pinyin-zhwiki
fcitx5-qt
fcitx5-solarized
ffmpegthumbnailer
file
filesystem
findutils
flex
font-manager
fortune-mod
fortune-mod-calvin
@ -81,35 +59,27 @@ fortune-mod-hitchhiker
fortune-mod-matrix
fortune-mod-portal-game
fortune-mod-starwars
fprintd
framework-system-git
freecad
freerdp
fwbuilder
fwupd
gamemode
gawk
gcc
gcc-libs
gdlauncher-bin
gedit
geoclue
gettext
gimp
git
git-lfs
glibc
gnome-disk-utility
gnome-firmware
gnome-sound-recorder
gnu-free-fonts
gnu-netcat
gnutls
google-chrome
gparted
gphoto2
grep
grim
grub
gsmartcontrol
gsound
gst-libav
gst-plugins-bad
gst-plugins-ugly
@ -118,7 +88,7 @@ gtk-engine-murrine
gutenprint
gvfs-gphoto2
gwakeonlan
gzip
hamradio-menus
handbrake
hddtemp
hexedit
@ -126,15 +96,13 @@ highlight
htop
hugin
hunspell-en_us
iio-sensor-proxy
inkscape
inotify-tools
iotop
iproute2
iputils
itstool
iw
jammr
jansson
jq
kanshi
kdocker
@ -147,51 +115,26 @@ lagrange
leptonica
less
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
lib32-libva
lib32-libva-mesa-driver
lib32-libxcomposite
lib32-libxinerama
lib32-libxslt
lib32-mesa-vdpau
lib32-mpg123
lib32-ocl-icd
lib32-openal
lib32-sqlite
lib32-v4l-utils
lib32-vkd3d
lib32-vulkan-icd-loader
libappindicator-gtk3
libdvdcss
libffado
libglvnd
libgnome-keyring
libgooglepinyin
libime
libjbig-shared
libjpeg6-turbo
libpinyin
libpng
libreoffice-extension-languagetool
libreoffice-still
libretro-overlays
libretro-shaders-slang
librewolf-bin
libva-mesa-driver
libva-utils
libvncserver
libxkbcommon
licenses
linux
linux-firmware
linux-firmware-qlogic
@ -202,8 +145,6 @@ lshw
lsp-plugins
ltunify-git
lvm2
m4
make
mako
mallard-ducktype
man-db
@ -217,6 +158,7 @@ merkuro
mesa
minecraft-launcher
mixxx
mkinitcpio-firmware
mousetweaks
mpc
mpv
@ -238,53 +180,41 @@ noto-fonts-extra
ntfs-3g
ntp
nvtop
ocl-icd
odt2txt
opencc
opendesktop-fonts
openh264
openshot
opustags
overdue
p7zip
package-query
papirus-icon-theme
patch
pavucontrol
pciutils
perl
perl-image-exiftool
perl-rename
picard
piper
pipewire-alsa
pipewire-jack
pipewire-pulse
pixman
pkgconf
pkgstats
playerctl
playonlinux
polkit-gnome
postgresql-libs
prismlauncher
procps-ng
psensor
psmisc
pv
pyside2
python
python-axolotl
python-levenshtein
python-matplotlib
python-mutagen
python-pip
python-pycryptodome
python-pyasyncore
python-pyenchant
python-pylast
python-pynvim
python-wxpython
qt5ct
qt5-graphicaleffects
qt5-imageformats
quodlibet
ranger
rar
@ -294,25 +224,18 @@ remmina
retroarch
retroarch-assets-xmb
rofi
rsnapshot
rsync
samsung_magician-consumer-ssd
seahorse
sed
shadow
shellcheck
shotcut
simple-scan
slurp
smartmontools
s-nail
sndio
speedtest-cli
ssh-audit
sshpass
stalonetray
steam
steam-native-runtime
sudo
sway
swaybg
@ -322,12 +245,8 @@ syncplay
syncthing
syncthing-gtk
sysfsutils
systemd-sysvcompat
systemd-ui
tar
telegram-desktop
texinfo
texlive-bin
tlp
tmux
traceroute
@ -336,19 +255,15 @@ tree
ttf-dejavu
ttf-ibm-plex
ttf-joypixels
ttf-liberation
ttf-ms-fonts
ttf-opensans
ttf-symbola-free
ttf-ubuntu-font-family
ueberzugpp
unicode-emoji
upd72020x-fw
usbutils
util-linux
vi
vim
visual-studio-code-bin
vkd3d
vlc
vnstat
@ -365,8 +280,6 @@ wayvnc
wd719x-firmware
wdisplays
wf-recorder
wget
which
wine-staging
winetricks
wireguard-tools
@ -374,9 +287,8 @@ wl-clipboard
wol
wpa_supplicant
xclip
xdg-desktop-portal
xdg-desktop-portal-gtk
xdg-desktop-portal-wlr
xf86-input-wacom
xf86-video-amdgpu
xfsprogs
xorg-xdpyinfo
@ -387,4 +299,3 @@ xsel
xterm
yay-bin
yt-dlp
zimg