diff --git a/config-root.yaml b/config-root.yaml index 0b292e37..714389bd 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -98,64 +98,76 @@ dotfiles: f_cpupower: src: etc/default/cpupower dst: /etc/default/cpupower + f_arch.conf: + src: boot/loader/entries/arch.conf + dst: /boot/loader/entries/arch.conf + f_arch-lts.conf: + src: boot/loader/entries/arch-lts.conf + dst: /boot/loader/entries/arch-lts.conf + f_kodi.conf: + src: boot/loader/entries/kodi.conf + dst: /boot/loader/entries/kodi.conf f_pacserve.service.conf: src: etc/pacserve/pacserve.service.conf dst: /etc/pacserve/pacserve.service.conf profiles: Network: dotfiles: - - d_network - - f_networkd.conf + - d_network + - f_networkd.conf Locale: dotfiles: - - f_locale.conf - - f_locale.gen + - f_locale.conf + - f_locale.gen Pacman: dotfiles: - - f_pacman.conf - - f_pacserve.service.conf + - f_pacman.conf + - f_pacserve.service.conf Mirkwood: dotfiles: - - f_getty.conf - - f_cryptissue - - f_welcomemessage.conf - - d_bin - - f_adb.service - - f_bluetooth.conf - - f_sshd_config - - f_logind.conf - - f_60-uinput-permissions.rules - - f_freetype2.sh - - f_fonts.conf - - f_99-lowbat.rules - - f_ignore - - f_mkinitcpio.conf - - f_vconsole.conf - - f_20-quiet-printk.conf - - f_system.conf - - f_cpupower + - f_getty.conf + - f_cryptissue + - f_welcomemessage.conf + - d_bin + - f_adb.service + - f_bluetooth.conf + - f_sshd_config + - f_logind.conf + - f_60-uinput-permissions.rules + - f_freetype2.sh + - f_fonts.conf + - f_99-lowbat.rules + - f_ignore + - f_mkinitcpio.conf + - f_vconsole.conf + - f_20-quiet-printk.conf + - f_system.conf + - f_cpupower + - f_arch.conf + - f_arch-lts.conf + - f_kodi.conf include: - - Locale - - Pacman - - Network + - Locale + - Pacman + - Network Moria: include: - - Locale - - Pacman - - Network + - Locale + - Pacman + - Network dotfiles: - - f_sshd_config - - f_99-sysctl.conf - - f_cpupower + - f_sshd_config + - f_99-sysctl.conf + - f_cpupower Gondor: include: - - Locale - - Pacman + - Locale + - Pacman dotfiles: - - f_sshd_config + - f_sshd_config localhost: include: - - Locale + - Locale Edoras: include: - - Pacman + - Pacman diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index d4e4acd3..583667f1 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -10,10 +10,8 @@ services: volumes: - /docker/tvheadend:/config - /mnt/Storage/Media/PVR:/recordings - - /mnt/Storage/picons:/picons - /etc/localtime:/etc/localtime:ro ports: - - 9981:9981 - 9982:9982 devices: - /dev/dri:/dev/dri #hardware acceleration diff --git a/efistub/arch.efi b/efistub/arch.efi deleted file mode 100755 index c0932d67..00000000 --- a/efistub/arch.efi +++ /dev/null @@ -1,12 +0,0 @@ -#/bin/bash -# vim:ft=sh - -sudo efibootmgr \ - --disk /dev/sda \ - --part 1 \ - --create \ - --quiet \ - --remove-dups \ - --label "Arch Linux" \ - --loader /vmlinuz-linux \ - --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' diff --git a/efistub/lts.efi b/efistub/lts.efi deleted file mode 100755 index 9a9d0613..00000000 --- a/efistub/lts.efi +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# vim:ft=sh - -sudo efibootmgr \ - --disk /dev/sda \ - --part 1 \ - --create \ - --quiet \ - --remove-dups \ - --label "Arch Linux LTS" \ - --loader /vmlinuz-linux-lts \ - --unicode 'initrd=\amd-ucode.img initrd=\initramfs-linux-lts.img cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' diff --git a/home/.EFISTUB/01-arch.efi b/home/.EFISTUB/01-arch.efi new file mode 100755 index 00000000..a5f67c2b --- /dev/null +++ b/home/.EFISTUB/01-arch.efi @@ -0,0 +1,12 @@ +#!/bin/bash +# vim:ft=sh + +sudo efibootmgr \ + --disk /dev/sda \ + --part 1 \ + --create \ + --quiet \ + --remove-dups \ + --label "Arch Linux" \ + --loader /vmlinuz-linux \ + --unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=3 vga=current processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux.img amdgpu.noretry=0' diff --git a/home/.EFISTUB/02-ck.efi b/home/.EFISTUB/02-ck.efi new file mode 100755 index 00000000..b387bad3 --- /dev/null +++ b/home/.EFISTUB/02-ck.efi @@ -0,0 +1,12 @@ +#!/bin/bash +# vim:ft=sh + +sudo efibootmgr \ + --disk /dev/sda \ + --part 1 \ + --create \ + --quiet \ + --remove-dups \ + --label "Arch Linux CK" \ + --loader /vmlinuz-linux-ck-zen \ + --unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=3 vga=current vt.global_cursor_default=0 processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux.img amdgpu.noretry=0' diff --git a/home/.EFISTUB/03-lts.efi b/home/.EFISTUB/03-lts.efi new file mode 100755 index 00000000..fd74e762 --- /dev/null +++ b/home/.EFISTUB/03-lts.efi @@ -0,0 +1,12 @@ +#!/bin/bash +# vim:ft=sh + +sudo efibootmgr \ + --disk /dev/sda \ + --part 1 \ + --create \ + --quiet \ + --remove-dups \ + --label "Arch Linux LTS" \ + --loader /vmlinuz-linux-lts \ + --unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=3 vga=current vt.global_cursor_default=0 processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux.img amdgpu.noretry=0' diff --git a/efistub/update.sh b/home/.EFISTUB/update.sh similarity index 85% rename from efistub/update.sh rename to home/.EFISTUB/update.sh index 19a17d85..07c1dba8 100755 --- a/efistub/update.sh +++ b/home/.EFISTUB/update.sh @@ -11,4 +11,4 @@ for bootscript in *.efi; do done # set bootorder -sudo efibootmgr --bootorder 0000,0001 +sudo efibootmgr --bootorder 0000,0001,0002 diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf index be2d89c7..2a3f77ed 100644 --- a/home/.config/mpv/mpv.conf +++ b/home/.config/mpv/mpv.conf @@ -21,8 +21,10 @@ audio-pitch-correction=yes # automatically insert scaletempo when playing with h replaygain=track ############# -# misc # +# Plugins/misc # ############# +# Mpris plugin +script=/usr/lib/mpv/mpris.so # Start ipc server input-ipc-server=/tmp/mpvsocket diff --git a/home/.config/sway/conf.d/04-output.conf b/home/.config/sway/conf.d/04-output.conf index 0a264714..b6030a4a 100644 --- a/home/.config/sway/conf.d/04-output.conf +++ b/home/.config/sway/conf.d/04-output.conf @@ -3,7 +3,3 @@ output * bg $wallpaper fill output eDP-1 position 0 0 output HDMI-A-1 position 1920 0 - -# Disable laptop screen when lid is closed -bindswitch --locked lid:on output $laptop disable -bindswitch --locked lid:off output $laptop enable diff --git a/root/boot/loader/README.md b/root/boot/loader/README.md deleted file mode 100644 index f0138427..00000000 --- a/root/boot/loader/README.md +++ /dev/null @@ -1,2 +0,0 @@ -I don't use systemd-boot on my main system anymore but this is here for reference -when I'm setting up new systems. diff --git a/root/boot/loader/entries/arch-busybox.conf b/root/boot/loader/entries/arch-busybox.conf deleted file mode 100755 index db073af3..00000000 --- a/root/boot/loader/entries/arch-busybox.conf +++ /dev/null @@ -1,5 +0,0 @@ -title Arch Linux -initrd /amd-ucode.img -initrd /initramfs-linux.img -linux /vmlinuz-linux -options cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo diff --git a/root/boot/loader/entries/arch-lts.conf b/root/boot/loader/entries/arch-lts.conf new file mode 100755 index 00000000..1df835e8 --- /dev/null +++ b/root/boot/loader/entries/arch-lts.conf @@ -0,0 +1,5 @@ +title Arch Linux LTS +initrd /amd-ucode.img +initrd /initramfs-linux-lts.img +linux /vmlinuz-linux-lts +options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo diff --git a/root/boot/loader/entries/arch-systemd.conf b/root/boot/loader/entries/arch.conf similarity index 100% rename from root/boot/loader/entries/arch-systemd.conf rename to root/boot/loader/entries/arch.conf diff --git a/root/boot/loader/entries/kodi.conf b/root/boot/loader/entries/kodi.conf new file mode 100755 index 00000000..5a86d927 --- /dev/null +++ b/root/boot/loader/entries/kodi.conf @@ -0,0 +1,5 @@ +title Kodi +initrd /amd-ucode.img +initrd /initramfs-linux.img +linux /vmlinuz-linux +options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait video=eDP-1:d video=1920x1080@60 diff --git a/root/boot/loader/loader.conf b/root/boot/loader/loader.conf index 62bce553..49951610 100755 --- a/root/boot/loader/loader.conf +++ b/root/boot/loader/loader.conf @@ -1,3 +1,3 @@ -default arch-busybox +default arch timeout 0 -editor 0 +editor 1 diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf index 54c22309..12d768ea 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -1,11 +1,8 @@ -COMPRESSION="zstd" MODULES=(amdgpu) FILES=() - {%@@ if profile == "Mirkwood" @@%} BINARIES=("/usr/bin/btrfs") -HOOKS=(colors consolefont welcomemessage base udev autodetect modconf block filesystems btrfs keyboard encrypt fsck) - +HOOKS=(base autodetect modconf block filesystems keyboard fsck systemd sd-colors sd-vconsole sd-encrypt) {%@@ else @@%} BINARIES=() HOOKS=(colors consolefont base udev autodetect modconf block filesystems keyboard fsck) diff --git a/scripts/media/mpvqueue b/scripts/media/mpvqueue index 5a84bc64..81e40f41 100755 --- a/scripts/media/mpvqueue +++ b/scripts/media/mpvqueue @@ -1,23 +1,23 @@ #!/usr/bin/env bash +MPVPIPE=/tmp/mpvqueue.playlist + notify="notify-send -i mpv -a mpv" url="$1" -# NOTE: You need to configure mpv to -# enable ipc server on this path (see my mpv config for an example) -MPVSOCKET="/tmp/mpvsocket" - # See if MPV is already running if [ -z "$(pidof mpv)" ]; then # mpv is not running + # remove fifo + rm -f $MPVPIPE && mkfifo $MPVPIPE # pause other players playerctl pause # start mpv - /usr/bin/mpv --no-terminal "$url" & disown + /usr/bin/mpv --no-terminal --input-file="${MPVPIPE}" "$url" & disown - # Wait for mpv to be up before adding anything else to playlist + # Wait for mpv to be up before moving on to adding anything else to playlist while [ -z "$(pidof mpv)" ]; do sleep 1 done @@ -26,5 +26,5 @@ if [ -z "$(pidof mpv)" ]; then else # mpv is running, so add stuff to playlist $notify "Adding $url" - echo "{\"command\": [\"loadfile\", \"$url\", \"append\"]}" | socat - /tmp/mpvsocket + echo "loadfile \"$url\" append-play" >> "${MPVPIPE}" fi