Codex/feat fedora installer

.github/workflows/install-script.yml

@@ -7,12 +7,14 @@ on:
       - "run_once_install-packages.sh.tmpl"
       - "dot_config/fish/config.fish.tmpl"
       - "installer/**"
+      - "Dockerfile.fedora-test-ci"
   pull_request:
     paths:
       - ".github/workflows/install-script.yml"
       - "run_once_install-packages.sh.tmpl"
       - "dot_config/fish/config.fish.tmpl"
       - "installer/**"
+      - "Dockerfile.fedora-test-ci"
   workflow_dispatch:
 
 jobs:
@@ -31,6 +33,21 @@ jobs:
       - name: Run Arch installer dry-run
         run: docker run --rm -v "$PWD:/work:ro" dotfiles-arch-test-ci
 
+  fedora:
+    name: Fedora install
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+
+      - name: Build Fedora test image
+        run: docker build -f Dockerfile.fedora-test-ci -t dotfiles-fedora-test-ci .
+
+      - name: Run Fedora installer dry-run
+        run: docker run --rm -v "$PWD:/work:ro" dotfiles-fedora-test-ci
+
   apple-silicon:
     name: Apple Silicon install
     runs-on: macos-15

Dockerfile.fedora-test

@@ -0,0 +1,13 @@
+FROM fedora:latest
+
+RUN dnf install --assumeyes \
+    rust \
+    cargo \
+    chezmoi \
+    && dnf clean all
+
+WORKDIR /work
+
+ENV CARGO_TARGET_DIR=/tmp/cargo-target
+
+CMD ["bash", "-lc", "bash -n run_once_install-packages.sh.tmpl && cd installer && cargo build --release && /tmp/cargo-target/release/dotsetup install"]

Dockerfile.fedora-test-ci

@@ -0,0 +1,13 @@
+FROM fedora:latest
+
+RUN dnf install --assumeyes \
+    rust \
+    cargo \
+    chezmoi \
+    && dnf clean all
+
+WORKDIR /work
+
+ENV CARGO_TARGET_DIR=/tmp/cargo-target
+
+CMD ["bash", "-lc", "bash -n run_once_install-packages.sh.tmpl && cd installer && cargo build --release && CI=1 DRY_RUN=1 /tmp/cargo-target/release/dotsetup install"]

README.md

@@ -1,6 +1,6 @@
 # Dotfiles
 
