diff --git a/README.md b/README.md index 3299ba9..315f19f 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,11 @@ # Deinonyxus   [![bluebuild build badge](https://github.com/randogoth/deinonyxus/actions/workflows/build.yml/badge.svg)](https://github.com/randogoth/deinonyxus/actions/workflows/build.yml) -*Deinonyxus* is a personal spin of the UBlue Bluefin DX image with the 🍦[Lix](https://lix.systems/) flavored Nix package manager baked in and a first-login bootstrap for simple declarative package management using [curator](https://codeberg.org/randogoth/curator). - -The Nix store is seeded into `/usr/share/nix-store` in the image and bind-mounted from `/var/lib/nix-store` to `/nix` on boot to avoid overlay stacking limits on composefs/ostree. +*Deinonyxus* is a personal spin of the UBlue Bluefin DX image with the 🍦[Lix](https://lix.systems/) flavored Nix package manager baked in. ## What’s inside - Base: `ghcr.io/ublue-os/bluefin-dx:latest` without Cockpit, Docker, Firefox, VS Code -- Lix: multi-user install baked in with persistence at `/var/home/nix`; `nix-daemon.service` enabled. -(D) - First-login bootstrap: installs Lix/nix packages `devbox`, `mc`, and `micro` via `curator` - System packages added: `syncthing`, `uv`, `vscodium`, `waydroid`; -- System flatpaks added: Telegram Desktop, Zen Browser - -## First login -- Triggers for each non-root user on their first session. -- Writes state to `~/.local/state/deinonyxus/curator-init.done`; delete it to rerun. -- Bootstraps `~/.config/curator/inventory.toml` and runs `curator switch` with the packages set above. +- System flatpaks added: Telegram Desktop, Waterfox browser ## Just Recipes - `upgrade-nix`: upgrades to the latest version of Lix via the user profile. Replaces `nix upgrade-nix` which does not work with an immutable lowerdir `/nix/store` folder diff --git a/files/scripts/ensure-plugdev-defaults.sh b/files/scripts/ensure-plugdev-defaults.sh deleted file mode 100755 index d554a26..0000000 --- a/files/scripts/ensure-plugdev-defaults.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -# Ensure new users are added to plugdev by default so OpenRazer udev rules work. -useradd_defaults=/etc/default/useradd -plugdev_group=plugdev - -touch "$useradd_defaults" - -if ! grep -q "^GROUPS=" "$useradd_defaults"; then - printf 'GROUPS=%s\n' "$plugdev_group" >>"$useradd_defaults" -elif ! grep -Eq "^GROUPS=.*\\b${plugdev_group}\\b" "$useradd_defaults"; then - # Append plugdev to any existing GROUPS setting. - sed -i "s/^GROUPS=\\(.*\\)/GROUPS=\\1 ${plugdev_group}/" "$useradd_defaults" -fi diff --git a/files/system/usr/lib/systemd/user/default.target.wants/deinonyxus-curator-init.service b/files/system/usr/lib/systemd/user/default.target.wants/deinonyxus-curator-init.service deleted file mode 120000 index e7af513..0000000 --- a/files/system/usr/lib/systemd/user/default.target.wants/deinonyxus-curator-init.service +++ /dev/null @@ -1 +0,0 @@ -/var/home/randogoth/Projects/code/randofin-os/files/system/usr/lib/systemd/user/deinonyxus-curator-init.service \ No newline at end of file diff --git a/files/system/usr/lib/systemd/user/deinonyxus-curator-init.service b/files/system/usr/lib/systemd/user/deinonyxus-curator-init.service deleted file mode 100644 index 9963d06..0000000 --- a/files/system/usr/lib/systemd/user/deinonyxus-curator-init.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Install Nix Home Manager and packages on first login -ConditionUser=!root -ConditionPathExists=!%h/.local/state/deinonyxus/curator-init.done - -[Service] -Type=oneshot -ExecStart=/usr/libexec/deinonyxus/curator.sh -ExecStartPost=/usr/bin/mkdir -p %h/.local/state/deinonyxus -ExecStartPost=/usr/bin/touch %h/.local/state/deinonyxus/curator-init.done - -[Install] -WantedBy=default.target diff --git a/files/system/usr/lib/sysusers.d/10-openrazer.conf b/files/system/usr/lib/sysusers.d/10-openrazer.conf deleted file mode 100644 index e9fc454..0000000 --- a/files/system/usr/lib/sysusers.d/10-openrazer.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Ensure plugdev exists for OpenRazer udev permissions -g plugdev - - diff --git a/files/system/usr/libexec/deinonyxus/curator.sh b/files/system/usr/libexec/deinonyxus/curator.sh deleted file mode 100755 index 4fc2b1c..0000000 --- a/files/system/usr/libexec/deinonyxus/curator.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -set -oue pipefail - -curator_git="--from git+https://codeberg.org/randogoth/curator/" - -uvx $curator_git curator init -uvx $curator_git curator add nix:mc nix:micro nix:devbox -uvx $curator_git curator switch -uv tool install $curator_git curator \ No newline at end of file diff --git a/recipes/recipe.yml b/recipes/recipe.yml index 258e836..39d2d9b 100644 --- a/recipes/recipe.yml +++ b/recipes/recipe.yml @@ -21,7 +21,6 @@ modules: - type: script scripts: - install-lix.sh - - ensure-plugdev-defaults.sh - type: systemd system: