From 9513b9c0090faf7b094f7dfba3c7f3e885ce6157 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Mon, 8 May 2023 17:59:45 +0300
Subject: [PATCH] Switch from pacserve to flexo

---
 config-root.toml                        | 11 +----------
 root/etc/pacman.conf                    |  5 -----
 root/etc/pacserve/pacserve.service.conf |  1 -
 3 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100755 root/etc/pacserve/pacserve.service.conf

diff --git a/config-root.toml b/config-root.toml
index 5fba743f..7020392f 100644
--- a/config-root.toml
+++ b/config-root.toml
@@ -135,10 +135,6 @@ dst = "/etc/systemd/system.conf"
 src = "etc/default/cpupower"
 dst = "/etc/default/cpupower"
 
-[dotfiles."f_pacserve.service.conf"]
-src = "etc/pacserve/pacserve.service.conf"
-dst = "/etc/pacserve/pacserve.service.conf"
-
 [dotfiles."f_mkinitcpio_linux.preset"]
 src = "etc/mkinitcpio.d/linux.preset"
 dst = "/etc/mkinitcpio.d/linux.preset"
@@ -170,12 +166,7 @@ dotfiles = ["d_network", "f_networkd.conf"]
 dotfiles = ["f_locale.conf", "f_locale.gen"]
 
 [profiles.Pacman]
-dotfiles = [
-  "f_pacman.conf",
-  "f_pacman_zsh_hook",
-  "f_pacserve.service.conf",
-  "f_sudoers_pacman",
-]
+dotfiles = ["f_pacman.conf", "f_pacman_zsh_hook", "f_sudoers_pacman"]
 
 [profiles.Mirkwood]
 dotfiles = [
diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf
index 93809dca..b959ce78 100755
--- a/root/etc/pacman.conf
+++ b/root/etc/pacman.conf
@@ -14,26 +14,21 @@ CacheDir=/var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64
 {%@@ endif @@%}
 
 [core]
-Include = /etc/pacman.d/pacserve
 Include = /etc/pacman.d/mirrorlist
 
 [extra]
-Include = /etc/pacman.d/pacserve
 Include = /etc/pacman.d/mirrorlist
 
 [community]
-Include = /etc/pacman.d/pacserve
 Include = /etc/pacman.d/mirrorlist
 
 [multilib]
-Include = /etc/pacman.d/pacserve
 Include = /etc/pacman.d/mirrorlist
 
 [korhonen_aur]
 {%@@ if profile == "Moria" @@%}
 Server = file:///var/www/index.korhonen.cc/repo/arch_linux/$repo/$arch
 {%@@ else @@%}
-Include = /etc/pacman.d/pacserve
 Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch
 {%@@ endif @@%}
 
diff --git a/root/etc/pacserve/pacserve.service.conf b/root/etc/pacserve/pacserve.service.conf
deleted file mode 100755
index a983b4c5..00000000
--- a/root/etc/pacserve/pacserve.service.conf
+++ /dev/null
@@ -1 +0,0 @@
-PACSERVE_ARGS="--multicast --avahi"