Update .sops.yaml and Makefile, remove unnecessary code in default.nix

ryanwclark1 · Feb 26, 2024 · d037fca · d037fca
1 parent 27691a7
commit d037fca
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/.sops.yaml b/.sops.yaml
@@ -1,30 +1,27 @@
 # .sops.yaml
 
 keys:
-  - &administrator age1jny3l6sy32vss49rj32qvszpctmjtgl9hdksqvh826ekx6c2e5aqns6dcm
+  - &administrator 93559682B3387BC2367FCB71436A329380CD5059
   - &frametop age1jny3l6sy32vss49rj32qvszpctmjtgl9hdksqvh826ekx6c2e5aqns6dcm
   - &woody age1jny3l6sy32vss49rj32qvszpctmjtgl9hdksqvh826ekx6c2e5aqns6dcm
 creation_rules:
   - path_regex: hosts/common/[^/]+\.yaml$
     key_groups:
-    - age:
+    - pgp:
       - *administrator
-      - *frametop
-      - *woody
-  - path_regex: hosts/common/users/[^/]+\.yaml$
-    key_groups:
     - age:
-      - *administrator
       - *frametop
       - *woody
   - path_regex: hosts/frametop/[^/]+\.yaml$
     key_groups:
-    - age:
+    - pgp:
       - *administrator
+    - age:
       - *frametop
   - path_regex: hosts/woody/[^/]+\.yaml$
     key_groups:
-    - age:
+    - pgp:
       - *administrator
+    - age:
       - *woody
 
diff --git a/Makefile b/Makefile
@@ -55,12 +55,26 @@ get_age_public_key:
 		echo "Age public key does not exist. Skipping..."; \
 	fi
 
+###########################################################################
+#
+#  Make PGP
+#
+############################################################################
+
+.PHONY: pgp
+
+# Not working!!!
+pgp:
+	@echo "Make PGP key..."
+	nix --extra-experimental-features nix-command shell --extra-experimental-features flakes nixpkgs#gpg --full-generate-key
+
 ###########################################################################
 #
 #  Make Secrets
 #
 ############################################################################
 
+# Not working!!!!
 .PHONY: secrets
 
 secrets:

diff --git a/hosts/common/users/administrator/default.nix b/hosts/common/users/administrator/default.nix
@@ -38,7 +38,6 @@ in
     neededForUsers = true;
   };
 
-  # home-manager.users.administrator = import ../../../../home/administrator/${config.networking.hostName}.nix;
   home-manager.users.administrator = import ../../../../home/${config.networking.hostName}.nix;
 
   # services.geoclue2.enable = true;