nethack container

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)

configs/0ad.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = [ pkgs.zeroad ];
-  networking.firewall = {
-    allowedTCPPorts = [ 20595 ];
-    allowedUDPPorts = [ 20595 ];
-  };
-}

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 =
     [

configs/bash.nix

@@ -5,6 +5,6 @@
     interactiveShellInit = ''
       set -o vi
     '';
-    enableCompletion = true;
+    completion.enable = true;
   };
 }

configs/bots/autorenkalender.nix

@@ -1,17 +1,9 @@
 {
-  pkgs,
-  lib,
   config,
+  inputs,
   ...
 }: let
-  autorenkalender-package = pkgs.fetchFromGitHub {
+  autorenkalender = inputs.autorenkalender.packages.x86_64-linux.default;
-    owner = "kmein";
-    repo = "autorenkalender";
-    rev = "cf49a7b057301332d980eb47042a626add93db66";
-    sha256 = "1pa7sjg33vdnjianrqldv445jdzzv3mn231ljk1j58hs0cd505gs";
-  };
-  autorenkalender =
-    pkgs.python3Packages.callPackage autorenkalender-package {};
 in {
   niveum.bots.autorenkalender = {
     enable = true;

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";

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" {
+      transliteration=$(${pkgs.writers.writePython3 "translit.py" {
-        # revert to pkgs.writers.writePython3 once https://github.com/NixOS/nixpkgs/pull/353367 is merged
+        libraries = py: [ py.cltk ];
-        libraries = [ pkgs.python3Packages.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;
   };
 

configs/browser.nix

@@ -6,7 +6,7 @@
 }: {
   environment.systemPackages = [
     niveumPackages.cro
-    pkgs.tor-browser-bundle-bin
+    pkgs.tor-browser
     pkgs.firefox
     pkgs.brave
   ];

configs/default.nix

@@ -3,7 +3,6 @@
   lib,
   config,
   niveumPackages,
-  unstablePackages,
   inputs,
   ...
 }:
@@ -27,9 +26,6 @@ in
             dmenu = pkgs.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
           };
           permittedInsecurePackages = [
-            "qtwebkit-5.212.0-alpha4"
-            "zotero-6.0.26"
-            "electron-25.9.0"
           ];
         };
       };
@@ -139,7 +135,6 @@ in
         };
       };
     }
-    { programs.command-not-found.enable = true; }
     {
       programs.gnupg = {
         agent = {
@@ -215,7 +210,6 @@ in
     ./direnv.nix
     ./docker.nix
     ./dunst.nix
-    ./flix.nix
     ./fonts.nix
     ./fzf.nix
     ./git.nix
@@ -236,8 +230,8 @@ in
     ./nix.nix
     ./newsboat.nix
     ./flameshot.nix
-    ./fritzbox.nix
     ./packages.nix
+    ./virtualization.nix
     ./picom.nix
     ./stardict.nix
     ./polkit.nix
@@ -262,7 +256,6 @@ in
       '';
     }
     ./tor.nix
-    ./stw-berlin.nix
     ./mastodon-bot.nix
     {
       fileSystems."${remoteDir}/fritz" = {

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)'';
       };
     };
   };

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 '{}'
-    '')
-  ];
-}

configs/fonts.nix

@@ -102,11 +102,12 @@ in {
       lmodern
       merriweather
       ocr-a
+      montserrat
       roboto
       roboto-mono
       noto-fonts
       noto-fonts-cjk-sans
-      noto-fonts-emoji
+      noto-fonts-color-emoji
       roboto-slab
       scheherazade-new
       source-code-pro
@@ -114,7 +115,7 @@ in {
       source-serif-pro
       theano
       niveumPackages.tocharian-font
-      vistafonts
+      vista-fonts
       vollkorn
       zilla-slab
     ]; # google-fonts league-of-moveable-type

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=";
-      }
-    ];
-  };
-}

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 ];
+  };
+}

configs/git.nix

