+ flake parts os-module pattern

milieuim · Nov 8, 2024 · 50a35c0 · 50a35c0
1 parent aef81aa
commit 50a35c0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/flake.nix b/flake.nix
@@ -120,8 +120,14 @@
           overlays.default = final: prev: {
             vaultix = inputs.self.packages.${prev.system}.default;
           };
-          nixosModules.default = import ./module self;
-
+          nixosModules.default =
+            { pkgs, ... }:
+            {
+              imports = [ ./module ];
+              vaultix.package = withSystem pkgs.stdenv.hostPlatform.system (
+                { config, ... }: config.packages.vaultix
+              );
+            };
         };
       }
     );

diff --git a/module/default.nix b/module/default.nix
@@ -1,4 +1,3 @@
-vaultixSelf:
 {
   config,
   options,
@@ -14,6 +13,7 @@ let
     isAttrs
     isPath
     readFile
+    literalMD
     literalExpression
     mkEnableOption
     mkIf
@@ -237,10 +237,7 @@ in
 {
   options.vaultix = {
 
-    package = mkOption {
-      type = types.package;
-      default = vaultixSelf.packages.${pkgs.system}.vaultix;
-    };
+    package = mkOption { defaultText = literalMD "`packages.vaultix` from this flake"; };
 
     settings = mkOption {
       type = settingsType;