mirror of
https://github.com/lhns/steam-frame-nix.git
synced 2026-10-06 04:04:16 +02:00
install: use an existing ~/nix-config instead of stopping
Without ~/.config/home-manager and --flake, a flake in ~/nix-config (e.g. left by uninstall) is used as it is, like --flake ~/nix-config, and linked to ~/.config/home-manager. A directory there without flake.nix still stops the install.
This commit is contained in:
1 parent
569ebea6cd
commit
d9773fafc4
3 files changed
+28
-11
No files matched your search
@@ -509,6 +509,20 @@ pkgs.runCommand "cleanup-check" { nativeBuildInputs = [ cleanup pkgs.jq pkgs.git
|
||||
! grep -q "^clone" $LOG || fail "cloned again"
|
||||
! switched_to_template || fail "template switched again"
|
||||
[ "$(grep -c '^hm ' $LOG)" = 1 ] || fail "switches: $(cat $LOG)"
|
||||
|
||||
# a plain install with ~/nix-config but no link: used as it is, linked
|
||||
rm $HOME/.config/home-manager
|
||||
res=$(inst)
|
||||
has "$res" "$HOME/nix-config already exists: using it as it is"
|
||||
hasnt "$res" "Creating a Home Manager configuration"
|
||||
has "$res" "hm switch --flake $HOME/nix-config -b"
|
||||
has "$res" "'home-manager switch' (from"
|
||||
[ "$(readlink $HOME/.config/home-manager)" = $HOME/nix-config ] || fail "plain install: link"
|
||||
# not a flake: the error, nothing created
|
||||
rm $HOME/.config/home-manager $HOME/nix-config/flake.nix
|
||||
res=$(inst 2>&1) && fail "a directory without flake.nix accepted"
|
||||
has "$res" "$HOME/nix-config exists and is not empty"
|
||||
gone $HOME/.config/home-manager
|
||||
echo "G ok"
|
||||
|
||||
# --- H: uninstall: Nix goes while programs from the store still run ---
|
||||
|
||||
Reference in new issue
Block a user