From 02ff6cc4a7b7225f46bdfefa6b9eec4e221b1e25 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Sun, 22 May 2022 03:47:34 +0000 Subject: [PATCH 1/9] Update install.sh --- install.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/install.sh b/install.sh index 00bff76..c9e89c6 100644 --- a/install.sh +++ b/install.sh @@ -43,6 +43,10 @@ echo "" echo "Which is the root partition?" read rootName +echo "" +echo "Which is your username?" +read userName + # Create EFI partition sudo mkfs.fat -F32 -n EFI $efiName @@ -89,6 +93,9 @@ sudo nixos-generate-config --root /mnt curl https://gitlab.com/ahoneybun/nyxi-installer/-/raw/main/config.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/ +sed -i 's/aaronh/$userName/g' /mnt/etc/configuration.nix +sed -i 's/home/aaronh/home/$userName/g' /mnt/etc/configuration.nix + # Install sudo nixos-install From 53b223bfa52f451f8909394c3fdcf4095e7d4e5c Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Sun, 22 May 2022 03:50:07 +0000 Subject: [PATCH 2/9] Update install.sh --- install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install.sh b/install.sh index c9e89c6..c121f56 100644 --- a/install.sh +++ b/install.sh @@ -46,6 +46,7 @@ read rootName echo "" echo "Which is your username?" read userName +echo "" # Create EFI partition sudo mkfs.fat -F32 -n EFI $efiName From ff72f6fac825bbd113f6754d86fc4ae11d6df382 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Sun, 22 May 2022 03:53:18 +0000 Subject: [PATCH 3/9] Update install.sh --- install.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/install.sh b/install.sh index c121f56..a581503 100644 --- a/install.sh +++ b/install.sh @@ -94,12 +94,13 @@ sudo nixos-generate-config --root /mnt curl https://gitlab.com/ahoneybun/nyxi-installer/-/raw/main/config.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/ -sed -i 's/aaronh/$userName/g' /mnt/etc/configuration.nix -sed -i 's/home/aaronh/home/$userName/g' /mnt/etc/configuration.nix - # Install sudo nixos-install +# Replacing username +sed -i 's/aaronh/$userName/g' /mnt/etc/configuration.nix +sed -i 's/home/aaronh/home/$userName/g' /mnt/etc/configuration.nix + # Start Setup section # sudo -i # curl https://gitlab.com/ahoneybun/nynx-installer/-/raw/main/setup.sh > /mnt/setup.sh @@ -113,6 +114,3 @@ sudo nixos-install # Removed install script. rm install.sh - -# Remove setup script -# rm setup.sh From b6504ab7b6d93fff3fd06bfbe0c5285aa8aaca52 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Sun, 22 May 2022 03:55:20 +0000 Subject: [PATCH 4/9] Update config.nix --- config.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/config.nix b/config.nix index 78356e1..355f9c9 100644 --- a/config.nix +++ b/config.nix @@ -53,16 +53,12 @@ services.fwupd.enable = true; # Define user accounts - users.extraUsers = - { - aaronh = - { - home = "/home/aaronh"; - extraGroups = [ "wheel" "networkmanager" ]; - isNormalUser = true; - hashedPassword = "$6$aAcbLtqiqzySifls$jdKMOQjoWITHD/dWNNZVUH/qNc6aoJ7v4zYofi0U7IJSVTbmOfChS3mzaJbp57AodjdPNKPrnrip8Nlh2Qanx."; - }; - }; + users.extraUsers.aaronh = { + home = "/home/aaronh"; + extraGroups = [ "wheel" "networkmanager" ]; + isNormalUser = true; + hashedPassword = "$6$aAcbLtqiqzySifls$jdKMOQjoWITHD/dWNNZVUH/qNc6aoJ7v4zYofi0U7IJSVTbmOfChS3mzaJbp57AodjdPNKPrnrip8Nlh2Qanx."; + }; # Install some packages environment.systemPackages = From 1b799fc5a6d2633d42ec0cc25eabf01f28321575 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Sun, 22 May 2022 04:08:04 +0000 Subject: [PATCH 5/9] Update install.sh --- install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index a581503..794f4ef 100644 --- a/install.sh +++ b/install.sh @@ -94,13 +94,13 @@ sudo nixos-generate-config --root /mnt curl https://gitlab.com/ahoneybun/nyxi-installer/-/raw/main/config.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/ -# Install -sudo nixos-install - # Replacing username sed -i 's/aaronh/$userName/g' /mnt/etc/configuration.nix sed -i 's/home/aaronh/home/$userName/g' /mnt/etc/configuration.nix +# Install +sudo nixos-install + # Start Setup section # sudo -i # curl https://gitlab.com/ahoneybun/nynx-installer/-/raw/main/setup.sh > /mnt/setup.sh From 523e854cc8e1879cbb3fc43cffb287d678c52c13 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Sun, 22 May 2022 04:08:54 +0000 Subject: [PATCH 6/9] Update install.sh --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 794f4ef..bedb216 100644 --- a/install.sh +++ b/install.sh @@ -95,8 +95,8 @@ sudo nixos-generate-config --root /mnt curl https://gitlab.com/ahoneybun/nyxi-installer/-/raw/main/config.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/ # Replacing username -sed -i 's/aaronh/$userName/g' /mnt/etc/configuration.nix -sed -i 's/home/aaronh/home/$userName/g' /mnt/etc/configuration.nix +sudo sed -i 's/aaronh/$userName/g' /mnt/etc/configuration.nix +sudo sed -i 's/home/aaronh/home/$userName/g' /mnt/etc/configuration.nix # Install sudo nixos-install From 476c35a560ac410a84ccf7603cc4c134dc539726 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Mon, 23 May 2022 01:32:25 +0000 Subject: [PATCH 7/9] Update install.sh --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index bedb216..484e557 100644 --- a/install.sh +++ b/install.sh @@ -95,8 +95,8 @@ sudo nixos-generate-config --root /mnt curl https://gitlab.com/ahoneybun/nyxi-installer/-/raw/main/config.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/ # Replacing username -sudo sed -i 's/aaronh/$userName/g' /mnt/etc/configuration.nix -sudo sed -i 's/home/aaronh/home/$userName/g' /mnt/etc/configuration.nix +sudo sed -i 's/aaronh/$userName/g' /mnt/etc/nixos/configuration.nix +sudo sed -i 's/home/aaronh/home/$userName/g' /mnt/etc/nixos/configuration.nix # Install sudo nixos-install From e12717f2f3492286a29e74dcb70f621d2d44aa2c Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Mon, 23 May 2022 01:38:37 +0000 Subject: [PATCH 8/9] Update install.sh --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 484e557..9792132 100644 --- a/install.sh +++ b/install.sh @@ -95,8 +95,8 @@ sudo nixos-generate-config --root /mnt curl https://gitlab.com/ahoneybun/nyxi-installer/-/raw/main/config.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/ # Replacing username -sudo sed -i 's/aaronh/$userName/g' /mnt/etc/nixos/configuration.nix -sudo sed -i 's/home/aaronh/home/$userName/g' /mnt/etc/nixos/configuration.nix +sudo sed -i "s/aaronh/$userName/g" /mnt/etc/nixos/configuration.nix +sudo sed -i "s/home/aaronh/home/$userName/g" /mnt/etc/nixos/configuration.nix # Install sudo nixos-install From 8500a002c1c34f976fe6a4556c61d873f6718259 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Mon, 23 May 2022 14:00:30 +0000 Subject: [PATCH 9/9] Update install.sh --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 9792132..1559872 100644 --- a/install.sh +++ b/install.sh @@ -96,7 +96,7 @@ curl https://gitlab.com/ahoneybun/nyxi-installer/-/raw/main/config.nix > configu # Replacing username sudo sed -i "s/aaronh/$userName/g" /mnt/etc/nixos/configuration.nix -sudo sed -i "s/home/aaronh/home/$userName/g" /mnt/etc/nixos/configuration.nix +sudo sed -i "s/\/home\/aaronh/\/home\/$userName/g" /mnt/etc/nixos/configuration.nix # Install sudo nixos-install