diff options
| -rw-r--r-- | desktop/configuration.nix | 24 | ||||
| -rw-r--r-- | disko/sda-simple.nix | 26 | ||||
| -rw-r--r-- | live/iso.nix | 1 |
3 files changed, 33 insertions, 18 deletions
diff --git a/desktop/configuration.nix b/desktop/configuration.nix index 7a09d9c..1e24cad 100644 --- a/desktop/configuration.nix +++ b/desktop/configuration.nix @@ -5,6 +5,11 @@ in { imports = []; + hardware = { + cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + enableRedistributableFirmware = true; + }; + documentation = { enable = true; man.enable = true; @@ -42,7 +47,15 @@ in }; }; + boot = { + extraModulePackages = [ ]; + + initrd = { + availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ]; + kernelModules = [ ]; + }; + lanzaboote = { enable = vars.secureBoot; pkiBundle = "/etc/secureboot"; @@ -57,6 +70,7 @@ in "snd-seq" "snd-rawmidi" "xhci_hcd" + "kvm_intel" ]; kernelParams = [ @@ -151,6 +165,7 @@ in }; networking = { + useDHCP = lib.mkDefault true; hostName = vars.hostName; networkmanager = { enable = true; @@ -300,9 +315,12 @@ in ssh.enableAskPassword = false; }; - nixpkgs.config = { - allowUnfree = true; - cudaSupport = false; + nixpkgs = { + hostPlatform = lib.mkDefault "x86_64-linux"; + config = { + allowUnfree = true; + cudaSupport = false; + }; }; security = { diff --git a/disko/sda-simple.nix b/disko/sda-simple.nix index d723bd5..a9c1e8f 100644 --- a/disko/sda-simple.nix +++ b/disko/sda-simple.nix @@ -1,17 +1,19 @@ -# CHANGE THE DISK YOU WANT TO FORMAT NOW +# This will install a simple system with a root and boot partition. +# Make sure to change the entry device entry to the one that you +# are installing the configuration to. { disko.devices = { disk = { - main = { - type = "disk"; - # CHANGEME change to the disk you want to format + my-disk = { + # change this entry device = "/dev/sda"; + type = "disk"; content = { type = "gpt"; partitions = { ESP = { - size = "500M"; type = "EF00"; + size = "500M"; content = { type = "filesystem"; format = "vfat"; @@ -19,18 +21,12 @@ mountOptions = [ "umask=0077" ]; }; }; - luks = { + root = { size = "100%"; content = { - type = "luks"; - name = "crypted"; - settings.allowDiscards = true; - passwordFile = "/tmp/secret.key"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - }; + type = "filesystem"; + format = "ext4"; + mountpoint = "/"; }; }; }; diff --git a/live/iso.nix b/live/iso.nix index 54fd079..da21878 100644 --- a/live/iso.nix +++ b/live/iso.nix @@ -146,6 +146,7 @@ vim "$HOME/toughnix/disko/sda-simple.nix" gum confirm --default=false "🔥 🔥 🔥 WARNING!!!! This will ERASE ALL DATA on the disk. Are you sure you want to continue?" sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko/latest -- --mode destroy,format,mount "$HOME/toughnix/disko/sda-simple.nix" cd /mnt + sudo nixos-install --flake $HOME/toughnix#continuity-dell '') ]; |