Export nix module as moe, change package export to packages.default

ymstnt-com · Feb 10, 2024 · 0c5c4ae · 0c5c4ae
1 parent 8efaf93
commit 0c5c4ae
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/flake.nix b/flake.nix
@@ -7,14 +7,15 @@
   };
 
   outputs = { self, nixpkgs, flake-utils }:
+    {
+      nixosModule = import ./nix/module.nix self.outputs.packages;
+    } //
     flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system:
       let
         pkgs = import nixpkgs { inherit system; };
         version = builtins.substring 0 8 self.lastModifiedDate or "dirty";
       in
       {
-        packages.moe = pkgs.callPackage ./nix/package.nix { inherit version; };
-        defaultPackage = self.packages.${system}.moe;
-      }
-    );
+        packages.default = pkgs.callPackage ./nix/package.nix { inherit version; };
+      });
 }
diff --git a/nix/module.nix b/nix/module.nix
@@ -1,16 +1,17 @@
-{ config, pkgs, lib, ... }:
+packages:
+{ config, pkgs, lib, specialArgs, ... }:
 
 with lib;
 with types;
 let
-  cfg = config.services.moe;
+  cfg = config.moe;
 in
 {
-  options.services.moe = {
+  options.moe = {
     enable = mkEnableOption "Enable the moe service";
     package = mkOption {
       type = package;
-      default = (pkgs.callPackage ./package.nix { });
+      default = packages.${pkgs.system}.default;
     };
     group = mkOption {
       type = str;