From c226c63ddab56a20684062bb020cd64f774f63d3 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Mon, 2 Dec 2019 12:12:47 +0100 Subject: Move secrets to keybase git submodule --- .gitmodules | 3 +++ private | 1 + system/satoshipad.nix | 1 - system/trillian.nix | 2 -- user/satoshipad.nix | 2 ++ user/trillian.nix | 2 ++ 6 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .gitmodules create mode 160000 private diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..2d802971 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "private"] + path = private + url = keybase://private/alanpearce/nixfiles-secrets diff --git a/private b/private new file mode 160000 index 00000000..1c1ddb17 --- /dev/null +++ b/private @@ -0,0 +1 @@ +Subproject commit 1c1ddb174daec94428e0934f5e71b6abb8d12a67 diff --git a/system/satoshipad.nix b/system/satoshipad.nix index ecd02846..a85d2f67 100644 --- a/system/satoshipad.nix +++ b/system/satoshipad.nix @@ -3,7 +3,6 @@ { imports = [ ./hardware-configuration.nix - ./private/default.nix diff --git a/system/trillian.nix b/system/trillian.nix index 276a2559..d2a74716 100644 --- a/system/trillian.nix +++ b/system/trillian.nix @@ -2,8 +2,6 @@ { imports = [ - ./private/default.nix - ./modules/darwin/stubby.nix ./modules/nextdns.nix diff --git a/user/satoshipad.nix b/user/satoshipad.nix index 445f28a3..9388122b 100644 --- a/user/satoshipad.nix +++ b/user/satoshipad.nix @@ -2,6 +2,8 @@ { imports = [ + ../private + ./settings/base.nix ./settings/development/base.nix ./settings/dunst.nix diff --git a/user/trillian.nix b/user/trillian.nix index 71e88622..282e5cf0 100644 --- a/user/trillian.nix +++ b/user/trillian.nix @@ -2,6 +2,8 @@ { imports = [ + ../private + ./settings/base.nix ./settings/development/base.nix ./settings/darwin.nix -- cgit 1.4.1