nethack container

update secrets
home-assistant: allow bluetooth
2026-03-16 18:21:07 +01:00 · 2025-12-19 22:44:08 +01:00 · 2025-12-19 22:38:42 +01:00 · 2025-12-19 15:05:54 +01:00 · 2025-12-19 15:05:29 +01:00 · 2025-12-19 13:11:24 +01:00
55 changed files with 518 additions and 2033 deletions
--- a/configs/0ad.nix
+++ b/configs/0ad.nix
@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = [ pkgs.zeroad ];
-  networking.firewall = {
-    allowedTCPPorts = [ 20595 ];
-    allowedUDPPorts = [ 20595 ];
-  };
-}
--- a/configs/admin-essentials.nix
+++ b/configs/admin-essentials.nix
@@ -4,7 +4,7 @@
  lib,
  ...
 }: let
-  darwin = lib.strings.hasSuffix "-darwin" pkgs.system;
+  darwin = lib.strings.hasSuffix "-darwin" pkgs.stdenv.hostPlatform.system;
 in {
  environment.systemPackages =
    [
--- a/configs/bots/default.nix
+++ b/configs/bots/default.nix
@@ -17,11 +17,15 @@ in {
    ./hesychius.nix
    ./smyth.nix
    ./nachtischsatan.nix
-    ./tlg-wotd.nix
+    # ./tlg-wotd.nix TODO reenable
    ./celan.nix
    ./nietzsche.nix
  ];

+  age.secrets = {
+    telegram-token-kmein.file = ../../secrets/telegram-token-kmein.age;
+  };
+
  systemd.tmpfiles.rules = map (path:
    tmpfilesConfig {
      type = "d";
--- a/configs/bots/tlg-wotd.nix
+++ b/configs/bots/tlg-wotd.nix
@@ -3,11 +3,14 @@
  lib,
  config,
  niveumPackages,
+  unstablePackages,
  ...
 }: let
  mastodonEndpoint = "https://social.krebsco.de";
 in {
  systemd.services.bot-tlg-wotd = {
+    # TODO reenable
+    # once https://github.com/NixOS/nixpkgs/pull/462893 is in stable NixOS
    enable = true;
    wants = ["network-online.target"];
    startAt = "9:30";
@@ -42,9 +45,8 @@ in {

      #ancientgreek #classics #wotd #wordoftheday

-      transliteration=$(${pkgs.writers.makePythonWriter pkgs.python311 pkgs.python311Packages pkgs.python3Packages "translit.py" {
-        # revert to pkgs.writers.writePython3 once https://github.com/NixOS/nixpkgs/pull/353367 is merged
-        libraries = [ pkgs.python3Packages.cltk ];
+      transliteration=$(${pkgs.writers.writePython3 "translit.py" {
+        libraries = py: [ py.cltk ];
      } ''
        import sys
        from cltk.phonology.grc.transcription import Transcriber
@@ -149,7 +151,6 @@ in {
  };

  age.secrets = {
-    telegram-token-kmein.file = ../../secrets/telegram-token-kmein.age;
    mastodon-token-tlgwotd.file = ../../secrets/mastodon-token-tlgwotd.age;
  };

--- a/configs/default.nix
+++ b/configs/default.nix
@@ -135,7 +135,6 @@ in
        };
      };
    }
-    { programs.command-not-found.enable = true; }
    {
      programs.gnupg = {
        agent = {
@@ -211,7 +210,6 @@ in
    ./direnv.nix
    ./docker.nix
    ./dunst.nix
-    ./flix.nix
    ./fonts.nix
    ./fzf.nix
    ./git.nix
@@ -232,8 +230,8 @@ in
    ./nix.nix
    ./newsboat.nix
    ./flameshot.nix
-    ./fritzbox.nix
    ./packages.nix
+    ./virtualization.nix
    ./picom.nix
    ./stardict.nix
    ./polkit.nix
@@ -258,7 +256,6 @@ in
      '';
    }
    ./tor.nix
-    ./stw-berlin.nix
    ./mastodon-bot.nix
    {
      fileSystems."${remoteDir}/fritz" = {
--- a/configs/flameshot.nix
+++ b/configs/flameshot.nix
@@ -15,7 +15,7 @@
        showHelp = false;
        squareMagnifier = true;
        uploadWithoutConfirmation = true;
-        buttons = ''@Variant(\0\0\0\x7f\0\0\0\vQList<int>\0\0\0\0\x10\0\0\0\x2\0\0\0\x5\0\0\0\x13\0\0\0\xa\0\0\0\x1\0\0\0\xc\0\0\0\xd\0\0\0\x6\0\0\0\x8\0\0\0\0\0\0\0\xf\0\0\0\x4\0\0\0\xb\0\0\0\x3\0\0\0\x12\0\0\0\x9)'';
+        # buttons = ''@Variant(\0\0\0\x7f\0\0\0\vQList<int>\0\0\0\0\x10\0\0\0\x2\0\0\0\x5\0\0\0\x13\0\0\0\xa\0\0\0\x1\0\0\0\xc\0\0\0\xd\0\0\0\x6\0\0\0\x8\0\0\0\0\0\0\0\xf\0\0\0\x4\0\0\0\xb\0\0\0\x3\0\0\0\x12\0\0\0\x9)'';
      };
    };
  };
--- a/configs/flix.nix
+++ b/configs/flix.nix
@@ -1,98 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: let
-  flixLocation = "/media/flix";
-  flixLocationNew = "/media/flix-new";
-  cacheLocation = "/var/cache/flix";
-  indexFilename = "index";
-  indexFilenameNew = "index-new";
-  flixUser = "flix";
-  flixGroup = "users";
-  inherit (import ../lib) tmpfilesConfig;
-in {
-  fileSystems.${flixLocation} = {
-    device = "prism.r:/export/download";
-    fsType = "nfs";
-    options = [
-      "noauto"
-      "noatime"
-      "nodiratime"
-      "x-systemd.automount"
-      "x-systemd.device-timeout=1"
-      "x-systemd.idle-timeout=1min"
-      "x-systemd.requires=tinc.retiolum.service"
-      "user"
-      "_netdev"
-    ];
-  };
-
-  fileSystems.${flixLocationNew} = {
-    device = "//yellow.r/public";
-    fsType = "cifs";
-    options = [
-      "guest"
-      "nofail"
-      "noauto"
-      "ro"
-      "x-systemd.automount"
-      "x-systemd.device-timeout=1"
-      "x-systemd.idle-timeout=1min"
-    ];
-  };
-
-  systemd.tmpfiles.rules = [
-    (tmpfilesConfig {
-      type = "d";
-      path = cacheLocation;
-      mode = "0750";
-      user = flixUser;
-      group = flixGroup;
-    })
-  ];
-
-  systemd.services.flix-index = {
-    description = "Flix indexing service";
-    wants = ["network-online.target"];
-    script = ''
-      cp ${flixLocation}/index ./${indexFilename}
-      cp ${flixLocationNew}/index ./${indexFilenameNew}
-    '';
-    startAt = "hourly";
-    serviceConfig = {
-      Type = "oneshot";
-      User = flixUser;
-      Group = flixGroup;
-      WorkingDirectory = cacheLocation;
-    };
-  };
-
-  users.extraUsers.${flixUser} = {
-    isSystemUser = true;
-    createHome = true;
-    home = cacheLocation;
-    group = flixGroup;
-  };
-
-  environment.systemPackages = [
-    (pkgs.writers.writeDashBin "mpv-simpsons" ''
-      set -efu
-      cd "${flixLocation}/download"
-      [ -f "${cacheLocation}/${indexFilename}" ] || exit 1
-
-      cat "${cacheLocation}/${indexFilename}" \
-        | ${pkgs.gnugrep}/bin/grep -i 'simpsons.*mkv' \
-        | shuf \
-        | ${pkgs.findutils}/bin/xargs -d '\n' ${pkgs.mpv}/bin/mpv
-    '')
-    (pkgs.writers.writeDashBin "flixmenu" ''
-      set -efu
-      (
-        ${pkgs.gnused}/bin/sed 's#^\.#${flixLocation}#' ${cacheLocation}/${indexFilename}
-        ${pkgs.gnused}/bin/sed 's#^\.#${flixLocationNew}#' ${cacheLocation}/${indexFilenameNew}
-      ) | ${pkgs.dmenu}/bin/dmenu -i -p flix -l 5 "$@" \
-        | ${pkgs.findutils}/bin/xargs -I '{}' ${pkgs.util-linux}/bin/setsid ${pkgs.xdg-utils}/bin/xdg-open '{}'
-    '')
-  ];
-}
--- a/configs/fritzbox.nix
+++ b/configs/fritzbox.nix
@@ -1,19 +0,0 @@
-{ config, ... }:
-{
-  networking.firewall.allowedUDPPorts = [ 51820 ];
-  networking.wg-quick.interfaces.aether = {
-    autostart = false;
-    dns = ["192.168.178.1" "fritz.box"];
-    listenPort = 51820;
-    privateKeyFile = config.age.secrets.wireguard-aether-key.path;
-    peers = [
-      {
-        allowedIPs = ["192.168.178.0/24" "0.0.0.0/0"];
-        endpoint = "lng5gx2rmssv8ge1.myfritz.net:58997";
-        persistentKeepalive = 25;
-        presharedKeyFile = config.age.secrets.wireguard-aether-psk.path;
-        publicKey = "8Rr7BueC0CGmycBQFS7YM7VF7Adkdc1ZcLFy8YXyOQk=";
-      }
-    ];
-  };
-}
--- a/configs/gaming.nix
+++ b/configs/gaming.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = [
+    pkgs.zeroad
+    pkgs.mari0
+    pkgs.luanti # fka minetest
+  ];
+  networking.firewall = {
+    # for 0ad multiplayer
+    allowedTCPPorts = [ 20595 ];
+    allowedUDPPorts = [ 20595 ];
+  };
+}
--- a/configs/git.nix
+++ b/configs/git.nix
@@ -17,7 +17,6 @@ in {
    pkgs.gitstats
    pkgs.patch
    pkgs.patchutils
-    inputs.self.packages.${pkgs.system}.git-preview
  ];

  environment.shellAliases = {
--- a/configs/mpv.nix
+++ b/configs/mpv.nix
@@ -37,7 +37,7 @@ in {
      };
      scripts = [
        pkgs.mpvScripts.quality-menu
-        niveumPackages.mpv-visualizer
+        pkgs.mpvScripts.visualizer
      ];
    };
  };
--- a/configs/neovim.nix
+++ b/configs/neovim.nix
@@ -52,8 +52,8 @@
    pkgs.nodePackages.typescript-language-server
    pkgs.lua-language-server
    pkgs.nodePackages.vscode-langservers-extracted
-    pkgs.lemminx
-    niveumPackages.jq-lsp
+    pkgs.lemminx # XML LSP
+    pkgs.jq-lsp
    pkgs.dhall-lsp-server
  ];
 }
--- a/configs/neovim.sync-conflict-20250130-092404-AJVBWR2.nix
+++ b/configs/neovim.sync-conflict-20250130-092404-AJVBWR2.nix
@@ -1,46 +0,0 @@
-{ pkgs, niveumPackages, config, ... }: {
-  environment.variables.EDITOR = pkgs.lib.mkForce "nvim";
-  environment.shellAliases.vi = "nvim";
-  environment.shellAliases.vim = "nvim";
-  environment.shellAliases.view = "nvim -R";
-
-  home-manager.users.me = {
-    editorconfig = {
-      enable = true;
-      settings = {
-        "*" = {
-          charset = "utf-8";
-          end_of_line = "lf";
-          trim_trailing_whitespace = true;
-          insert_final_newline = true;
-          indent_style = "space";
-          indent_size = 2;
-        };
-        "*.py" = { indent_size = 4; };
-        Makefile = { indent_style = "tab"; };
-        "*.md" = { trim_trailing_whitespace = false; };
-      };
-    };
-  };
-
-  environment.systemPackages = [
-    (pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
-    (niveumPackages.vim.override {
-      stylixColors = config.lib.stylix.colors;
-      # colorscheme = "base16-gruvbox-dark-medium";
-    })
-
-    # language servers
-    pkgs.pyright
-    pkgs.haskellPackages.haskell-language-server
-    pkgs.texlab
-    pkgs.nil
-    pkgs.rust-analyzer
-    pkgs.nodePackages.typescript-language-server
-    pkgs.lua-language-server
-    pkgs.nodePackages.vscode-langservers-extracted
-    pkgs.lemminx
-    niveumPackages.jq-lsp
-    pkgs.dhall-lsp-server
-  ];
-}
--- a/configs/packages.nix
+++ b/configs/packages.nix
@@ -153,15 +153,12 @@ in {
    niveumPackages.mpv-iptv
    niveumPackages.devanagari
    niveumPackages.betacode # ancient greek betacode to unicode converter
-    niveumPackages.meteo
-    niveumPackages.jq-lsp
+    pkgs.jq-lsp
    niveumPackages.swallow # window swallowing
    niveumPackages.literature-quote
    niveumPackages.booksplit
    niveumPackages.dmenu-randr
-    niveumPackages.dmenu-bluetooth
    niveumPackages.manual-sort
-    niveumPackages.dns-sledgehammer
    niveumPackages.wttr
    niveumPackages.unicodmenu
    niveumPackages.emailmenu
@@ -209,11 +206,7 @@ in {
    ncspot
    playerctl

-    nix-index
-    niveumPackages.nix-index-update
-
    #krebs
-    niveumPackages.dic
    pkgs.nur.repos.mic92.ircsink

    (haskellPackages.ghcWithHoogle (hs: [
--- a/configs/stw-berlin.nix
+++ b/configs/stw-berlin.nix
@@ -1,52 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
-  age.secrets.stw-berlin-card-code.file = ../secrets/stw-berlin-card-code.age;
-
-  systemd.services.stw-berlin = {
-    enable = true;
-    wants = ["network-online.target"];
-    startAt = "weekly";
-    serviceConfig = {
-      User = config.users.users.me.name;
-      Group = config.users.users.me.group;
-      WorkingDirectory = "/home/kfm/cloud/nextcloud/Uni/Meta/Mensa";
-      LoadCredential = [
-        "password:${config.age.secrets.stw-berlin-card-code.path}"
-      ];
-    };
-    script = ''
-      KARTEN_ID=8071859
-      PASSWORT=$(cat "$CREDENTIALS_DIRECTORY"/password)
-
-      endpoint=https://ks.stw.berlin:4433/TL1/TLM/KASVC
-      authorization_header='Authorization: Basic S0FTVkM6ekt2NXlFMUxaVW12VzI5SQ=='
-
-      get_auth_token() {
-        ${pkgs.curl}/bin/curl -sSL "$endpoint/LOGIN?karteNr=$KARTEN_ID&format=JSON&datenformat=JSON" \
-          -X POST \
-          -H "$authorization_header" \
-          --data-raw '{"BenutzerID":"'$KARTEN_ID'","Passwort":"'$PASSWORT'"}' \
-          | ${pkgs.jq}/bin/jq -r '.[0].authToken|@uri'
-      }
-
-
-      get_transactions() {
-        ${pkgs.curl}/bin/curl -sSL "$endpoint/TRANS?format=JSON&authToken=$(get_auth_token)&karteNr=$KARTEN_ID&datumVon=12.02.2018&datumBis=$(date -d tomorrow +%d.%m.%Y)" \
-          -H "$authorization_header" \
-          | ${pkgs.jq}/bin/jq
-      }
-
-      get_items() {
-        ${pkgs.curl}/bin/curl -sSL "$endpoint/TRANSPOS?format=JSON&authToken=$(get_auth_token)&karteNr=$KARTEN_ID&datumVon=12.02.2018&datumBis=$(date -d tomorrow +%d.%m.%Y)" \
-          -H "$authorization_header" \
-          | ${pkgs.jq}/bin/jq
-      }
-
-      get_transactions > transactions-$(date -I).json
-      get_items > items-$(date -I).json
-    '';
-  };
-}
--- a/configs/virtualization.nix
+++ b/configs/virtualization.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+{
+  users.users.me.extraGroups = [ "libvirtd" ];
+  virtualisation.libvirtd.enable = true;
+
+  # Enable TPM support for VMs
+  virtualisation.libvirtd.qemu = {
+    # swtpm.enable = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    virt-manager
+  ];
+}
--- a/flake.lock
+++ b/flake.lock
@@ -53,43 +53,6 @@
        "type": "github"
      }
    },
-    "almanac": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1640984494,
-        "narHash": "sha256-xxbrGJtRK6wzOR09vGPqoUvnY5f0h6hn6Uecy331Zhw=",
-        "owner": "lfborjas",
-        "repo": "almanac",
-        "rev": "72931bd9accefccd2df59d9d64a6cbb91f2d5f17",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lfborjas",
-        "repo": "almanac",
-        "type": "github"
-      }
-    },
-    "astro-calendar": {
-      "inputs": {
-        "almanac": "almanac",
-        "nixpkgs": "nixpkgs_4",
-        "swiss-ephemeris": "swiss-ephemeris",
-        "swisseph": "swisseph"
-      },
-      "locked": {
-        "lastModified": 1759827606,
-        "narHash": "sha256-JunaXkzalZtQYjGxJrMGYDEgOwullKLnpAFj/SaJaKI=",
-        "owner": "kmein",
-        "repo": "astro-calendar",
-        "rev": "f1579f087ee49e4c6a3bcf130b20738123f8616a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "kmein",
-        "repo": "astro-calendar",
-        "type": "github"
-      }
-    },
    "autorenkalender": {
      "inputs": {
        "nixpkgs": [
@@ -345,7 +308,7 @@
    },
    "fenix": {
      "inputs": {
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_4",
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
@@ -504,36 +467,20 @@
        "type": "github"
      },
      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
+        "id": "flake-utils",
+        "type": "indirect"
      }
    },
    "flake-utils_4": {
      "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_5"
      },
      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_5": {
-      "locked": {
-        "lastModified": 1676283394,
-        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
@@ -650,11 +597,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1764776959,
-        "narHash": "sha256-d+5CGloq7Lo1u2SkzhF8oiOdUc6Z5emh22nTXUB9CFA=",
+        "lastModified": 1765170903,
+        "narHash": "sha256-O8VTGey1xxiRW+Fpb+Ps9zU7ShmxUA1a7cMTcENCVNg=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "e1680d594a9281651cbf7d126941a8c8e2396183",
+        "rev": "20561be440a11ec57a89715480717baf19fe6343",
        "type": "github"
      },
      "original": {
@@ -664,25 +611,6 @@
        "type": "github"
      }
    },
-    "ical-ephemeris": {
-      "inputs": {
-        "astro-calendar": "astro-calendar",
-        "nixpkgs": "nixpkgs_5"
-      },
-      "locked": {
-        "lastModified": 1761309163,
-        "narHash": "sha256-x5BdTIoG/ANMhJJw+IMWLbdXJ7vTh3dou8zN4LCnTeU=",
-        "ref": "refs/heads/master",
-        "rev": "949682c2ec4da9a23c414a8ca8c039652cbbef0c",
-        "revCount": 22,
-        "type": "git",
-        "url": "ssh://gitea@code.kmein.de:22022/kfm/ical-ephemeris"
-      },
-      "original": {
-        "type": "git",
-        "url": "ssh://gitea@code.kmein.de:22022/kfm/ical-ephemeris"
-      }
-    },
    "kellia-dictionary": {
      "flake": false,
      "locked": {
@@ -750,15 +678,14 @@
    "menstruation-backend_2": {
      "inputs": {
        "fenix": "fenix",
-        "flake-utils": "flake-utils_4",
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
-        "lastModified": 1759437689,
-        "narHash": "sha256-L3gLXmW+9oE+5YosaOSIDtNlXmXxnY8RXDNj2J8uIRs=",
+        "lastModified": 1765657254,
+        "narHash": "sha256-9kZdra5Bx3sfkcZW0eRULsWwloigv7+xQfr+JL0kX6s=",
        "owner": "kmein",
        "repo": "menstruation.rs",
-        "rev": "7ae9a7affffd20eafe0158b9b7ca50cc8a77f2af",
+        "rev": "cc7278fc187f1d4b1f802fbde926a6195a7a0d47",
        "type": "github"
      },
      "original": {
@@ -801,9 +728,6 @@
    },
    "menstruation-telegram_2": {
      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
        "menstruation-backend": [
          "menstruation-backend"
        ],
@@ -812,11 +736,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1677075205,
-        "narHash": "sha256-2+xuAhsS3y2qB0ObVPCHXrmnTsIZ8uI5HFI4+Ash8PY=",
+        "lastModified": 1765657432,
+        "narHash": "sha256-gzoBH783lFsQocSwjp2d6v778sWcLnKXIQPnkVTx+qU=",
        "owner": "kmein",
        "repo": "menstruation-telegram",
-        "rev": "f7ddb6d9610aacb50ec66a3ce1bdc49fe4664a49",
+        "rev": "63ff6b28e0609f470b63813b37320188fff7e95d",
        "type": "github"
      },
      "original": {
@@ -889,26 +813,23 @@
        "type": "github"
      }
    },
-    "nix-formatter-pack_2": {
+    "nix-index-database": {
      "inputs": {
        "nixpkgs": [
-          "nix-on-droid",
          "nixpkgs"
-        ],
-        "nmd": "nmd_3",
-        "nmt": "nmt_2"
+        ]
      },
      "locked": {
-        "lastModified": 1666720474,
-        "narHash": "sha256-iWojjDS1D19zpeZXbBdjWb9MiKmVVFQCqtJmtTXgPx8=",
-        "owner": "Gerschtli",
-        "repo": "nix-formatter-pack",
-        "rev": "14876cc8fe94a3d329964ecb073b4c988c7b61f5",
+        "lastModified": 1765267181,
+        "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
        "type": "github"
      },
      "original": {
-        "owner": "Gerschtli",
-        "repo": "nix-formatter-pack",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
        "type": "github"
      }
    },
@@ -943,33 +864,6 @@
        "type": "github"
      }
    },
-    "nix-on-droid_2": {
-      "inputs": {
-        "home-manager": [
-          "home-manager"
-        ],
-        "nix-formatter-pack": "nix-formatter-pack_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap_2",
-        "nmd": "nmd_4"
-      },
-      "locked": {
-        "lastModified": 1688144254,
-        "narHash": "sha256-8KL1l/7eP2Zm1aJjdVaSOk0W5kTnJo9kcgW03gqWuiI=",
-        "owner": "t184256",
-        "repo": "nix-on-droid",
-        "rev": "2301e01d48c90b60751005317de7a84a51a87eb6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "t184256",
-        "ref": "release-23.05",
-        "repo": "nix-on-droid",
-        "type": "github"
-      }
-    },
    "nix-writers": {
      "flake": false,
      "locked": {
@@ -1010,7 +904,7 @@
    },
    "nixinate_2": {
      "inputs": {
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
        "lastModified": 1742737607,
@@ -1058,22 +952,6 @@
        "type": "github"
      }
    },
-    "nixpkgs-for-bootstrap_2": {
-      "locked": {
-        "lastModified": 1686921029,
-        "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04",
-        "type": "github"
-      }
-    },
    "nixpkgs-old": {
      "locked": {
        "lastModified": 1682600000,
@@ -1124,11 +1002,11 @@
    },
    "nixpkgs-unstable_2": {
      "locked": {
-        "lastModified": 1764856811,
-        "narHash": "sha256-p7ihpz21BB+NhuT3qVL3clzWz+UyZlt7S3RRXxZGPls=",
+        "lastModified": 1765369061,
+        "narHash": "sha256-VPyShT4DyGtXH2wsD8yAVvvvi9OILUHTqNxWQd/6yZA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "152586a6a98226db20aab6e6e1c9a37c535acfbc",
+        "rev": "aaa6c85f51f9333738c170ccc55b5fe5f55938f4",
        "type": "github"
      },
      "original": {
@@ -1139,22 +1017,6 @@
      }
    },
    "nixpkgs_10": {
-      "locked": {
-        "lastModified": 1764667669,
-        "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "418468ac9527e799809c900eda37cbff999199b6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_11": {
      "locked": {
        "lastModified": 1760878510,
        "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
@@ -1170,7 +1032,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_12": {
+    "nixpkgs_11": {
      "locked": {
        "lastModified": 1659446231,
        "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=",
@@ -1186,6 +1048,22 @@
        "type": "github"
      }
    },
+    "nixpkgs_12": {
+      "locked": {
+        "lastModified": 1744536153,
+        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "nixpkgs_13": {
      "locked": {
        "lastModified": 1615532953,
@@ -1230,11 +1108,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1758035966,
-        "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=",
+        "lastModified": 1701436327,
+        "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b",
+        "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
        "type": "github"
      },
      "original": {
@@ -1246,11 +1124,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1759381078,
-        "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
+        "lastModified": 1701436327,
+        "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
+        "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
        "type": "github"
      },
      "original": {
@@ -1261,38 +1139,6 @@
      }
    },
    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1701436327,
-        "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1701436327,
-        "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_8": {
      "locked": {
        "lastModified": 1653060744,
        "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
@@ -1308,13 +1154,13 @@
        "type": "github"
      }
    },
-    "nixpkgs_9": {
+    "nixpkgs_7": {
      "locked": {
-        "lastModified": 1764677808,
-        "narHash": "sha256-H3lC7knbXOBrHI9hITQ7modLuX20mYJVhZORL5ioms0=",
+        "lastModified": 1764983851,
+        "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "1aab89277eb2d87823d5b69bae631a2496cff57a",
+        "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454",
        "type": "github"
      },
      "original": {
@@ -1324,6 +1170,38 @@
        "type": "github"
      }
    },
+    "nixpkgs_8": {
+      "locked": {
+        "lastModified": 1765186076,
+        "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_9": {
+      "locked": {
+        "lastModified": 1744536153,
+        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "nmd": {
      "flake": false,
      "locked": {
@@ -1356,38 +1234,6 @@
        "type": "gitlab"
      }
    },
-    "nmd_3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1666190571,
-        "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=",
-        "owner": "rycee",
-        "repo": "nmd",
-        "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169",
-        "type": "gitlab"
-      },
-      "original": {
-        "owner": "rycee",
-        "repo": "nmd",
-        "type": "gitlab"
-      }
-    },
-    "nmd_4": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1666190571,
-        "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=",
-        "owner": "rycee",
-        "repo": "nmd",
-        "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169",
-        "type": "gitlab"
-      },
-      "original": {
-        "owner": "rycee",
-        "repo": "nmd",
-        "type": "gitlab"
-      }
-    },
    "nmt": {
      "flake": false,
      "locked": {
@@ -1404,22 +1250,6 @@
        "type": "gitlab"
      }
    },
-    "nmt_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1648075362,
-        "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
-        "owner": "rycee",
-        "repo": "nmt",
-        "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
-        "type": "gitlab"
-      },
-      "original": {
-        "owner": "rycee",
-        "repo": "nmt",
-        "type": "gitlab"
-      }
-    },
    "nur": {
      "locked": {
        "lastModified": 1693680361,
@@ -1438,14 +1268,14 @@
    "nur_2": {
      "inputs": {
        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_10"
+        "nixpkgs": "nixpkgs_8"
      },
      "locked": {
-        "lastModified": 1764853233,
-        "narHash": "sha256-bp7B5alQk7nDLtFLKaOHhSPBNVCcwIxMXjcc/VzY0hg=",
+        "lastModified": 1765367248,
+        "narHash": "sha256-JyVUlh5wINjw29Ops7ZjRrzw+55r5GpCHjO0TCsoowc=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "5e8ec1167d3a375e2857fbe915b3d8658d3e6472",
+        "rev": "6af054d2762ef52fad9943d490708f937008cca4",
        "type": "github"
      },
      "original": {
@@ -1510,19 +1340,16 @@
    "recht_2": {
      "inputs": {
        "blessings": "blessings_2",
-        "flake-utils": [
-          "flake-utils"
-        ],
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1736882697,
-        "narHash": "sha256-G++JyQ6GJlQ8T/R18xb02HhSE1NWfpAboUEBleaadd8=",
+        "lastModified": 1765658439,
+        "narHash": "sha256-7u21xVZBEYhgEd4UX+nG86oDblxCJtG/eYT1g2S45nc=",
        "owner": "kmein",
        "repo": "recht",
-        "rev": "dd49a91b1e611920889680aa2c9101166b0ce83e",
+        "rev": "dbdd8fd69d6b82bce1132ceb8dd2f5715887e6ee",
        "type": "github"
      },
      "original": {
@@ -1568,18 +1395,16 @@
        "coptic-dictionary": "coptic-dictionary",
        "flake-utils": "flake-utils_3",
        "home-manager": "home-manager_2",
-        "ical-ephemeris": "ical-ephemeris",
        "menstruation-backend": "menstruation-backend_2",
        "menstruation-telegram": "menstruation-telegram_2",
-        "nix-on-droid": "nix-on-droid_2",
+        "nix-index-database": "nix-index-database",
        "nixinate": "nixinate_2",
-        "nixpkgs": "nixpkgs_9",
+        "nixpkgs": "nixpkgs_7",
        "nixpkgs-old": "nixpkgs-old_2",
        "nixpkgs-unstable": "nixpkgs-unstable_2",
        "nur": "nur_2",
        "recht": "recht_2",
        "retiolum": "retiolum_2",
-        "rust-overlay": "rust-overlay_2",
        "scripts": "scripts_2",
        "stockholm": "stockholm",
        "stylix": "stylix_2",
@@ -1636,16 +1461,32 @@
    },
    "rust-overlay_2": {
      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_9"
      },
      "locked": {
-        "lastModified": 1764816035,
-        "narHash": "sha256-F0IQSmSj4t2ThkbWZooAhkCTO+YpZSd2Pqiv2uoYEHo=",
+        "lastModified": 1765593578,
+        "narHash": "sha256-qbl874bCIy9+OLImdfBfZ9ITUDDjjTAB04Dk4PlZFV0=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "74d9abb7c5c030469f90d97a67d127cc5d76c238",
+        "rev": "348b94ed9ddffccdf1a65582a2dcff0a4a3eeeb4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_3": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_12"
+      },
+      "locked": {
+        "lastModified": 1765593578,
+        "narHash": "sha256-qbl874bCIy9+OLImdfBfZ9ITUDDjjTAB04Dk4PlZFV0=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "348b94ed9ddffccdf1a65582a2dcff0a4a3eeeb4",
        "type": "github"
      },
      "original": {
@@ -1688,22 +1529,17 @@
    },
    "scripts_2": {
      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
        "nixpkgs": [
          "nixpkgs"
        ],
-        "rust-overlay": [
-          "rust-overlay"
-        ]
+        "rust-overlay": "rust-overlay_2"
      },
      "locked": {
-        "lastModified": 1763370753,
-        "narHash": "sha256-sjYc9aP52GrVCPWxf+B0o0lqDGVGfpXqX9MI9eKyCZI=",
+        "lastModified": 1765657698,
+        "narHash": "sha256-Ic5lcBZQKw9kOU6BUl3w+r1zCj9hveHyaHsOAYB7Yhg=",
        "owner": "kmein",
        "repo": "scripts",
-        "rev": "e71d09ba89bb1e210a7e103aaa3fe619dbc801e7",
+        "rev": "aeea5b4cdaf39169ab469a7c31269c8360b9c403",
        "type": "github"
      },
      "original": {
@@ -1716,7 +1552,7 @@
      "inputs": {
        "buildbot-nix": "buildbot-nix",
        "nix-writers": "nix-writers",
-        "nixpkgs": "nixpkgs_11"
+        "nixpkgs": "nixpkgs_10"
      },
      "locked": {
        "lastModified": 1763891069,
@@ -1775,7 +1611,7 @@
          "nixpkgs"
        ],
        "nur": "nur_3",
-        "systems": "systems_5",
+        "systems": "systems_4",
        "tinted-foot": "tinted-foot",
        "tinted-kitty": "tinted-kitty",
        "tinted-schemes": "tinted-schemes",
@@ -1783,11 +1619,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1764836393,
-        "narHash": "sha256-J2jgYyXiXctr91MSuBQ6dwB1YaC7DpzKp+Rkj6pqS8o=",
+        "lastModified": 1765065096,
+        "narHash": "sha256-abrrONk8vzRtY6fHEkjZOyRJpKHjPlFqMBE0+/DxfAU=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "6f3b50c8fa9c468fc787e211b700e46592bf9d56",
+        "rev": "84d9d55885d463d461234f3aac07b2389a2577d8",
        "type": "github"
      },
      "original": {
@@ -1797,38 +1633,6 @@
        "type": "github"
      }
    },
-    "swiss-ephemeris": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1638583659,
-        "narHash": "sha256-EEgKk5DDkmICteFzFzXdvdGke7aPoJa6aQ228nAYieQ=",
-        "owner": "lfborjas",
-        "repo": "swiss-ephemeris",
-        "rev": "3094368f5f963e8756e89e3b3dd24b96796b8682",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lfborjas",
-        "repo": "swiss-ephemeris",
-        "type": "github"
-      }
-    },
-    "swisseph": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1757697308,
-        "narHash": "sha256-m2Qgzhsgrv0KyJin8UfNFJ8KL/HFfoN8AmCTlcirHXE=",
-        "owner": "aloistr",
-        "repo": "swisseph",
-        "rev": "3084917b5d2384af6fb928583552e0a299fb6d83",
-        "type": "github"
-      },
-      "original": {
-        "owner": "aloistr",
-        "repo": "swisseph",
-        "type": "github"
-      }
-    },
    "systems": {
      "locked": {
        "lastModified": 1681028828,
@@ -1925,15 +1729,14 @@
    },
    "telebots_2": {
      "inputs": {
-        "flake-utils": "flake-utils_5",
-        "nixpkgs": "nixpkgs_12"
+        "nixpkgs": "nixpkgs_11"
      },
      "locked": {
-        "lastModified": 1703313352,
-        "narHash": "sha256-EV1hfkxEn6L+z6A9rcyfkmBGzu0VwA2rF1iA32nfXW8=",
+        "lastModified": 1765657917,
+        "narHash": "sha256-buujY0TRj+Skg1Uo8ut7kUKHDfOtsvxt/LEOiO+ehvA=",
        "owner": "kmein",
        "repo": "telebots",
-        "rev": "534221956e6d9dc5528d94247dd35e9f597de169",
+        "rev": "1232c6f82e7cdf80b6b76a992544db42a293f7b2",
        "type": "github"
      },
      "original": {
@@ -1976,22 +1779,17 @@
    },
    "tinc-graph_2": {
      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
        "nixpkgs": [
          "nixpkgs"
        ],
-        "rust-overlay": [
-          "rust-overlay"
-        ]
+        "rust-overlay": "rust-overlay_3"
      },
      "locked": {
-        "lastModified": 1748887042,
-        "narHash": "sha256-WWQxnmKyQm/iccHxDdobdGOPfcVNf+PQwy9HQ2b9W8g=",
+        "lastModified": 1765658153,
+        "narHash": "sha256-cNTBy57MGlRBY9211prc/wau+CbwoJo0mydgGva1/LQ=",
        "owner": "kmein",
        "repo": "tinc-graph",
-        "rev": "8847b2d0e69065bf4bbb9885fbd465f3b1b2369a",
+        "rev": "119c9486460f90c45d4a157ea9b9f1cd2901d176",
        "type": "github"
      },
      "original": {
@@ -2161,9 +1959,7 @@
    },
    "wallpaper-generator_2": {
      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
+        "flake-utils": "flake-utils_4",
        "nixpkgs": "nixpkgs_13"
      },
      "locked": {
--- a/flake.nix
+++ b/flake.nix
@@ -5,14 +5,12 @@
    self.submodules = true;

    agenix.url = "github:ryantm/agenix";
-    # alew-web.url = "git+ssh://gitea@code.kmein.de:22022/kfm/alew-web.git?ref=refs/heads/master";
    autorenkalender.url = "github:kmein/autorenkalender";
    coptic-dictionary.url = "github:kmein/coptic-dictionary";
-    flake-utils.url = "github:numtide/flake-utils";
    home-manager.url = "github:nix-community/home-manager/release-25.11";
    menstruation-backend.url = "github:kmein/menstruation.rs";
    menstruation-telegram.url = "github:kmein/menstruation-telegram";
-    nix-on-droid.url = "github:t184256/nix-on-droid/release-23.05";
+    nix-index-database.url = "github:nix-community/nix-index-database";
    nixinate.url = "github:matthewcroughan/nixinate";
    nixpkgs-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0";
    nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
@@ -20,7 +18,6 @@
    nur.url = "github:nix-community/NUR";
    recht.url = "github:kmein/recht";
    retiolum.url = "github:krebs/retiolum";
-    rust-overlay.url = "github:oxalica/rust-overlay";
    scripts.url = "github:kmein/scripts";
    stockholm.url = "github:krebs/stockholm";
    stylix.url = "github:danth/stylix/release-25.11";
@@ -29,120 +26,110 @@
    voidrice.url = "github:Lukesmithxyz/voidrice";
    wallpaper-generator.url = "github:pinpox/wallpaper-generator/v1.1";
    wallpapers.url = "github:kmein/wallpapers";
-    ical-ephemeris.url = "git+ssh://gitea@code.kmein.de:22022/kfm/ical-ephemeris";

-    autorenkalender.inputs.nixpkgs.follows = "nixpkgs";
    agenix.inputs.home-manager.follows = "home-manager";
    agenix.inputs.nixpkgs.follows = "nixpkgs";
+    autorenkalender.inputs.nixpkgs.follows = "nixpkgs";
    coptic-dictionary.inputs.nixpkgs.follows = "nixpkgs";
    home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    # menstruation-backend.inputs.flake-utils.follows = "flake-utils";
-    # menstruation-backend.inputs.nixpkgs.follows = "nixpkgs";
-    # menstruation-backend.inputs.rust-overlay.follows = "rust-overlay";
-    menstruation-telegram.inputs.flake-utils.follows = "flake-utils";
    menstruation-telegram.inputs.menstruation-backend.follows = "menstruation-backend";
    menstruation-telegram.inputs.nixpkgs.follows = "nixpkgs-old";
-    nix-on-droid.inputs.home-manager.follows = "home-manager";
-    nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
-    recht.inputs.flake-utils.follows = "flake-utils";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
    recht.inputs.nixpkgs.follows = "nixpkgs";
-    rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
-    scripts.inputs.flake-utils.follows = "flake-utils";
    scripts.inputs.nixpkgs.follows = "nixpkgs";
-    scripts.inputs.rust-overlay.follows = "rust-overlay";
    stylix.inputs.nixpkgs.follows = "nixpkgs";
-    tinc-graph.inputs.flake-utils.follows = "flake-utils";
    tinc-graph.inputs.nixpkgs.follows = "nixpkgs";
-    tinc-graph.inputs.rust-overlay.follows = "rust-overlay";
    voidrice.flake = false;
-    wallpaper-generator.inputs.flake-utils.follows = "flake-utils";
    wallpapers.flake = false;
  };

-  nixConfig = {
-    extra-substituters = [ "https://kmein.cachix.org" ];
-    extra-trusted-public-keys = [ "kmein.cachix.org-1:rsJ2b6++VQHJ1W6rGuDUYsK/qUkFA3bNpO6PyEyJ9Ls=" ];
-  };
-
-  outputs = inputs @ {
-    self,
-    nixpkgs,
-    nixpkgs-unstable,
-    nur,
-    home-manager,
-    agenix,
-    retiolum,
-    nixinate,
-    flake-utils,
-    nix-on-droid,
-    stylix,
-    ...
-  }:
+  outputs =
+    inputs@{
+      self,
+      nixpkgs,
+      nixpkgs-unstable,
+      nur,
+      home-manager,
+      agenix,
+      retiolum,
+      nixinate,
+      flake-utils,
+      nix-index-database,
+      stylix,
+      ...
+    }:
+    let
+      lib = nixpkgs.lib;
+      eachSupportedSystem = lib.genAttrs lib.systems.flakeExposed;
+    in
    {
      apps = {
-        x86_64-darwin = let
-          pkgs = nixpkgs.legacyPackages.x86_64-darwin;
-        in {
-          deploy-maakaron = {
-            type = "app";
-            program = toString (pkgs.writers.writeDash "deploy-maakaron" ''
-              exec $(nix build .#homeConfigurations.maakaron.activationPackage --no-link --print-out-paths)/activate
-            '');
-          };
-        };
-        x86_64-linux = let
-          pkgs = nixpkgs.legacyPackages.x86_64-linux;
-          lib = nixpkgs.lib;
-        in
+        x86_64-linux =
+          let
+            pkgs = nixpkgs.legacyPackages.x86_64-linux;
+            lib = nixpkgs.lib;
+          in
          nixinate.nixinate.x86_64-linux self
          // {
            mock-secrets = {
              type = "app";
-              program = toString (pkgs.writers.writeDash "mock-secrets" ''
-                ${pkgs.findutils}/bin/find secrets -not -path '*/.*' -type f  | ${pkgs.coreutils}/bin/sort > secrets.txt
-              '');
+              program = toString (
+                pkgs.writers.writeDash "mock-secrets" ''
+                  ${pkgs.findutils}/bin/find secrets -not -path '*/.*' -type f  | ${pkgs.coreutils}/bin/sort > secrets.txt
+                ''
+              );
            };
          }
          # the following error prevents remote building of ful: https://github.com/NixOS/nixpkgs/issues/177873
-          // builtins.listToAttrs (map (hostname: let
-            externalNetwork = import ./lib/external-network.nix;
-            targets = {
-              ful = "root@ful";
-              zaatar = "root@zaatar";
-              makanek = "root@makanek";
-              manakish = "root@manakish";
-              tahina = "root@tahina";
-              tabula = "root@tabula";
-              kabsa = "root@kabsa";
-              fatteh = "root@fatteh";
-              kibbeh = "root@kibbeh";
-            };
-          in
-            lib.attrsets.nameValuePair "deploy-${hostname}" {
-              type = "app";
-              program = toString (pkgs.writers.writeDash "deploy-${hostname}" ''
-                exec ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch \
-                  --max-jobs 2 \
-                  --log-format internal-json \
-                  --flake .#${hostname} \
-                  --target-host ${targets.${hostname}} 2>&1 \
-                  | ${pkgs.nix-output-monitor}/bin/nom --json
-              '');
-            }) (builtins.attrNames self.nixosConfigurations))
+          // builtins.listToAttrs (
+            map (
+              hostname:
+              let
+                targets = {
+                  ful = "root@ful";
+                  zaatar = "root@zaatar";
+                  makanek = "root@makanek";
+                  manakish = "root@manakish";
+                  tahina = "root@tahina";
+                  tabula = "root@tabula";
+                  kabsa = "root@kabsa";
+                  fatteh = "root@fatteh";
+                  kibbeh = "root@kibbeh";
+                };
+              in
+              lib.attrsets.nameValuePair "deploy-${hostname}" {
+                type = "app";
+                program = toString (
+                  pkgs.writers.writeDash "deploy-${hostname}" ''
+                    exec ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch \
+                      --max-jobs 2 \
+                      --log-format internal-json \
+                      --flake .#${hostname} \
+                      --target-host ${targets.${hostname}} 2>&1 \
+                      | ${pkgs.nix-output-monitor}/bin/nom --json
+                  ''
+                );
+              }
+            ) (builtins.attrNames self.nixosConfigurations)
+          )
          // {
            deploy-ful = {
              type = "app";
-              program = toString (pkgs.writers.writeDash "deploy-ful" ''
-                exec ${pkgs.nix}/bin/nix run .#nixinate.ful \
-                  --log-format internal-json 2>&1 \
-                  | ${pkgs.nix-output-monitor}/bin/nom --json
-              '');
+              program = toString (
+                pkgs.writers.writeDash "deploy-ful" ''
+                  exec ${pkgs.nix}/bin/nix run .#nixinate.ful \
+                    --log-format internal-json 2>&1 \
+                    | ${pkgs.nix-output-monitor}/bin/nom --json
+                ''
+              );
            };
          };
      };

+      # TODO overlay for packages
+      # TODO remove flake-utils dependency from my own repos
+
      nixosModules = {
-        htgen = import modules/htgen.nix;
        moodle-dl = import modules/moodle-dl.nix;
        networkmanager-declarative = import modules/networkmanager-declarative.nix;
        passport = import modules/passport.nix;
@@ -157,37 +144,6 @@
        panoptikon = import lib/panoptikon.nix;
      };

-      nixOnDroidConfigurations = {
-        moto = nix-on-droid.lib.nixOnDroidConfiguration {
-          modules = [systems/moto/configuration.nix];
-          pkgs = import nixpkgs {
-            system = "aarch64-linux";
-            overlays = [nix-on-droid.overlays.default];
-          };
-          extraSpecialArgs = {
-            niveumPackages = inputs.self.packages.aarch64-linux;
-            niveumLib = inputs.self.lib;
-            inherit inputs;
-          };
-          home-manager-path = home-manager.outPath;
-        };
-      };
-
-      homeConfigurations = {
-        maakaron = let
-          system = "x86_64-darwin";
-          pkgs = nixpkgs.legacyPackages.${system};
-        in
-          home-manager.lib.homeManagerConfiguration {
-            inherit pkgs;
-            modules = [./systems/maakaron/home.nix];
-            extraSpecialArgs = {
-              inherit inputs;
-              niveumPackages = inputs.self.packages.${system};
-            };
-          };
-      };
-
      nixosConfigurations = let
        niveumSpecialArgs = system: {
          unstablePackages = import nixpkgs-unstable {
@@ -211,10 +167,8 @@
            systems/ful/configuration.nix
            agenix.nixosModules.default
            inputs.self.nixosModules.passport
-            inputs.ical-ephemeris.nixosModules.default
            inputs.self.nixosModules.panoptikon
            inputs.self.nixosModules.go-webring
-            inputs.self.nixosModules.htgen
            inputs.stockholm.nixosModules.reaktor2
            retiolum.nixosModules.retiolum
            nur.modules.nixos.default
@@ -256,7 +210,6 @@
          modules = [
            systems/makanek/configuration.nix
            inputs.self.nixosModules.telegram-bot
-            inputs.self.nixosModules.htgen
            inputs.self.nixosModules.passport
            agenix.nixosModules.default
            retiolum.nixosModules.retiolum
@@ -289,6 +242,7 @@
            agenix.nixosModules.default
            retiolum.nixosModules.retiolum
            home-manager.nixosModules.home-manager
+            nix-index-database.nixosModules.default
            nur.modules.nixos.default
            stylix.nixosModules.stylix
          ];
@@ -302,6 +256,7 @@
            retiolum.nixosModules.retiolum
            home-manager.nixosModules.home-manager
            nur.modules.nixos.default
+            nix-index-database.nixosModules.default
            stylix.nixosModules.stylix
          ];
        };
@@ -314,148 +269,134 @@
            retiolum.nixosModules.retiolum
            home-manager.nixosModules.home-manager
            nur.modules.nixos.default
+            nix-index-database.nixosModules.default
            stylix.nixosModules.stylix
          ];
        };
      };
-    }
-    // flake-utils.lib.eachSystem [flake-utils.lib.system.x86_64-linux flake-utils.lib.system.x86_64-darwin flake-utils.lib.system.aarch64-linux] (system: let
-      pkgs = import nixpkgs {
-        inherit system;
-        config.allowUnfree = true;
-        overlays = [
-          nur.overlays.default
-          (self: super: {
-            mpv = super.mpv.override {scripts = [inputs.self.packages.${system}.mpv-visualizer super.mpvScripts.mpris];};
-            dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
-          })
-        ];
-      };
-      unstablePackages = import nixpkgs-unstable {
-        inherit system;
-      };
-      wrapScript = {
-        packages ? [],
-        name,
-        script,
-      }:
-        pkgs.writers.writeDashBin name ''PATH=$PATH:${nixpkgs.lib.makeBinPath (packages ++ [pkgs.findutils pkgs.coreutils pkgs.gnused pkgs.gnugrep])} ${script} "$@"'';
-    in {
-      packages = rec {
+
+      packages = eachSupportedSystem (system: let
+        pkgs = import nixpkgs {
+          inherit system;
+          config.allowUnfree = true;
+          overlays = [
+            nur.overlays.default
+            (self: super: {
+              mpv = super.mpv.override {scripts = [super.mpvScripts.visualizer super.mpvScripts.mpris];};
+              dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
+            })
+          ];
+        };
+        wrapScript = {
+          packages ? [],
+          name,
+          script,
+        }:
+          pkgs.writers.writeDashBin name ''PATH=$PATH:${nixpkgs.lib.makeBinPath (packages ++ [pkgs.findutils pkgs.coreutils pkgs.gnused pkgs.gnugrep])} ${script} "$@"'';
+      in {
+        # linguistics and ancient world
        auc = pkgs.callPackage packages/auc.nix {};
        betacode = pkgs.callPackage packages/betacode.nix {};
-        brainmelter = pkgs.callPackage packages/brainmelter.nix {};
-        brassica = pkgs.callPackage packages/brassica.nix {};
-        cheat-sh = pkgs.callPackage packages/cheat-sh.nix {};
+        brassica = pkgs.callPackage packages/brassica.nix {}; # TODO upstream
+        devanagari = pkgs.callPackage packages/devanagari {};
+        stardict-tools = pkgs.callPackage packages/stardict-tools.nix {};
+        heuretes = pkgs.callPackage packages/heuretes.nix {};
+        ipa = pkgs.writers.writePython3Bin "ipa" {flakeIgnore = ["E501"];} (builtins.readFile packages/ipa.py);
+        jsesh = pkgs.callPackage packages/jsesh.nix {}; # TODO upstream
+        kirciuoklis = pkgs.callPackage packages/kirciuoklis.nix {};
+        polyglot = pkgs.callPackage packages/polyglot.nix {};
+        tocharian-font = pkgs.callPackage packages/tocharian-font.nix {};
+        gfs-fonts = pkgs.callPackage packages/gfs-fonts.nix {};
        closest = pkgs.callPackage packages/closest {};
-        cro = pkgs.callPackage packages/cro.nix {};
+
+        # lit
+        random-zeno = pkgs.callPackage packages/random-zeno.nix {};
+        literature-quote = pkgs.callPackage packages/literature-quote.nix {};
+
+        # krebs
+        brainmelter = pkgs.callPackage packages/brainmelter.nix {};
        cyberlocker-tools = pkgs.callPackage packages/cyberlocker-tools.nix {};
+        hc = pkgs.callPackage packages/hc.nix {};
+        kpaste = pkgs.callPackage packages/kpaste.nix {};
+        pls = pkgs.callPackage packages/pls.nix {};
+        untilport = pkgs.callPackage packages/untilport.nix {};
+        radio-news = pkgs.callPackage packages/radio-news.nix {};
+
+        # window manager
+        swallow = pkgs.callPackage packages/swallow.nix {};
+        devour = pkgs.callPackage packages/devour.nix {};
+
+        cheat-sh = pkgs.callPackage packages/cheat-sh.nix {};
+        vimPlugins-cheat-sh-vim = pkgs.callPackage packages/vimPlugins/cheat-sh.nix {}; # TODO upstream
+        cro = pkgs.callPackage packages/cro.nix {};
        default-gateway = pkgs.callPackage packages/default-gateway.nix {};
        depp = pkgs.callPackage packages/depp.nix {};
        dashboard = pkgs.callPackage packages/dashboard {};
-        devanagari = pkgs.callPackage packages/devanagari {};
-        devour = pkgs.callPackage packages/devour.nix {};
-        dic = pkgs.callPackage packages/dic.nix {};
-        dirmir = pkgs.callPackage packages/dirmir.nix {};
-        dmenu-bluetooth = pkgs.callPackage packages/dmenu-bluetooth.nix {};
-        dmenu-scrot = pkgs.callPackage packages/dmenu-scrot.nix {};
-        dns-sledgehammer = pkgs.callPackage packages/dns-sledgehammer.nix {};
        fkill = pkgs.callPackage packages/fkill.nix {};
        fzfmenu = pkgs.callPackage packages/fzfmenu.nix {};
-        genius = pkgs.callPackage packages/genius.nix {};
-        gfs-fonts = pkgs.callPackage packages/gfs-fonts.nix {};
-        git-preview = pkgs.callPackage packages/git-preview.nix {};
        gpt35 = pkgs.callPackage packages/gpt.nix {model = "gpt-3.5-turbo";};
        gpt4 = pkgs.callPackage packages/gpt.nix {model = "gpt-4";};
-        hc = pkgs.callPackage packages/hc.nix {};
-        jq-lsp = pkgs.callPackage packages/jq-lsp.nix {};
-        stardict-tools = pkgs.callPackage packages/stardict-tools.nix {};
-        heuretes = pkgs.callPackage packages/heuretes.nix {};
-        htgen = pkgs.callPackage packages/htgen.nix {};
        image-convert-favicon = pkgs.callPackage packages/image-convert-favicon.nix {};
        image-convert-tolino = pkgs.callPackage packages/image-convert-tolino.nix {};
-        infschmv = pkgs.callPackage packages/infschmv.nix {};
-        iolanguage = pkgs.callPackage packages/iolanguage.nix {};
-        ipa = pkgs.writers.writePython3Bin "ipa" {flakeIgnore = ["E501"];} (builtins.readFile packages/ipa.py);
-        ix = pkgs.callPackage packages/ix.nix {};
-        jsesh = pkgs.callPackage packages/jsesh.nix {};
        k-lock = pkgs.callPackage packages/k-lock.nix {};
-        kirciuoklis = pkgs.callPackage packages/kirciuoklis.nix {};
        klem = pkgs.callPackage packages/klem.nix {};
-        kpaste = pkgs.callPackage packages/kpaste.nix {};
-        literature-quote = pkgs.callPackage packages/literature-quote.nix {};
-        mahlzeit = pkgs.haskellPackages.callPackage packages/mahlzeit.nix {};
-        man-pandoc = pkgs.callPackage packages/man/pandoc.nix {};
+        man-pandoc = pkgs.callPackage packages/man/pandoc.nix {}; # TODO upstream
        man-pdf = pkgs.callPackage packages/man-pdf.nix {};
        mansplain = pkgs.callPackage packages/mansplain.nix {};
        manual-sort = pkgs.callPackage packages/manual-sort.nix {};
        menu-calc = pkgs.callPackage packages/menu-calc.nix {};
-        meteo = pkgs.callPackage packages/meteo.nix {};
        noise-waves = pkgs.callPackage packages/noise-waves.nix {};
        mpv-radio = pkgs.callPackage packages/mpv-radio.nix {di-fm-key-file = "/dev/null";};
        mpv-tuner = pkgs.callPackage packages/mpv-tuner.nix {di-fm-key-file = "/dev/null";};
        mpv-tv = pkgs.callPackage packages/mpv-tv.nix {};
        mpv-iptv = pkgs.callPackage packages/mpv-iptv.nix {};
-        mpv-visualizer = unstablePackages.mpvScripts.visualizer;
        new-mac = pkgs.callPackage packages/new-mac.nix {};
        nix-git = pkgs.callPackage packages/nix-git.nix {};
-        nix-index-update = pkgs.callPackage packages/nix-index-update.nix {inherit system;};
        notemenu = pkgs.callPackage packages/notemenu.nix {niveumPackages = self.packages.${system};};
-        opustags = pkgs.callPackage packages/opustags.nix {};
-        pls = pkgs.callPackage packages/pls.nix {};
-        polyglot = pkgs.callPackage packages/polyglot.nix {};
+        opustags = pkgs.callPackage packages/opustags.nix {}; # TODO upstream
        q = pkgs.callPackage packages/q.nix {};
        qrpaste = pkgs.callPackage packages/qrpaste.nix {};
-        random-zeno = pkgs.callPackage packages/random-zeno.nix {};
-        go-webring = pkgs.callPackage packages/go-webring.nix {};
+        go-webring = pkgs.callPackage packages/go-webring.nix {}; # TODO upstream
        rfc = pkgs.callPackage packages/rfc.nix {};
        gimp = pkgs.callPackage packages/gimp.nix {};
        scanned = pkgs.callPackage packages/scanned.nix {};
-        swallow = pkgs.callPackage packages/swallow.nix {};
-        text2pdf = pkgs.callPackage packages/text2pdf.nix {};
+        text2pdf = pkgs.callPackage packages/text2pdf.nix {}; # TODO upstream
        timer = pkgs.callPackage packages/timer.nix {};
-        tocharian-font = pkgs.callPackage packages/tocharian-font.nix {};
-        trans = pkgs.callPackage packages/trans.nix {};
+        trans = pkgs.callPackage packages/trans.nix {}; # TODO upstream
        ttspaste = pkgs.callPackage packages/ttspaste.nix {};
        unicodmenu = pkgs.callPackage packages/unicodmenu.nix {};
        emailmenu = pkgs.callPackage packages/emailmenu.nix {};
-        stag = pkgs.callPackage packages/stag.nix {};
-        untilport = pkgs.callPackage packages/untilport.nix {};
+        stag = pkgs.callPackage packages/stag.nix {}; # TODO upstream
        vg = pkgs.callPackage packages/vg.nix {};
        vim = pkgs.callPackage packages/vim.nix {niveumPackages = self.packages.${system};};
        obsidian-vim = pkgs.callPackage packages/obsidian-vim.nix {};
-        radio-news = pkgs.callPackage packages/radio-news.nix {};
-        vimPlugins-cheat-sh-vim = pkgs.callPackage packages/vimPlugins/cheat-sh.nix {};
-        vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix {};
-        vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix {};
-        vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix {};
-        vimPlugins-mdwa-nvim = pkgs.callPackage packages/vimPlugins/mdwa-nvim.nix {};
-        vimPlugins-vim-ernest = pkgs.callPackage packages/vimPlugins/vim-ernest.nix {};
-        vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix {};
-        vimPlugins-vim-colors-paramount = pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix {};
-        vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix {};
-        vimPlugins-vim-fsharp = pkgs.callPackage packages/vimPlugins/vim-fsharp.nix {};
-        vimPlugins-vim-mail = pkgs.callPackage packages/vimPlugins/vim-mail.nix {};
-        vimPlugins-vim-reason-plus = pkgs.callPackage packages/vimPlugins/vim-reason-plus.nix {};
+        vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix {}; # TODO upstream
+        vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix {}; # TODO upstream
+        vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix {}; # TODO upstream
+        vimPlugins-mdwa-nvim = pkgs.callPackage packages/vimPlugins/mdwa-nvim.nix {}; # TODO upstream
+        vimPlugins-vim-ernest = pkgs.callPackage packages/vimPlugins/vim-ernest.nix {}; # TODO upstream
+        vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix {}; # TODO upstream
+        vimPlugins-vim-colors-paramount = pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix {}; # TODO upstream
+        vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix {}; # TODO upstream
+        vimPlugins-vim-fsharp = pkgs.callPackage packages/vimPlugins/vim-fsharp.nix {}; # TODO upstream
+        vimPlugins-vim-mail = pkgs.callPackage packages/vimPlugins/vim-mail.nix {}; # TODO upstream
+        vimPlugins-vim-reason-plus = pkgs.callPackage packages/vimPlugins/vim-reason-plus.nix {}; # TODO upstream
        vimv = pkgs.callPackage packages/vimv.nix {};
-        weechat-declarative = pkgs.callPackage packages/weechat-declarative.nix {};
-        weechatScripts-hotlist2extern = pkgs.callPackage packages/weechatScripts/hotlist2extern.nix {};
-        wttr = pkgs.callPackage packages/wttr.nix {};
-
-        itl = pkgs.callPackage packages/itl.nix {};
-        itools = pkgs.callPackage packages/itools.nix {itl = itl;};
+        weechat-declarative = pkgs.callPackage packages/weechat-declarative.nix {}; # TODO upstream
+        weechatScripts-hotlist2extern = pkgs.callPackage packages/weechatScripts/hotlist2extern.nix {}; # TODO upstream
+        dmenu-randr = pkgs.callPackage packages/dmenu-randr.nix {};
+        wttr = pkgs.callPackage packages/wttr.nix {}; # TODO upstream

        booksplit = wrapScript {
          script = inputs.voidrice.outPath + "/.local/bin/booksplit";
          name = "booksplit";
          packages = [pkgs.ffmpeg pkgs.glibc.bin];
        };
-        dmenu-randr = pkgs.callPackage packages/dmenu-randr.nix {};
        tag = wrapScript {
          script = inputs.voidrice.outPath + "/.local/bin/tag";
          name = "tag";
          packages = [pkgs.ffmpeg];
        };
-      };
-    });
+      });
+    };
 }
--- a/lib/streams.nix
+++ b/lib/streams.nix
@@ -85,9 +85,6 @@ let
  big-fm-name = name: "${name} | bigFM";
  big-fm = name: "https://streams.bigfm.de/bigfm-${name}-128-aac";

-  rautemusik-name = name: "${name} | rm.fm";
-  rautemusik = name: "http://${name}-high.rautemusik.fm/";
-
  rte-name = name: "RTÉ ${name}";
  rte = name: "https://www.rte.ie/manifests/${name}.m3u8";

@@ -1207,198 +1204,6 @@ in
      logo = "https://cdn.schlagerparadies.de/images/rsp_setup/logo-radio-schlagerparadies.svg";
      tags = [tags.schlager];
    }
-    {
-      station = rautemusik-name "Volksmusik";
-      desc = "Volksmusik, Blasmusik, Schlager";
-      stream = rautemusik "volksmusik";
-      tags = [tags.schlager];
-    }
-    {
-      station = rautemusik-name "Study";
-      stream = rautemusik "study";
-      desc = "Lo-Fi, Chillout, Easy Listening";
-      tags = [tags.lofi tags.chill];
-    }
-    {
-      station = rautemusik-name "TechHouse";
-      stream = rautemusik "techhouse";
-      desc = "Techhouse, Deephouse, Techno, Minimal";
-      tags = [tags.party];
-    }
-    {
-      station = rautemusik-name "Goldies";
-      stream = rautemusik "goldies";
-      desc = "Oldies, 60s, 70s, 80s";
-      tags = [tags.vintage];
-    }
-    {
-      station = rautemusik-name "90s";
-      stream = rautemusik "90s";
-      desc = "90s, Eurodance, Pop, HipHop";
-      tags = [tags.vintage];
-    }
-    {
-      station = rautemusik-name "Schlager";
-      stream = rautemusik "schlager";
-      desc = "Schlager, Discofox, Deutsch, Pop";
-      tags = [tags.schlager];
-    }
-    {
-      station = rautemusik-name "Country";
-      stream = rautemusik "country";
-      desc = "Country, Western, Americana";
-      tags = [tags.trad tags.american];
-    }
-    {
-      station = rautemusik-name "Sex";
-      stream = rautemusik "sex";
-      desc = "RnB, Pop, Easy Listening";
-      tags = [tags.chill];
-    }
-    {
-      station = rautemusik-name "LoveHits";
-      stream = rautemusik "lovehits";
-      desc = "Lovesongs, Balladen, RnB, Pop";
-      tags = [tags.pop];
-    }
-    {
-      station = rautemusik-name "Klassik";
-      stream = rautemusik "klassik";
-      desc = "Symphonie, Orchester, Klassik";
-      tags = [tags.classical];
-    }
-    {
-      station = rautemusik-name "Traurig";
-      stream = rautemusik "traurig";
-      desc = "Balladen, Pop, Easy Listening";
-      tags = [tags.pop];
-    }
-    {
-      station = rautemusik-name "Happy";
-      stream = rautemusik "happy";
-      desc = "Pop, Dance, Charts";
-      tags = [tags.pop];
-    }
-    {
-      station = rautemusik-name "Solo Piano";
-      stream = rautemusik "solopiano";
-      desc = "Klavier, Instrumental, Easy Listening";
-      tags = [tags.classical];
-    }
-    {
-      station = rautemusik-name "HappyHardcore";
-      stream = rautemusik "happyhardcore";
-      desc = "UK Core, Happy Hardcore, Dance";
-      tags = [tags.party];
-    }
-    {
-      station = rautemusik-name "HardeR";
-      stream = rautemusik "harder";
-      desc = "Hardstyle, Hardcore, Jumpstyle";
-      tags = [tags.party];
-    }
-    {
-      station = rautemusik-name "BigCityBeats";
-      stream = rautemusik "bigcitybeats";
-      desc = "EDM, Dance, House, Electro, Star DJs";
-      tags = [tags.pop tags.party];
-    }
-    {
-      station = rautemusik-name "Lounge";
-      stream = rautemusik "lounge";
-      desc = "Ambient, Jazz, Chillout, Easy Listening";
-      tags = [tags.chill];
-    }
-    {
-      station = rautemusik-name "Oriental";
-      stream = rautemusik "oriental";
-      desc = "Arabisch, Oriental, HipHop";
-      tags = [tags.arabic];
-    }
-    {
-      station = rautemusik-name "Salsa";
-      stream = rautemusik "salsa";
-      desc = "Salsa, Latina, Tropical";
-      tags = [tags.groovy];
-    }
-    {
-      station = rautemusik-name "Christmas";
-      stream = rautemusik "christmas";
-      desc = "Weihnachtslieder, Balladen, Schlager";
-      tags = [tags.xmas];
-    }
-    {
-      station = rautemusik-name "Christmas Chor";
-      stream = rautemusik "christmas-chor";
-      desc = "Chor, Weihnachtslieder, Gesang";
-      tags = [tags.xmas];
-    }
-    {
-      station = rautemusik-name "Christmas Schlager";
-      stream = rautemusik "christmas-schlager";
-      desc = "Schlager, Weihnachtslieder";
-      tags = [tags.xmas tags.schlager];
-    }
-    {
-      station = rautemusik-name "Weihnachten.FM";
-      stream = rautemusik "weihnachten";
-      desc = "Weihnachtslieder, Pop";
-      tags = [tags.xmas];
-    }
-    {
-      station = rautemusik-name "Top40";
-      stream = rautemusik "top40";
-      desc = "Charts, Top40, Dance, Hiphop";
-      tags = [tags.top40];
-    }
-    {
-      station = rautemusik-name "Rock";
-      desc = "Rock, Alternative, Punk";
-      stream = rautemusik "rock";
-      tags = [tags.rock];
-    }
-    {
-      station = rautemusik-name "PartyHits";
-      desc = "Karneval, Mallorca, Après Ski, Schlager";
-      stream = rautemusik "partyhits";
-      tags = [tags.schlager];
-    }
-    {
-      station = rautemusik-name "Deutschrap Charts";
-      stream = rautemusik "deutschrap-charts";
-      desc = "Deutschrap, HipHop, Rap, Charts";
-      tags = [tags.rap];
-    }
-    {
-      station = rautemusik-name "Deutschrap Classic";
-      stream = rautemusik "deutschrap-classic";
-      desc = "Oldschool, Rap, HipHop, Deutschrap";
-      tags = [tags.rap];
-    }
-    {
-      station = rautemusik-name "ChartHits";
-      stream = rautemusik "ChartHits";
-      desc = "House, RnB, Dance, Electro";
-      tags = [tags.top40];
-    }
-    {
-      station = rautemusik-name "BreakZ.FM";
-      stream = rautemusik "breakz";
-      desc = "RnB, House, HipHop, Dance, Mixtapes";
-      tags = [tags.top40];
-    }
-    {
-      station = rautemusik-name "Bass";
-      stream = rautemusik "bass";
-      desc = "DnB, Dubstep, Trap & Bass House";
-      tags = [tags.party];
-    }
-    {
-      station = rautemusik-name "12punks";
-      stream = rautemusik "12punks";
-      desc = "Punk, Punk Rock, Ska, Hardcore";
-      tags = [tags.rock];
-    }
    {
      logo = "https://d3kle7qwymxpcy.cloudfront.net/images/broadcasts/77/a4/13931/1/c175.png";
      station = "Raidió Rírá";
@@ -1406,12 +1211,6 @@ in
      desc = "Is cairt-staisiún ceoil é Raidió Rí-Rá a bhíonn ag craoladh go hiomlán trí Ghaeilge! Bíonn an ceol ar fad ó na cairteacha le cloisteáil ar an stáisiún, mar aon leis an bpopnuacht, an nuacht spóirt agus an nuacht scannánaíochta is déanaí!";
      tags = [tags.top40];
    }
-    {
-      stream = "http://188.247.86.67:8008";
-      station = "Rotana Tarab";
-      logo = "https://liveonlineradio.net/wp-content/uploads/2017/11/Rotana-Tarab-100x47.jpg";
-      tags = [tags.trad tags.arabic];
-    }
    {
      stream = "http://asima.out.airtime.pro:8000/asima_a";
      station = "Asima";
@@ -1554,6 +1353,11 @@ in
      desc = "Ohne Blatt vor dem Mund! Für alle, die aufwachen wollen.";
      tags = [tags.text];
    }
+    {
+      station = "NIUS";
+      stream = "https://nius.stream25.radiohost.de/live_mp3-192";
+      tags = [tags.text];
+    }
    {
      station = "Kontrafunk";
      stream = "https://icecast.multhielemedia.de/listen/kontrafunk/radio.mp3";
@@ -1649,21 +1453,6 @@ in
      station = "ERTU Al Quran Al Kareem";
      tags = [tags.arabic tags.text tags.holy];
    }
-    {
-      stream = "http://149.28.52.216:3344/listen.mp3";
-      station = "Verse 24/7 Holy Quran";
-      tags = [tags.arabic tags.text tags.holy];
-    }
-    {
-      stream = "https://s6.voscast.com:9355/stream";
-      station = "Kilid Herat";
-      tags = [tags.arabic tags.holy]; # nasheeds
-    }
-    {
-      stream = "https://s6.voscast.com:9355/stream";
-      station = "Radio Salam Watandar";
-      tags = [tags.arabic tags.holy];
-    }
    {
      stream = "http://onair15.xdevel.com:7064/1/";
      station = "Radio Mozart Italia";
@@ -1671,12 +1460,6 @@ in
      desc = "Emittente ufficiale delle Associazioni Mozart Italia nel mondo";
      tags = [tags.classical];
    }
-    {
-      stream = "http://onair7.xdevel.com:7126/1/";
-      station = "Opera Radio Budapest";
-      logo = "https://www.opera.hu/static/default/asset/img/common/opera-logo.svg";
-      tags = [tags.classical];
-    }
    {
      stream = "http://peacefulpiano.stream.publicradio.org/peacefulpiano.mp3";
      station = "Peaceful Piano";
@@ -1846,11 +1629,6 @@ in
      stream = "https://playerservices.streamtheworld.com/api/livestream-redirect/KAN_88.mp3";
      tags = [tags.hebrew];
    }
-    {
-      station = "Digital Impulse – Classical Channel";
-      stream = "http://orion.shoutca.st:8978/stream";
-      tags = [tags.classical];
-    }
    {
      station = "Старое радио (детское)";
      stream = "http://195.91.237.50:8000/detskoe128";
@@ -1921,18 +1699,23 @@ in
      stream = "http://cw.dimebank.com:8080/CNNfast";
      tags = [tags.text];
    }
+    {
+      station = "80s80s | Dark Wave";
+      stream = "https://streams.80s80s.de/darkwave/mp3-192/homepage/";
+      tags = [tags.wave];
+    }
+    {
+      station = "80s80s | Wave";
+      stream = "https://streams.80s80s.de/wave/mp3-192/homepage/";
+      tags = [tags.wave];
+    }
    {
      station = "XXX orchestral";
      stream = "http://orion.shoutca.st:8978/stream";
      tags = [tags.classical];
    }
    {
-      station = "XXX greek";
-      stream = "http://radio.hostchefs.net:8046/stream?1520818130148";
-      tags = [tags.greek];
-    }
-    {
-      station = "XXX turkish or greek";
+      station = "Kral FM Xanthi";
      stream = "https://onairmediagroup.live24.gr/kralfm100xanthi";
      tags = [tags.greek tags.turkish];
    }
@@ -1986,11 +1769,6 @@ in
      stream = "http://s2.voscast.com:12312/;";
      station = "Bahrain Quran Radio";
    }
-    {
-      tags = [tags.arabic tags.text tags.holy];
-      stream = "http://162.244.81.30:8224/;";
-      station = "Quran Radio Lebanon";
-    }
    {
      tags = [tags.arabic tags.text tags.holy];
      stream = "http://tijaniyyah.asuscomm.com:8000/stream/2/";
@@ -2001,16 +1779,6 @@ in
      station = "Coptic for God";
      stream = "http://66.70.249.70:5832/stream";
    }
-    {
-      stream = "http://stream-025.zeno.fm/5y95pu36sm0uv?";
-      station = "Hayat FM";
-      tags = [tags.arabic tags.text tags.holy];
-    }
-    {
-      stream = "http://uk2.internet-radio.com:8151/stream";
-      station = "The Quran Radio";
-      tags = [tags.arabic tags.text tags.holy];
-    }
    {
      stream = "http://www.radioeins.de/livemp3";
      station = "radioeins | RBB";
@@ -2025,9 +1793,17 @@ in
      stream = "http://mp3.ffh.de/radioffh/hqlivestream.mp3";
      station = "Hitradio FFH";
    }
+    {
+      stream = "https://mp3.planetradio.de/planetradio/hqlivestream.aac";
+      station = "planet radio";
+    }
    { # Lex Fridman's favourite
      stream = "av://lavfi:anoisesrc=color=brown";
-      station = "Brownian noise";
+      station = "Brown noise";
+    }
+    {
+      stream = "av://lavfi:anoisesrc=color=pink";
+      station = "Pink noise";
    }
    {
      stream = "https://st03.sslstream.dlf.de/dlf/03/high/aac/stream.aac";
--- a/modules/htgen.nix
+++ b/modules/htgen.nix
@@ -1,47 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  htgen = pkgs.callPackage ../packages/htgen.nix {};
-in {
-  options.services.htgen = lib.mkOption {
-    default = {};
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        enable = lib.mkEnableOption "htgen-${config._module.args.name}";
-        port = lib.mkOption {
-          type = lib.types.int;
-        };
-        script = lib.mkOption {
-          type = lib.types.str;
-        };
-      };
-    }));
-  };
-  config = {
-    systemd.services =
-      lib.mapAttrs' (
-        name: cfg:
-          lib.nameValuePair "htgen-${name}" {
-            wantedBy = ["multi-user.target"];
-            after = ["network.target"];
-            environment = {
-              HOME = "/var/lib/htgen-${name}";
-              HTGEN_PORT = toString cfg.port;
-              HTGEN_SCRIPT = cfg.script;
-            };
-            serviceConfig = {
-              SyslogIdentifier = "htgen-${name}";
-              DynamicUser = true;
-              StateDirectory = "htgen-${name}";
-              PrivateTmp = true;
-              Restart = "always";
-              ExecStart = "${htgen}/bin/htgen --serve";
-            };
-          }
-      )
-      config.services.htgen;
-  };
-}
--- a/modules/panoptikon.nix
+++ b/modules/panoptikon.nix
@@ -29,7 +29,7 @@
            default = "daily";
          };
          loadCredential = lib.mkOption {
-            type = lib.types.listOf lib.types.string;
+            type = lib.types.listOf lib.types.str;
            description = ''
              This can be used to pass secrets to the systemd service without adding them to the nix store.
            '';
--- a/packages/cheat-sh.nix
+++ b/packages/cheat-sh.nix
@@ -3,7 +3,7 @@
  writers,
  curl,
 }:
