Merge branch 'master' into nvim-lua

2021-02-27 11:50:22 +02:00 · 2021-02-27 11:50:22 +02:00 · 42b00296cf
parent 355c10eda4 d444812c17
commit 42b00296cf
18 changed files with 90 additions and 110 deletions
--- a/config-root.yaml
+++ b/config-root.yaml
@ -98,76 +98,64 @@ 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_arch.conf
-      - f_arch-lts.conf
-      - f_kodi.conf
+    - 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
    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
--- a/docker/tvheadend/docker-compose.yaml
+++ b/docker/tvheadend/docker-compose.yaml
@ -10,8 +10,10 @@ 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
--- a/efistub/arch.efi
+++ b/efistub/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 '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'
--- a/efistub/lts.efi
+++ b/efistub/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 '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'
--- a/home/.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,0002
+sudo efibootmgr --bootorder 0000,0001
--- a/home/.EFISTUB/01-arch.efi
+++ b/home/.EFISTUB/01-arch.efi
@ -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 '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'
--- a/home/.EFISTUB/02-ck.efi
+++ b/home/.EFISTUB/02-ck.efi
@ -1,12 +0,0 @@
-#!/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'
--- a/home/.EFISTUB/03-lts.efi
+++ b/home/.EFISTUB/03-lts.efi
@ -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 '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'
--- a/home/.config/mpv/mpv.conf
+++ b/home/.config/mpv/mpv.conf
@ -21,10 +21,8 @@ audio-pitch-correction=yes # automatically insert scaletempo when playing with h
 replaygain=track

 #############
-# Plugins/misc #
+# misc #
 #############
-# Mpris plugin
-script=/usr/lib/mpv/mpris.so

 # Start ipc server
 input-ipc-server=/tmp/mpvsocket
--- a/home/.config/sway/conf.d/04-output.conf
+++ b/home/.config/sway/conf.d/04-output.conf
@ -3,3 +3,7 @@
 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
--- a/root/boot/loader/README.md
+++ b/root/boot/loader/README.md
@ -0,0 +1,2 @@
+I don't use systemd-boot on my main system anymore but this is here for reference
+when I'm setting up new systems.
--- a/root/boot/loader/entries/arch-busybox.conf
+++ b/root/boot/loader/entries/arch-busybox.conf
@ -0,0 +1,5 @@
+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
--- a/root/boot/loader/entries/arch-lts.conf
+++ b/root/boot/loader/entries/arch-lts.conf
@ -1,5 +0,0 @@
-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
--- a/root/boot/loader/entries/arch-systemd.conf
+++ b/root/boot/loader/entries/arch-systemd.conf
--- a/root/boot/loader/entries/kodi.conf
+++ b/root/boot/loader/entries/kodi.conf
@ -1,5 +0,0 @@
-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
--- a/root/boot/loader/loader.conf
+++ b/root/boot/loader/loader.conf
@ -1,3 +1,3 @@
-default arch
+default arch-busybox
 timeout 0
-editor 	1
+editor 	0
--- a/root/etc/mkinitcpio.conf
+++ b/root/etc/mkinitcpio.conf
@ -1,8 +1,11 @@
+COMPRESSION="zstd"
 MODULES=(amdgpu)
 FILES=()
+
 {%@@ if profile == "Mirkwood" @@%}
 BINARIES=("/usr/bin/btrfs")
-HOOKS=(base autodetect modconf block filesystems keyboard fsck systemd sd-colors sd-vconsole sd-encrypt)
+HOOKS=(colors consolefont welcomemessage base udev autodetect modconf block filesystems btrfs keyboard encrypt fsck)
+
 {%@@ else @@%}
 BINARIES=()
 HOOKS=(colors consolefont base udev autodetect modconf block filesystems keyboard fsck)
--- 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 --input-file="${MPVPIPE}" "$url" & disown
+	/usr/bin/mpv --no-terminal "$url" & disown

-	# Wait for mpv to be up before moving on to adding anything else to playlist
+	# Wait for mpv to be up before 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 "loadfile \"$url\" append-play" >>  "${MPVPIPE}"
+	echo "{\"command\": [\"loadfile\", \"$url\", \"append\"]}" | socat - /tmp/mpvsocket
 fi