summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2022-10-12 06:15:06 +0200
committerAlan Pearce2022-10-12 06:16:02 +0200
commit880f752dc8d2f8c2457ddabd64623a7f4ec5a717 (patch)
tree093d12a93f15c1ec30328389432d33e26b58a6e6
parent79e99bb67f841d829dd1775c2d47008a15ba63e2 (diff)
downloadnixfiles-880f752dc8d2f8c2457ddabd64623a7f4ec5a717.tar.lz
nixfiles-880f752dc8d2f8c2457ddabd64623a7f4ec5a717.tar.zst
nixfiles-880f752dc8d2f8c2457ddabd64623a7f4ec5a717.zip
Add secrets to home-manager configuration
-rw-r--r--flake.lock19
-rw-r--r--flake.nix8
-rw-r--r--user/mba.nix2
3 files changed, 24 insertions, 5 deletions
diff --git a/flake.lock b/flake.lock
index bfd7151a..cfef3f59 100644
--- a/flake.lock
+++ b/flake.lock
@@ -127,7 +127,24 @@
         "emacs-overlay": "emacs-overlay",
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_2",
+        "secrets": "secrets"
+      }
+    },
+    "secrets": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1657941017,
+        "narHash": "sha256-IrF5XqkCec0XyhCgtPkfjwoezZ5BFm1jhO2hzsAXOxo=",
+        "ref": "refs/heads/main",
+        "rev": "965a22670505edcd64b1139369ff0aa6083fa45d",
+        "revCount": 32,
+        "type": "git",
+        "url": "ssh://git.alanpearce.eu/nixfiles-private"
+      },
+      "original": {
+        "type": "git",
+        "url": "ssh://git.alanpearce.eu/nixfiles-private"
       }
     },
     "utils": {
diff --git a/flake.nix b/flake.nix
index 24620fcb..1e235810 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,9 +7,13 @@
     home-manager.url = github:nix-community/home-manager;
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     emacs-overlay.url = github:nix-community/emacs-overlay;
+    secrets = {
+      url = git+ssh://git.alanpearce.eu/nixfiles-private;
+      flake = false;
+    };
   };
 
-  outputs = { self, darwin, home-manager, nixpkgs, ... }@attrs:
+  outputs = { self, darwin, home-manager, nixpkgs, secrets, ... }@attrs:
   let
     darwinSystem =
       "x86_64-darwin"; # aarch64 is still failing on some compiler-rt derivation
@@ -27,7 +31,7 @@
     };
     homeConfigurations.mba = home-manager.lib.homeManagerConfiguration {
       pkgs = darwinPkgs;
-      modules = [ ./user/mba.nix ];
+      modules = [ ./user/mba.nix (secrets + "/default.nix") ];
     };
   };
 }
diff --git a/user/mba.nix b/user/mba.nix
index 9c1c3845..9183108d 100644
--- a/user/mba.nix
+++ b/user/mba.nix
@@ -2,8 +2,6 @@
 
 {
   imports = [
-    ../private
-
     ./settings/base.nix
     ./settings/development/base.nix
     ./settings/development/clojure.nix