feat: Add system updater, config updates with three-way merge, and version tracking (v1)

Author: draphy

CONTRIBUTING.md

@@ -0,0 +1,92 @@
+# draphyOS Package Manifest
+# Format: package_name:min_version:max_version
+# - min_version: first version where package is required (empty = always)
+# - max_version: last version where package is required (empty = current)
+#
+# Examples:
+#   polybar::          # Required in all versions
+#   newtool:2:         # Added in version 2, still required
+#   oldtool::1         # Only in version 1, removed after
+#   temptool:2:3       # Only in versions 2 and 3
+
+# === Core (always required) ===
+i3::
+i3lock::
+dunst::
+lightdm::
+
+# === Terminal ===
+rxvt-unicode::
+
+# === Networking ===
+NetworkManager::
+network-manager-applet::
+firefox::
+
+# === Audio ===
+pulseaudio-utils::
+pavucontrol::
+
+# === Utilities ===
+brightnessctl::
+htop::
+mousepad::
+Thunar::
+
+# === App launcher ===
+rofi::
+
+# === Productivity & GUI tools ===
+lxappearance::
+powertop::
+arandr::
+tmux::
+
+# === draphyOS Customizations ===
+# Shell
+fish::
+
+# Status bar
+polybar::
+
+# Compositor
+picom::
+
+# Utilities
+feh::
+flameshot::
+playerctl::
+xss-lock::
+ImageMagick::
+xdotool::
+xclip::
+
+# Bluetooth
+blueman::
+
+# Authentication
+xfce-polkit::
+gnome-keyring::
+
+# Theming
+xfce4-settings::
+
+# Night light
+redshift::
+geoclue2::
+
+# Fonts
+fira-code-fonts::
+google-noto-sans-mono-vf-fonts::
+fontawesome-6-free-fonts::
+fontawesome-6-brands-fonts::
+
+# Icons & Themes
+mint-y-icons::
+adwaita-cursor-theme::
+
+# Calendar popup
+yad::
+
+# Qt theming
+qt5ct::

PACKAGES

@@ -55,6 +55,7 @@ If you love that vibe — welcome home.
 
 ## Features
 
+### Desktop Environment
 - ⌨️ Pre-configured i3 window manager with vim-style keybindings
 - 📊 Clean polybar status bar (replaces i3status)
 - 🚀 Beautiful rofi app launcher with dark theme
@@ -65,6 +66,13 @@ If you love that vibe — welcome home.
 - 🌙 Night light (redshift) for eye comfort
 - 📋 Comprehensive keybinding cheatsheet (`Super+F1`)
 
+### System Management
+- 🔄 **System updater** (`update-draphyOS`) — Interactive tool for system updates, security patches, and Fedora version upgrades
+- ⬆️ **Config updates** — Update draphyOS configs from GitHub with intelligent three-way merge (preserves your customizations)
+- 📦 **Smart uninstall** — Tracks packages installed by draphyOS for clean removal
+- 🔋 **Battery health** — Optional 80% charge limit for laptop battery longevity
+- 🔀 **Version migrations** — Seamless upgrades between draphyOS versions
+
 ---
 
 ## 📋 Prerequisites
@@ -128,6 +136,51 @@ git clone https://github.com/draphy/draphyOS ~/.draphyOS && ~/.draphyOS/install.
 
 ---
 
+## 🔄 System Updates
+
+draphyOS includes `update-draphyOS`, a safe, interactive system update tool.
+
+### Quick Usage
+
+```bash
+update-draphyOS              # Interactive menu
+update-draphyOS -u           # Quick system update
+update-draphyOS -d           # Update draphyOS configs
+update-draphyOS -v           # Fedora version upgrade
+```
+
+### Features
+
+| Option | Description |
+|--------|-------------|
+| **System Update** | Update all packages with `dnf upgrade` |
+| **Security Only** | Install only security patches |
+| **Full Maintenance** | Update + clean cache + remove orphans |
+| **Fedora Upgrade** | Upgrade to next Fedora version (e.g., F41 → F42) |
+| **draphyOS Update** | Pull latest configs from GitHub |
+
+### draphyOS Config Updates
+
+When you update draphyOS configs, the updater:
+
+1. **Backs up** your current configs automatically
+2. **Fetches** the latest version from GitHub
+3. **Preserves your changes** using three-way merge:
+   - If you haven't modified a config → updates automatically
+   - If only upstream changed → updates automatically
+   - If both changed → attempts auto-merge, asks you on conflicts
+4. **Runs migrations** for version upgrades (e.g., new keybindings, config format changes)
+5. **Installs new packages** if required by the update
+
+### Conflict Resolution
+
+When a config conflict is detected, you choose:
+- **Keep mine** — Ignore upstream changes
+- **Use new** — Replace with upstream version
+- **Backup & use new** — Save your version as `.backup-TIMESTAMP`, use new
+
+---
+
 ## ⌨️ Keybindings
 
 | Key                       | Action                   |
@@ -282,6 +335,8 @@ Every tool in draphyOS was chosen with a purpose. Here's why:
 
 ## 📁 Configuration Files
 
