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;
   };

modules/nixos/desktop/gnome/default.nix

@@ -0,0 +1,28 @@
+{ pkgs, ... }:
+
+{
+  services.xserver = {
+    enable = true;
+    displayManager.gdm.enable = true;
+    desktopManager.gnome.enable = true;
+  };
+
+  environment.gnome.excludePackages = with pkgs; [
+    orca
+    evince
+    geary
+    gnome-disk-utility
+    gnome-backgrounds
+    gnome-user-docs
+    epiphany
+    yelp
+    gnome-software
+    totem
+    snapshot
+    simple-scan
+    gnome-console
+    gnome-text-editor
+    gnome-tour
+    gnome-bluetooth
+  ];
+}

modules/nixos/multimedia/default.nix

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

modules/nixos/user/caem.nix

@@ -8,4 +8,6 @@
       "wheel"
     ];
   };
+
+  home-manager.users.caem = import ../../home/caem;
 }