diff options
| author | Alan Pearce | 2017-09-10 14:53:28 +0200 |
|---|---|---|
| committer | Alan Pearce | 2017-09-10 14:53:28 +0200 |
| commit | 38fce4627d3c2f8ba79049f571fd16bc5037d008 (patch) | |
| tree | aa94daae3cd03af7f887077d4d62c49120fe57d5 | |
| parent | 9b2347d2832781c13f73e57ca775fd3583aeeaee (diff) | |
| parent | 40aa6a71001395b69a7145096524d4e7e580ad13 (diff) | |
| download | nixfiles-38fce4627d3c2f8ba79049f571fd16bc5037d008.tar.lz nixfiles-38fce4627d3c2f8ba79049f571fd16bc5037d008.tar.zst nixfiles-38fce4627d3c2f8ba79049f571fd16bc5037d008.zip | |
Merge remote-tracking branch 'origin/HEAD'
| -rw-r--r-- | modules/grub2.nix | 1 | ||||
| -rw-r--r-- | modules/t470s.nix | 4 | ||||
| -rw-r--r-- | satoshipad.nix | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/modules/grub2.nix b/modules/grub2.nix index 6eaa8cc5..be78a60c 100644 --- a/modules/grub2.nix +++ b/modules/grub2.nix @@ -9,4 +9,5 @@ }; efi.canTouchEfiVariables = true; }; + boot.earlyVconsoleSetup = true; } diff --git a/modules/t470s.nix b/modules/t470s.nix index ba2c17cc..ddaba1df 100644 --- a/modules/t470s.nix +++ b/modules/t470s.nix @@ -4,4 +4,8 @@ hardware.firmware = with pkgs; [ firmwareLinuxNonfree ]; + + environment.systemPackages = with pkgs; [ + nvme-cli + ]; } diff --git a/satoshipad.nix b/satoshipad.nix index 67fda3ec..c9e2921c 100644 --- a/satoshipad.nix +++ b/satoshipad.nix @@ -40,6 +40,7 @@ boot.initrd.luks.devices = [ { name = "root"; + allowDiscards = true; device = "/dev/disk/by-uuid/bb7f9a24-8963-4d00-9258-118050b35748"; preLVM = true; } |