-writers.writeDashBin "so" ''
+writers.writeDashBin "cht.sh" ''
  IFS=+
  ${curl}/bin/curl -sSL http://cht.sh/"$*"
 ''
--- a/packages/cro.nix
+++ b/packages/cro.nix
@@ -1,10 +1,10 @@
-{ writers, chromium }:
-writers.writeDashBin "cro" ''
-  ${chromium}/bin/chromium \
-    --disable-sync \
-    --no-default-browser-check \
-    --no-first-run \
-    --user-data-dir="$(mktemp -d)" \
-    --incognito \
-    "$@"
-''
+{ coreutils, chromium }:
+chromium.override {
+  commandLineArgs = [
+    "--disable-sync"
+    "--no-default-browser-check"
+    "--no-first-run"
+    "--user-data-dir=$(${coreutils}/bin/mktemp -d)"
+    "--incognito"
+  ];
+}
--- a/packages/dic.nix
+++ b/packages/dic.nix
@@ -1,43 +0,0 @@
-{
-  fetchgit,
-  lib,
-  stdenv,
-  coreutils,
-  curl,
-  gnugrep,
-  gnused,
-  util-linux,
-}:
-stdenv.mkDerivation {
-  name = "dic";
-
-  src = fetchgit {
-    url = https://cgit.ni.krebsco.de/dic;
-    rev = "refs/tags/v1.1.1";
-    sha256 = "1gbj967a5hj53fdkkxijqgwnl9hb8kskz0cmpjq7v65ffz3v6vag";
-  };
-
-  phases = [
-    "unpackPhase"
-    "installPhase"
-  ];
-
-  installPhase = let
-    path = lib.makeBinPath [
-      coreutils
-      curl
-      gnused
-      gnugrep
-      util-linux
-    ];
-  in ''
-    mkdir -p $out/bin
-
-    sed \
-      's,^main() {$,&\n  PATH=${path}; export PATH,' \
-      < ./dic \
-      > $out/bin/dic
-
-    chmod +x $out/bin/dic
-  '';
-}
--- a/packages/dirmir.nix
+++ b/packages/dirmir.nix
@@ -1,24 +0,0 @@
-{writers}:
-writers.writeDashBin "dirmir" ''
-  SOURCE="$1"
-  TARGET="$2"
-
-  if [ ! -d "$SOURCE" ] || [ $# -ne 2 ]; then
-    echo >/dev/stderr "Usage: dirmir SOURCE TARGET"
-    exit 1
-  fi
-
-  if [ -e "$TARGET" ]; then
-    echo >/dev/stderr "$TARGET" already exists. Please use a different name.
-    exit 1
-  fi
-
-  find "$SOURCE" | while read -r entry; do
-    if [ -d "$entry" ]; then
-      mkdir -p "$TARGET/$entry"
-    else
-      # create a file with the same permissions as $entry
-      install -m "$(stat -c %a "$entry")" /dev/null "$TARGET/$entry"
-    fi
-  done
-''
--- a/packages/dmenu-bluetooth.nix
+++ b/packages/dmenu-bluetooth.nix
@@ -1,64 +0,0 @@
-{
-  writers,
-  libnotify,
-  dmenu,
-  bluez5,
-  lib,
-}:
-writers.writeDashBin "dmenu-bluetooth" ''
-  # UI for connecting to bluetooth devices
-  set -efu
-  PATH=$PATH=${lib.makeBinPath [libnotify dmenu bluez5]}
-
-  bluetooth_notify() {
-    notify-send --app-name=" Bluetooth" "$@"
-  }
-
-  chose_device() {
-    # the output from `bluetoothctl {paired-,}devices` has a first column which always contains `Device` followed by a MAC address and the device name
-    cut -d ' ' -f2- | dmenu -i -l 5 -p "Bluetooth device"
-  }
-
-  bluetoothctl scan on &
-
-  case "$(printf "pair\nconnect\ndisconnect" | dmenu -i)" in
-    pair)
-      chosen="$(bluetoothctl devices | chose_device)"
-      chosen_name="$(echo "$chosen" | cut -d ' ' -f2-)"
-
-      bluetooth_notify "$chosen_name" "Pairing ..."
-
-      if bluetoothctl pair "$(echo "$chosen" | cut -d ' ' -f1)"; then
-        bluetooth_notify "✔ $chosen_name" "Paired with device."
-      else
-        test "$chosen" && bluetooth_notify "❌ $chosen_name" "Failed to pair with device."
-      fi
-    ;;
-
-    connect)
-      chosen="$(bluetoothctl paired-devices | chose_device)"
-      chosen_name="$(echo "$chosen" | cut -d ' ' -f2-)"
-
-      bluetooth_notify "$chosen_name" "Trying to connect ..."
-
-      if bluetoothctl connect "$(echo "$chosen" | cut -d ' ' -f1)"; then
-        bluetooth_notify "✔ $chosen_name" "Connected to device."
-      else # something was selected but it didn't work
-        test "$chosen" && bluetooth_notify "❌ $chosen_name" "Failed to connect to device."
-      fi
-    ;;
-
-    disconnect)
-      chosen="$(bluetoothctl paired-devices | chose_device)"
-      chosen_name="$(echo "$chosen" | cut -d ' ' -f2-)"
-
-      bluetooth_notify "$chosen_name" "Disconnecting ..."
-
-      if bluetoothctl disconnect "$(echo "$chosen" | cut -d ' ' -f1)"; then
-        bluetooth_notify "✔ $chosen_name" "Disconnected from device."
-      else # something was selected but it didn't work
-        test "$chosen" && bluetooth_notify "❌ $chosen_name" "Failed to disconnect from device."
-      fi
-    ;;
-  esac
-''
--- a/packages/dmenu-scrot.nix
+++ b/packages/dmenu-scrot.nix
@@ -1,42 +0,0 @@
-{
-  writers,
-  lib,
-  dmenu,
-  scrot,
-  libnotify,
-  xclip,
-  screenshotsDirectory ? "/tmp",
-}:
-writers.writeDashBin "dmenu-scrot" ''
-  # ref https://gitlab.com/dwt1/dotfiles/-/blob/master/.dmenu/dmenu-scrot.sh
-  PATH=$PATH:${lib.makeBinPath [dmenu scrot libnotify xclip]}
-
-  APP_NAME="📸 Scrot"
-  IMG_PATH="${screenshotsDirectory}"
-  TIME=3000 #Miliseconds notification should remain visible
-
-  cmd=$(printf "fullscreen\nsection\nupload_fullscreen\nupload_section\n" | dmenu -p 'Screenshot')
-
-  cd "$IMG_PATH" || exit
-  case ''${cmd%% *} in
-    fullscreen)
-      scrot -d 1 \
-        && notify-send -u low -t $TIME -a "$APP_NAME" 'Screenshot (full screen) saved.'
-      ;;
-
-    section)
-      scrot -s \
-        && notify-send -u low -t $TIME -a "$APP_NAME" 'Screenshot (section) saved.'
-      ;;
-
-    upload_fullscreen)
-      scrot -d 1 -e "kpaste < \$f" | tail --lines=1 | xclip -selection clipboard -in \
-        && notify-send -u low -t $TIME -a "$APP_NAME" "Screenshot (full screen) uploaded: $(xclip -selection clipboard -out)"
-      ;;
-
-    upload_section)
-      scrot -s -e "kpaste < \$f" | tail --lines=1 | xclip -selection clipboard -in \
-        &&  notify-send -u low -t $TIME -a "$APP_NAME" "Screenshot (section) uploaded: $(xclip -selection clipboard -out)"
-      ;;
-  esac
-''
--- a/packages/dns-sledgehammer.nix
+++ b/packages/dns-sledgehammer.nix
@@ -1,7 +0,0 @@
-{
-  writers,
-  coreutils,
-}:
-writers.writeDashBin "dns-sledgehammer" ''
-  ${coreutils}/bin/printf '%s\n' 'nameserver 1.1.1.1' 'options edns0' > /etc/resolv.conf
-''
--- a/packages/genius.nix
+++ b/packages/genius.nix
@@ -1,28 +0,0 @@
-{
-  writers,
-  curl,
-  coreutils,
-  gnused,
-  pandoc,
-}:
-writers.writeDashBin "genius" ''
-  ${coreutils}/bin/test "$#" -eq 2 || (
-    echo "usage: $0 <artist> <song>"
-    exit 1
-  )
-
-  normalize() {
-    ${coreutils}/bin/tr -d -c '0-9A-Za-z ' | ${coreutils}/bin/tr ' ' - | ${coreutils}/bin/tr '[:upper:]' '[:lower:]'
-  }
-
-  ARTIST=$(echo "$1" | normalize | ${gnused}/bin/sed 's/./\U&/')
-  TITLE=$(echo "$2" | normalize)
-  GENIUS_URL="https://genius.com/$ARTIST-$TITLE-lyrics"
-
-  ${curl}/bin/curl -s "$GENIUS_URL" \
-    | ${gnused}/bin/sed -ne '/class="lyrics"/,/<\/p>/p' \
-    | ${pandoc}/bin/pandoc -f html -s -t plain \
-    | ${gnused}/bin/sed 's/^_/\x1b[3m/g;s/_$/\x1b[0m/g;s/^\[/\n\x1b\[1m\[/g;s/\]$/\]\x1b[0m/g'
-
-  printf "\n%s\n" "$GENIUS_URL" >/dev/stderr
-''
--- a/packages/git-preview.nix
+++ b/packages/git-preview.nix
@@ -1,23 +0,0 @@
-{
-  coreutils,
-  git,
-  writers,
-}:
-writers.writeDashBin "git-preview" ''
-  set -efu
-  head_commit=$(${git}/bin/git log -1 --format=%H)
-  merge_commit=$1; shift
-  merge_message='Merge for git-preview'
-  preview_dir=$(${coreutils}/bin/mktemp --tmpdir -d git-preview.XXXXXXXX)
-  preview_name=$(${coreutils}/bin/basename "$preview_dir")
-  ${git}/bin/git worktree add --detach -f "$preview_dir" 2>/dev/null
-  ${git}/bin/git -C "$preview_dir" checkout -q "$head_commit"
-  ${git}/bin/git -C "$preview_dir" merge \
-      ''${GIT_PREVIEW_MERGE_STRATEGY+-s "$GIT_PREVIEW_MERGE_STRATEGY"} \
-      -m "$merge_message" \
-      -q \
-      "$merge_commit"
-  ${git}/bin/git -C "$preview_dir" diff "$head_commit.." "$@"
-  ${coreutils}/bin/rm -fR "$preview_dir"
-  ${coreutils}/bin/rm -R .git/worktrees/"$preview_name"
-''
--- a/packages/heuretes.nix
+++ b/packages/heuretes.nix
@@ -2,6 +2,7 @@
  writers,
  fetchurl,
  xan,
