diff --git a/modules/boot.nix b/modules/boot.nix index 2d363d6..5e301f2 100644 --- a/modules/boot.nix +++ b/modules/boot.nix @@ -17,7 +17,7 @@ in filesystem = lib.mkOption { type = lib.types.str; example = "btrfs"; - default = "zfs"; + default = "ext4"; description = "The filesystem installed."; }; fullDiskEncryption = libS.mkOpinionatedOption "use luks full disk encrytion"; @@ -67,7 +67,6 @@ in efiSupport = true; efiInstallAsRemovable = true; fsIdentifier = "uuid"; - device = "nodev"; enableCryptodisk = lib.mkIf cfg.fullDiskEncryption true; }; }; diff --git a/secrets/secrets.nix b/secrets/secrets.nix deleted file mode 100644 index ece1f87..0000000 --- a/secrets/secrets.nix +++ /dev/null @@ -1,13 +0,0 @@ -let - alice = "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; - dennis = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJFc7O+5G6fwpXv9j/miJzST6g1AKkPTFtKwuj6j8NC+"; - - allUsers = [alice dennis]; - - palatine-hill = "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; - photon = "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; - - allSystems = [palatine-hill photon]; -in { - "TEST.age".publicKeys = allUsers ++ [photon]; -} \ No newline at end of file diff --git a/systems/palatine-hill/configuration.nix b/systems/palatine-hill/configuration.nix index 4ede6ca..07b10c2 100644 --- a/systems/palatine-hill/configuration.nix +++ b/systems/palatine-hill/configuration.nix @@ -3,7 +3,10 @@ time.timeZone = "America/New_York"; console.keyMap = "us"; networking.hostId = "dc2f9781"; - boot.zfs.extraPools = [ "ZFS-primary" ]; + boot = { + zfs.extraPools = [ "ZFS-primary" ]; + loader.grub.device = "/dev/sda"; + }; virtualisation = { docker = {