More configuration progression

modules/nixos/core/default.nix

@@ -1,6 +1,6 @@
-{ lib }:
+{ lib, ... }:
 
 {
-  imports = lib.getModuleImports;
+  imports = lib.getModuleImports ./.;
 }
 

modules/nixos/core/impermanence.nix

@@ -25,4 +25,16 @@
     btrfs subvolume create /btrfs_tmp/root
     umount /btrfs_tmp
   '';
+
+  environment.persistence."/nix/persist" = {
+    hideMounts = true;
+    directories = [
+      "/var/log" 
+      "/var/lib/nixos"
+      "/var/lib/AccountsService"
+    ];
+    files = [
+      "/etc/machine-id"
+    ];
+  };
 }

modules/nixos/core/security.nix

@@ -1,7 +1,7 @@
 { ... }:
 
 {
-  programs.gnupg = {
+  programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
   };