From bff14baa1faafb2c8963400fabc60c6cdc6a31ab Mon Sep 17 00:00:00 2001
From: Paul Brinkmeier <hallo@pbrinkmeier.de>
Date: Mon, 3 Apr 2023 14:11:01 +0200
Subject: [PATCH] Flakeify the docker image

---
 README.md            | 17 +++++++++++------
 flake.nix            |  7 +++++++
 nix/docker-image.nix |  9 ---------
 3 files changed, 18 insertions(+), 15 deletions(-)
 delete mode 100644 nix/docker-image.nix

diff --git a/README.md b/README.md
index ef53b1b..608ce08 100644
--- a/README.md
+++ b/README.md
@@ -6,24 +6,29 @@
 $ nix build
 ```
 
+## Running
+
+```
+$ nix run
+```
+
 ## Building the Docker image
 
 ```
-# TODO
-$ docker load < $(nix-build nix/docker-image.nix)
+$ docker load < $(nix build .#docker --print-out-paths)
 ```
 
 ## Development Shell
 
-Includes Stack, `haskell-language-server`, `gen-hie` etc.
+Includes Stack, GHC, `haskell-language-server`, `gen-hie` etc.
 
 ```
-nix develop
+$ nix develop
 ```
 
 ## Running Stack and GHC
 
 ```
-nix run .#stack
-nix run .#ghc
+$ nix run .#stack
+$ nix run .#ghc
 ```
diff --git a/flake.nix b/flake.nix
index e664880..48f8ecc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -57,6 +57,13 @@
         inherit stack;
         inherit utoy;
 
+        docker = 
+          pkgs.dockerTools.buildImage {
+            name = "git.pbrinkmeier.de/paul/utoy";
+            tag = utoy.version;
+            config.Cmd = [ "${utoy}/bin/utoy" ];
+          };
+
         default = utoy;
       };
 
diff --git a/nix/docker-image.nix b/nix/docker-image.nix
deleted file mode 100644
index cfe6368..0000000
--- a/nix/docker-image.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-let
-  pkgs = import ./pkgs.nix {};
-  utoy = import ../utoy.nix;
-in
-  pkgs.dockerTools.buildImage {
-    name = "git.pbrinkmeier.de/paul/utoy";
-    tag = utoy.version;
-    config.Cmd = [ "${utoy}/bin/utoy" ];
-  }