@@ -17,7 +17,6 @@ in {
     pkgs.gitstats
     pkgs.patch
     pkgs.patchutils
-    inputs.self.packages.${pkgs.system}.git-preview
   ];
 
   environment.shellAliases = {
@@ -29,9 +28,7 @@ in {
     programs.git = {
       enable = true;
       package = pkgs.gitFull;
-      userName = kieran.name;
+      settings.alias = {
-      userEmail = kieran.email;
-      aliases = {
         br = "branch";
         co = "checkout";
         ci = "commit";
@@ -45,19 +42,12 @@ in {
         graph = "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all";
       };
       ignores = ignorePaths;
-      extraConfig = {
+      settings.user.name = kieran.name;
-        pull.ff = "only";
+      settings.user.email = kieran.email;
-        rebase.autoStash = true;
+      settings.pull.ff = "only";
-        merge.autoStash = true;
+      settings.rebase.autoStash = true;
-        push.autoSetupRemote = true;
+      settings.merge.autoStash = true;
-
+      settings.push.autoSetupRemove = true;
-        # # ref https://github.com/dandavison/delta
-        # core.pager = "${pkgs.delta}/bin/delta";
-        # interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
-        # delta.navigate = true;
-        # merge.conflictStyle = "diff3";
-        # diff.colorMoved = "default";
-      };
     };
   };
 }

configs/i3.nix

@@ -94,7 +94,7 @@ in {
   services.xserver = {
     windowManager.i3 = {
       enable = true;
-      package = pkgs.i3-gaps;
+      package = pkgs.i3;
     };
   };
 
@@ -132,7 +132,7 @@ in {
       border = 1;
     };
     bars = [
-      (config.home-manager.users.me.lib.stylix.i3.bar
+      (config.home-manager.users.me.stylix.targets.i3.exportedBarConfig
         // rec {
           workspaceButtons = true;
           mode = "hide"; # "dock";

configs/mpv.nix

@@ -37,7 +37,7 @@ in {
       };
       scripts = [
         pkgs.mpvScripts.quality-menu
-        niveumPackages.mpv-visualizer
+        pkgs.mpvScripts.visualizer
       ];
     };
   };

configs/neovim.nix

@@ -52,8 +52,8 @@
     pkgs.nodePackages.typescript-language-server
     pkgs.lua-language-server
     pkgs.nodePackages.vscode-langservers-extracted
-    pkgs.lemminx
+    pkgs.lemminx # XML LSP
-    niveumPackages.jq-lsp
+    pkgs.jq-lsp
     pkgs.dhall-lsp-server
   ];
 }

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
-  ];
-}

configs/packages.nix

@@ -4,7 +4,6 @@
   lib,
   inputs,
   niveumPackages,
-  unstablePackages,
   ...
 }: let
   worldradio = pkgs.callPackage ../packages/worldradio.nix {};
@@ -71,7 +70,7 @@ in {
     '')
     # INTERNET
     aria2
-    tdesktop
+    telegram-desktop
     whois
     dnsutils
     # FILE MANAGERS
