From 0b5e66f4eadf0d0a6c4a1a15e25013c2b85bf07a Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 6 Mar 2024 13:06:59 +0100 Subject: [PATCH 1/2] use stable nix Signed-off-by: Harald Hoyer --- modules/nixos/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix index 58c3139..76c4299 100644 --- a/modules/nixos/nix/default.nix +++ b/modules/nixos/nix/default.nix @@ -14,7 +14,7 @@ in { options.plusultra.nix = with types; { enable = mkBoolOpt false "Whether or not to manage nix configuration."; - package = mkOpt package pkgs.nixUnstable "Which nix package to use."; + package = mkOpt package pkgs.nix "Which nix package to use."; default-substituter = { url = mkOpt str "https://cache.nixos.org" "The url for the substituter."; From ca7f3fb9737bde17e3ffd13bc55a375d332593f2 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 6 Mar 2024 13:07:13 +0100 Subject: [PATCH 2/2] sgx: fix secrets path Signed-off-by: Harald Hoyer --- systems/x86_64-linux/sgx/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/systems/x86_64-linux/sgx/default.nix b/systems/x86_64-linux/sgx/default.nix index 4f0e752..b53b40a 100644 --- a/systems/x86_64-linux/sgx/default.nix +++ b/systems/x86_64-linux/sgx/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, lib, config, ... }: with lib; with lib.plusultra; { @@ -24,13 +24,11 @@ with lib.plusultra; }; sops.secrets.pccs = { - sopsFile = ../.secrets/sgx/pccs.yaml; # bring your own password file + sopsFile = ../../../.secrets/sgx/pccs.yaml; # bring your own password file }; networking.wireless.enable = false; # Enables wireless support via wpa_supplicant. - - plusultra.gui.enable = false; plusultra.nix.enable = true; plusultra.nix.extra-substituters = {