+### User Configs (symlinked to ~/.draphyOS/configs/)
+
 | Config   | Location                           | Description    |
 | -------- | ---------------------------------- | -------------- |
 | i3       | `~/.config/i3/config`              | Window manager |
@@ -294,6 +349,17 @@ Every tool in draphyOS was chosen with a purpose. Here's why:
 | Redshift | `~/.config/redshift/redshift.conf` | Night light    |
 | GTK      | `~/.config/gtk-3.0/settings.ini`   | Theme settings |
 
+### draphyOS Internal Files
+
+| File | Location | Description |
+| ---- | -------- | ----------- |
+| Install marker | `~/.draphyOS-installed` | Tracks installation state, version, base system |
+| Package state | `~/.draphyOS-packages-before` | Snapshot of packages before install (for clean uninstall) |
+| Config checksums | `~/.draphyOS-config-checksums` | MD5 checksums for three-way merge during updates |
+| Update script | `/usr/local/bin/update-draphyOS` | System-wide update command |
+| VERSION | `~/.draphyOS/VERSION` | Current draphyOS version number |
+| PACKAGES | `~/.draphyOS/PACKAGES` | Package manifest with version requirements |
+
 ---
 
 ## 💡 Productivity Tips
@@ -401,6 +467,55 @@ No setup needed — works automatically with PAM.
 
 </details>
 
+<details>
+<summary><strong>🔋 Battery Charge Limit</strong></summary>
+
+During installation, you can set an 80% charge limit to extend battery lifespan:
+- Reduces battery wear from constant 100% charging
+- Best for laptops that are often plugged in
+- Uses a systemd service to persist across reboots
+
+To change the limit later:
+```bash
+# Check current limit
+cat /sys/class/power_supply/BAT0/charge_control_end_threshold
+
+# Set to 80%
+echo 80 | sudo tee /sys/class/power_supply/BAT0/charge_control_end_threshold
+
+# Set back to 100%
+echo 100 | sudo tee /sys/class/power_supply/BAT0/charge_control_end_threshold
+```
+
+> **Note:** Not all laptops support charge limits. The installer only offers this if your hardware supports it.
+
+</details>
+
+<details>
+<summary><strong>🔄 System Updates</strong></summary>
+
+Use `update-draphyOS` for all system maintenance:
+
+```bash
+update-draphyOS           # Interactive menu with all options
+update-draphyOS -u        # Quick update (equivalent to dnf upgrade)
+update-draphyOS -s        # Security updates only
+update-draphyOS -f        # Full maintenance (update + clean + autoremove)
+update-draphyOS -d        # Update draphyOS configs from GitHub
+update-draphyOS -v        # Upgrade to next Fedora version
+update-draphyOS -h        # Show help
+```
+
+The tool handles:
+- Package updates with proper metadata refresh
+- Security-only updates when you need stability
+- Orphaned package cleanup
+- Fedora version upgrades (F41 → F42)
+- Reboot prompts when kernel updates require it
+- draphyOS config updates with conflict resolution
+
+</details>
+
 <details>
 <summary><strong>⌨️ Terminal Multiplexer (tmux)</strong></summary>
 
@@ -422,6 +537,15 @@ Great for remote work — sessions persist after disconnect.
 ~/.draphyOS/uninstall.sh
 ```
 
+### Smart Package Removal
+
+draphyOS tracks which packages it installed. On uninstall:
+
+- **If package state was saved** (installations after v1): Precisely removes only packages added by draphyOS, restoring your system to its exact pre-install state
+- **Legacy installations**: Falls back to predefined package lists
+
+### Base System Detection
+
 The uninstaller is smart about your base system:
 
 **Fedora i3 Spin:**
@@ -435,10 +559,14 @@ The uninstaller is smart about your base system:
 - Option to fully remove all i3 packages
 - Restore backup or skip
 
-All uninstalls:
-- Remove draphyOS config symlinks
-- Optionally revert shell to bash
-- Optionally restore your backup configs
+### What Gets Removed
+
+- draphyOS config symlinks
+- System update script (`/usr/local/bin/update-draphyOS`)
+- Battery charge limit service (if configured)
+- LightDM customization (restored from backup)
+- Optionally: shell reverted to bash
+- Optionally: backup configs restored
 
 ---
 
@@ -508,6 +636,32 @@ If not auto-detected or you need to apply manually, picom's `glx` backend doesn'
 
 </details>
 
+<details>
+<summary><strong>update-draphyOS command not found?</strong></summary>
+
+The update script is installed to `/usr/local/bin/update-draphyOS` during installation. If it's missing:
+
+```bash
+# Reinstall the update script
+sudo cp ~/.draphyOS/update.sh /usr/local/bin/update-draphyOS
+sudo chmod +x /usr/local/bin/update-draphyOS
+```
+
+</details>
+
+<details>
+<summary><strong>Config update shows conflicts for unchanged files?</strong></summary>
+
+This can happen if you installed draphyOS before version tracking was added. The updater will create the checksum file on first update, so future updates will work correctly.
+
+To reset checksums manually:
+```bash
+rm ~/.draphyOS-config-checksums
+update-draphyOS -d
+```
+
+</details>
+
 ---
 
 ## 🤝 Contributing

README.md

@@ -0,0 +1 @@
+1