fix: emitting packages

.gitignore

@@ -1,6 +1,7 @@
 .direnv/
 
 # nixago: ignore-linked-files
+/rustfmt.toml
 /treefmt.toml
 /.prettierrc.json
 /lefthook.yml

flake.lock

@@ -1,19 +1,5 @@
 {
   "nodes": {
-    "flake-schemas": {
-      "locked": {
-        "lastModified": 1697467827,
-        "narHash": "sha256-j8SR19V1SRysyJwpOBF4TLuAvAjF5t+gMiboN4gYQDU=",
-        "rev": "764932025c817d4e500a8d2a4d8c565563923d29",
-        "revCount": 29,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.2/018b3da8-4cc3-7fbb-8ff7-1588413c53e2/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/0.1.2.tar.gz"
-      }
-    },
     "flake-utils": {
       "locked": {
         "lastModified": 1653893745,
@@ -379,7 +365,6 @@
     },
     "root": {
       "inputs": {
-        "flake-schemas": "flake-schemas",
         "nixago": "nixago",
         "nixago-exts": "nixago-exts_3",
         "nixpkgs": "nixpkgs"

flake.nix

@@ -9,8 +9,6 @@
 
     nixago-exts.url = "github:nix-community/nixago-extensions";
     nixago-exts.inputs.nixpkgs.follows = "nixpkgs";
-
-    flake-schemas.url = "https://flakehub.com/f/DeterminateSystems/flake-schemas/0.1.2.tar.gz";
   };
 
   outputs = inputs @ { self, nixpkgs, nixago, nixago-exts, ... }:
@@ -22,37 +20,51 @@
         pkgs = import nixpkgs { inherit system; };
       });
     in
+    rec
     {
-      # The schemes we use.
-      schemas = inputs.flake-schemas.schemas;
-
-      # Expose the configuration options for setup.
-      nixosModules = {
-        mfgames-project-setup = import ./src/modules/default.nix;
-        default = self.nixosModules.mfgames-project-setup;
-      };
-
       # Expose the configuration information.
       lib = {
-        sayHello = nixpkgs."x86_64-linux".lib.debug.traceVal (name: "Hello there, ${name}!");
+        mkConfig =
-      };
+          { system
+          , pkgs
+          , conform ? { }
+          , rust ? { }
+          , ...
+          }:
+          let
+            rustDefaults = { enable = false; };
+            conformDefaults = { scopes = [ ]; };
+            configs = import ./src/configs/default.nix {
+              inherit system pkgs nixago nixago-exts;
+              conform = conformDefaults // conform;
+              rust = rustDefaults // rust;
+            };
+          in
+          {
+            packages = [ pkgs.lefthook ];
 
-      configs =
+            shellHook = ''
-        forEachSupportedSystem ({ system, pkgs }:
+              ${configs.shellHook}
-          (import ./src/configs/default.nix { inherit system pkgs nixago nixago-exts; }));
+              ${pkgs.lefthook}/bin/lefthook install
+
+              alias lefthook="${pkgs.lefthook}/bin/lefthook"
+            '';
+          };
+      };
 
       # Set up the developer shell.
       devShells = forEachSupportedSystem ({ system, pkgs }:
         let
-          configs = import ./src/configs/default.nix { inherit system pkgs nixago nixago-exts; };
+          config = lib.mkConfig {
+            inherit system pkgs;
+            #rust.enable = false;
+          };
         in
         {
           # Shell
           default = pkgs.mkShell {
-            shellHook = ''
+            packages = [ ] ++ config.packages;
-              ${configs.shellHook}
+            shellHook = config.shellHook;
-              lefthook install
-            '';
           };
         });
 

src/configs/conform.nix

@@ -1,7 +1,9 @@
-inputs @ { system, nixago, nixago-exts, ... }:
+inputs @ { system, nixago-exts, conform, ... }:
 nixago-exts.conform.${system} {
   commit = {
-    header = { length = inputs.pkgs.lib.debug.traceVal 89; };
+    header.length = 89;
+    scopes = conform.scopes;
+
     conventional = {
       types = [
         "build"
@@ -15,8 +17,6 @@ nixago-exts.conform.${system} {
         "style"
         "test"
       ];
-
-      scopes = [ "cli" ];
     };
   };
 }

src/configs/default.nix

@@ -1,9 +1,12 @@
-inputs:
+inputs @ { pkgs, rust ? { enable = false; }, ... }:
-inputs.nixago.lib.${inputs.system}.makeAll [
+let lib = pkgs.lib; in
+inputs.nixago.lib.${inputs.system}.makeAll ([
   (import ./conform.nix (inputs))
   (import ./editorconfig.nix (inputs))
   (import ./lefthook.nix (inputs))
   (import ./prettier.nix (inputs))
-  #(import ./rustfmt.nix (inputs))
   (import ./treefmt.nix (inputs))
 ]
+++ lib.optionals rust.enable [
+  (import ./rustfmt.nix (inputs))
+])

src/configs/rustfmt.nix

@@ -1,4 +1,4 @@
-inputs:
+inputs @ { pkgs, ... }:
 let
   data = {
     brace_style = "AlwaysNextLine";

src/configs/treefmt.nix

@@ -1,9 +1,9 @@
-inputs @ { pkgs, ... }:
+inputs @ { pkgs, rust, ... }:
 let
   data = {
     formatter = {
       nix = {
-        command = "nixpkgs-fmt";
+        command = "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt";
         includes = [ "*.nix" ];
       };
 
@@ -24,7 +24,8 @@ let
         ];
         excludes = [ "**.min.js" ];
       };
-
+    }
+    // pkgs.lib.attrsets.optionalAttrs rust.enable {
       rust = {
         command = "rustfmt";
         options = [ "--edition" "2021" ];

src/modules/default.nix

@@ -1,23 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.mfgames-project-setup;
-  secretType = types.submodule ({ config, ... }: {
-    options = {
-      rust = mkOption {
-        type = types.bool;
-        default = false;
-      };
-    };
-  });
-in
-{
-  options.mfgames-project-setup = {
-    rust = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Enabling this option including tools for handling Rust projects.
-      '';
-    };
-  };
-}