From 6840fd8748b570faabfe054835c5d3edb56f471d Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Fri, 24 Mar 2023 03:20:04 +0100
Subject: update inputs

also remove some old stuff. also deduplicate the erlangs on my akkoma.
also remove chromium, since for some reason hydra hasn't built it yet
and I'm not fancying compiling it myself.

also remove the whole sshd mosh stuff for the chat, since that broke
tmux-on-login.
---
 flora/configuration.nix   | 2 +-
 flora/services/akkoma.nix | 9 +++++++++
 flora/services/blog.nix   | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'flora')

diff --git a/flora/configuration.nix b/flora/configuration.nix
index c04f240..3eaaa08 100644
--- a/flora/configuration.nix
+++ b/flora/configuration.nix
@@ -9,7 +9,7 @@
     #./services/picarones.nix
     ./services/dockerhub.nix
     ./services/blog.nix
-    ./services/znc.nix
+    # ./services/znc.nix
     ./services/mail.nix
     ./services/trainspotter.nix
   ];
diff --git a/flora/services/akkoma.nix b/flora/services/akkoma.nix
index efc693e..98cfb7b 100644
--- a/flora/services/akkoma.nix
+++ b/flora/services/akkoma.nix
@@ -6,6 +6,7 @@ let
     inherit system;
     overlays = [ (self: super: rec {
       beamPackages = super.beam.packagesWith super.erlang_nox;
+      elixir = beamPackages.elixir_1_13;
     }) ];
   };
   staticDir = "/var/lib/akkoma/static";
@@ -31,6 +32,14 @@ in
         ("${inputs.nixpkgs-unstable}/nixos/modules/services/web-apps/akkoma.nix")
       ];
 
+      # the pleroma_ctl wrapper uses pkgs.elixir, which without this is not the same
+      # as akkoma's elixir
+      nixpkgs.overlays = [
+        (self: super: {
+          elixir = unstable.beamPackages.elixir_1_13;
+        })
+      ];
+
       system.stateVersion = "22.11";
 
       services.akkoma = {
diff --git a/flora/services/blog.nix b/flora/services/blog.nix
index e78152f..e8335b1 100644
--- a/flora/services/blog.nix
+++ b/flora/services/blog.nix
@@ -4,7 +4,7 @@ let
   lux = pkgs.stdenv.mkDerivation {
     name = "gtfs-mdbooks";
     src = pkgs.fetchgit {
-      url = "https://stuebinm.eu/git/lux";
+      url = "https://stuebinm.eu/git/forks/lux";
       rev = "refs/heads/master";
       sha256 = "sha256-L2y5SEGOaoWl+jQGP3TmpQQLojjkRAjiRjbwhGKOg14=";
     };
-- 
cgit v1.2.3