diff --git a/README.md b/README.md index 5d78b16..ebd41e7 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ ## First login behavior - Triggers for each non-root user on their first session. -- Writes state to `~/.local/state/deinonyxus/nixpkgs-init.done`; delete it to rerun. +- Writes state to `~/.local/state/deinonyxus/curator-init.done`; delete it to rerun. - Bootstraps `~/.config/home-manager/home.nix` and runs `home-manager switch` with the package set above. ## Install / Rebase diff --git a/files/scripts/nixpkgs.sh b/files/scripts/nixpkgs.sh deleted file mode 120000 index a232a07..0000000 --- a/files/scripts/nixpkgs.sh +++ /dev/null @@ -1 +0,0 @@ -../system/usr/libexec/randofin-os/nixpkgs.sh \ No newline at end of file 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 new file mode 120000 index 0000000..e7af513 --- /dev/null +++ b/files/system/usr/lib/systemd/user/default.target.wants/deinonyxus-curator-init.service @@ -0,0 +1 @@ +/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/default.target.wants/deinonyxus-nixpkgs-init.service b/files/system/usr/lib/systemd/user/default.target.wants/deinonyxus-nixpkgs-init.service deleted file mode 120000 index 937f72b..0000000 --- a/files/system/usr/lib/systemd/user/default.target.wants/deinonyxus-nixpkgs-init.service +++ /dev/null @@ -1 +0,0 @@ -../deinonyxus-nixpkgs-init.service \ No newline at end of file diff --git a/files/system/usr/lib/systemd/user/deinonyxus-nixpkgs-init.service b/files/system/usr/lib/systemd/user/deinonyxus-curator-init.service similarity index 56% rename from files/system/usr/lib/systemd/user/deinonyxus-nixpkgs-init.service rename to files/system/usr/lib/systemd/user/deinonyxus-curator-init.service index 4e1ca95..9963d06 100644 --- a/files/system/usr/lib/systemd/user/deinonyxus-nixpkgs-init.service +++ b/files/system/usr/lib/systemd/user/deinonyxus-curator-init.service @@ -1,13 +1,13 @@ [Unit] Description=Install Nix Home Manager and packages on first login ConditionUser=!root -ConditionPathExists=!%h/.local/state/deinonyxus/nixpkgs-init.done +ConditionPathExists=!%h/.local/state/deinonyxus/curator-init.done [Service] Type=oneshot -ExecStart=/usr/libexec/deinonyxus/nixpkgs.sh +ExecStart=/usr/libexec/deinonyxus/curator.sh ExecStartPost=/usr/bin/mkdir -p %h/.local/state/deinonyxus -ExecStartPost=/usr/bin/touch %h/.local/state/deinonyxus/nixpkgs-init.done +ExecStartPost=/usr/bin/touch %h/.local/state/deinonyxus/curator-init.done [Install] WantedBy=default.target diff --git a/files/system/usr/libexec/deinonyxus/curator.sh b/files/system/usr/libexec/deinonyxus/curator.sh new file mode 100755 index 0000000..f8bed91 --- /dev/null +++ b/files/system/usr/libexec/deinonyxus/curator.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +set -oue pipefail + +uv tool install --from git+https://codeberg.org/randogoth/curator/ curator + +curator init +curator add brew.mc +curator add nix.micro +curator add nix.vscodium +curator switch \ No newline at end of file diff --git a/files/system/usr/libexec/deinonyxus/nixpkgs.sh b/files/system/usr/libexec/deinonyxus/nixpkgs.sh deleted file mode 100755 index dae46d0..0000000 --- a/files/system/usr/libexec/deinonyxus/nixpkgs.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash -set -oue pipefail -nix run github:nix-community/home-manager/release-25.11 -- init --switch - -pkgs='uv micro vscodium mc' -f=~/.config/home-manager/home.nix -tmp="$(mktemp)" -{ - echo " home.packages = [" - for p in $pkgs; do echo " pkgs.$p"; done - echo " ];" -} > "$tmp" - -sed -i "/^[[:space:]]*home\.packages[[:space:]]*=[[:space:]]*\[/,/^[[:space:]]*];[[:space:]]*$/{ - /^[[:space:]]*home\.packages[[:space:]]*=/{ - r $tmp - } - d -}" "$f" - -rm -f "$tmp" - -home-manager switch diff --git a/recipes/recipe.yml b/recipes/recipe.yml index f169d3e..fbf3b04 100644 --- a/recipes/recipe.yml +++ b/recipes/recipe.yml @@ -32,6 +32,7 @@ modules: install: packages: - syncthing + - uv - waydroid remove: packages: