From e201b758370ed846a7645d7102014e3867df5b37 Mon Sep 17 00:00:00 2001
From: Steve Beaulac <steve@beaulac.me>
Date: Thu, 16 Jul 2026 00:41:34 -0400
Subject: [PATCH] chore(packages): re-sort and deduplicate package lists

Alphabetically sorted all three package lists and removed duplicate
entries. Also moved some packages between lists for better grouping
(e.g. dev tools like neovim/rust/go from sjb-base to sjb-dev).
---
 packages/sjb-base.packages    | 28 ++++------------------------
 packages/sjb-desktop.packages | 28 +++++++++++++++-------------
 packages/sjb-dev.packages     | 20 ++++++++++----------
 3 files changed, 29 insertions(+), 47 deletions(-)

diff --git a/packages/sjb-base.packages b/packages/sjb-base.packages
index ee82e38..ee64403 100644
--- a/packages/sjb-base.packages
+++ b/packages/sjb-base.packages
@@ -4,28 +4,25 @@ acpid
 bolt
 btrfs-assistant
 cpupower
+croc
 dmidecode
 dmraid
-dmraid
 dnsmasq
+dog
 dosfstools
-dosfstools
-e2fsprogs
-e2fsprogs
+dust
 efibootmgr
 efitools
 exfatprogs
 f2fs-tools
 fwupd
 inetutils
-libnewt
 jfsutils
 man-db
 mtools
 networkmanager
 networkmanager-openvpn
 ntfs-3g
-ntfs-3g
 ntp
 openssh
 plymouth-git
@@ -56,7 +53,6 @@ bluez-utils
 
 alsa-firmware
 alsa-plugins
-alsa-utils 
 
 # Shell
 fish
@@ -75,11 +71,10 @@ curl
 duf
 eza
 fd
-fs
 fzf
 git
 jq
-neovim
+vim
 ripgrep
 rsync
 syncthing
@@ -97,25 +92,10 @@ pass
 pass-otp
 
 rclone
-rust
-go
-uv
-nodejs
-dotnet-runtime
-
 gopass
-iamb-bin
-croc
 weechat
 weechat-matrix-rs-git
 
 yt-dlp
-fabric-ai-bin
-
-lazyjj
 resvg
-reader-bin
-portal-bin
-codename-goose-bin
-
 
diff --git a/packages/sjb-desktop.packages b/packages/sjb-desktop.packages
index 366c10f..e458bbe 100644
--- a/packages/sjb-desktop.packages
+++ b/packages/sjb-desktop.packages
@@ -1,16 +1,17 @@
-awesome-terminal-fonts
 adwaita-icon-theme
+awesome-terminal-fonts
+awww
+blueman
 brightnessctl
 chromium
-gnome-bluetooth-3.0
 emacs-wayland
 fcitx5
 fcitx5-gtk
 fcitx5-qt
 firefox
 flatpak
+foot
 freecad
-ghostty
 gimp
 gnome-keyring
 gnome-themes-extra
@@ -35,6 +36,7 @@ hyprpaper
 hyprpicker
 hyprpolkitagent
 hyprshot
+hyprshutdown
 hyprsunset
 hyprutils
 imv
@@ -42,8 +44,6 @@ inkscape
 kicad
 kicad-library
 kicad-library-3d
-sddm
-sddm-archlinux-theme-git
 libreoffice-fresh
 mako
 mpv
@@ -53,8 +53,10 @@ noto-fonts-cjk
 noto-fonts-extra
 opendesktop-fonts
 openwebstart-bin
-otf-monaspace-nerd
+ostt-vulkan-bin
 otf-firamono-nerd
+otf-monaspace-nerd
+papirus-icon-theme
 pavucontrol
 pcmanfm
 pipewire-alsa
@@ -65,16 +67,16 @@ pipewire-session-manager
 pipewire-v4l2
 playerctl
 poppler-glib
-qt6-declarative
-qt6-wayland
 qt5ct
 qt6ct
-papirus-icon-theme
+qt6-declarative
+qt6-wayland
 rofi
 satty
+sddm
+sddm-archlinux-theme-git
 slurp
 spotify
-awww
 tenacity
 ttf-0xproto-nerd
 ttf-bitstream-vera
@@ -85,10 +87,11 @@ ttf-liberation
 ttf-meslo-nerd
 ttf-opensans
 uwsm
-walker
 wayland-pipewire-idle-inhibit
+weston
 wireplumber
 wl-clipboard
+wl-screenrec
 wtype
 xdg-desktop-portal-gtk
 xdg-desktop-portal-hyprland
@@ -97,6 +100,5 @@ xorg-xwayland
 xournalpp
 zathura
 zathura-pdf-poppler
-zoom
-ostt-vulkan-bin
 zed
+zoom
diff --git a/packages/sjb-dev.packages b/packages/sjb-dev.packages
index 33635ac..450c499 100644
--- a/packages/sjb-dev.packages
+++ b/packages/sjb-dev.packages
@@ -1,35 +1,35 @@
-fakeroot
-bun-bin
 clang
-d2-bin
-devcontainer-cli
 dfu-programmer
 dfu-util
-diffutils
 distrobox
+toolbox
 doxygen
-esptool
+fakeroot
 gdb
 gef
 github-cli
-github-copilot-cli-bin
 harper
 hurl
 incus
 jdk-openjdk
 jujutsu
 jupyter-notebook
-mermaid-cli
+lazygit
 mise
 mono
+neovim
+nodejs
+rustup
+go
+uv
+dotnet-runtime
 nuget
 nvm
 odin
-opencode-bin
 podman
 podman-compose
 qemu-user-static
 qemu-user-static-binfmt
 tea
-lazygit
+tree-sitter-cli
 zls