1 files changed, 14 insertions, 32 deletions

diff --git a/flake.nix b/flake.nix
index bbd444f..116626b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,43 +8,25 @@
     flaky-utils.url = "git+https://cgit.euxane.eu/flaky-utils";
   };
 
-  outputs = { self, nixpkgs, flake-utils, flaky-utils }:
-  flake-utils.lib.eachDefaultSystem (system: let
+  outputs = { self, nixpkgs, flake-utils, flaky-utils }: let
+
+    mkPackage = pkgs: pkgs.callPackage ./nix/package.nix {
+      src = ./.;
+      version = self.rev or self.dirtyRev;
+    };
+
+  in flake-utils.lib.eachDefaultSystem (system: let
     pkgs = import nixpkgs { inherit system; };
   in {
-    devShell = flaky-utils.lib.mkDevShell {
-      inherit pkgs;
 
-      tools = with pkgs; [
-        nim
-        nrpl
-        nim-atlas
-        nimble
-        nimlangserver
-        nim_lk
-      ];
-
-      prePrompt = ''
-        echo "<C-d> to exit this development shell."
-      '';
+    packages = {
+      default = self.packages.${system}.tickwatch;
+      tickwatch = mkPackage pkgs;
+    };
 
-      shell = null;
+    devShells.default = import ./nix/devshell.nix {
+      inherit flaky-utils pkgs;
     };
 
-    packages.default = pkgs.stdenv.mkDerivation (final: {
-      pname = "tickwatch";
-      meta.mainProgram = final.pname;
-      version = "SNAPSHOT";
-      src = ./.;
-      buildInputs = [ pkgs.nim ];
-      doCheck = true;
-      makeFlags = [
-        "NIM_FLAGS=--nimcache:."
-        "VERSION=${final.version}"
-      ];
-      installFlags = [
-        "DESTDIR=$(out)"
-      ];
-    });
   });
 }