+  util-linux,
 }: let
  database = fetchurl {
    url = "http://c.krebsco.de/greek.csv";
@@ -9,5 +10,5 @@
  };
 in
  writers.writeDashBin "heuretes" ''
-    ${xan}/bin/xan search -s simple "^$*$" ${database} | ${xan}/bin/xan table
+    ${xan}/bin/xan search -s simple "$*" ${database} | ${util-linux}/bin/column -s, -t
  ''
--- a/packages/htgen.nix
+++ b/packages/htgen.nix
@@ -1,31 +0,0 @@
-{
-  fetchgit,
-  lib,
-  pkgs,
-  stdenv,
-}:
-stdenv.mkDerivation rec {
-  pname = "htgen";
-  version = "1.3.1";
-
-  src = fetchgit {
-    url = "http://cgit.krebsco.de/htgen";
-    rev = "refs/tags/${version}";
-    sha256 = "0ml8kp89bwkrwy6iqclzyhxgv2qn9dcpwaafbmsr4mgcl70zx22r";
-  };
-
-  installPhase = ''
-    mkdir -p $out/bin
-    {
-      echo '#! ${pkgs.dash}/bin/dash'
-      echo 'export PATH=${lib.makeBinPath [
-      pkgs.coreutils
-      pkgs.jq
-      pkgs.ucspi-tcp
-    ]}''${PATH+":$PATH"}'
-      sed 's:^Server=htgen$:&/${version}:' htgen
-    } > $out/bin/htgen
-    chmod +x $out/bin/htgen
-    cp -r examples $out
-  '';
-}
--- a/packages/infschmv.nix
+++ b/packages/infschmv.nix
@@ -1,13 +0,0 @@
-{
-  writers,
-  pup,
-  curl,
-  pandoc,
-  man,
-}:
-writers.writeDashBin "InfSchMV" ''
-  ${curl}/bin/curl -sSL https://www.berlin.de/corona/massnahmen/verordnung/ \
-    | ${pup}/bin/pup .textile \
-    | ${pandoc}/bin/pandoc -f html -t man -s \
-    | ${man}/bin/man -l -
-''
--- a/packages/iolanguage.nix
+++ b/packages/iolanguage.nix
@@ -1,29 +0,0 @@
-{
-  lib,
-  stdenv,
-  cmake,
-  python3,
-  fetchFromGitHub,
-}:
-stdenv.mkDerivation rec {
-  version = "2017.09.06";
-  name = "iolanguage-${version}";
-  src = fetchFromGitHub {
-    owner = "IoLanguage";
-    repo = "io";
-    rev = "${version}";
-    sha256 = "07rg1zrz6i6ghp11cm14w7bbaaa1s8sb0y5i7gr2sds0ijlpq223";
-    fetchSubmodules = true;
-  };
-  buildInputs = [cmake python3];
-  preBuild = "mkdir -p build && cd build";
-  buildPhase = ''
-    cmake -DCMAKE_INSTALL_PREFIX=$out/ ..
-    make all
-  '';
-  meta = with lib; {
-    homepage = "https://iolanguage.org/";
-    description = "Io programming language. Inspired by Self, Smalltalk and LISP.";
-    license = licenses.bsd3;
-  };
-}
--- a/packages/ix.nix
+++ b/packages/ix.nix
@@ -1,16 +0,0 @@
-{
-  stdenv,
-  fetchurl,
-}:
-stdenv.mkDerivation {
-  name = "ix";
-  src = fetchurl {
-    url = "https://ix.io/client";
-    sha256 = "0xc2s4s1aq143zz8lgkq5k25dpf049dw253qxiav5k7d7qvzzy57";
-  };
-  phases = ["installPhase"];
-  installPhase = ''
-    mkdir -p $out/bin
-    install $src $out/bin/ix
-  '';
-}
--- a/packages/jq-lsp.nix
+++ b/packages/jq-lsp.nix
@@ -1,16 +0,0 @@
-{
-  buildGoModule,
-  fetchFromGitHub,
-  lib,
-}:
-buildGoModule {
-  name = "jq-lsp";
-  version = "unstable-2023-09-08";
-  src = fetchFromGitHub {
-    owner = "wader";
-    repo = "jq-lsp";
-    rev = "85edf1adbe5e6c91b37c67b6a4bf85eda1e49f2f";
-    hash = "sha256-ItLKRSbGZ8UqFEHCoh96KwhSpuKZ3l+2ZXnBkHEZL0M=";
-  };
-  vendorHash = "sha256-ppQ81uERHBgOr/bm/CoDSWcK+IqHwvcL6RFi0DgoLuw=";
-}
--- a/packages/mahlzeit.nix
+++ b/packages/mahlzeit.nix
@@ -1,63 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  mkDerivation,
-  ansi-terminal,
-  base,
-  directory,
-  doctest,
-  filepath,
-  megaparsec,
-  optparse-applicative,
-  prettyprinter,
-  process,
-  raw-strings-qq,
-  stdenv,
-  tasty,
-  tasty-hunit,
-  text,
-  yaml,
-}:
-mkDerivation {
-  pname = "mahlzeit";
-  version = "0.1.0";
-  src = fetchFromGitHub {
-    owner = "kmein";
-    repo = "mahlzeit";
-    rev = "954c0fb3f45815999bc65d003794af6a850b069c";
-    sha256 = "046yrr40hjmxkjmwzcvmwb39fxx2v2i6hgdxrjfiwilzvhikarrg";
-  };
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    ansi-terminal
-    base
-    directory
-    filepath
-    megaparsec
-    prettyprinter
-    text
-    yaml
-  ];
-  executableHaskellDepends = [
-    ansi-terminal
-    base
-    directory
-    filepath
-    optparse-applicative
-    process
-    text
-    yaml
-  ];
-  testHaskellDepends = [
-    base
-    doctest
-    megaparsec
-    raw-strings-qq
-    tasty
-    tasty-hunit
-  ];
-  homepage = "https://github.com/kmein/mahlzeit";
-  description = "Recipe toolkit";
-  license = lib.licenses.mit;
-}
--- a/packages/meteo.nix
+++ b/packages/meteo.nix
@@ -1,89 +0,0 @@
-{
-  writers,
-  lib,
-  jq,
-  curl,
-  xdotool,
-  nsxiv,
-  gnused,
-  defaultStation ? 103840,
-}:
-writers.writeDashBin "meteo" ''
-    # usage: meteo --list
-    # usage: meteo --update
-    # usage: meteo STATION
-    set -efu
-
-    PATH=$PATH:${lib.makeBinPath [jq curl xdotool nsxiv gnused]}
-
-    # TODO XDG
-    CONFIG_DIR=$HOME/.config/wetter
-    STATIONS_FILE=$CONFIG_DIR/stations.json
-
-    case ''${1-} in
-      --list)
-        sed -n 's/^\s*\(--[^)]\+\))$/\1/p' "$0"
-        jq -r -n \
-        --slurpfile stations_file "$STATIONS_FILE" \
-        '
-          $stations_file[0] as $known_stations |
-
-          $known_stations | keys[]
-        '
-        exit
-      ;;
-      --update)
-        mkdir -p "$(dirname "$STATIONS_FILE")"
-        exec >"$STATIONS_FILE"
-
-        curl -fsSL http://wetterstationen.meteomedia.de/ |
-        jq -Rrs '
-          def decodeHTML:
-            gsub("&auml;";"ä") |
-            gsub("&ouml;";"ö") |
-            gsub("&uuml;";"ü") |
-            gsub("&Auml;";"Ä") |
-            gsub("&Ouml;";"Ö") |
-            gsub("&Uuml;";"Ü") |
-            gsub("&szlig;";"ß")
-            ;
-          [
-            match(".*<option value=\"/\\?map=Deutschland&station=(?<station>[0-9]+)\">(?<name>[^<]+)</option>";"g")
-            .captures |
-            map({"\(.name)":(.string)}) |
-            add |
-            {"\(.name|decodeHTML)":(.station|tonumber)}
-          ] |
-          add
-        '
-        exit
-      ;;
-    esac
-
-  # set -x
-
-    station=''${1-${toString defaultStation}}
-    station=$(jq -e -n \
-    --arg station "$station" \
-    --slurpfile stations_file "$STATIONS_FILE" \
-    '
-      $stations_file[0] as $known_stations |
-
-      $station |
-      if test("^[0-9]+$") then
-        tonumber
-      else
-        $known_stations[.]
-      end
-    ')
-    cache="/tmp/''${LOGNAME}_wetter_$station.png"
-    curl -sSL \
-        "http://wetterstationen.meteomedia.de/messnetz/vorhersagegrafik/$station.png" \
-        -o "$cache"
-
-    if window_id=$(xdotool search --name "^nsxiv - $cache$"); then
-      xdotool key --window "$window_id" r
-    else
-      nsxiv "$cache" &
-    fi
-''
--- a/packages/nix-index-update.nix
+++ b/packages/nix-index-update.nix
@@ -1,13 +0,0 @@
-{
-  writers,
-  wget,
-  system,
-}:
-writers.writeDashBin "nix-index-update" ''
-  filename="index-${system}"
-  mkdir -p ~/.cache/nix-index
-  cd ~/.cache/nix-index
-  # -N will only download a new version if there is an update.
-  ${wget}/bin/wget -q -N https://github.com/Mic92/nix-index-database/releases/latest/download/$filename
-  ln -f $filename files
-''
--- a/packages/rfc.nix
+++ b/packages/rfc.nix
@@ -1,10 +1,8 @@
 {
  writers,
  curl,
-  pup,
  gawk,
  gnused,
-  gnugrep,
  less,
  fzf,
 }:
--- a/2
+++ b/2
--- a/systems/fatteh/configuration.nix
+++ b/systems/fatteh/configuration.nix
@@ -9,7 +9,7 @@ in {
    ./hardware-configuration.nix
    ../../configs/networkmanager.nix
    ../../configs/default.nix
-    ../../configs/0ad.nix
+    ../../configs/gaming.nix
    # ../../configs/gnome.nix
  ];

@@ -41,8 +41,6 @@ in {
    wireguard-aether-psk.file = ../../secrets/fatteh-wireguard-aether-psk.age;
  };

-  networking.wg-quick.interfaces.aether.address = ["192.168.178.202/24"];
-
  networking.hostName = "fatteh";
  networking.retiolum = retiolumAddresses.fatteh;

--- a/systems/ful/configuration.nix
+++ b/systems/ful/configuration.nix
@@ -2,7 +2,6 @@
  config,
  pkgs,
  lib,
-  inputs,
  ...
 }: let
  inherit (import ../../lib) kieran retiolumAddresses restic;