-Personal dotfiles managed with [chezmoi](https://www.chezmoi.io/). Works for macOS (Apple Silicon) and Linux (Arch/CachyOS). Also installs a large set of tools and packages I want in every system.
+Personal dotfiles managed with [chezmoi](https://www.chezmoi.io/). Works for macOS (Apple Silicon) and Linux (Arch/CachyOS/Fedora). Also installs a large set of tools and packages I want in every system.
 
 ## Quick start
 
@@ -35,6 +35,8 @@ Examples:
 ```bash
 just test-arch
 just test-arch-ci
+just test-fedora
+just test-fedora-ci
 ```
 
 ## Wiki

installer/packages.toml

@@ -53,6 +53,59 @@ pacman = [
 ]
 aur = []
 
+[fedora]
+copr = [
+  "dejan/lazygit",
+  "varlad/zellij",
+  "lihaohong/yazi",
+]
+dnf = [
+  "git",
+  "git-lfs",
+  "fish",
+  "neovim",
+  "tree-sitter-cli",
+  "@development-tools",
+  "wl-clipboard",
+  "xclip",
+  "moby-engine",
+  "tailscale",
+  "ripgrep",
+  "fd-find",
+  "fzf",
+  "gdu",
+  "btop",
+  "python3",
+  "go",
+  "zoxide",
+  "lsd",
+  "file",
+  "ffmpeg-free",
+  "unzip",
+  "7zip",
+  "jq",
+  "poppler-utils",
+  "ImageMagick",
+  "thefuck",
+  "fastfetch",
+  "figlet",
+  "cowsay",
+  "fortune-mod",
+  "tealdeer",
+  "curl",
+  "jetbrains-mono-fonts",
+  "just",
+  "navi",
+  # Virtualization (QEMU)
+  "qemu-kvm",
+  "virt-manager",
+  "virt-viewer",
+  "dnsmasq",
+  "nmap-ncat",
+  "libvirt",
+  "edk2-ovmf",
+]
+
 [macos.brew]
 formula = [
   "git",
@@ -104,6 +157,7 @@ casks = [
 packages = [
   { check = "topgrade", package = "topgrade" },
   { check = "tldr", package = "tealdeer" },
+  { check = "btm", package = "bottom" },
 ]
 
 [go]

installer/src/helpers.rs

@@ -1,5 +1,6 @@
 use indicatif::ProgressBar;
 use inquire::{Confirm, Select};
+use std::process::Command;
 
 /// Prompts the user with a spinner and a confirmation message.
 /// Returns `true` if the user confirms, `false` otherwise.
@@ -58,3 +59,61 @@ pub fn is_non_interactive() -> bool {
         || std::env::var("DRY_RUN").is_ok()
         || !std::io::IsTerminal::is_terminal(&std::io::stdin())
 }
+
+pub fn root_command(command: &str, args: Vec<String>) -> Vec<String> {
+    root_command_for_uid(command, args, current_uid())
+}
+
+fn current_uid() -> Option<u32> {
+    let output = Command::new("id").arg("-u").output().ok()?;
+    if !output.status.success() {
+        return None;
+    }
+
+    std::str::from_utf8(&output.stdout)
+        .ok()?
+        .trim()
+        .parse()
+        .ok()
+}
+
+fn root_command_for_uid(command: &str, args: Vec<String>, uid: Option<u32>) -> Vec<String> {
+    let mut command_parts = Vec::new();
+
+    if uid != Some(0) {
+        command_parts.push("sudo".into());
+    }
+
+    command_parts.push(command.into());
+    command_parts.extend(args);
+    command_parts
+}
+
+#[cfg(test)]
+mod tests {
+    use super::root_command_for_uid;
+
+    #[test]
+    fn root_command_skips_sudo_for_root() {
+        assert_eq!(
+            root_command_for_uid("dnf", vec!["install".into()], Some(0)),
+            vec!["dnf".to_string(), "install".to_string()]
+        );
+    }
+
+    #[test]
+    fn root_command_uses_sudo_for_non_root() {
+        assert_eq!(
+            root_command_for_uid("dnf", vec!["install".into()], Some(1000)),
+            vec!["sudo".to_string(), "dnf".to_string(), "install".to_string()]
+        );
+    }
+
+    #[test]
+    fn root_command_uses_sudo_when_uid_is_unknown() {
+        assert_eq!(
+            root_command_for_uid("dnf", vec!["install".into()], None),
+            vec!["sudo".to_string(), "dnf".to_string(), "install".to_string()]
+        );
+    }
+}

installer/src/installers/arch.rs

@@ -7,7 +7,7 @@ use strum_macros::{Display, EnumIter};
 use which::which;
 
 use crate::{
-    helpers::{is_non_interactive, select_with_spinner},
+    helpers::{is_non_interactive, root_command, select_with_spinner},
     packages::Packages,
     platform,
 };
@@ -70,9 +70,17 @@ impl ArchInstaller {
                 AurHelper::None => return Ok(()),
             };
 
-            let status = Command::new("sudo")
-                .args(["pacman", "-S", "--needed", "base-devel", "git"])
-                .status()?;
+            let command = root_command(
+                "pacman",
+                vec![
+                    "-S".into(),
+                    "--needed".into(),
+                    "base-devel".into(),
+                    "git".into(),
+                ],
+            );
+            let status =
+                spinner.suspend(|| Command::new(&command[0]).args(&command[1..]).status())?;
 
             if !status.success() {
                 anyhow::bail!("Failed to install AUR build dependencies");
@@ -108,14 +116,14 @@ impl ArchInstaller {
 
         let pacman = &self.packages.arch.pacman;
         if !pacman.is_empty() {
-            let mut args = vec!["pacman".into(), "-S".into(), "--needed".into()];
+            let mut args = vec!["-S".into(), "--needed".into()];
 
             if is_non_interactive() {
                 args.push("--noconfirm".into());
             }
 
             args.append(&mut pacman.clone());
-            self.commands.push(args);
+            self.commands.push(root_command("pacman", args));
         } else {
             println!("{}", style("No Pacman packages to install").bold().yellow());
         }

installer/src/installers/fedora.rs

@@ -0,0 +1,70 @@
+use console::style;
+
+use crate::{
+    helpers::{is_non_interactive, root_command},
+    packages::Packages,
+    platform,
+};
+
+pub struct FedoraInstaller {
+    packages: Packages,
+    commands: Vec<Vec<String>>,
+}
+
+impl FedoraInstaller {
+    pub fn new(packages: Packages) -> Self {
+        Self {
+            packages,
+            commands: Vec::new(),
+        }
+    }
+
+    pub fn get_commands(&self) -> &[Vec<String>] {
+        &self.commands
+    }
+
+    pub fn install(&mut self) -> anyhow::Result<()> {
+        if !platform::is_fedora() {
+            return Ok(());
+        }
+
+        let copr = &self.packages.fedora.copr;
+        if !copr.is_empty() {
+            self.commands.push(root_command(
+                "dnf",
+                vec![
+                    "install".into(),
+                    "--assumeyes".into(),
+                    "dnf-plugins-core".into(),
+                ],
+            ));
+
+            for repository in copr {
+                self.commands.push(root_command(
+                    "dnf",
+                    vec![
+                        "copr".into(),
+                        "enable".into(),
+                        "--assumeyes".into(),
+                        repository.clone(),
+                    ],
+                ));
+            }
+        }
+
+        let dnf = &self.packages.fedora.dnf;
+        if dnf.is_empty() {
+            println!("{}", style("No DNF packages to install").bold().yellow());
+            return Ok(());
+        }
+
+        let mut args = vec!["install".into()];
+        if is_non_interactive() {
+            args.push("--assumeyes".into());
+        }
+        args.append(&mut dnf.clone());
+        self.commands.push(root_command("dnf", args));
+
+        Ok(())
+    }
+}