Extra all packages into a single master manifest

install.sh

@@ -16,8 +16,15 @@ source $OMARCHY_INSTALL/preflight/repositories.sh
 source $OMARCHY_INSTALL/preflight/migrations.sh
 source $OMARCHY_INSTALL/preflight/first-run-mode.sh
 
+# Packages
+source $OMARCHY_INSTALL/packages.sh
+source $OMARCHY_INSTALL/packaging/asdcontrol.sh
+source $OMARCHY_INSTALL/packaging/fonts.sh
+source $OMARCHY_INSTALL/packaging/lazyvim.sh
+
 # Configuration
 source $OMARCHY_INSTALL/config/config.sh
+source $OMARCHY_INSTALL/config/theme.sh
 source $OMARCHY_INSTALL/config/branding.sh
 source $OMARCHY_INSTALL/config/network.sh
 source $OMARCHY_INSTALL/config/git.sh
@@ -31,29 +38,17 @@ source $OMARCHY_INSTALL/config/ignore-power-button.sh
 source $OMARCHY_INSTALL/config/ssh-flakiness.sh
 source $OMARCHY_INSTALL/config/detect-keyboard-layout.sh
 source $OMARCHY_INSTALL/config/fix-fkeys.sh
+source $OMARCHY_INSTALL/config/bluetooth.sh
+source $OMARCHY_INSTALL/config/printer.sh
 source $OMARCHY_INSTALL/config/xcompose.sh
+source $OMARCHY_INSTALL/config/mise-ruby.sh
+source $OMARCHY_INSTALL/config/docker.sh
 
 # Login
 source $OMARCHY_INSTALL/login/plymouth.sh
 source $OMARCHY_INSTALL/login/limine-snapper.sh
 source $OMARCHY_INSTALL/login/alt-bootloaders.sh
 
-# Development
-source $OMARCHY_INSTALL/development/terminal.sh
-source $OMARCHY_INSTALL/development/development.sh
-source $OMARCHY_INSTALL/development/nvim.sh
-source $OMARCHY_INSTALL/development/ruby.sh
-source $OMARCHY_INSTALL/development/docker.sh
-
-# Desktop
-source $OMARCHY_INSTALL/desktop/desktop.sh
-source $OMARCHY_INSTALL/desktop/hyprlandia.sh
-source $OMARCHY_INSTALL/desktop/theme.sh
-source $OMARCHY_INSTALL/desktop/bluetooth.sh
-source $OMARCHY_INSTALL/desktop/asdcontrol.sh
-source $OMARCHY_INSTALL/desktop/fonts.sh
-source $OMARCHY_INSTALL/desktop/printer.sh
-
 # Apps
 source $OMARCHY_INSTALL/apps/webapps.sh
 source $OMARCHY_INSTALL/apps/tuis.sh

install/config/bluetooth.sh

@@ -1,7 +1,4 @@
 #!/bin/bash
 
-# Install bluetooth controls
-sudo pacman -S --noconfirm --needed blueberry
-
 # Turn on bluetooth by default
 chrootable_systemctl_enable bluetooth.service

install/config/docker.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-sudo pacman -S --noconfirm --needed docker docker-compose docker-buildx
-
 # Configure Docker daemon:
 # - limit log size to avoid running out of disk
 # - use host's DNS resolver

install/config/mise-ruby.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 # Install Ruby using gcc-14 for compatibility
-sudo pacman -S --noconfirm --needed gcc14
 mise settings set ruby.ruby_build_opts "CC=gcc-14 CXX=g++-14"
 
 # Trust .ruby-version

install/config/printer.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-sudo pacman -S --noconfirm cups cups-pdf cups-filters cups-browsed system-config-printer avahi nss-mdns
 chrootable_systemctl_enable cups.service
 
 # Disable multicast dns in resolved. Avahi will provide this for better network printer discovery

install/config/theme.sh

@@ -1,20 +1,5 @@
 #!/bin/bash
 
-# Use dark mode for QT apps too (like kdenlive)
-if ! pacman -Q kvantum-qt5 &>/dev/null; then
-  sudo pacman -S --noconfirm kvantum-qt5
-fi
-
-# Prefer dark mode everything
-if ! pacman -Q gnome-themes-extra &>/dev/null; then
-  sudo pacman -S --noconfirm gnome-themes-extra # Adds Adwaita-dark theme
-fi
-
-# Allow icons to match the theme
-if ! pacman -Q yaru-icon-theme &>/dev/null; then
-  sudo pacman -S --noconfirm yaru-icon-theme
-fi
-
 gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
 gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
 gsettings set org.gnome.desktop.interface icon-theme "Yaru-blue"

install/desktop/desktop.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-sudo pacman -S --noconfirm --needed \
-  brightnessctl playerctl pamixer wiremix wireplumber \
-  fcitx5 fcitx5-gtk fcitx5-qt wl-clip-persist \
-  nautilus sushi ffmpegthumbnailer gvfs-mtp \
-  python-gobject power-profiles-daemon \
-  slurp satty wf-recorder wl-screenrec \
-  mpv evince imv \
-  walker-bin omarchy-chromium

install/desktop/fonts.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-sudo pacman -S --noconfirm --needed \
-  ttf-font-awesome ttf-cascadia-mono-nerd ttf-jetbrains-mono ttf-ia-writer \
-  noto-fonts noto-fonts-emoji noto-fonts-cjk noto-fonts-extra
-
-mkdir -p ~/.local/share/fonts
-cp ~/.local/share/omarchy/config/omarchy.ttf ~/.local/share/fonts/
-fc-cache

