lumiose setup fin

This commit is contained in:
2026-04-26 03:15:29 -05:00
parent 559d5615ea
commit 64d4f36d4d
3 changed files with 16 additions and 12 deletions
+5 -4
View File
@@ -15,6 +15,7 @@
# 10. install the os (let it fail, fix it, repeat, etc) `nixos-install --flake /mnt/home/blake/.nix#hostname` # 10. install the os (let it fail, fix it, repeat, etc) `nixos-install --flake /mnt/home/blake/.nix#hostname`
# 11. set the root password # 11. set the root password
# 12. reboot and dont forget to `sudo chown -R blake:blake /home/blake` # 12. reboot and dont forget to `sudo chown -R blake:blake /home/blake`
# 13. change nix repo upstream to ssh
#!/usr/bin/env bash #!/usr/bin/env bash
set -euo pipefail set -euo pipefail
@@ -85,9 +86,9 @@ mkdir -p /mnt/home/blake/.config/sops/age
# --- move config --- # --- move config ---
echo "moving nix config into /mnt/home/blake/.nix ..." echo "moving nix config into /mnt/home/blake/.nix ..."
mv /bootstrap_nix /mnt/home/blake/.nix cp /bootstrap_nix /mnt/home/blake/.nix
echo "moving hardware into /mnt/home/blake/.nix/hosts/nixos/$HOSTNAME ..." #echo "moving hardware into /mnt/home/blake/.nix/hosts/nixos/$HOSTNAME ..."
cp /mnt/etc/nixos/hardware-configuration.nix /mnt/home/blake/.nix/hosts/nixos/$HOSTNAME #cp /mnt/etc/nixos/hardware-configuration.nix /mnt/home/blake/.nix/hosts/nixos/$HOSTNAME
# --- write age key --- # --- write age key ---
echo "writing age key..." echo "writing age key..."
@@ -100,7 +101,7 @@ echo "$AGE_KEY" | tee \
echo echo
echo "running nixos-install..." echo "running nixos-install..."
set +e set +e
nixos-install --flake /mnt/home/blake/.nix#"${HOSTNAME}" nixos-install --root /mnt --flake /mnt/home/blake/.nix#"${HOSTNAME}"
INSTALL_EXIT=$? INSTALL_EXIT=$?
set -e set -e
+11 -1
View File
@@ -7,7 +7,8 @@ in
{ {
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
./hardware-configuration.nix [ (modulesPath + "/installer/scan/not-detected.nix")
#./hardware-configuration.nix
./disko.nix ./disko.nix
../../nixos ../../nixos
../../../users/blake ../../../users/blake
@@ -88,6 +89,15 @@ in
# Or disable the firewall altogether. # Or disable the firewall altogether.
networking.firewall.enable = true; networking.firewall.enable = true;
# hardware stuff
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
system.stateVersion = "25.05"; # stays here : ) system.stateVersion = "25.05"; # stays here : )
} }
@@ -5,13 +5,8 @@
{ {
imports = imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
# fileSystems."/" = # fileSystems."/" =
# { device = "/dev/mapper/crypted"; # { device = "/dev/mapper/crypted";
@@ -47,6 +42,4 @@
# #
swapDevices = [ ]; swapDevices = [ ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }