mirror of
https://github.com/lhns/steam-frame-nix.git
synced 2026-10-06 03:00:13 +02:00
install: a short closing note instead of "Next steps"
The switch already ran, so the note only says to open a new terminal, where the configuration is and how to apply changes. Dropped: the "uncomment the steamFrame block" hint, the Konsole/Developer Mode hint and the status/uninstall line.
This commit is contained in:
1 parent
9936f32aea
commit
569ebea6cd
2 files changed
+9
-13
No files matched your search
+6
-13
@@ -567,9 +567,10 @@ cmd_install() {
|
|||||||
local pending=()
|
local pending=()
|
||||||
mapfile -t pending < <(restart_pending)
|
mapfile -t pending < <(restart_pending)
|
||||||
|
|
||||||
local switch_cmd="home-manager switch --flake $ref" edit="your configuration"
|
local switch_cmd="home-manager switch --flake $ref" config=$ref
|
||||||
if [[ -n $dir ]]; then
|
if [[ -n $dir ]]; then
|
||||||
edit="$dir/home.nix"
|
config="$(tilde "$dir")"
|
||||||
|
[[ -e $dir/home.nix ]] && config+=" (home.nix)"
|
||||||
if [[ $(readlink -f "$HM_CONFIG_LINK" 2>/dev/null) == "$dir" ]] \
|
if [[ $(readlink -f "$HM_CONFIG_LINK" 2>/dev/null) == "$dir" ]] \
|
||||||
&& [[ $ref == "$dir" || $ref == "$dir#$USER_NAME" ]]; then
|
&& [[ $ref == "$dir" || $ref == "$dir#$USER_NAME" ]]; then
|
||||||
switch_cmd="home-manager switch"
|
switch_cmd="home-manager switch"
|
||||||
@@ -584,17 +585,9 @@ cmd_install() {
|
|||||||
fi
|
fi
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
|
|
||||||
Next steps:
|
Open a new terminal so that nix and home-manager are on your PATH.
|
||||||
- Open a new terminal so that nix and home-manager are on your PATH.
|
Your configuration: $config. After changing it, apply it with
|
||||||
- Edit $edit (e.g. uncomment the steamFrame block),
|
'$switch_cmd' (from a terminal in the nested desktop; new files need 'git add').
|
||||||
then apply it with:
|
|
||||||
$switch_cmd
|
|
||||||
Run it from a terminal in the nested desktop. Flakes only see files
|
|
||||||
tracked by git: 'git add' new files first.
|
|
||||||
- Konsole in the Steam session's "+" menu needs Steam Developer Mode
|
|
||||||
(Steam Settings > System > Enable Developer Mode) or
|
|
||||||
steamFrame.launcherMenu.showAllApps = true.
|
|
||||||
- Status: install.sh status. Remove everything: install.sh uninstall
|
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -417,6 +417,9 @@ pkgs.runCommand "cleanup-check" { nativeBuildInputs = [ cleanup pkgs.jq pkgs.git
|
|||||||
grep -q "steamFrame" $HOME/nix-config/home.nix || fail "no template"
|
grep -q "steamFrame" $HOME/nix-config/home.nix || fail "no template"
|
||||||
[ -s $HOME/nix-config/.git/steam-frame-nix-template ] || fail "no template marker"
|
[ -s $HOME/nix-config/.git/steam-frame-nix-template ] || fail "no template marker"
|
||||||
! $GIT -C $HOME/nix-config status --porcelain | grep -v '^A ' || fail "marker visible to git"
|
! $GIT -C $HOME/nix-config status --porcelain | grep -v '^A ' || fail "marker visible to git"
|
||||||
|
has "$res" "Your configuration: ~/nix-config (home.nix). After changing it, apply it with"
|
||||||
|
has "$res" "'home-manager switch' (from a terminal in the nested desktop"
|
||||||
|
for p in uncomment Konsole "install.sh status"; do hasnt "$res" "$p"; done
|
||||||
# --clone replaces it (unchanged; active with the helpers: no switch to it)
|
# --clone replaces it (unchanged; active with the helpers: no switch to it)
|
||||||
res=$(inst --clone github:owner/config)
|
res=$(inst --clone github:owner/config)
|
||||||
has "$res" "(skipped)"
|
has "$res" "(skipped)"
|
||||||
|
|||||||
Reference in new issue
Block a user