From d968201dc861090555a03283a8a913932ee7ea15 Mon Sep 17 00:00:00 2001
From: "Shahar \"Dawn\" Or" <mightyiampresence@gmail.com>
Date: Sun, 27 Oct 2024 15:36:22 +0700
Subject: [PATCH] boot-message package

---
 boot-message.nix                       | 31 ++++++++++++++++++++++++++
 flake.nix                              |  1 +
 nixos-modules/modules/boot-message.nix | 15 -------------
 nixos-modules/types/desktop.nix        |  1 -
 4 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 boot-message.nix
 delete mode 100644 nixos-modules/modules/boot-message.nix

diff --git a/boot-message.nix b/boot-message.nix
new file mode 100644
index 0000000..8246595
--- /dev/null
+++ b/boot-message.nix
@@ -0,0 +1,31 @@
+{ self, lib, ... }:
+{
+  perSystem =
+    { pkgs, ... }:
+    {
+      packages.boot-message = pkgs.writeShellApplication {
+        name = "boot-message";
+        text =
+          let
+            message = lib.escapeShellArg ''
+              If found, please contact:
+              Shahar "Dawn" Or
+              +66613657506
+              mightyiampresence@gmail.com
+              @mightyiam:matrix.org
+            '';
+          in
+          ''echo -e ${message} | cowsay --bold --aurora -f dragon'';
+        runtimeInputs = [ pkgs.neo-cowsay ];
+      };
+    };
+
+  flake.nixosModules.common.imports = [
+    (
+      { pkgs, ... }:
+      {
+        boot.initrd.preDeviceCommands = lib.getExe self.packages.${pkgs.stdenv.system}.boot-message;
+      }
+    )
+  ];
+}
diff --git a/flake.nix b/flake.nix
index a21647f..4a68da2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -76,6 +76,7 @@
     inputs:
     inputs.flake-parts.lib.mkFlake { inputs = inputs; } {
       imports = [
+        ./boot-message.nix
         ./catppuccin.nix
         ./fmt.nix
         ./meta.nix
diff --git a/nixos-modules/modules/boot-message.nix b/nixos-modules/modules/boot-message.nix
deleted file mode 100644
index 76052bf..0000000
--- a/nixos-modules/modules/boot-message.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ lib, pkgs, ... }:
-let
-  message = ''
-    If found, please contact:
-    Shahar "Dawn" Or
-    +66613657506
-    mightyiampresence@gmail.com
-    @mightyiam:matrix.org
-  '';
-in
-{
-  boot.initrd.preDeviceCommands = ''
-    echo -e ${lib.escapeShellArg message} | ${pkgs.neo-cowsay}/bin/cowsay --bold --aurora -f dragon
-  '';
-}
diff --git a/nixos-modules/types/desktop.nix b/nixos-modules/types/desktop.nix
index e616413..8f21150 100644
--- a/nixos-modules/types/desktop.nix
+++ b/nixos-modules/types/desktop.nix
@@ -2,7 +2,6 @@
   imports = [
     ../modules/allow-unfree-packages.nix
     ../modules/bluetooth.nix
-    ../modules/boot-message.nix
     ../modules/dconf.nix
     ../modules/editor.nix
     ../modules/firmware.nix