@@ -15,8 +14,8 @@ in {
    ./hledger.nix
    ./go-webring.nix
    ./gemini.nix
-    ./ical-ephemeris.nix
    ./wallabag.nix
+    ./nethack.nix
    ../../configs/monitoring.nix
    ../../configs/mycelium.nix
    ../../configs/tor.nix
@@ -72,64 +71,6 @@ in {
    ];
  };

-  users.users.servant = {
-    isSystemUser = true;
-    group = "servant";
-  };
-  users.groups.servant = {};
-  systemd.services.servant = {
-    enable = true;
-    environment.PORT = toString 18987;
-    environment.VIRTUAL_HOST = "https://openapiaiapi.kmein.de";
-    serviceConfig.ExecStart = pkgs.writers.writeHaskell "server" {
-      libraries = with pkgs.haskellPackages; [
-        servant
-        servant-server
-        servant-openapi3
-        servant-swagger-ui
-        servant-client
-        aeson
-        text
-        warp
-        uuid
-        lens
-      ];
-      ghcArgs = ["-O3" "-threaded"];
-    } ./servant-openapi.hs;
-    serviceConfig.User = "servant";
-    serviceConfig.Group = "servant";
-  };
-
-  services.htgen.openapi-conversion = {
-    port = 18988;
-    script = ''. ${pkgs.writers.writeDash "openapi-conversion" ''
-      case "$Method $Request_URI" in
-        "GET /openapi-3.1.json")
-          schema=$(mktemp -d)
-          trap 'rm -rf $schema' EXIT
-          ${pkgs.wget}/bin/wget http://127.0.0.1:${toString 18987}/openapi.json -O "$schema"/openapi.json
-          cat  "$schema"/openapi.json >&2
-          PATH=${lib.makeBinPath [pkgs.bashInteractive pkgs.nodejs]} ${pkgs.nodejs}/bin/npx --yes openapi-format "$schema"/openapi.json --convertTo "3.1" -o "$schema"/openapi-new.json
-          printf 'HTTP/1.1 200 OK\r\n'
-          printf 'Content-Type: %s\r\n' "$(${pkgs.file}/bin/file -ib "$schema"/openapi-new.json)"
-          printf 'Server: %s\r\n' "$Server"
-          printf 'Connection: close\r\n'
-          printf 'Content-Length: %d\r\n' $(${pkgs.coreutils}/bin/wc -c < "$schema"/openapi-new.json)
-          printf '\r\n'
-          cat "$schema"/openapi-new.json
-          exit
-        ;;
-      esac
-    ''}'';
-  };
-
-  services.nginx.virtualHosts."openapiaiapi.kmein.de" = {
-    enableACME = true;
-    forceSSL = true;
-    locations."/openapi-3.1.json".proxyPass = "http://127.0.0.1:${toString 18988}";
-    locations."/".proxyPass = "http://127.0.0.1:${toString 18987}";
-  };
-
  networking = {
    firewall.allowedTCPPorts = [80 443];
    hostName = "ful";
--- a/systems/ful/ical-ephemeris.nix
+++ b/systems/ful/ical-ephemeris.nix
@@ -1,29 +0,0 @@
-{ config, ... }:
-let
-  port = 9090;
-in
-{
-  services.nginx.virtualHosts."ical-ephemeris.kmein.de" = {
-    forceSSL = true;
-    enableACME = true;
-    locations."/" = {
-      proxyPass = "http://localhost:${toString port}/";
-    };
-  };
-
-  services.ical-ephemeris = {
-    enable = true;
-    inherit port;
-    brevoApiKeyFile = config.age.secrets.brevo-key.path;
-    copecartIpnKeyFile = config.age.secrets.copecart-ipn.path;
-    baseUrl = "https://ical-ephemeris.kmein.de";
-  };
-
-  age.secrets.copecart-ipn = {
-    file = ../../secrets/copecart-ipn.age;
-  };
-
-  age.secrets.brevo-key = {
-    file = ../../secrets/brevo-key.age;
-  };
-}
--- a/systems/ful/matomo.nix
+++ b/systems/ful/matomo.nix
@@ -21,7 +21,7 @@ in {
    nginx = {
      serverName = "matomo.kmein.de";
    };
-    package = pkgs.matomo_5;
+    package = pkgs.matomo;
  };

  services.mysql = {
--- a/systems/ful/nethack.nix
+++ b/systems/ful/nethack.nix
@@ -0,0 +1,60 @@
+{
+  networking.firewall.allowedTCPPorts = [ 22 ];
+
+  containers.nethack = {
+    autoStart = true;
+
+    forwardPorts = [
+      {
+        containerPort = 22;
+        hostPort = 22;
+      }
+    ];
+
+    config =
+      { pkgs, ... }:
+      {
+        system.stateVersion = "25.11";
+
+        networking.hostName = "nethack";
+        services.openssh.enable = true;
+
+        environment.systemPackages = [ pkgs.nethack ];
+
+        programs.tmux.enable = true;
+        programs.tmux.extraConfig = ''
+          set -g mouse on
+          set -g allow-rename off
+          set -g detach-on-destroy off
+
+          unbind-key C-b
+          set -g prefix None
+        '';
+
+        users.users.nethack = {
+          isNormalUser = true;
+          home = "/home/nethack";
+          createHome = true;
+          shell = pkgs.bash;
+          openssh.authorizedKeys.keys = [
+            "ssh-ed25519 AAAA...yourkey"
+            "ssh-ed25519 AAAA...friendkey"
+          ];
+        };
+
+        services.openssh.settings = {
+          PasswordAuthentication = false;
+          PermitRootLogin = "no";
+        };
+
+        services.openssh.extraConfig = ''
+          Match User nethack
+            ForceCommand ${pkgs.tmux}/bin/tmux attach -t nethack || \
+                         ${pkgs.tmux}/bin/tmux new -s nethack ${pkgs.nethack}/bin/nethack
+            AllowTcpForwarding no
+            X11Forwarding no
+            PermitTTY yes
+        '';
+      };
+  };
+}
--- a/systems/ful/servant-openapi.hs
+++ b/systems/ful/servant-openapi.hs
@@ -1,119 +0,0 @@
-
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE TypeOperators #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE OverloadedStrings #-}
-
-module Main where
-
-import Data.Aeson (ToJSON, FromJSON)
-import GHC.Generics (Generic)
-import Data.String (IsString(..))
-import Network.Wai (Application)
-import Network.Wai.Handler.Warp (run)
-import Servant
-import Servant.Client (HasClient (..))
-import Servant.OpenApi (HasOpenApi(..), toOpenApi)
-import qualified Data.Version as Version
-import Servant.Swagger.UI (SwaggerSchemaUI, swaggerSchemaUIServer)
-import Data.OpenApi (ToSchema, servers, license, info, description, version, title)
-import qualified Data.OpenApi as OpenApi
-import Control.Concurrent.MVar (MVar, newMVar, modifyMVar, readMVar)
-import System.Environment (getEnv)
-import Control.Monad.IO.Class (liftIO)
-import Control.Lens
-import qualified Data.Text as T
-import GHC.Generics
-import GHC.TypeLits
-import Data.UUID (UUID)
-import Data.UUID.V4 (nextRandom)
-import qualified Data.UUID as UUID
-
-- Define a simple data type
-data User = User
-  { userId :: UUID
-  , name   :: String
-  , age    :: Int
-  } deriving (Generic, Show)
-
-instance ToJSON User
-instance FromJSON User
-instance ToSchema User
-
-- Define the API type
-type API = "users" :> OperationId "getUsers" :> Get '[JSON] [User]
-      :<|> "users" :> OperationId "insertUser" :> ReqBody '[JSON] User :> Post '[JSON] User
-      :<|> "users" :> OperationId "updateUser" :> Capture "id" UUID :> ReqBody '[JSON] User :> Put '[JSON] User
-      :<|> "users" :> OperationId "deleteUser" :> Capture "id" UUID :> Delete '[JSON] NoContent
-
-- Define the API with Swagger endpoints
-type APIWithSwagger = API
-      :<|> SwaggerSchemaUI "swagger-ui" "openapi.json"
-
-
-data OperationId (name :: Symbol)
-
-instance HasServer subApi ctx => HasServer (OperationId name :> subApi) ctx where
-  type ServerT (OperationId name :> subApi) m = ServerT subApi m
-  route _ = route (Proxy @subApi)
-  hoistServerWithContext _ = hoistServerWithContext (Proxy @subApi)
-
-instance (HasOpenApi subApi, KnownSymbol name) => HasOpenApi (OperationId name :> subApi) where
-  toOpenApi _ = toOpenApi (Proxy @subApi) & OpenApi.allOperations . OpenApi.operationId ?~ apiName
-    where
-      apiName = T.pack $ symbolVal (Proxy @name)
-
-instance HasClient m api => HasClient m (OperationId name :> api) where
-  type Client m (OperationId name :> api) = Client m api
-  clientWithRoute pm Proxy = clientWithRoute pm (Proxy :: Proxy api)
-  hoistClientMonad pm _ = hoistClientMonad pm (Proxy :: Proxy api)
-
-- Handlers for the API
-getUsers :: MVar [User] -> Handler [User]
-getUsers usersVar = liftIO $ readMVar usersVar
-
-addUser :: MVar [User] -> User -> Handler User
-addUser usersVar newUser = liftIO $ do
-    newId <- nextRandom
-    let userWithId = newUser { userId = newId }
-    modifyMVar usersVar $ \users -> return (userWithId : users, userWithId)
-
-updateUser :: MVar [User] -> UUID -> User -> Handler User
-updateUser usersVar uid updatedUser = liftIO $ do
-    modifyMVar usersVar $ \users ->
-        let newUsers = map (\user -> if userId user == uid then updatedUser { userId = uid } else user) users
-        in return (newUsers, updatedUser { userId = uid })
-
-deleteUser :: MVar [User] -> UUID -> Handler NoContent
-deleteUser usersVar uid = liftIO $ do
-    modifyMVar usersVar $ \users ->
-        let newUsers = filter (\user -> userId user /= uid) users
-        in return (newUsers, NoContent)
-
-- Implement the server
-server :: OpenApi.Server -> MVar [User] -> Server APIWithSwagger
-server virtualHost usersVar = (getUsers usersVar
-              :<|> addUser usersVar
-              :<|> updateUser usersVar
-              :<|> deleteUser usersVar)
-              :<|> swaggerSchemaUIServer (toOpenApi (Proxy :: Proxy API)
-                  & info.title        .~ "OpenAPI AI API"
-                  & info.version      .~ "1.0"
-                  & info.description  ?~ "This is an API for AI with OpenAPI"
-                  & info.license      ?~ "MIT"
-                  & servers           .~ [virtualHost])
-
-- Create the application
-app :: OpenApi.Server -> MVar [User] -> Application
-app virtualHost usersVar = serve (Proxy :: Proxy APIWithSwagger) (server virtualHost usersVar)
-
-- Main entry point
-main :: IO ()
-main = do
-    initialUsers <- mapM (\(name, age) -> nextRandom >>= \uid -> return (User uid name age)) [("Alice", 30), ("Bob", 25)]
-    usersVar <- newMVar initialUsers
-    virtualHost <- getEnv "VIRTUAL_HOST"
-    port <- read <$> getEnv "PORT"  -- Assuming PORT is a number
-    run port (app (fromString virtualHost) usersVar)
-
--- a/systems/kabsa/configuration.nix
+++ b/systems/kabsa/configuration.nix
@@ -45,8 +45,6 @@ in {
    wireguard-aether-psk.file = ../../secrets/kabsa-wireguard-aether-psk.age;
  };

-  networking.wg-quick.interfaces.aether.address = ["192.168.178.203/24"];
-
  environment.systemPackages = [pkgs.zeroad];

  networking = {
--- a/systems/kibbeh/configuration.nix
+++ b/systems/kibbeh/configuration.nix
@@ -14,7 +14,6 @@
    ../../configs/sound.nix
    ../../configs/printing.nix
    ../../configs/nix.nix
-    ../../configs/flix.nix
    ../../configs/fonts.nix
    ../../configs/mycelium.nix
    ../../configs/retiolum.nix
@@ -80,7 +79,6 @@
      niveumPackages.mpv-tv
      telegram-desktop
      (niveumPackages.mpv-radio.override { di-fm-key-file = config.age.secrets.di-fm-key.path; })
-      niveumPackages.meteo
      spotify
    ];
  };
--- a/systems/maakaron/home.nix
+++ b/systems/maakaron/home.nix
@@ -1,103 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  inputs,
-  niveumPackages,
-  ...
-}: let
-  system = "x86_64-darwin";
-
-  nextcloud = "${config.home.homeDirectory}/Nextcloud/ZODIAC";
-
-  hora = pkgs.callPackage ../../packages/hora.nix {
-    timeLedger = "${nextcloud}/hora.timeclock";
-  };
-
-  adminEssentials = import ../../configs/admin-essentials.nix {
-    inherit pkgs niveumPackages lib system;
-  };
-
-  stardict = import ../../configs/stardict.nix {
-    inherit pkgs lib inputs;
-  };
-
-  git = import ../../configs/git.nix {
-    inherit pkgs lib inputs system;
-  };
-in {
-  home.packages =
-    [
-      hora
-      niveumPackages.vim
-      pkgs.ghc
-      pkgs.python3
-    ]
-    ++ adminEssentials.environment.systemPackages
-    ++ git.environment.systemPackages;
-  #++ stardict.environment.systemPackages;
-
-  home.shellAliases =
-    adminEssentials.environment.shellAliases
-    // git.environment.shellAliases;
-
-  programs.git = git.home-manager.users.me.programs.git;
-
-  programs.zsh = let
-    promptColours = {
-      success = "green";
-      failure = "red";
-    };
-  in {
-    autocd = true;
-    defaultKeymap = "viins";
-    enableAutosuggestions = true;
-    enableCompletion = true;
-    enable = true;
-    historySubstringSearch.enable = true;
-    syntaxHighlighting.enable = true;
-    syntaxHighlighting.highlighters = ["main" "brackets" "pattern" "line"];
-    initExtra = ''
-      # ref https://gist.github.com/meeech/0b97a86f235d10bc4e2a1116eec38e7e
-      if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ];
-      then
-        . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'
-      fi
-
-      precmd () {
-        if [[ -n $IN_NIX_SHELL ]]; then
-          PROMPT='%B%~%b %(?.%F{${promptColours.success}}.%F{${promptColours.failure}})λ%f '
-        else
-          PROMPT='%B%~%b %(?.%F{${promptColours.success}}.%F{${promptColours.failure}})%#%f '
-        fi
-        print -Pn "\e]2;%n@%M:%~\a" # title bar prompt
-      }
-      zle-keymap-select zle-line-init () {
-        case $KEYMAP in
-          vicmd) print -n '\e]12;green\a';;
-          viins|main) print -n '\e]12;gray\a';;
-        esac
-      }
-      zle -N zle-line-init
-      zle -N zle-keymap-select
-    '';
-  };
-
-  home.sessionVariables.EDITOR = "${niveumPackages.vim}/bin/nvim";
-  home.file."Local Applications".source = pkgs.symlinkJoin {
-    name = "local-applications";
-    paths = [pkgs.anki-bin pkgs.dbeaver pkgs.vscode pkgs.stellarium];
-  };
-  home.stateVersion = "23.11";
-  home.username = "xm7234fu";
-  home.homeDirectory = "/Users/${config.home.username}";
-  nixpkgs.config.allowUnfree = true;
-  nix.package = pkgs.nixVersions.stable;
-  nix.extraOptions = "experimental-features = nix-command flakes";
-}
-
-/*
-hora register -p weekly --depth 1 --empty
-
-
-*/
--- a/systems/makanek/gitea.nix
+++ b/systems/makanek/gitea.nix
@@ -7,8 +7,10 @@ in {
    defaultOptions.settings = {
      USER_DEFINED_DEFAULT = true;
    };
-    instances = {
-      "gitea".settings = {
+    instances = let instance = "gitea"; in {
+      ${instance}.settings = {
+        BIND = "/run/anubis/anubis-${instance}/anubis.sock";
+        METRICS_BIND = "/run/anubis/anubis-${instance}/anubis-metrics.sock";
        TARGET = "http://localhost:${toString config.services.gitea.settings.server.HTTP_PORT}";
        USER_DEFINED_INSTANCE = true;
        OG_PASSTHROUGH = true;
--- a/systems/makanek/tarot.nix
+++ b/systems/makanek/tarot.nix
@@ -3,7 +3,8 @@
  pkgs,
  lib,
  ...
-}: let
+}:
+let
  tarotPort = 7407;
  tarotFiles = pkgs.fetchzip {
    url = "https://c.krebsco.de/tarot.zip";
@@ -14,33 +15,45 @@
    url = "http://c.krebsco.de/tarot.pdf";
    sha256 = "1n2m53kjg2vj9dbr70b9jrsbqwdfrcb48l4wswn21549fi24g6dx";
  };
-in {
-  services.htgen.tarot = {
-    port = tarotPort;
-    script = ''. ${pkgs.writers.writeDash "tarot" ''
-        case "$Method $Request_URI" in
-          "GET /")
-            if item=$(${pkgs.findutils}/bin/find ${toString tarotFiles} -type f | ${pkgs.coreutils}/bin/shuf -n1); then
-              card=$(mktemp --tmpdir tarot.XXX)
-              trap 'rm $card' EXIT
-              reverse=$(${pkgs.coreutils}/bin/shuf -i0-1 -n1)
-              if [ "$reverse" -eq 1 ]; then
-                ${pkgs.imagemagick}/bin/convert -rotate 180 "$item" "$card"
-              else
-                ${pkgs.coreutils}/bin/cp "$item" "$card"
-              fi
-              printf 'HTTP/1.1 200 OK\r\n'
-              printf 'Content-Type: %s\r\n' "$(${pkgs.file}/bin/file -ib "$card")"
-              printf 'Server: %s\r\n' "$Server"
-              printf 'Connection: close\r\n'
-              printf 'Content-Length: %d\r\n' $(${pkgs.coreutils}/bin/wc -c < "$card")
-              printf '\r\n'
-              cat "$card"
-              exit
-            fi
-          ;;
-        esac
-      ''}'';
+in
+{
+  systemd.services.tarot = {
+    enable = true;
+    serviceConfig.Type = "simple";
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig.ExecStart = pkgs.writers.writePython3 "tarot-server" {
+      libraries = py: [ py.pillow py.flask ];
+    } ''
+      from flask import Flask, send_file
+      from pathlib import Path
+      from random import choice, randint
+      from io import BytesIO
+      from PIL import Image
+
+      app = Flask(__name__)
+      TAROT_DIR = Path("${tarotFiles}")
+
+
+      @app.route("/")
+      def tarot():
+          card_path = choice(list(TAROT_DIR.glob("*")))
+
+          with Image.open(card_path) as img:
+              if randint(0, 1):
+                  img = img.rotate(180)
+              buf = BytesIO()
+              img.save(buf, format="JPEG")
+              buf.seek(0)
+              return send_file(
+                  buf,
+                  mimetype='image/jpeg',
+                  as_attachment=False
+              )
+
+
+      if __name__ == "__main__":
+          app.run(port=${toString tarotPort})
+    '';
  };

  niveum.passport.services = [
@@ -55,7 +68,7 @@ in {
    enableACME = true;
    forceSSL = true;
    locations = {
-      "/".proxyPass = "http://127.0.0.1:${toString tarotPort}";
+      "/".proxyPass = "http://127.0.0.1:${toString tarotPort}/";
      "/files/" = {
        root = pkgs.linkFarm "tarot" [
          {
--- a/systems/manakish/configuration.nix
+++ b/systems/manakish/configuration.nix
@@ -36,8 +36,6 @@ in {
    wireguard-aether-psk.file = ../../secrets/manakish-wireguard-aether-psk.age;
  };

-  networking.wg-quick.interfaces.aether.address = ["192.168.178.204/24"];
-
  niveum = {
    batteryName = "BAT0";
    wirelessInterface = "wlp3s0";
--- a/systems/moto/configuration.nix
+++ b/systems/moto/configuration.nix
@@ -1,71 +0,0 @@
-{
-  pkgs,
-  niveumPackages,
-  inputs,
-  ...
-}: let
-  sshPort = 8022;
-in {
-  environment.packages = with pkgs; [
-    nil
-    bzip2
-    coreutils
-    curl
-    diffutils
-    findutils
-    git
-    gnugrep
-    gnupg
-    gnused
-    gnutar
-    gzip
-    hostname
-    iproute2
-    man
-    openssh
-    procps
-    tzdata
-    unzip
-    util-linux
-    vim
-    which
-    xz
-    zip
-    hledger
-    hledger-ui
-    niveumPackages.vim
-    gitAndTools.gh
-    ripgrep
-    (pkgs.writers.writeDashBin "start-ssh" ''
-      ${pkgs.openssh}/bin/sshd -f ${pkgs.writeText "sshd_config" ''
-        HostKey /data/data/com.termux.nix/files/home/.ssh/ssh_host_rsa_key
-        Port ${toString sshPort}
-      ''}
-    '')
-  ];
-
-  nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
-
-  home-manager = {
-    useGlobalPkgs = true;
-    backupFileExtension = "hm-bak";
-    config = {pkgs, ...}: {
-      home.stateVersion = "23.05";
-      programs.tmux.enable = true;
-    };
-  };
-
-  environment.sessionVariables = {
-    LEDGER_FILE = "/data/data/com.termux.nix/files/home/src/ledger/privat.journal";
-  };
-
-  user.shell = "${pkgs.fish}/bin/fish";
-
-  environment.etcBackupExtension = ".bak";
-
-  system.stateVersion = "23.05";
-
-  nix.extraOptions = ''
-    experimental-features = nix-command flakes
-  '';
-}
--- a/systems/zaatar/home-assistant.nix
+++ b/systems/zaatar/home-assistant.nix
@@ -74,6 +74,40 @@ in {

  hardware.bluetooth.enable = true;

+  systemd.services.update-containers = {
+    startAt = "Mon 02:00";
+    script = ''
+      images=$(${pkgs.podman}/bin/podman ps -a --format="{{.Image}}" | sort -u)
+
+      for image in $images; do
+        ${pkgs.podman}/bin/podman pull "$image"
+      done
+    '';
+    serviceConfig = {
+      Type = "oneshot";
+      Restart = "on-failure";
+      RestartSec = "1h";
+    };
+  };
+
+  systemd.services.restart-homeassistant = {
+    startAt = "Tue 02:00";
+    script = ''
+      ${pkgs.systemd}/bin/systemctl try-restart podman-homeassistant.service
+    '';
+    serviceConfig = {
+      Type = "oneshot";
+    };
+  };
+
+  virtualisation.podman = {
+    enable = true;
+    autoPrune = {
+      enable = true;
+      flags = ["--all"];
+    };
+  };
+
  virtualisation.oci-containers = {
    backend = "podman";
    containers.homeassistant = {
@@ -82,6 +116,9 @@ in {
        "${playlistDirectoryPath}:/media"
        "/run/dbus:/run/dbus:ro"
      ];
+      # needed for bluetooth
+      capabilities.NET_ADMIN = true;
+      capabilities.NET_RAW = true;
      environment.TZ = "Europe/Berlin";
      image = "ghcr.io/home-assistant/home-assistant:stable";
      extraOptions = [
Author	SHA1	Message	Date
Kierán Meinhardt	0c6ec93443	nethack container	2025-12-19 22:44:08 +01:00
Kierán Meinhardt	15ef01268b	update secrets	2025-12-19 22:38:42 +01:00
Kierán Meinhardt	682db94aae	home-assistant: allow bluetooth	2025-12-19 15:05:54 +01:00
Kierán Meinhardt	1bba38be77	tarot: replace htgen by flask	2025-12-19 15:05:29 +01:00
Kierán Meinhardt	f7a7e80d97	anubis: set socket paths	2025-12-19 13:11:24 +01:00
Kierán Meinhardt	7327b3149a	tlg-wotd: temporarily disable	2025-12-19 13:11:06 +01:00
Kierán Meinhardt	9ab93d0e82	htgen: update	2025-12-19 12:51:40 +01:00
Kierán Meinhardt	2f5ad473c6	cro: chromium.override	2025-12-19 11:56:48 +01:00
Kierán Meinhardt	e478ae3e6e	flake: update lock	2025-12-19 11:56:33 +01:00
Kierán Meinhardt	06d3d12afa	system -> stdenv.hostPlatform.system	2025-12-19 11:56:16 +01:00
Kierán Meinhardt	1060339a93	home-assistant: auto-update container	2025-12-19 11:56:02 +01:00
Kierán Meinhardt	af1e852228	streams: update	2025-12-19 11:18:49 +01:00
Kierán Meinhardt	9ff500bb37	gaming: init more	2025-12-14 18:19:37 +01:00
Kierán Meinhardt	18603a5682	jq-lsp: use upstream	2025-12-13 23:59:09 +01:00
Kierán Meinhardt	53578ac92b	command-not-found: conflicts with nix-index-database	2025-12-13 23:56:50 +01:00
Kierán Meinhardt	14118b6a63	maakaron: remove	2025-12-13 23:53:24 +01:00
Kierán Meinhardt	0813d2e37c	moto: remove	2025-12-13 23:51:35 +01:00
Kierán Meinhardt	8d5743119f	rfc: remove unneeded arguments	2025-12-13 23:50:12 +01:00
Kierán Meinhardt	5105ef0b1e	flake: add upstream TODOs	2025-12-13 23:50:00 +01:00
Kierán Meinhardt	d67c8a6298	ix: remove	2025-12-13 23:19:15 +01:00
Kierán Meinhardt	64ac86b32b	nix-index: use nix-index-database flake	2025-12-13 23:19:15 +01:00
Kierán Meinhardt	ed5c8815ce	flake: broadly sort packages by domain	2025-12-13 23:19:15 +01:00
Kierán Meinhardt	5e41f04f72	iolanguage: remove	2025-12-13 23:19:15 +01:00
Kierán Meinhardt	e8e5bb6211	heuretes: fix table display	2025-12-13 23:19:15 +01:00
Kierán Meinhardt	e910bf6f6a	cht.sh: rename command	2025-12-13 23:19:15 +01:00
Kierán Meinhardt	bd47cef7e5	infschmv: remove	2025-12-13 23:19:15 +01:00
Kierán Meinhardt	ad3249077b	jq-lsp: remove	2025-12-13 23:19:15 +01:00
Kierán Meinhardt	367acd05e5	git-preview: remove	2025-12-13 23:19:14 +01:00
Kierán Meinhardt	bae1d0b0cc	genius: remove	2025-12-13 23:19:14 +01:00
Kierán Meinhardt	f58e111ce1	dns-sledgehammer: remove	2025-12-13 23:19:14 +01:00
Kierán Meinhardt	b647b9f901	dmenu-scrot: remove	2025-12-13 23:19:14 +01:00
Kierán Meinhardt	883655dc58	dmenu-bluetooth: remove	2025-12-13 23:19:14 +01:00
Kierán Meinhardt	21960a2c95	dirmir: remove	2025-12-13 23:19:14 +01:00
Kierán Meinhardt	254195b331	dic: remove	2025-12-13 23:19:14 +01:00
Kierán Meinhardt	ce032525d2	meteo: remove	2025-12-13 23:19:14 +01:00
Kierán Meinhardt	f9b992cce3	mahlzeit: remove	2025-12-13 23:19:14 +01:00
Kierán Meinhardt	3f6e4755a6	flake: remove rust-overlay input	2025-12-13 23:19:14 +01:00
Kierán Meinhardt	cc4c5b79c1	ical-ephemeris: remove	2025-12-13 23:19:14 +01:00
Kierán Meinhardt	673edbb8b3	ful: remove openapi joke	2025-12-13 23:19:14 +01:00
Kierán Meinhardt	89f9e09c3d	update	2025-12-13 23:19:14 +01:00
Kierán Meinhardt	f1a6b1f4f6	flake: do not use flake-utils	2025-12-13 22:37:47 +01:00
Kierán Meinhardt	16398282ed	flake.lock: Update Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/e1680d594a9281651cbf7d126941a8c8e2396183?narHash=sha256-d%2B5CGloq7Lo1u2SkzhF8oiOdUc6Z5emh22nTXUB9CFA%3D' (2025-12-03) → 'github:nix-community/home-manager/20561be440a11ec57a89715480717baf19fe6343?narHash=sha256-O8VTGey1xxiRW%2BFpb%2BPs9zU7ShmxUA1a7cMTcENCVNg%3D' (2025-12-08) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/1aab89277eb2d87823d5b69bae631a2496cff57a?narHash=sha256-H3lC7knbXOBrHI9hITQ7modLuX20mYJVhZORL5ioms0%3D' (2025-12-02) → 'github:NixOS/nixpkgs/d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454?narHash=sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o%3D' (2025-12-06) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/152586a6a98226db20aab6e6e1c9a37c535acfbc?narHash=sha256-p7ihpz21BB%2BNhuT3qVL3clzWz%2BUyZlt7S3RRXxZGPls%3D' (2025-12-04) → 'github:NixOS/nixpkgs/aaa6c85f51f9333738c170ccc55b5fe5f55938f4?narHash=sha256-VPyShT4DyGtXH2wsD8yAVvvvi9OILUHTqNxWQd/6yZA%3D' (2025-12-10) • Updated input 'nur': 'github:nix-community/NUR/5e8ec1167d3a375e2857fbe915b3d8658d3e6472?narHash=sha256-bp7B5alQk7nDLtFLKaOHhSPBNVCcwIxMXjcc/VzY0hg%3D' (2025-12-04) → 'github:nix-community/NUR/6af054d2762ef52fad9943d490708f937008cca4?narHash=sha256-JyVUlh5wINjw29Ops7ZjRrzw%2B55r5GpCHjO0TCsoowc%3D' (2025-12-10) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/418468ac9527e799809c900eda37cbff999199b6?narHash=sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y%3D' (2025-12-02) → 'github:nixos/nixpkgs/addf7cf5f383a3101ecfba091b98d0a1263dc9b8?narHash=sha256-hM20uyap1a0M9d344I692r%2Bik4gTMyj60cQWO%2BhAYP8%3D' (2025-12-08) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/74d9abb7c5c030469f90d97a67d127cc5d76c238?narHash=sha256-F0IQSmSj4t2ThkbWZooAhkCTO%2BYpZSd2Pqiv2uoYEHo%3D' (2025-12-04) → 'github:oxalica/rust-overlay/db61f666aea93b28f644861fbddd37f235cc5983?narHash=sha256-jTof2%2Bir9UPmv4lWksYO6WbaXCC0nsDExrB9KZj7Dz4%3D' (2025-12-10) • Updated input 'stylix': 'github:danth/stylix/6f3b50c8fa9c468fc787e211b700e46592bf9d56?narHash=sha256-J2jgYyXiXctr91MSuBQ6dwB1YaC7DpzKp%2BRkj6pqS8o%3D' (2025-12-04) → 'github:danth/stylix/84d9d55885d463d461234f3aac07b2389a2577d8?narHash=sha256-abrrONk8vzRtY6fHEkjZOyRJpKHjPlFqMBE0%2B/DxfAU%3D' (2025-12-06)	2025-12-10 13:26:01 +01:00
Kierán Meinhardt	315ccf102d	vm host setup	2025-12-09 12:54:50 +01:00
Kierán Meinhardt	7d8feb0876	stw-berlin: disable	2025-12-09 12:54:35 +01:00
Kierán Meinhardt	44f7a9d4fa	fritzbox: remove	2025-12-08 14:00:30 +01:00
Kierán Meinhardt	b070207bd5	flameshot: remove buttons	2025-12-05 11:31:07 +01:00
Kierán Meinhardt	614f7e0f8c	remove flix config	2025-12-05 11:30:59 +01:00