@@ -103,7 +102,7 @@ in {
     wdisplays
     libnotify # for notify-send
     xclip # clipboard CLI
-    xdragon # drag and drop
+    dragon-drop # drag and drop
     xorg.xkill # kill by clicking
     portfolio # personal finance overview
     audacity
@@ -121,13 +120,13 @@ in {
     zoom-us # video conferencing
     (pkgs.writers.writeDashBin "im" ''
       weechat_password=$(${pkgs.pass}/bin/pass weechat)
-      exec ${unstablePackages.weechat}/bin/weechat -t -r '/mouse enable; /remote add makanek http://${externalNetwork.makanek}:8002 -password='"$weechat_password"'; /remote connect makanek'
+      exec ${weechat}/bin/weechat -t -r '/mouse enable; /remote add makanek http://${externalNetwork.makanek}:8002 -password='"$weechat_password"'; /remote connect makanek'
     '')
     alejandra # nix formatter
     pdfgrep # search in pdf
     pdftk # pdf toolkit
     mupdf
-    poppler_utils # pdf toolkit
+    poppler-utils # pdf toolkit
     kdePackages.okular # the word is nucular
     xournalpp # for annotating pdfs
     pdfpc # presenter console for pdf slides
@@ -152,18 +151,14 @@ in {
     niveumPackages.pls
     niveumPackages.mpv-tv
     niveumPackages.mpv-iptv
-    jellyfin-media-player
     niveumPackages.devanagari
     niveumPackages.betacode # ancient greek betacode to unicode converter
-    niveumPackages.meteo
+    pkgs.jq-lsp
-    niveumPackages.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
@@ -211,11 +206,7 @@ in {
     ncspot
     playerctl
 
-    nix-index
-    niveumPackages.nix-index-update
-
     #krebs
-    niveumPackages.dic
     pkgs.nur.repos.mic92.ircsink
 
     (haskellPackages.ghcWithHoogle (hs: [
@@ -242,8 +233,6 @@ in {
     dhall
 
     html-tidy
-    nodePackages.csslint
-    nodePackages.jsonlint
     deno # better node.js
     go
     texlive.combined.scheme-full

configs/ssh.nix

@@ -4,6 +4,7 @@
 in {
   users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys;
   programs.ssh.startAgent = true;
+  services.gnome.gcr-ssh-agent.enable = false;
 
   home-manager.users.me = {
     # https://discourse.nixos.org/t/gnome-keyring-and-ssh-agent-without-gnome/11663
@@ -40,6 +41,7 @@ in {
 
   home-manager.users.me.programs.ssh = {
     enable = true;
+    enableDefaultConfig = false;
     matchBlocks = {
       "github.com" = {
         hostname = "ssh.github.com";

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
-    '';
-  };
-}

configs/stylix.nix

@@ -70,7 +70,7 @@ in {
     };
 
     emoji = {
-      package = pkgs.noto-fonts-emoji;
+      package = pkgs.noto-fonts-color-emoji;
       name = "Noto Color Emoji";
     };
 

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
+  ];
+}

flake.nix

@@ -5,143 +5,131 @@
     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";
-    home-manager.url = "github:nix-community/home-manager/release-25.05";
     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";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
     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.05";
+    stylix.url = "github:danth/stylix/release-25.11";
     telebots.url = "github:kmein/telebots";
     tinc-graph.url = "github:kmein/tinc-graph";
     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";
 
     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-index-database.inputs.nixpkgs.follows = "nixpkgs";
-    nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
-    recht.inputs.flake-utils.follows = "flake-utils";
     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.home-manager.follows = "home-manager";
     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 = {
+  outputs =
-    extra-substituters = [ "https://kmein.cachix.org" ];
+    inputs@{
-    extra-trusted-public-keys = [ "kmein.cachix.org-1:rsJ2b6++VQHJ1W6rGuDUYsK/qUkFA3bNpO6PyEyJ9Ls=" ];
+      self,
-  };
+      nixpkgs,
-
+      nixpkgs-unstable,
-  outputs = inputs @ {
+      nur,
-    self,
+      home-manager,
-    nixpkgs,
+      agenix,
-    nixpkgs-unstable,
+      retiolum,
-    nur,
+      nixinate,
-    home-manager,
+      flake-utils,
-    agenix,
+      nix-index-database,
-    retiolum,
+      stylix,
-    nixinate,
+      ...
-    flake-utils,
+    }:
-    nix-on-droid,
+    let
-    stylix,
+      lib = nixpkgs.lib;
-    ...
+      eachSupportedSystem = lib.genAttrs lib.systems.flakeExposed;
-  }:
+    in
     {
       apps = {
-        x86_64-darwin = let
+        x86_64-linux =
-          pkgs = nixpkgs.legacyPackages.x86_64-darwin;
+          let
-        in {
+            pkgs = nixpkgs.legacyPackages.x86_64-linux;
-          deploy-maakaron = {
+            lib = nixpkgs.lib;
-            type = "app";
+          in
-            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
           nixinate.nixinate.x86_64-linux self
           // {
             mock-secrets = {
               type = "app";
-              program = toString (pkgs.writers.writeDash "mock-secrets" ''
+              program = toString (
-                ${pkgs.findutils}/bin/find secrets -not -path '*/.*' -type f  | ${pkgs.coreutils}/bin/sort > secrets.txt
+                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
+          // builtins.listToAttrs (
-            externalNetwork = import ./lib/external-network.nix;
+            map (
-            targets = {
+              hostname:
-              ful = "root@ful";
+              let
-              zaatar = "root@zaatar";
+                targets = {
-              makanek = "root@makanek";
+                  ful = "root@ful";
-              manakish = "root@manakish";
+                  zaatar = "root@zaatar";
-              tahina = "root@tahina";
+                  makanek = "root@makanek";
-              tabula = "root@tabula";
+                  manakish = "root@manakish";
-              kabsa = "root@kabsa";
+                  tahina = "root@tahina";
-              fatteh = "root@fatteh";
+                  tabula = "root@tabula";
-              kibbeh = "root@kibbeh";
+                  kabsa = "root@kabsa";
-            };
+                  fatteh = "root@fatteh";
-          in
+                  kibbeh = "root@kibbeh";
-            lib.attrsets.nameValuePair "deploy-${hostname}" {
+                };
-              type = "app";
+              in
-              program = toString (pkgs.writers.writeDash "deploy-${hostname}" ''
+              lib.attrsets.nameValuePair "deploy-${hostname}" {
-                exec ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch \
+                type = "app";
-                  --max-jobs 2 \
+                program = toString (
-                  --log-format internal-json \
+                  pkgs.writers.writeDash "deploy-${hostname}" ''
-                  --flake .#${hostname} \
+                    exec ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch \
-                  --target-host ${targets.${hostname}} 2>&1 \
+                      --max-jobs 2 \
-                  | ${pkgs.nix-output-monitor}/bin/nom --json
+                      --log-format internal-json \
-              '');
+                      --flake .#${hostname} \
-            }) (builtins.attrNames self.nixosConfigurations))
+                      --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" ''
+              program = toString (
-                exec ${pkgs.nix}/bin/nix run .#nixinate.ful \
+                pkgs.writers.writeDash "deploy-ful" ''
-                  --log-format internal-json 2>&1 \
+                  exec ${pkgs.nix}/bin/nix run .#nixinate.ful \
-                  | ${pkgs.nix-output-monitor}/bin/nom --json
+                    --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;
@@ -156,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 {
@@ -210,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
@@ -255,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
@@ -288,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
           ];
@@ -301,6 +256,7 @@
             retiolum.nixosModules.retiolum
             home-manager.nixosModules.home-manager
             nur.modules.nixos.default
+            nix-index-database.nixosModules.default
             stylix.nixosModules.stylix
           ];
         };
@@ -313,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
+      packages = eachSupportedSystem (system: let
-      pkgs = import nixpkgs {
+        pkgs = import nixpkgs {
-        inherit system;
+          inherit system;
-        config.allowUnfree = true;
+          config.allowUnfree = true;
-        overlays = [
+          overlays = [
-          nur.overlays.default
+            nur.overlays.default
-          (self: super: {
+            (self: super: {
-            mpv = super.mpv.override {scripts = [inputs.self.packages.${system}.mpv-visualizer super.mpvScripts.mpris];};
+              mpv = super.mpv.override {scripts = [super.mpvScripts.visualizer super.mpvScripts.mpris];};
-            dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
+              dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
-          })
+            })
-        ];
+          ];
-      };
+        };
-      unstablePackages = import nixpkgs-unstable {
+        wrapScript = {
-        inherit system;
+          packages ? [],
-      };
+          name,
-      wrapScript = {
+          script,
-        packages ? [],
+        }:
-        name,
+          pkgs.writers.writeDashBin name ''PATH=$PATH:${nixpkgs.lib.makeBinPath (packages ++ [pkgs.findutils pkgs.coreutils pkgs.gnused pkgs.gnugrep])} ${script} "$@"'';
-        script,
+      in {
-      }:
+        # linguistics and ancient world
-        pkgs.writers.writeDashBin name ''PATH=$PATH:${nixpkgs.lib.makeBinPath (packages ++ [pkgs.findutils pkgs.coreutils pkgs.gnused pkgs.gnugrep])} ${script} "$@"'';
-    in {
-      packages = rec {
         auc = pkgs.callPackage packages/auc.nix {};
         betacode = pkgs.callPackage packages/betacode.nix {};
-        brainmelter = pkgs.callPackage packages/brainmelter.nix {};
+        brassica = pkgs.callPackage packages/brassica.nix {}; # TODO upstream
-        brassica = pkgs.callPackage packages/brassica.nix {};
+        devanagari = pkgs.callPackage packages/devanagari {};
-        cheat-sh = pkgs.callPackage packages/cheat-sh.nix {};
+        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 {};
+        man-pandoc = pkgs.callPackage packages/man/pandoc.nix {}; # TODO upstream
-        literature-quote = pkgs.callPackage packages/literature-quote.nix {};
-        mahlzeit = pkgs.haskellPackages.callPackage packages/mahlzeit.nix {};
-        man-pandoc = pkgs.callPackage packages/man/pandoc.nix {};
         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 {};
+        opustags = pkgs.callPackage packages/opustags.nix {}; # TODO upstream
-        pls = pkgs.callPackage packages/pls.nix {};
-        polyglot = pkgs.callPackage packages/polyglot.nix {};
         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 {}; # TODO upstream
-        go-webring = pkgs.callPackage packages/go-webring.nix {};
         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 {}; # TODO upstream
-        text2pdf = pkgs.callPackage packages/text2pdf.nix {};
         timer = pkgs.callPackage packages/timer.nix {};
-        tocharian-font = pkgs.callPackage packages/tocharian-font.nix {};
+        trans = pkgs.callPackage packages/trans.nix {}; # TODO upstream
-        trans = pkgs.callPackage packages/trans.nix {};
         ttspaste = pkgs.callPackage packages/ttspaste.nix {};
         unicodmenu = pkgs.callPackage packages/unicodmenu.nix {};
         emailmenu = pkgs.callPackage packages/emailmenu.nix {};
-        stag = pkgs.callPackage packages/stag.nix {};
+        stag = pkgs.callPackage packages/stag.nix {}; # TODO upstream
-        untilport = pkgs.callPackage packages/untilport.nix {};
         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-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix {}; # TODO upstream
-        vimPlugins-cheat-sh-vim = pkgs.callPackage packages/vimPlugins/cheat-sh.nix {};
+        vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix {}; # TODO upstream
-        vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix {};
+        vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix {}; # TODO upstream
-        vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix {};
+        vimPlugins-mdwa-nvim = pkgs.callPackage packages/vimPlugins/mdwa-nvim.nix {}; # TODO upstream
-        vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix {};
+        vimPlugins-vim-ernest = pkgs.callPackage packages/vimPlugins/vim-ernest.nix {}; # TODO upstream
-        vimPlugins-mdwa-nvim = pkgs.callPackage packages/vimPlugins/mdwa-nvim.nix {};
+        vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix {}; # TODO upstream
-        vimPlugins-vim-ernest = pkgs.callPackage packages/vimPlugins/vim-ernest.nix {};
+        vimPlugins-vim-colors-paramount = pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix {}; # TODO upstream
-        vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix {};
+        vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix {}; # TODO upstream
-        vimPlugins-vim-colors-paramount = pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix {};
+        vimPlugins-vim-fsharp = pkgs.callPackage packages/vimPlugins/vim-fsharp.nix {}; # TODO upstream
-        vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix {};
+        vimPlugins-vim-mail = pkgs.callPackage packages/vimPlugins/vim-mail.nix {}; # TODO upstream
-        vimPlugins-vim-fsharp = pkgs.callPackage packages/vimPlugins/vim-fsharp.nix {};
+        vimPlugins-vim-reason-plus = pkgs.callPackage packages/vimPlugins/vim-reason-plus.nix {}; # TODO upstream
-        vimPlugins-vim-mail = pkgs.callPackage packages/vimPlugins/vim-mail.nix {};
-        vimPlugins-vim-reason-plus = pkgs.callPackage packages/vimPlugins/vim-reason-plus.nix {};
         vimv = pkgs.callPackage packages/vimv.nix {};
-        weechat-declarative = pkgs.callPackage packages/weechat-declarative.nix {};
+        weechat-declarative = pkgs.callPackage packages/weechat-declarative.nix {}; # TODO upstream
-        weechatScripts-hotlist2extern = pkgs.callPackage packages/weechatScripts/hotlist2extern.nix {};
+        weechatScripts-hotlist2extern = pkgs.callPackage packages/weechatScripts/hotlist2extern.nix {}; # TODO upstream
-        wttr = pkgs.callPackage packages/wttr.nix {};
+        dmenu-randr = pkgs.callPackage packages/dmenu-randr.nix {};
-
+        wttr = pkgs.callPackage packages/wttr.nix {}; # TODO upstream
-        itl = pkgs.callPackage packages/itl.nix {};
-        itools = pkgs.callPackage packages/itools.nix {itl = itl;};
 
         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];
         };
-      };
+      });
-    });
+    };
 }

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";
+      station = "Kral FM Xanthi";
-      stream = "http://radio.hostchefs.net:8046/stream?1520818130148";
-      tags = [tags.greek];
-    }
-    {
-      station = "XXX turkish or greek";
       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";

lib/vim/init.lua

@@ -155,10 +155,11 @@ local language_servers = {
 }
 
 for server, settings in pairs(language_servers) do
-  require('lspconfig')[server].setup{
+  vim.lsp.config(server, {
     on_attach = on_attach,
     flags = lsp_flags,
     settings = settings,
     capabilities = capabilities
-  }
+  })
+  vim.lsp.enable(server)
 end

lib/vim/init.vim

@@ -102,6 +102,7 @@ augroup filetypes
   autocmd bufnewfile,bufread urls,config set filetype=conf
   autocmd bufnewfile,bufread *.elm packadd elm-vim | set filetype=elm shiftwidth=4
   autocmd bufnewfile,bufread *.md packadd vim-pandoc | packadd vim-pandoc-syntax | set filetype=pandoc
+  autocmd bufnewfile,bufread *.ex,*.exs packadd vim-elixir | set filetype=elixir
   autocmd filetype haskell packadd haskell-vim | set keywordprg=hoogle\ -i
   autocmd filetype javascript packadd vim-javascript
   autocmd filetype make setlocal noexpandtab
@@ -129,9 +130,7 @@ autocmd! User GoyoEnter Limelight
 autocmd! User GoyoLeave Limelight!
 
 
-" Disable Copilot for files larger than 100kb
+" Disable Copilot by default
-autocmd BufReadPre *
+let b:copilot_enabled = v:false
-    \ let f=getfsize(expand("<afile>"))
+" keymap to toggle it enabled
-    \ | if f > 100000 || f == -2
+nnoremap <leader>gc :let b:copilot_enabled = !b:copilot_enabled<CR>
-    \ | let b:copilot_enabled = v:false
-    \ | endif

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;
-  };
-}

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.
             '';

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/"$*"
 ''

packages/cro.nix

@@ -1,10 +1,10 @@
-{ writers, chromium }:
+{ coreutils, chromium }:
-writers.writeDashBin "cro" ''
+chromium.override {
-  ${chromium}/bin/chromium \
+  commandLineArgs = [
-    --disable-sync \
+    "--disable-sync"
-    --no-default-browser-check \
+    "--no-default-browser-check"
-    --no-first-run \
+    "--no-first-run"
-    --user-data-dir="$(mktemp -d)" \
+    "--user-data-dir=$(${coreutils}/bin/mktemp -d)"
-    --incognito \
+    "--incognito"
-    "$@"
+  ];
-''
+}

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
-  '';
-}

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
-''

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
-''

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
-''

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
-''

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
-''

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"
-''

packages/hc.nix

@@ -9,7 +9,7 @@
   gnugrep,
   qrencode,
   texlive,
-  utillinux,
+  util-linux,
   zbar,
 }:
 stdenv.mkDerivation rec {
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
       gnugrep
       qrencode
       texlive.combined.scheme-full
-      utillinux
+      util-linux
       zbar
     ]}
   '';

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
   ''

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
-  '';
-}

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 -
-''

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;
-  };
-}

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
-  '';
-}

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=";
-}

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;
-}

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("ä";"ä") |
-            gsub("ö";"ö") |
-            gsub("ü";"ü") |
-            gsub("Ä";"Ä") |
-            gsub("Ö";"Ö") |
-            gsub("Ü";"Ü") |
-            gsub("ß";"ß")
-            ;
-          [
-            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
-''

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
-''

packages/pls.nix

@@ -1,6 +1,7 @@
 {
   lib,
   writers,
+  yt-dlp,
   miller,
   gnused,
   curl,
@@ -95,6 +96,10 @@
     "ich kann damit leben"
     "es ist was es ist"
   ];
+
+  download = writers.writeDash "download" ''
+    ${yt-dlp}/bin/yt-dlp --add-metadata --audio-format mp3 --audio-quality 0 -xic "$@"
+  '';
 in
   writers.writeDashBin "pls" ''
     case "$1" in

packages/rfc.nix

@@ -1,10 +1,8 @@
 {
   writers,
   curl,
-  pup,
   gawk,
   gnused,
-  gnugrep,
   less,
   fzf,
 }:

packages/vim.nix

@@ -81,6 +81,7 @@
         dhall-vim
         elm-vim
         emmet-vim
+        vim-elixir
         haskell-vim
         niveumPackages.vimPlugins-icalendar-vim
         niveumPackages.vimPlugins-jq-vim

packages/vimPlugins/cheat-sh.nix

@@ -1,7 +1,7 @@
 {
   vimUtils,
   fetchFromGitHub,
-}: (vimUtils.buildVimPluginFrom2Nix {
+}: (vimUtils.buildVimPlugin {
   pname = "cheat.sh-vim";
   version = "826219d1";
   src = fetchFromGitHub {

packages/vimPlugins/icalendar-vim.nix

@@ -1,7 +1,7 @@
 {
   vimUtils,
   fetchFromGitHub,
-}: (vimUtils.buildVimPluginFrom2Nix {
+}: (vimUtils.buildVimPlugin {
   pname = "icalendar.vim";
   version = "542fff45";
   src = fetchFromGitHub {

packages/vimPlugins/jq-vim.nix

@@ -2,7 +2,7 @@
   vimUtils,
   fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix {
+vimUtils.buildVimPlugin {
   pname = "jq.vim";
   version = "5baf8ed1";
   src = fetchFromGitHub {

packages/vimPlugins/mdwa-nvim.nix

@@ -1,8 +1,7 @@
 {
   vimUtils,
   fetchFromGitHub,
-  lib,
+}: (vimUtils.buildVimPlugin {
-}: (vimUtils.buildVimPluginFrom2Nix {
   pname = "mdwa.nvim";
   version = "9f37270";
   src = fetchFromGitHub {

packages/vimPlugins/typst-vim.nix

@@ -2,7 +2,7 @@
   vimUtils,
   fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix {
+vimUtils.buildVimPlugin {
   pname = "typst.vim";
   version = "2882f21";
   src = fetchFromGitHub {

packages/vimPlugins/vim-256noir.nix

@@ -2,7 +2,7 @@
   vimUtils,
   fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix {
+vimUtils.buildVimPlugin {
   pname = "vim-256noir";
   version = "e8668a18";
   src = fetchFromGitHub {

packages/vimPlugins/vim-colors-paramount.nix

@@ -2,7 +2,7 @@
   vimUtils,
   fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix rec {
+vimUtils.buildVimPlugin {
   pname = "vim-colors-paramount";
   version = "a5601d36";
   src = fetchFromGitHub {

packages/vimPlugins/vim-ernest.nix

@@ -2,7 +2,7 @@
   vimUtils,
   fetchFromGitHub,
   lib,
-}: (vimUtils.buildVimPluginFrom2Nix {
+}: (vimUtils.buildVimPlugin {
   pname = "vim-ernest";
   version = "4b99bc3";
   src = fetchFromGitHub {

packages/vimPlugins/vim-fetch.nix

@@ -1,7 +1,7 @@
 {
   vimUtils,
   fetchFromGitHub,
-}: (vimUtils.buildVimPluginFrom2Nix rec {
+}: (vimUtils.buildVimPlugin {
   pname = "vim-fetch";
   version = "76c08586";
   src = fetchFromGitHub {

packages/vimPlugins/vim-fsharp.nix

@@ -2,7 +2,7 @@
   vimUtils,
   fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix {
+vimUtils.buildVimPlugin {
   pname = "vim-fsharp";
   version = "627db7d7";
   src = fetchFromGitHub {

packages/vimPlugins/vim-mail.nix

@@ -2,7 +2,7 @@
   vimUtils,
   fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix {
+vimUtils.buildVimPlugin {
   pname = "vim-mail";
   version = "acdbb5bd";
   src = fetchFromGitHub {

packages/vimPlugins/vim-reason-plus.nix

@@ -1,7 +1,7 @@
 {
   vimUtils,
   fetchFromGitHub,
-}: (vimUtils.buildVimPluginFrom2Nix {
+}: (vimUtils.buildVimPlugin {
   pname = "vim-reason-plus";
   version = "c11a2940";
   src = fetchFromGitHub {

packages/weechat-declarative.nix

@@ -1,7 +1,6 @@
 {
   pkgs,
   lib,
-  unstablePackages,
   ...
 } @ args: let
   # config cannot be declared in the input attribute set because that would
@@ -137,7 +136,7 @@
     ))
   );
 
-  weechat = unstablePackages.weechat.override {
+  weechatPkg = pkgs.weechat.override {
     configure = _: {
       init = "/exec -oc cat ${setFile}";
 
@@ -163,14 +162,14 @@
         cfg.files
       )
     }
-    exec ${weechat}/bin/weechat "$@"
+    exec ${weechatPkg}/bin/weechat "$@"
   '';
 in
   pkgs.symlinkJoin {
     name = "weechat-configured";
     paths = [
       wrapper
-      unstablePackages.weechat
+      weechatPkg
     ];
     postBuild = ''
       ln -s ${setFile} $out/weechat.set

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;
 

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";

systems/ful/ical-ephemeris.nix

@@ -1,24 +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;
-    baseUrl = "https://ical-ephemeris.kmein.de";
-  };
-
-  age.secrets.brevo-key = {
-    file = ../../secrets/brevo-key.age;
-  };
-}

systems/ful/matomo.nix

@@ -21,7 +21,7 @@ in {
     nginx = {
       serverName = "matomo.kmein.de";
     };
-    package = pkgs.matomo_5;
+    package = pkgs.matomo;
   };
 
   services.mysql = {

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
+        '';
+      };
+  };
+}

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)
-

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 = {

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
     ];
   };

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
-
-
-*/

systems/makanek/configuration.nix

@@ -13,7 +13,7 @@ in {
     ./menstruation.nix
     ./moinbot.nix
     ./monitoring
-    ./names.nix
+    # ./names.nix
     ./nextcloud.nix
     ../../configs/mycelium.nix
     ./radio-news.nix

systems/makanek/gitea.nix

@@ -7,8 +7,10 @@ in {
     defaultOptions.settings = {
       USER_DEFINED_DEFAULT = true;
     };
-    instances = {
+    instances = let instance = "gitea"; in {
-      "gitea".settings = {
+      ${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;

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 {
+in
-  services.htgen.tarot = {
+{
-    port = tarotPort;
+  systemd.services.tarot = {
-    script = ''. ${pkgs.writers.writeDash "tarot" ''
+    enable = true;
-        case "$Method $Request_URI" in
+    serviceConfig.Type = "simple";
-          "GET /")
+    wantedBy = [ "multi-user.target" ];
-            if item=$(${pkgs.findutils}/bin/find ${toString tarotFiles} -type f | ${pkgs.coreutils}/bin/shuf -n1); then
+    serviceConfig.ExecStart = pkgs.writers.writePython3 "tarot-server" {
-              card=$(mktemp --tmpdir tarot.XXX)
+      libraries = py: [ py.pillow py.flask ];
-              trap 'rm $card' EXIT
+    } ''
-              reverse=$(${pkgs.coreutils}/bin/shuf -i0-1 -n1)
+      from flask import Flask, send_file
-              if [ "$reverse" -eq 1 ]; then
+      from pathlib import Path
-                ${pkgs.imagemagick}/bin/convert -rotate 180 "$item" "$card"
+      from random import choice, randint
-              else
+      from io import BytesIO
-                ${pkgs.coreutils}/bin/cp "$item" "$card"
+      from PIL import Image
-              fi
+
-              printf 'HTTP/1.1 200 OK\r\n'
+      app = Flask(__name__)
-              printf 'Content-Type: %s\r\n' "$(${pkgs.file}/bin/file -ib "$card")"
+      TAROT_DIR = Path("${tarotFiles}")
-              printf 'Server: %s\r\n' "$Server"
+
-              printf 'Connection: close\r\n'
+
-              printf 'Content-Length: %d\r\n' $(${pkgs.coreutils}/bin/wc -c < "$card")
+      @app.route("/")
-              printf '\r\n'
+      def tarot():
-              cat "$card"
+          card_path = choice(list(TAROT_DIR.glob("*")))
-              exit
+
-            fi
+          with Image.open(card_path) as img:
-          ;;
+              if randint(0, 1):
-        esac
+                  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" [
           {

systems/makanek/weechat.nix

@@ -1,15 +1,11 @@
 {
   lib,
   pkgs,
-  config,
-  unstablePackages,
   ...
 }: let
   inherit (import ../../lib) kieran;
   weechatHome = "/var/lib/weechat";
-  weechat-declarative = pkgs.callPackage ../../packages/weechat-declarative.nix {
+  weechat-declarative = pkgs.callPackage ../../packages/weechat-declarative.nix {};
-    inherit unstablePackages;
-  };
 in {
   systemd.services.weechat = let
     tmux = pkgs.writers.writeDash "tmux" ''

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";

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
-    utillinux
-    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
-  '';
-}

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 = [