From 9bb9782ec67747556c5a6a9bc976119c2cbfdaed Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Mon, 7 Sep 2020 12:50:29 +0200 Subject: [PATCH] feat: remove luks config from hardware/base.nix --- hardware/base.nix | 6 ------ work-pc.nix | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hardware/base.nix b/hardware/base.nix index 3a8a721..6772415 100644 --- a/hardware/base.nix +++ b/hardware/base.nix @@ -5,12 +5,6 @@ ./planck.nix ]; - boot.initrd.luks.devices = { - root = { - device = "/dev/disk/by-partlabel/nixos"; - allowDiscards = true; - }; - }; boot.supportedFilesystems = [ "btrfs" ]; boot.kernelPackages = pkgs.linuxPackages_latest; boot.loader.systemd-boot.enable = true; diff --git a/work-pc.nix b/work-pc.nix index 2d23dc6..17880c0 100644 --- a/work-pc.nix +++ b/work-pc.nix @@ -11,6 +11,14 @@ ./virtualisation/docker.nix ]; + # replace with regenerated hardware-configuration.nix + boot.initrd.luks.devices = { + enc = { + device = "/dev/disk/by-partlabel/nixos"; + allowDiscards = true; + }; + }; + nixpkgs.config.allowUnfree = true; networking.hostName = "pilot1-nixos"; # Define your hostname.