From 75411387bf7f447d04962adee2fcd2dae47811a3 Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Sun, 29 Dec 2024 22:15:11 -0700 Subject: [PATCH] fish: user_setup: Try using systemd-nspawn by default on aarch64 and x86_64 systems Signed-off-by: Nathan Chancellor --- fish/functions/user_setup.fish | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fish/functions/user_setup.fish b/fish/functions/user_setup.fish index 1f404db2..b0e9ca3f 100644 --- a/fish/functions/user_setup.fish +++ b/fish/functions/user_setup.fish @@ -343,14 +343,15 @@ rpmbuild/' >>$gitignore end end - switch $LOCATION-(uname -m) - case hetzner'*' workstation'*' vm-x86_64 + switch (uname -m) + case aarch64 x86_64 ln -fnrsv $configs/tmux/.tmux.conf.nspawn $HOME/.tmux.conf.container - # These platforms are guaranteed to use tmux so ensure the tmux + # These platforms will more than likely use tmux so ensure the tmux # directory exists with the expected permissions so that sd_nspawn - # will find it and mount it into the container properly. This is - # not necessarily safe to do if the platform is not going to use tmux. + # will find it and mount it into the container properly. Even if they + # do not use tmux, creating the directory and passing it through to + # the container is not the end of the world, as no socket will exist. set tmux_tmp /var/tmp/tmux-(id -u) mkdir -p $tmux_tmp # tmux checks that the permissions are restrictive