From 8c2d7dbe7ba747ce0227f15e00d0fc6f64cceef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Wed, 5 Apr 2023 23:19:56 +0300
Subject: [PATCH] wip2 sops

thanks @williamvds
---
 configuration.nix |  2 --
 data.nix          |  2 +-
 flake.nix         |  9 ++++-----
 secrets.nix       | 11 -----------
 4 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 secrets.nix

diff --git a/configuration.nix b/configuration.nix
index 4348b7b..fc58dad 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -69,7 +69,6 @@ in {
   imports = [
     ./hardware-configuration.nix
     ./zfs.nix
-    #<sops-nix/modules/sops>
     sops-nix.nixosModules.sops
   ];
 
@@ -105,7 +104,6 @@ in {
     };
   };
 
-
   time.timeZone = "UTC";
 
   users = {
diff --git a/data.nix b/data.nix
index b848496..3cd582d 100644
--- a/data.nix
+++ b/data.nix
@@ -1,3 +1,3 @@
 {
-  pubkeys = { }; # TODO
+  pubkeys = {}; # TODO
 }
diff --git a/flake.nix b/flake.nix
index 05d3ad8..d598576 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,7 +11,6 @@
     deploy-rs.url = "github:serokell/deploy-rs";
     deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
     deploy-rs.inputs.utils.follows = "flake-utils";
-
   };
 
   nixConfig = {
@@ -26,7 +25,7 @@
     sops-nix,
     deploy-rs,
     flake-utils,
-  }: let
+  } @ inputs: let
     myData = import ./data.nix;
   in
     {
@@ -36,9 +35,9 @@
           ./configuration.nix
           ./hardware-configuration.nix
           ./zfs.nix
-
-          sops-nix.nixosModules.sops
         ];
+
+        specialArgs = inputs;
       };
 
       deploy.nodes.hel1-a = {
@@ -63,7 +62,7 @@
           packages = [
             pkgs.age
             pkgs.ssh-to-age
-	    pkgs.sops
+            pkgs.sops
             deploy-rs.packages.${system}.deploy-rs
           ];
         };
diff --git a/secrets.nix b/secrets.nix
deleted file mode 100644
index 71d2d39..0000000
--- a/secrets.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-let
-  motiejus = "age1yubikey1qtwmhf7h7ljs3dyx06wyzme4st6w4calkdpmsxgpxc9t2cldezvasd6n8wg";
-  users = [ motiejus ];
-
-  hel1-a = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF6Wd2lKrpP2Gqul10obMo2dc1xKaaLv0I4FAnfIaFKu";
-  systems = [ hel1-a ];
-in
-{
-  "secrets/hel1-a/zfs-passphrase.age".publicKeys = [ hel1-a ] ++ users;
-  "secrets/hel1-a/borgbackup/password.age".publicKeys = [ hel1-a ] ++ users;
-}