Move sops into separate module

flake.nix

@@ -41,42 +41,15 @@
         systems = [ "aarch64-linux" ];
         imports = [
           ./base
+          ./sops
           ./home-manager
         ];
         perSystem =
           { pkgs, system, ... }:
-          # let
-          #   pkgs = import inputs.nixpkgs {
-          #     inherit system;
-          #     overlays = [
-          #       inputs.nur.overlays.default
-          #       inputs.nixgl.overlays.default
-          #     ];
-          #   };
-          # in
           {
-            # _module.args.pkgs = pkgs;
             # https://flake.parts/options/devshell.html
             devshells.default = {
-              commands = [
+              packages = [ pkgs.forgejo-cli ];
-                {
-                  help = " generate age key";
-                  name = "age-generate-key";
-                  command = "${pkgs.uutils-coreutils-noprefix}/bin/mkdir -p ~/.config/sops/age && ${pkgs.age}/bin/age-keygen -o ~/.config/sops/age/keys.txt && ${pkgs.uutils-coreutils-noprefix}/bin/cat ~/.config/sops/age/keys.txt";
-                  category = " SOPS";
-                }
-                {
-                  help = " edit secrets.yaml";
-                  name = "sops-edit";
-                  command = "${pkgs.sops}/bin/sops edit ./home-manager/secrets/secrets.yaml";
-                  category = " SOPS";
-                }
-              ];
-              packages = [
-                pkgs.age
-                pkgs.forgejo-cli
-                pkgs.sops
-              ];
               devshell = {
                 motd = ''
                   {202}  Nix Laptop Configuration{reset}

home-manager/home.nix

@@ -18,7 +18,7 @@ in
     secrets = {
       openrouter_api_key = { };
     };
-    defaultSopsFile = ./secrets/secrets.yaml;
+    defaultSopsFile = ../sops/secrets.yaml;
     age.keyFile = /home/${username}/.config/sops/age/keys.txt;
   };
   # https://nix.catppuccin.com/search/rolling/

sops/default.nix

@@ -0,0 +1,32 @@
+{ flake-parts-lib, ... }:
+{
+  options = {
+    perSystem = flake-parts-lib.mkPerSystemOption (
+      { config, pkgs, ... }:
+      {
+        config = {
+          devshells.default = {
+            commands = [
+              {
+                help = " generate age key";
+                name = "age-generate-key";
+                command = "${pkgs.uutils-coreutils-noprefix}/bin/mkdir -p ~/.config/sops/age && ${pkgs.age}/bin/age-keygen -o ~/.config/sops/age/keys.txt && ${pkgs.uutils-coreutils-noprefix}/bin/cat ~/.config/sops/age/keys.txt";
+                category = " SOPS";
+              }
+              {
+                help = " edit secrets.yaml";
+                name = "sops-edit";
+                command = "${pkgs.sops}/bin/sops edit ./sops/secrets.yaml";
+                category = " SOPS";
+              }
+            ];
+            packages = [
+              pkgs.age
+              pkgs.sops
+            ];
+          };
+        };
+      }
+    );
+  };
+}