Simplify flake-parts modules

.envrc

@@ -1,3 +1,4 @@
 watch_dir ./base
+watch_dir ./sops
 watch_file ./home-manager/default.nix
 use flake

base/base/default.nix

@@ -1,14 +1,13 @@
-{ flake-parts-lib, inputs, ... }:
+{ inputs, ... }:
 {
   imports = [
     inputs.treefmt-nix.flakeModule
     inputs.git-hooks-nix.flakeModule
     inputs.devshell.flakeModule
   ];
-  options.perSystem = flake-parts-lib.mkPerSystemOption (
+  perSystem =
     { config, pkgs, ... }:
     {
-      config = {
       devshells.default = {
         commands = [
           {
@@ -52,6 +51,4 @@
       # https://flake.parts/options/treefmt-nix.html
       treefmt.projectRootFile = "flake.nix";
     };
-    }
-  );
 }

base/languages/en-us/default.nix

@@ -1,4 +1,4 @@
-{ flake-parts-lib, ... }:
+{ ... }:
 let
   dictionary = [
     "Asahi"
@@ -11,7 +11,7 @@ let
   ];
 in
 {
-  options.perSystem = flake-parts-lib.mkPerSystemOption (
+  perSystem =
     { pkgs, ... }:
     let
       tomlFormatter = pkgs.formats.toml { };
@@ -85,7 +85,6 @@ in
       };
     in
     {
-      config = {
       helix.languages.language-server = {
         # https://ltex-plus.github.io/ltex-plus/supported-languages.html
         ltex-ls-plus = {
@@ -146,6 +145,4 @@ in
         # '';
       };
     };
-    }
-  );
 }

base/languages/markdown/default.nix

@@ -1,10 +1,9 @@
-{ flake-parts-lib, ... }:
+{ ... }:
 {
   imports = [ ../en-us ];
-  options.perSystem = flake-parts-lib.mkPerSystemOption (
+  perSystem =
     { config, pkgs, ... }:
     {
-      config = {
       helix.languages = {
         language = [
           {
@@ -41,6 +40,4 @@
       };
       pre-commit.settings.hooks.markdownlint.enable = true;
     };
-    }
-  );
 }

base/languages/nix/default.nix

@@ -1,7 +1,7 @@
-{ flake-parts-lib, ... }:
+{ ... }:
 {
   imports = [ ../en-us ];
-  options.perSystem = flake-parts-lib.mkPerSystemOption (
+  perSystem =
     { config, pkgs, ... }:
     {
       helix.languages = {
@@ -30,6 +30,5 @@
         enable = true;
         strict = true;
       };
-    }
+    };
-  );
 }

base/languages/toml/default.nix

@@ -1,10 +1,9 @@
-{ flake-parts-lib, ... }:
+{ ... }:
 {
   imports = [ ../en-us ];
-  options.perSystem = flake-parts-lib.mkPerSystemOption (
+  perSystem =
     { config, pkgs, ... }:
     {
-      config = {
       helix.languages = {
         language = [
           {
@@ -30,6 +29,4 @@
       treefmt.programs.taplo.enable = true;
       pre-commit.settings.hooks.check-toml.enable = true;
     };
-    }
-  );
 }

base/languages/yaml/default.nix

@@ -1,10 +1,9 @@
-{ flake-parts-lib, ... }:
+{ ... }:
 {
   imports = [ ../en-us ];
-  options.perSystem = flake-parts-lib.mkPerSystemOption (
+  perSystem =
     { config, pkgs, ... }:
     {
-      config = {
       helix.languages = {
         language = [
           {
@@ -42,6 +41,4 @@
         sort-simple-yaml.enable = true;
       };
     };
-    }
-  );
 }

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/default.nix

@@ -1,16 +1,26 @@
-{
+{ inputs, withSystem, ... }:
-  flake-parts-lib,
-  inputs,
-  withSystem,
-  ...
-}:
 {
   imports = [ inputs.home-manager.flakeModules.home-manager ];
-  options = {
+  # https://nix-community.github.io/home-manager/options.xhtml
-    perSystem = flake-parts-lib.mkPerSystemOption (
+  flake.homeConfigurations = {
+    asahi = withSystem "aarch64-linux" (
+      { pkgs, ... }:
+      inputs.home-manager.lib.homeManagerConfiguration {
+        inherit pkgs;
+        extraSpecialArgs = { inherit inputs pkgs; };
+        modules = [
+          { nixpkgs.overlays = [ inputs.nur.overlays.default ]; }
+          inputs.lix-module.nixosModules.default
+          inputs.sops-nix.homeManagerModules.sops
+          inputs.stylix.homeModules.stylix
+          inputs.catppuccin.homeModules.catppuccin
+          ./home.nix
+        ];
+      }
+    );
+  };
+  perSystem =
     { config, system, ... }:
-      {
-        config =
     let
       pkgs = import inputs.nixpkgs {
         inherit system;
@@ -48,27 +58,4 @@
       pre-commit.settings.excludes = [ "home-manager/vencord.nix" ];
       treefmt.settings.global.excludes = [ "home-manager/vencord.nix" ];
     };
-      }
-    );
-  };
-  config = {
-    # https://nix-community.github.io/home-manager/options.xhtml
-    flake.homeConfigurations = {
-      asahi = withSystem "aarch64-linux" (
-        { pkgs, ... }:
-        inputs.home-manager.lib.homeManagerConfiguration {
-          inherit pkgs;
-          extraSpecialArgs = { inherit inputs pkgs; };
-          modules = [
-            { nixpkgs.overlays = [ inputs.nur.overlays.default ]; }
-            inputs.lix-module.nixosModules.default
-            inputs.sops-nix.homeManagerModules.sops
-            inputs.stylix.homeModules.stylix
-            inputs.catppuccin.homeModules.catppuccin
-            ./home.nix
-          ];
-        }
-      );
-    };
-  };
 }

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,29 @@
+{ ... }:
+{
+  perSystem =
+    { 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
+          ];
+        };
+      };
+    };
+}