From 8fdbfb297181b67901b90492044eda23ed6384e1 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Tue, 31 May 2022 13:23:21 +0000 Subject: [PATCH 01/13] removing custom username --- install.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/install.sh b/install.sh index 1559872..493292a 100644 --- a/install.sh +++ b/install.sh @@ -43,11 +43,6 @@ echo "" echo "Which is the root partition?" read rootName -echo "" -echo "Which is your username?" -read userName -echo "" - # Create EFI partition sudo mkfs.fat -F32 -n EFI $efiName @@ -94,10 +89,6 @@ 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 - # Install sudo nixos-install From d724ef887454ef40a504174bf33ba9ea8d265e33 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Tue, 31 May 2022 13:26:01 +0000 Subject: [PATCH 02/13] Simplify custom configuration file --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 493292a..b15f30b 100644 --- a/install.sh +++ b/install.sh @@ -87,7 +87,7 @@ sudo mount $efiName /mnt/boot # Generate Nix configuration 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/ +sudo curl https://gitlab.com/ahoneybun/nyxi-installer/-/raw/main/configuration.nix > /mnt/etc/nixos/configuration.nix # Install sudo nixos-install From 669a096167c8260e6558ccd9bb548c1140c9e11c Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Tue, 31 May 2022 13:27:32 +0000 Subject: [PATCH 03/13] Add new file --- configuration.nix | 107 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 configuration.nix diff --git a/configuration.nix b/configuration.nix new file mode 100644 index 0000000..355f9c9 --- /dev/null +++ b/configuration.nix @@ -0,0 +1,107 @@ +{ config, pkgs, ... }: + +{ + # Import other configuration modules + # (hardware-configuration.nix is autogenerated upon installation) + # paths in nix expressions are always relative the file which defines them + imports = + [ + ./hardware-configuration.nix + ]; + + boot.loader = { + systemd-boot.enable = true; + }; + + boot.initrd.luks.devices = { + crypt-root = { + device = "/dev/disk/by-label/luks"; + preLVM = true; + }; + }; + + # Allow Unfree + nixpkgs.config.allowUnfree = true; + + # Enable 32 Bit libraries for applications like Steam + hardware.opengl.driSupport32Bit = true; + + # Name your host machine + networking.hostName = "NixOS"; + networking.networkmanager.enable = true; + + # Set your time zone. + time.timeZone = "America/Denver"; + + # Enter keyboard layout + services.xserver.layout = "us"; + + # Enable Flatpak + xdg = { + portal = { + enable = true; + extraPortals = with pkgs; [ + xdg-desktop-portal-wlr + xdg-desktop-portal-kde + ]; + }; + }; + + services.flatpak.enable = true; + + # Enable fwupd + services.fwupd.enable = true; + + # Define user accounts + users.extraUsers.aaronh = { + home = "/home/aaronh"; + extraGroups = [ "wheel" "networkmanager" ]; + isNormalUser = true; + hashedPassword = "$6$aAcbLtqiqzySifls$jdKMOQjoWITHD/dWNNZVUH/qNc6aoJ7v4zYofi0U7IJSVTbmOfChS3mzaJbp57AodjdPNKPrnrip8Nlh2Qanx."; + }; + + # Install some packages + environment.systemPackages = + with pkgs; + [ + firefox + fish + flatpak + git + libsForQt5.bismuth + libsForQt5.kde-gtk-config + libsForQt5.plasma-nm + libsForQt5.plasma-pa + libsForQt5.sddm + steam + thunderbird + ]; + + # Enable the OpenSSH daemon + services.openssh.enable = true; + + # Plasma + services.xserver.enable = true; + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + + # Enable Pipewire + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + # Enable Bluetooth + hardware.bluetooth.enable = true; + + # Enable CUPS + services.printing.enable = true; + + # System + system.autoUpgrade.enable = true; + system.autoUpgrade.allowReboot = true; + +} From f4ec76840d5abe5191d15212dedb59c6bd6c0a79 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Tue, 31 May 2022 13:29:29 +0000 Subject: [PATCH 04/13] Add new file --- plasma.nix | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 plasma.nix diff --git a/plasma.nix b/plasma.nix new file mode 100644 index 0000000..6ca9ab0 --- /dev/null +++ b/plasma.nix @@ -0,0 +1,9 @@ +{ config, pkgs, ... }: + +{ + # Plasma + services.xserver.enable = true; + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + +} From e8e084d1d93189ef198f2f430acea2aa3abcdc36 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Tue, 31 May 2022 13:33:52 +0000 Subject: [PATCH 05/13] Update plasma.nix --- plasma.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/plasma.nix b/plasma.nix index 6ca9ab0..d102fcf 100644 --- a/plasma.nix +++ b/plasma.nix @@ -6,4 +6,15 @@ services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; + + # Install some packages + environment.systemPackages = + with pkgs; + [ + libsForQt5.bismuth + libsForQt5.kde-gtk-config + libsForQt5.plasma-nm + libsForQt5.plasma-pa + libsForQt5.sddm + ]; } From b8a6ae76844aed20465b9ee59891d6e0b7e5e7f5 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Tue, 31 May 2022 13:34:30 +0000 Subject: [PATCH 06/13] Update configuration.nix --- configuration.nix | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/configuration.nix b/configuration.nix index 355f9c9..f1b0fad 100644 --- a/configuration.nix +++ b/configuration.nix @@ -7,6 +7,7 @@ imports = [ ./hardware-configuration.nix + ./plasma.nix ]; boot.loader = { @@ -20,12 +21,6 @@ }; }; - # Allow Unfree - nixpkgs.config.allowUnfree = true; - - # Enable 32 Bit libraries for applications like Steam - hardware.opengl.driSupport32Bit = true; - # Name your host machine networking.hostName = "NixOS"; networking.networkmanager.enable = true; @@ -68,22 +63,12 @@ fish flatpak git - libsForQt5.bismuth - libsForQt5.kde-gtk-config - libsForQt5.plasma-nm - libsForQt5.plasma-pa - libsForQt5.sddm steam thunderbird ]; # Enable the OpenSSH daemon services.openssh.enable = true; - - # Plasma - services.xserver.enable = true; - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; # Enable Pipewire security.rtkit.enable = true; From cd6e1a571a4301be638632b45ac8edb5c12397e1 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Tue, 31 May 2022 13:34:50 +0000 Subject: [PATCH 07/13] Update plasma.nix --- plasma.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plasma.nix b/plasma.nix index d102fcf..165a398 100644 --- a/plasma.nix +++ b/plasma.nix @@ -1,12 +1,17 @@ { config, pkgs, ... }: { + # Allow Unfree + nixpkgs.config.allowUnfree = true; + + # Enable 32 Bit libraries for applications like Steam + hardware.opengl.driSupport32Bit = true; + # Plasma services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; - # Install some packages environment.systemPackages = with pkgs; From c28bcfb2bbc311bbb3853549ad6a259b4e082f60 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Tue, 31 May 2022 13:35:36 +0000 Subject: [PATCH 08/13] Update install.sh --- install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install.sh b/install.sh index b15f30b..35e0ef8 100644 --- a/install.sh +++ b/install.sh @@ -87,6 +87,7 @@ sudo mount $efiName /mnt/boot # Generate Nix configuration sudo nixos-generate-config --root /mnt +sudo curl https://gitlab.com/ahoneybun/nyxi-installer/-/raw/main/plasma.nix > /mnt/etc/nixos/plasma.nix sudo curl https://gitlab.com/ahoneybun/nyxi-installer/-/raw/main/configuration.nix > /mnt/etc/nixos/configuration.nix # Install From 26692591e9433370cbe59267cf2042ab133b1967 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Tue, 31 May 2022 13:44:56 +0000 Subject: [PATCH 09/13] Update install.sh --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 35e0ef8..0fba9b7 100644 --- a/install.sh +++ b/install.sh @@ -75,10 +75,10 @@ sudo btrfs subvolume create /mnt/@home sudo umount /mnt # Mount the subvolumes. -sudo mount -o noatime,commit=120,compress=zstd:10,space_cache,subvol=@ /dev/lvm/root /mnt +sudo mount -o noatime,commit=120,compress=zstd:10,subvol=@ /dev/lvm/root /mnt sudo mkdir /mnt/home/ -sudo mount -o noatime,commit=120,compress=zstd:10,space_cache,subvol=@home /dev/lvm/root /mnt/home +sudo mount -o noatime,commit=120,compress=zstd:10,subvol=@home /dev/lvm/root /mnt/home # Mount the EFI partition. sudo mkdir /mnt/boot/ From 7617906a17c1f0f6c664f83f31178d18af40ec71 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Tue, 31 May 2022 13:48:06 +0000 Subject: [PATCH 10/13] Update install.sh --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 0fba9b7..37f3420 100644 --- a/install.sh +++ b/install.sh @@ -87,8 +87,8 @@ sudo mount $efiName /mnt/boot # Generate Nix configuration sudo nixos-generate-config --root /mnt -sudo curl https://gitlab.com/ahoneybun/nyxi-installer/-/raw/main/plasma.nix > /mnt/etc/nixos/plasma.nix -sudo curl https://gitlab.com/ahoneybun/nyxi-installer/-/raw/main/configuration.nix > /mnt/etc/nixos/configuration.nix +curl https://gitlab.com/ahoneybun/nyxi-installer/-/raw/split-config/plasma.nix > plasma.nix; sudo mv -f plasma.nix /mnt/etc/nixos/ +curl https://gitlab.com/ahoneybun/nyxi-installer/-/raw/split-config/configuration.nix > configuration.nix; sudo mv -f configuration.nix /mnt/etc/nixos/ # Install sudo nixos-install From 659730d4fa0736f6dff31a8a72751c617153813e Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Tue, 31 May 2022 13:58:09 +0000 Subject: [PATCH 11/13] Delete config.nix --- config.nix | 107 ----------------------------------------------------- 1 file changed, 107 deletions(-) delete mode 100644 config.nix diff --git a/config.nix b/config.nix deleted file mode 100644 index 355f9c9..0000000 --- a/config.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ config, pkgs, ... }: - -{ - # Import other configuration modules - # (hardware-configuration.nix is autogenerated upon installation) - # paths in nix expressions are always relative the file which defines them - imports = - [ - ./hardware-configuration.nix - ]; - - boot.loader = { - systemd-boot.enable = true; - }; - - boot.initrd.luks.devices = { - crypt-root = { - device = "/dev/disk/by-label/luks"; - preLVM = true; - }; - }; - - # Allow Unfree - nixpkgs.config.allowUnfree = true; - - # Enable 32 Bit libraries for applications like Steam - hardware.opengl.driSupport32Bit = true; - - # Name your host machine - networking.hostName = "NixOS"; - networking.networkmanager.enable = true; - - # Set your time zone. - time.timeZone = "America/Denver"; - - # Enter keyboard layout - services.xserver.layout = "us"; - - # Enable Flatpak - xdg = { - portal = { - enable = true; - extraPortals = with pkgs; [ - xdg-desktop-portal-wlr - xdg-desktop-portal-kde - ]; - }; - }; - - services.flatpak.enable = true; - - # Enable fwupd - services.fwupd.enable = true; - - # Define user accounts - users.extraUsers.aaronh = { - home = "/home/aaronh"; - extraGroups = [ "wheel" "networkmanager" ]; - isNormalUser = true; - hashedPassword = "$6$aAcbLtqiqzySifls$jdKMOQjoWITHD/dWNNZVUH/qNc6aoJ7v4zYofi0U7IJSVTbmOfChS3mzaJbp57AodjdPNKPrnrip8Nlh2Qanx."; - }; - - # Install some packages - environment.systemPackages = - with pkgs; - [ - firefox - fish - flatpak - git - libsForQt5.bismuth - libsForQt5.kde-gtk-config - libsForQt5.plasma-nm - libsForQt5.plasma-pa - libsForQt5.sddm - steam - thunderbird - ]; - - # Enable the OpenSSH daemon - services.openssh.enable = true; - - # Plasma - services.xserver.enable = true; - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; - - # Enable Pipewire - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - # Enable Bluetooth - hardware.bluetooth.enable = true; - - # Enable CUPS - services.printing.enable = true; - - # System - system.autoUpgrade.enable = true; - system.autoUpgrade.allowReboot = true; - -} From 43b8ccf89363f48cc6054bf5ba38e6698143016c Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Tue, 31 May 2022 15:34:05 +0000 Subject: [PATCH 12/13] Update configuration.nix --- configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configuration.nix b/configuration.nix index f1b0fad..13f39bc 100644 --- a/configuration.nix +++ b/configuration.nix @@ -85,6 +85,9 @@ # Enable CUPS services.printing.enable = true; + # system stateVersion + system.stateVersion = "22.05"; + # System system.autoUpgrade.enable = true; system.autoUpgrade.allowReboot = true; From be9b8ecdaf7d94e465dbd0b7169203e483421586 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Tue, 31 May 2022 15:34:28 +0000 Subject: [PATCH 13/13] Update configuration.nix --- configuration.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/configuration.nix b/configuration.nix index 13f39bc..39ebe77 100644 --- a/configuration.nix +++ b/configuration.nix @@ -85,10 +85,8 @@ # Enable CUPS services.printing.enable = true; - # system stateVersion - system.stateVersion = "22.05"; - # System + system.stateVersion = "22.05"; system.autoUpgrade.enable = true; system.autoUpgrade.allowReboot = true;