configuration.nix has sops

4 files changed, 14 insertions, 12 deletions

diff --git a/desktop/configuration.nix b/desktop/configuration.nix
index aa5290e..445ad90 100644
--- a/desktop/configuration.nix
+++ b/desktop/configuration.nix
@@ -5,6 +5,18 @@ in
 {
   imports = [];
 
+  sops = {
+    defaultSopsFile = ../secrets/secrets.yaml;
+    defaultSopsFormat = "yaml";
+    gnupg = {
+      home = "/home/${vars.userName}/.gnupg";
+      sshKeyPaths = [];
+    };
+    secrets.mail = {
+      format = "yaml";
+    };
+  };
+
   hardware.enableAllFirmware = true;
 
   documentation = {
diff --git a/desktop/home.nix b/desktop/home.nix
index ed4d039..f649145 100644
--- a/desktop/home.nix
+++ b/desktop/home.nix
@@ -3,15 +3,6 @@ let
   vars = import ./vars.nix;
 in
 {
-  sops = {
-    defaultSopsFile = ../secrets/secrets.yaml;
-    defaultSopsFormat = "yaml";
-    gnupg = {
-      home = "${config.home.homeDirectory}/.gnupg";
-      sshKeyPaths = [];
-    };
-  };
-
   home = {
     activation.startup-files = lib.hm.dag.entryAfter [ "installPackages" ] ''
     if [ ! -d "${config.home.homeDirectory}/org/website/" ]; then
diff --git a/desktop/sda-simple.nix b/desktop/sda-simple.nix
index a9c1e8f..86263dd 100644
--- a/desktop/sda-simple.nix
+++ b/desktop/sda-simple.nix
@@ -14,6 +14,7 @@
             ESP = {
               type = "EF00";
               size = "500M";
+              priority = 1;
               content = {
                 type = "filesystem";
                 format = "vfat";
@@ -23,6 +24,7 @@
             };
             root = {
               size = "100%";
+              priority = 2;
               content = {
                 type = "filesystem";
                 format = "ext4";
diff --git a/flake.nix b/flake.nix
index 69db601..0c914f9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,9 +61,6 @@
           sops-nix.nixosModules.sops
           {
             home-manager = {
-              sharedModules = [
-                sops-nix.homeManagerModules.sops
-              ];
               useGlobalPkgs = true;
               extraSpecialArgs = attrs;
               useUserPackages = true;