Expand k config syntax, multiple packages per line, comments on line

with packages and @RAW syntax for complex packages, also remove options,
will apply them manually

2 files changed, 8 insertions, 14 deletions

diff --git a/.config/k/config.toml b/.config/k/config.toml
index 78bc233..4f78a6c 100644
--- a/.config/k/config.toml
+++ b/.config/k/config.toml
@@ -48,29 +48,23 @@ vesktop-1.6.5.x86_64.rpm
 qdbus
 loupe
 chromium
+stylua
+caddy
 
 # ZFS
-https://zfsonlinux.org/fedora/zfs-release-3-1$(rpm --eval "%{dist}").noarch.rpm
-kernel-devel-$(uname -r | awk -F'-' '{print $1}')
+@RAW https://zfsonlinux.org/fedora/zfs-release-3-1$(rpm --eval "%{dist}").noarch.rpm
+@RAW kernel-devel-$(uname -r | awk -F'-' '{print $1}')
 # NOTE: zfs must be after kernel was installed (as 2 separate k sync!!!!)
 zfs
 
 # For webzfs
-libsodium-devel
-libffi-devel
-python3-devel
+libsodium-devel libffi-devel python3-devel
 
-stylua
+# For sanoid/syncoid
+perl-Config-IniFiles perl-Data-Dumper perl-Capture-Tiny perl-Getopt-Long lzop mbuffer mhash pv
 
 '''
 
-[system.dnf]
-# TODO(kyren): add a way to undo these options if they are removed?
-options = [
-  "zfs*.enabled=0",
-  "zfs-latest.enabled=1",
-]
-
 [system.copr]
 "scottames/ghostty" = {}
 "yorickpeterse/stylua" = {}
diff --git a/.zshrc b/.zshrc
index 08661fc..987864e 100644
--- a/.zshrc
+++ b/.zshrc
@@ -133,7 +133,7 @@ if [ ! -f "$MARKER_FILE" ]; then
 fi
 
 if [ -v K_SWITCH_HOME ]; then
-  k switch $HOME
+  k switch $HOME --no-rebuild-self
 fi
 
 if false; then