install/desktop/hyprlandia.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-sudo pacman -S --noconfirm --needed \
-  hyprland hyprshot hyprpicker hyprlock hypridle hyprsunset polkit-gnome hyprland-qtutils \
-  libqalculate waybar mako swaybg swayosd \
-  xdg-desktop-portal-hyprland xdg-desktop-portal-gtk

install/development/development.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-sudo pacman -S --noconfirm --needed \
-  cargo clang llvm mise \
-  imagemagick \
-  mariadb-libs postgresql-libs \
-  github-cli \
-  lazygit lazydocker

install/development/terminal.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-sudo pacman -S --noconfirm --needed \
-  unzip inetutils impala \
-  fd eza fzf ripgrep zoxide bat dust jq xmlstarlet \
-  wl-clipboard fastfetch btop \
-  man tldr less whois plocate \
-  starship bash-completion \
-  gum python-poetry-core python-terminaltexteffects \
-  tzupdate \
-  ufw ufw-docker \
-  alacritty

install/login/limine-snapper.sh

@@ -62,7 +62,6 @@ term_background_bright: 24283b
  
 EOF
 
-  sudo pacman -S --noconfirm --needed limine-snapper-sync limine-mkinitcpio-hook
   sudo limine-update
 
   # Match Snapper configs if not installing from the ISO

install/login/plymouth.sh

@@ -1,9 +1,6 @@
 #!/bin/bash
 
 # Hyprland launched via UWSM and login directly as user, rely on disk encryption + hyprlock for security
-if ! command -v uwsm &>/dev/null || ! command -v plymouth &>/dev/null; then
-  sudo pacman -S --noconfirm --needed plymouth uwsm
-fi
 
 # ==============================================================================
 # PLYMOUTH SETUP

install/packages.sh

@@ -0,0 +1,109 @@
+sudo pacman -S --noconfirm --needed \
+  alacritty \
+  avahi \
+  bash-completion \
+  bat \
+  blueberry \
+  brightnessctl \
+  btop \
+  cargo \
+  clang \
+  cups \
+  cups-browsed \
+  cups-filters \
+  cups-pdf \
+  docker \
+  docker-buildx \
+  docker-compose \
+  dust \
+  evince \
+  eza \
+  fastfetch \
+  fcitx5 \
+  fcitx5-gtk \
+  fcitx5-qt \
+  fd \
+  ffmpegthumbnailer \
+  fzf \
+  gcc14 \
+  github-cli \
+  gnome-themes-extra \
+  gum \
+  gvfs-mtp \
+  hypridle \
+  hyprland \
+  hyprland-qtutils \
+  hyprlock \
+  hyprpicker \
+  hyprshot \
+  hyprsunset \
+  imagemagick \
+  impala \
+  imv \
+  inetutils \
+  jq \
+  kvantum-qt5 \
+  lazydocker \
+  lazygit \
+  less \
+  libqalculate \
+  limine-mkinitcpio-hook \
+  limine-snapper-sync \
+  llvm \
+  luarocks \
+  mako \
+  man \
+  mariadb-libs \
+  mise \
+  mpv \
+  nautilus \
+  noto-fonts \
+  noto-fonts-cjk \
+  noto-fonts-emoji \
+  noto-fonts-extra \
+  nss-mdns \
+  nvim \
+  omarchy-chromium \
+  pamixer \
+  playerctl \
+  plocate \
+  plymouth \
+  polkit-gnome \
+  postgresql-libs \
+  power-profiles-daemon \
+  python-gobject \
+  python-poetry-core \
+  python-terminaltexteffects \
+  ripgrep \
+  satty \
+  slurp \
+  starship \
+  sushi \
+  swaybg \
+  swayosd \
+  system-config-printer \
+  tldr \
+  tree-sitter-cli \
+  ttf-cascadia-mono-nerd \
+  ttf-font-awesome \
+  ttf-ia-writer \
+  ttf-jetbrains-mono \
+  tzupdate \
+  ufw \
+  ufw-docker \
+  unzip \
+  uwsm \
+  walker-bin \
+  waybar \
+  wf-recorder \
+  whois \
+  wiremix \
+  wireplumber \
+  wl-clip-persist \
+  wl-clipboard \
+  wl-screenrec \
+  xdg-desktop-portal-gtk \
+  xdg-desktop-portal-hyprland \
+  xmlstarlet \
+  yaru-icon-theme \
+  zoxide

install/packaging/fonts.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Omarchy logo in a font for Waybar use
+mkdir -p ~/.local/share/fonts
+cp ~/.local/share/omarchy/config/omarchy.ttf ~/.local/share/fonts/
+fc-cache

install/packaging/lazyvim.sh

@@ -1,10 +1,6 @@
 #!/bin/bash
 
-if ! command -v nvim &>/dev/null || [ ! -d "$HOME/.config/nvim" ]; then
+if [[ ! -d "$HOME/.config/nvim" ]]; then
-  sudo pacman -S --noconfirm --needed nvim luarocks tree-sitter-cli
-
-  # Install LazyVim
-  rm -rf ~/.config/nvim
   git clone https://github.com/LazyVim/starter ~/.config/nvim
   cp -R ~/.local/share/omarchy/config/nvim/* ~/.config/nvim/
   rm -rf ~/.config/nvim/.git