Fixed several issues with the nix flake

2 files changed, 12 insertions, 7 deletions

diff --git a/flake.nix b/flake.nix
index 988a4fd..527f307 100644
--- a/flake.nix
+++ b/flake.nix
@@ -110,11 +110,6 @@
           default = eko;
         };
 
-        nixosModules = rec {
-          default = eko;
-          eko = import ./service.nix inputs;
-        };
-
         # TODO: make my own devshell?
         # devShells = rec {
         #   default = pkgs.mkShell {
@@ -169,5 +164,11 @@
         #   };
         # };
       }
-    );
+    )
+    // {
+      nixosModules = rec {
+        default = eko;
+        eko = import ./service.nix inputs;
+      };
+    };
 }
diff --git a/service.nix b/service.nix
index 9e9e437..4cc39b3 100644
--- a/service.nix
+++ b/service.nix
@@ -14,7 +14,11 @@ in
   options.services.eko = {
     enable = lib.mkEnableOption "eko service";
 
-    package = lib.mkPackageOption inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.eko-server { };
+    package = lib.mkOption {
+      description = "Eko package to use as the server executable";
+      default = inputs.self.packages.${pkgs.system}.eko-server;
+      type = lib.types.package;
+    };
 
     dataDir = lib.mkOption {
       description = "Eko data directory";