From 67563d4e6f159ef42b0e9c29f81e918fd6319359 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Tue, 28 May 2024 14:29:48 +0200
Subject: [PATCH] flake: use `mkApp` from flake-utils, restructure a bit

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 flake.nix | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/flake.nix b/flake.nix
index 625154d..ba91060 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,6 +14,7 @@
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs { inherit system; };
+        inherit (flake-utils.lib) mkApp;
 
         treefmt = treefmt-nix.lib.evalModule pkgs {
           projectRootFile = "flake.nix";
@@ -40,7 +41,29 @@
             cp -vr public/* $out/
           '';
         };
+
+        update-gpg-key = pkgs.writeShellApplication {
+          name = "c8h4-io-update-gpg-key";
+          runtimeInputs = with pkgs; [ gnupg ];
+          text = ''
+            gpg --export --armor 9C561D6430B28D6BDCBC9CEB73D5E7FDEE3DE49A >static/gpg.asc
+          '';
+        };
+
+        devserver = pkgs.writeShellApplication {
+          name = "c8h4-io-devserver";
+          runtimeInputs = with pkgs; [ hugo ];
+          text = ''
+            hugo server --renderToMemory
+          '';
+        };
       in {
+        apps = {
+          default = mkApp { drv = devserver; };
+          devserver = mkApp { drv = devserver; };
+          update-gpg-key = mkApp { drv = update-gpg-key; };
+        };
+
         checks = rec {
           inherit c8h4-io;
           formatting = treefmt.config.build.check self;
@@ -51,18 +74,6 @@
         packages = rec {
           inherit c8h4-io;
           default = c8h4-io;
-          update-gpg-key = pkgs.writeShellScriptBin "c8h4-io-update-gpg-key" ''
-            ${pkgs.gnupg}/bin/gpg --export --armor 9C561D6430B28D6BDCBC9CEB73D5E7FDEE3DE49A >static/gpg.asc
-          '';
-        };
-
-        apps.devserver = let
-          drv = pkgs.writeShellScript "c8h4-io-hugo-devserver" ''
-            ${pkgs.hugo}/bin/hugo server
-          '';
-        in {
-          type = "app";
-          program = "${drv}";
         };
 
         devShells.default = pkgs.mkShell {