From b12be3c162e94d596ac1925c2e48740c3e41b3ce Mon Sep 17 00:00:00 2001
From: Steve Beaulac <steve@beaulac.me>
Date: Tue, 16 Jun 2026 03:54:27 +0000
Subject: [PATCH] updated install script

---
 installer/01-install-cachy.sh | 3 +--
 installer/03-install-swap.sh  | 2 +-
 installer/09-gnupg.sh         | 1 -
 installer/10-base-desktop.sh  | 2 +-
 installer/20-base-dev.sh      | 4 ++--
 installer/desktop.sh          | 5 -----
 packages/sjb-base.packages    | 4 ++--
 packages/sjb-desktop.packages | 6 +++---
 packages/sjb-dev.packages     | 5 +++--
 9 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/installer/01-install-cachy.sh b/installer/01-install-cachy.sh
index 645e1cb..0604b88 100755
--- a/installer/01-install-cachy.sh
+++ b/installer/01-install-cachy.sh
@@ -46,6 +46,5 @@ paru -Sy --noconfirm \
     cachyos-wallpapers \
     cachyos-fish-config \
     linux-cachyos \
-    linux-cachyos-headers \
-    linux-cachyos-sched-ext-headers
+    linux-cachyos-headers
 
diff --git a/installer/03-install-swap.sh b/installer/03-install-swap.sh
index cf13e90..cc3837c 100755
--- a/installer/03-install-swap.sh
+++ b/installer/03-install-swap.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-if [[ $GID != 0 ]]; then
+if [[ $UID != 0 ]]; then
     echo "need to be root"
     exit 0;
 fi
diff --git a/installer/09-gnupg.sh b/installer/09-gnupg.sh
index b059f36..1e858d9 100755
--- a/installer/09-gnupg.sh
+++ b/installer/09-gnupg.sh
@@ -8,7 +8,6 @@ paru -Sy --noconfirm \
     gcr \
     pcsclite \
     ccid \
-    opengpg-crd-tools \
     gnupg
 
 # Setup GPG configuration with multiple keyservers for better reliability
diff --git a/installer/10-base-desktop.sh b/installer/10-base-desktop.sh
index 08f797d..bd6e2ec 100755
--- a/installer/10-base-desktop.sh
+++ b/installer/10-base-desktop.sh
@@ -4,7 +4,7 @@ if [[ ! -x "$(command -v paru)" ]]; then
     sudo pacman -S --noconfirm --needed paru || exit 1
 fi
 
-mapfile -t packages < <(grep -v  '^#' "$SJB_CONF_DIR/sjb-desktop.packages" | grep -v '^$')
+mapfile -t packages < <(grep -v  '^#' "$DOTFILES_DIR/packages/sjb-desktop.packages" | grep -v '^$')
 paru -S --noconfirm --needed "${packages[@]}"
 
 
diff --git a/installer/20-base-dev.sh b/installer/20-base-dev.sh
index 9897f60..234aecc 100755
--- a/installer/20-base-dev.sh
+++ b/installer/20-base-dev.sh
@@ -6,8 +6,8 @@ if [[ ! -x "$(command -v paru)" ]]; then
     sudo pacman -S --noconfirm --needed paru || exit 1
 fi
 
-mapfile -t packages < <(grep -v  '^#' "$SJB_CONF_DIR/sjb-dev.packages" | grep  -v '^$')
+mapfile -t packages < <(grep -v  '^#' "$DOTFILES_DIR/packages/sjb-dev.packages" | grep  -v '^$')
 paru -S --noconfirm --needed "${packages[@]}"
 
-cat ${SJB_CONF_DIR}/rules/99-platformio-udev.rules | sudo tee /etc/udev/rules.d/99-platformio-udev.rules
+cat ${CONFIG_DIR}/rules/99-platformio-udev.rules | sudo tee /etc/udev/rules.d/99-platformio-udev.rules
 sudo systemctl restart systemd-udevd
diff --git a/installer/desktop.sh b/installer/desktop.sh
index a89f86a..5ea6de7 100755
--- a/installer/desktop.sh
+++ b/installer/desktop.sh
@@ -1,10 +1,5 @@
 #!/bin/sh -e
 
-if [[ ! -x "$(command -v sjb-orgmode-installer)" ]]; then
-    echo "Error: sjb config script are not installed, run sjb-install.sh" >&2
-    exit 1
-fi
-
 if [[ -x "$(command -v systemctl)" ]]; then
     systemctl --user enable --now syncthing
 fi
diff --git a/packages/sjb-base.packages b/packages/sjb-base.packages
index 9fcac47..ee82e38 100644
--- a/packages/sjb-base.packages
+++ b/packages/sjb-base.packages
@@ -35,6 +35,7 @@ systemd-boot-manager
 ufw
 upower
 wireguard-tools
+base-devel
 
 ethtool
 smartmontools
@@ -100,7 +101,7 @@ rust
 go
 uv
 nodejs
-donet-runtime
+dotnet-runtime
 
 gopass
 iamb-bin
@@ -112,7 +113,6 @@ yt-dlp
 fabric-ai-bin
 
 lazyjj
-jj
 resvg
 reader-bin
 portal-bin
diff --git a/packages/sjb-desktop.packages b/packages/sjb-desktop.packages
index 82ba71f..e68aa38 100644
--- a/packages/sjb-desktop.packages
+++ b/packages/sjb-desktop.packages
@@ -2,7 +2,7 @@ awesome-terminal-fonts
 adwaita-icon-theme
 brightnessctl
 chromium
-blueberry
+gnome-bluetooth-3.0
 emacs-wayland
 fcitx5
 fcitx5-gtk
@@ -21,7 +21,6 @@ gst-plugin-pipewire
 gst-plugins-bad
 gst-plugins-ugly
 gvfs
-gvfs-dnssed
 gvfs-goa
 gvfs-gphoto2
 gvfs-mtp
@@ -43,7 +42,8 @@ inkscape
 kicad
 kicad-library
 kicad-library-3d
-lemurs
+sddm
+sddm-archlinux-theme-git
 libreoffice-fresh
 mako
 mpv
diff --git a/packages/sjb-dev.packages b/packages/sjb-dev.packages
index 9036561..33635ac 100644
--- a/packages/sjb-dev.packages
+++ b/packages/sjb-dev.packages
@@ -1,9 +1,10 @@
+fakeroot
 bun-bin
 clang
 d2-bin
 devcontainer-cli
 dfu-programmer
-dfu-utils
+dfu-util
 diffutils
 distrobox
 doxygen
@@ -11,7 +12,7 @@ esptool
 gdb
 gef
 github-cli
-github-copilot
+github-copilot-cli-bin
 harper
 hurl
 incus