diff --git a/just/custom.just b/just/custom.just index 05eceece4a0..9c1957bfe18 100644 --- a/just/custom.just +++ b/just/custom.just @@ -144,6 +144,11 @@ nix-devbox: curl -fsSL https://get.jetpack.io/devbox | bash echo 'You MUST reboot to continue' +# Remove nix +nix-remove: + echo 'Setting phasers to stun. Removing nix.' + /nix/nix-installer uninstall + # Install nix and Devbox (Global Profile) nix-devbox-global: echo 'Installing devbox global profile.' diff --git a/usr/bin/ublue-nix-install b/usr/bin/ublue-nix-install index d0f6159405f..3416f2d5f0e 100755 --- a/usr/bin/ublue-nix-install +++ b/usr/bin/ublue-nix-install @@ -1,97 +1,5 @@ #!/bin/bash -# original script here: https://github.com/dnkmmr69420/nix-with-selinux/blob/main/silverblue-installer.sh -# thanks dnkmmr! - -#!/bin/bash -sudo sleep 2 -echo "Adding selinux content to /nix" -sudo semanage fcontext -a -t etc_t '/nix/store/[^/]+/etc(/.*)?' ; sudo semanage fcontext -a -t lib_t '/nix/store/[^/]+/lib(/.*)?' ; sudo semanage fcontext -a -t systemd_unit_file_t '/nix/store/[^/]+/lib/systemd/system(/.*)?' ; sudo semanage fcontext -a -t man_t '/nix/store/[^/]+/man(/.*)?' ; sudo semanage fcontext -a -t bin_t '/nix/store/[^/]+/s?bin(/.*)?' ; sudo semanage fcontext -a -t usr_t '/nix/store/[^/]+/share(/.*)?' ; sudo semanage fcontext -a -t var_run_t '/nix/var/nix/daemon-socket(/.*)?' ; sudo semanage fcontext -a -t usr_t '/nix/var/nix/profiles(/per-user/[^/]+)?/[^/]+' -sleep 1 -sudo mkdir /var/lib/nix -sleep 1 -echo "adding selinux content to /var/lib/nix" -sudo semanage fcontext -a -t etc_t '/var/lib/nix/store/[^/]+/etc(/.*)?' ; sudo semanage fcontext -a -t lib_t '/var/lib/nix/store/[^/]+/lib(/.*)?' ; sudo semanage fcontext -a -t systemd_unit_file_t '/var/lib/nix/store/[^/]+/lib/systemd/system(/.*)?' ; sudo semanage fcontext -a -t man_t '/var/lib/nix/store/[^/]+/man(/.*)?' ; sudo semanage fcontext -a -t bin_t '/var/lib/nix/store/[^/]+/s?bin(/.*)?' ; sudo semanage fcontext -a -t usr_t '/var/lib/nix/store/[^/]+/share(/.*)?' ; sudo semanage fcontext -a -t var_run_t '/var/lib/nix/var/nix/daemon-socket(/.*)?' ; sudo semanage fcontext -a -t usr_t '/var/lib/nix/var/nix/profiles(/per-user/[^/]+)?/[^/]+' -echo "Creating service files" -sleep 1 -echo "creating SSL cert file" - -sudo tee /etc/systemd/system/nix-daemon.service.d/override.conf <