Merge branch 'main' into 'main-pbp'

# Conflicts:
#   README.md
#   install.sh
This commit is contained in:
Aaron Honeycutt 2023-01-25 18:11:51 +00:00
commit 83b2ac8792
6 changed files with 5 additions and 9 deletions

View file

@ -55,7 +55,7 @@ https://nixos.org/manual/nixos/stable/index.html#sec-installation-booting-networ
## Start the installer
```sh
sh <(curl -L https://gitlab.com/ahoneybun/nyxi-installer/-/raw/main-pbp/install.sh)
sh <(curl -L https://gitlab.com/ahoneybun/nyxi-installer/-/raw/main/install.sh)
```
The following will happen:

0
Screenshots/.gitkeep Normal file
View file

Binary file not shown.

After

Width:  |  Height:  |  Size: 223 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 107 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 170 KiB

View file

@ -21,10 +21,6 @@ echo +1G # Set +1G as last sector.
echo n # Create new partition (for root).
echo # Set default partition number.
echo # Set default first sector.
echo -4G # Set last sector.
echo n # Create Swap partition
echo # Set default partition number.
echo # Set default first sector.
echo # Set last sector.
echo t # Change partition type.
echo 1 # Pick first partition.
@ -91,17 +87,17 @@ read desktopChoice
# Update the second command to the file name that matches your DE/WM .nix file
if [ $desktopChoice = 1 ]; then
curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/plasma.nix > plasma.nix; sudo mv -f plasma.nix /mnt/etc/nixos/
curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/plasma.nix > plasma.nix; sudo mv -f plasma.nix /mnt/etc/nixos/
sudo sed -i "10 i \ ./plasma.nix" /mnt/etc/nixos/configuration.nix
else
if [ $desktopChoice = 2 ]; then
curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/gnome.nix > gnome.nix; sudo mv -f gnome.nix /mnt/etc/nixos/
curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/gnome.nix > gnome.nix; sudo mv -f gnome.nix /mnt/etc/nixos/
sudo sed -i "10 i \ ./gnome.nix" /mnt/etc/nixos/configuration.nix
fi
if [ $desktopChoice = 3 ]; then
curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/pantheon.nix > pantheon.nix; sudo mv -f pantheon.nix /mnt/etc/nixos/
curl https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/pantheon.nix > pantheon.nix; sudo mv -f pantheon.nix /mnt/etc/nixos/
sudo sed -i "10 i \ ./pantheon.nix" /mnt/etc/nixos/configuration.nix
fi