From 119ee899d9f04495479e409a3a21bab9a87150b6 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Mon, 17 Jun 2024 11:52:14 +0200
Subject: [PATCH] Minor updates

---
 components/network/sshd/default.nix           | 24 +------------------
 flake.lock                                    |  8 +++----
 .../cream/facts/ssh.jobrad.id_ed25519.pub     |  2 +-
 machines/orbi/media-jellyfin.nix              |  1 -
 4 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/components/network/sshd/default.nix b/components/network/sshd/default.nix
index f1801f3..1e8606e 100644
--- a/components/network/sshd/default.nix
+++ b/components/network/sshd/default.nix
@@ -7,29 +7,7 @@ let
 
   # maybe ascii-image-converter is also nice here
   sshBanner = pkgs.runCommand "ssh-banner"
-    {
-      nativeBuildInputs = [
-        (pkgs.boxes.overrideAttrs (old: rec {
-          version = "2.3.0";
-          src = pkgs.fetchFromGitHub {
-            owner = "ascii-boxes";
-            repo = "boxes";
-            rev = "v${version}";
-            sha256 = "sha256-/gc/5vDflmEwOtQbtLwRcchyr22rLQcWqs5GrwRxY70=";
-          };
-          nativeBuildInputs = old.nativeBuildInputs ++ [
-            pkgs.libunistring
-            pkgs.pcre2
-            pkgs.ncurses
-          ];
-          installPhase = ''
-            install -Dm755 -t $out/bin out/boxes
-            install -Dm644 -t $out/share/boxes boxes-config
-            install -Dm644 -t $out/share/man/man1 doc/boxes.1
-          '';
-        }))
-      ];
-    } ''
+    { nativeBuildInputs = [ pkgs.boxes ]; } ''
     echo "${config.networking.hostName}" | boxes -d ansi -s 80x1 -a r > $out
   '';
 
diff --git a/flake.lock b/flake.lock
index 8d9231a..d900780 100644
--- a/flake.lock
+++ b/flake.lock
@@ -863,11 +863,11 @@
     },
     "private_assets": {
       "locked": {
-        "lastModified": 1718464398,
-        "narHash": "sha256-iw5jhVDRo6m1Q+2Looxtt2ttLtgazbrkcrN3aTtYib4=",
+        "lastModified": 1718617829,
+        "narHash": "sha256-pDupyj5/A52RqyWiSPVy1NlupFm9gqT+3vrP2fjkWP4=",
         "ref": "main",
-        "rev": "d62f54771b324d74e15404c2565b25541ec9a4ff",
-        "revCount": 26,
+        "rev": "73ae5a992c9251ed5165a5cdc29ed1a9cdd36091",
+        "revCount": 27,
         "type": "git",
         "url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-assets.git"
       },
diff --git a/machines/cream/facts/ssh.jobrad.id_ed25519.pub b/machines/cream/facts/ssh.jobrad.id_ed25519.pub
index 12fba19..3f2d672 100644
--- a/machines/cream/facts/ssh.jobrad.id_ed25519.pub
+++ b/machines/cream/facts/ssh.jobrad.id_ed25519.pub
@@ -1 +1 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDNOdK+3LlS+UObocReWlvs4nRPnNFups27PG95Ty/8O nixbld@cream
\ No newline at end of file
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIArokGctZ2VLf92FhfE8pHzkx/bjz0/J1QjeaGgDSj1s ingolf.wagner@jobrad.org
diff --git a/machines/orbi/media-jellyfin.nix b/machines/orbi/media-jellyfin.nix
index c2e40bb..e5e47a3 100644
--- a/machines/orbi/media-jellyfin.nix
+++ b/machines/orbi/media-jellyfin.nix
@@ -36,6 +36,5 @@
     {
       enable = true;
       virtualHosts. "flix.ingolf-wagner.de" = flixConfig;
-      #virtualHosts. "video.ingolf-wagner.de" = flixConfig;
     };
 }