add lib/asecret.nix

3 files changed, 32 insertions, 4 deletions

diff --git a/lib/asecret.nix b/lib/asecret.nix
new file mode 100644
index 0000000..3688612
--- /dev/null
+++ b/lib/asecret.nix
@@ -0,0 +1,29 @@
+{ lib
+, pkgs
+, sources
+, ...
+}:
+{
+  overlays = [
+    (import "${sources.asecret}/pkgs") 
+  ];
+  devShell = {
+    packages = [
+      pkgs.asecret
+      pkgs.nixVersions.nix_2_24 # nix-plugins' `buildInputs'
+    ];
+    shellHook = ''
+      PASSWORD_STORE_DIR=${toString ../.}/secrets; export PASSWORD_STORE_DIR
+
+      NIX_CONFIG='
+        plugin-files = ${pkgs.nix-plugins}/lib/nix/plugins
+        extra-builtins-file = ${sources.asecret}/extra-builtins.nix
+      '; export NIX_CONFIG
+    '';
+  };
+  nixosModules.asecret = {
+    nixpkgs.overlays = [
+      (_: super: { asecret-lib = import "${sources.asecret}/lib" { inherit lib; }; })
+    ];
+  };
+}
diff --git a/lib/default.nix b/lib/default.nix
index bb8f63a..53f736e 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -12,6 +12,7 @@ in
         lib.evalModules {
           modules = [
             config
+            ./asecret.nix
             ./devShell.nix
             ./machines.nix
             ./nixosModules.nix
diff --git a/lib/machines.nix b/lib/machines.nix
index d652fcf..675326d 100644
--- a/lib/machines.nix
+++ b/lib/machines.nix
@@ -10,16 +10,14 @@ let
         config
         {
           documentation.enable = false;
+
           boot.loader.grub.device = "nodev";
           fileSystems."/".device = "tmpfs";
-          nixpkgs.localSystem = {
-            system = "x86_64-linux";
-          };
+          nixpkgs.localSystem.system = "x86_64-linux";
         }
       ];
       specialArgs = {
         inherit
-          pkgs
           self
           sources
           ;