use substituteInPlace

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)

.bin/mp3player-write

@@ -0,0 +1,114 @@
+#!/usr/bin/env bash
+
+# Usage:
+# ./mp3_transfer.sh -s 1.3 /mnt/mp3player file1.m4a file2.m4a ...
+
+set -e
+
+# Default speed
+SPEED=1.0
+
+# Parse options
+while getopts ":s:" opt; do
+  case $opt in
+    s)
+      SPEED=$OPTARG
+      ;;
+    \?)
+      echo "Invalid option: -$OPTARG" >&2
+      exit 1
+      ;;
+    :)
+      echo "Option -$OPTARG requires a value." >&2
+      exit 1
+      ;;
+  esac
+done
+
+# Shift past the options
+shift $((OPTIND -1))
+
+# Check arguments
+if [ "$#" -lt 2 ]; then
+  echo "Usage: $0 [-s speed] MOUNT_POINT FILE1 [FILE2 ...]"
+  exit 1
+fi
+
+MOUNT_POINT=$1
+shift
+FILES=("$@")
+
+# Check mount point exists
+if [ ! -d "$MOUNT_POINT" ]; then
+  echo "Error: Mount point '$MOUNT_POINT' does not exist."
+  exit 1
+fi
+
+# Estimate required space
+TOTAL_SIZE=0
+for f in "${FILES[@]}"; do
+  if [ ! -f "$f" ]; then
+    echo "Warning: File '$f' does not exist, skipping."
+    continue
+  fi
+  # Get file size in bytes
+  FILE_SIZE=$(stat --printf="%s" "$f")
+  # Estimate mp3 output size: roughly 1/2 of original m4a (adjust if needed)
+  TOTAL_SIZE=$((TOTAL_SIZE + FILE_SIZE / 2))
+done
+
+# Get available space in bytes
+AVAILABLE=$(df --output=avail "$MOUNT_POINT" | tail -n 1)
+AVAILABLE=$((AVAILABLE * 1024))  # df reports in KB
+
+if [ "$TOTAL_SIZE" -gt "$AVAILABLE" ]; then
+  echo "Error: Not enough space on device. Required: $TOTAL_SIZE bytes, Available: $AVAILABLE bytes"
+  exit 1
+fi
+
+echo "Enough space available. Starting conversion..."
+
+sanitize_filename() {
+  local name="$1"
+  # Remove path, keep only base name
+  name=$(basename "$name" .m4a)
+  # Replace spaces and special chars with underscore
+  name=$(echo "$name" | tr ' ' '_' | tr -cd '[:alnum:]_-')
+  # Truncate to max 50 chars
+  echo "${name:0:50}"
+}
+
+# Convert and copy files
+for f in "${FILES[@]}"; do
+  if [ ! -f "$f" ]; then
+    continue
+  fi
+
+  # Determine the next prefix
+  existing_prefixes=$(ls "$MOUNT_POINT" | grep -E '^[0-9].*\.mp3$' | sed -E 's/^([0-9]).*/\1/' | sort -n | uniq)
+  for i in {0..9}; do
+    if ! echo "$existing_prefixes" | grep -q "^$i$"; then
+      PREFIX=$i
+      break
+    fi
+  done
+
+  echo "Using prefix: $PREFIX"
+
+  BASENAME=$(sanitize_filename "$f")
+  OUT_PATTERN="$MOUNT_POINT/${PREFIX}%02d_${BASENAME}.mp3"
+
+  echo "Converting '$f' to '$OUT_PATTERN' at speed $SPEED..."
+
+  ffmpeg -i "$f" \
+    -filter:a "atempo=$SPEED" -ar 44100 -ac 2 -c:a libmp3lame -b:a 128k \
+    -f segment -segment_time 300 \
+    "$OUT_PATTERN"
+
+  # Update prefix for next file
+  # Count how many segments were created
+  SEG_COUNT=$(ls "$MOUNT_POINT" | grep -E "^${PREFIX}[0-9]{2}_" | wc -l)
+  PREFIX=$((PREFIX + SEG_COUNT))
+done
+
+echo "All files processed successfully."

README.md

@@ -1,5 +1,7 @@
 # niveum
 
+> I must Create a System, or be enslav'd by another Man's. —William Blake
+
 > [nĭvĕus](https://logeion.uchicago.edu/niveus), a, um, adj. [nix], _of_ or _from snow, snowy, snow-_ (poet.)
 >
 > 1. Lit.: aggeribus niveis informis, Verg. G. 3, 354: aqua, _cooled with snow_, Mart. 12, 17, 6; cf. id. 14, 104 and 117: mons, _covered with snow_, Cat. 64, 240.—

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 =
     [
@@ -85,7 +85,7 @@ in {
     '';
   in
     {
-      nixi = "nix repl '<nixpkgs>'";
+      nixi = "nix repl nixpkgs";
       take = "source ${take}";
       wcd = "source ${wcd}";
       where = "source ${where}";

configs/aerc.nix

@@ -4,18 +4,20 @@
   lib,
   niveumPackages,
   ...
-}: let
+}:
+let
   inherit (import ../lib/email.nix) defaults thunderbirdProfile;
-in {
+in
+{
   age.secrets = {
-    email-password-cock = {
+    email-password-ical-ephemeris = {
-      file = ../secrets/email-password-cock.age;
+      file = ../secrets/email-password-ical-ephemeris.age;
       owner = config.users.users.me.name;
       group = config.users.users.me.group;
       mode = "400";
     };
-    email-password-letos = {
+    email-password-cock = {
-      file = ../secrets/email-password-letos.age;
+      file = ../secrets/email-password-cock.age;
       owner = config.users.users.me.name;
       group = config.users.users.me.group;
       mode = "400";
@@ -50,7 +52,8 @@ in {
 
     programs.mbsync = {
       enable = true;
-      extraConfig = lib.concatStringsSep "\n\n" (lib.mapAttrsToList (name: account: ''
+      extraConfig = lib.concatStringsSep "\n\n" (
+        lib.mapAttrsToList (name: account: ''
           IMAPAccount ${name}
           CertificateFile /etc/ssl/certs/ca-certificates.crt
           Host ${account.imap.host}
@@ -74,46 +77,55 @@ in {
           Patterns *
           Remove None
           SyncState *
-        '')
+        '') config.home-manager.users.me.accounts.email.accounts
-        config.home-manager.users.me.accounts.email.accounts);
+      );
     };
 
     accounts.email.accounts = {
       cock =
-        lib.recursiveUpdate defaults
+        let
-        rec {
+          mailhost = "mail.cock.li";
           address = "2210@cock.li";
+        in
+        lib.recursiveUpdate defaults {
+          address = address;
           userName = address;
           passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-cock.path}";
           realName = "2210";
-          imap.host = "mail.cock.li";
+          imap.host = mailhost;
           imap.port = 993;
-          smtp.host = imap.host;
+          smtp.host = mailhost;
           smtp.port = 25;
           smtp.tls.useStartTls = true;
         };
-      letos =
+      ical-ephemeris =
-        lib.recursiveUpdate defaults
+        let
-        {
+          address = "ical.ephemeris@web.de";
-          userName = "slfletos";
+        in
-          address = "letos.sprachlit@hu-berlin.de";
+        lib.recursiveUpdate defaults {
-          passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-letos.path}";
+          userName = address;
-          imap.host = "mailbox.cms.hu-berlin.de";
+          realName = "Kieran from iCal Ephemeris";
+          address = address;
+          passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-ical-ephemeris.path}";
+          imap.host = "imap.web.de";
           imap.port = 993;
-          smtp.host = "mailhost.cms.hu-berlin.de";
+          smtp.host = "smtp.web.de";
-          smtp.port = 25;
+          smtp.port = 587;
           smtp.tls.useStartTls = true;
         };
       posteo =
-        lib.recursiveUpdate defaults
+        let
-        rec {
+          mailhost = "posteo.de";
           address = "kieran.meinhardt@posteo.net";
-          aliases = ["kmein@posteo.de"];
+        in
+        lib.recursiveUpdate defaults {
+          address = address;
+          aliases = [ "kmein@posteo.de" ];
           userName = address;
-          imap.host = "posteo.de";
+          imap.host = mailhost;
           imap.port = 993;
           imap.tls.enable = true;
-          smtp.host = imap.host;
+          smtp.host = mailhost;
           smtp.port = 465;
           smtp.tls.enable = true;
           primary = true;
@@ -140,10 +152,8 @@ in {
           "msgcompose.text_color" = config.lib.stylix.colors.withHashtag.base00;
           "msgcompose.background_color" = config.lib.stylix.colors.withHashtag.base05;
         };
-        userChrome = ''
+        userChrome = '''';
-        '';
+        userContent = '''';
-        userContent = ''
-        '';
         withExternalGnupg = false;
       };
     };
@@ -278,7 +288,9 @@ in {
         ui.spinner = ". , .";
         general.unsafe-accounts-conf = true;
         general.pgp-provider = "gpg";
-        viewer = {pager = "${pkgs.less}/bin/less -R";};
+        viewer = {
+          pager = "${pkgs.less}/bin/less -R";
+        };
         compose = {
           # address-book-cmd = "khard email --remove-first-line --parsable '%s'";
           no-attachment-warning = "(attach|attached|attachments?|anbei|Anhang|angehängt|beigefügt)";
@@ -295,24 +307,26 @@ in {
           "message/rfc822" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
           "application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
         };
-        openers = let
+        openers =
-          as-pdf = pkgs.writers.writeDash "as-pdf" ''
+          let
-            d=$(mktemp -d)
+            as-pdf = pkgs.writers.writeDash "as-pdf" ''
-            trap clean EXIT
+              d=$(mktemp -d)
-            clean() {
+              trap clean EXIT
-              rm -rf "$d"
+              clean() {
-            }
+                rm -rf "$d"
-            ${pkgs.libreoffice}/bin/libreoffice --headless --convert-to pdf "$1" --outdir "$d"
+              }
-            ${pkgs.zathura}/bin/zathura "$d"/*.pdf
+              ${pkgs.libreoffice}/bin/libreoffice --headless --convert-to pdf "$1" --outdir "$d"
-          '';
+              ${pkgs.zathura}/bin/zathura "$d"/*.pdf
-        in {
+            '';
-          "image/*" = "${pkgs.nsxiv}/bin/nsxiv";
+          in
-          "application/pdf" = "${pkgs.zathura}/bin/zathura";
+          {
-          "application/vnd.openxmlformats-officedocument.wordprocessingml.document" = toString as-pdf;
+            "image/*" = "${pkgs.nsxiv}/bin/nsxiv";
-          "application/vnd.oasis.opendocument.text" = toString as-pdf;
+            "application/pdf" = "${pkgs.zathura}/bin/zathura";
-          "video/*" = "${pkgs.mpv}/bin/mpv";
+            "application/vnd.openxmlformats-officedocument.wordprocessingml.document" = toString as-pdf;
-          "audio/*" = "${pkgs.mpv}/bin/mpv";
+            "application/vnd.oasis.opendocument.text" = toString as-pdf;
-        };
+            "video/*" = "${pkgs.mpv}/bin/mpv";
+            "audio/*" = "${pkgs.mpv}/bin/mpv";
+          };
       };
 
       templates = {

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/smyth.nix

@@ -20,15 +20,31 @@
     command = toString (pkgs.writers.writeDash "random-smyth" ''
       set -efu
 
+      good_curl() {
+        ${pkgs.curl}/bin/curl "$@" \
+          --compressed \
+          -H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8' \
+          -H 'Accept-Language: en-US,en;q=0.5' \
+          -H 'DNT: 1' \
+          -H 'Connection: keep-alive' \
+          -H 'Upgrade-Insecure-Requests: 1' \
+          -H 'Sec-Fetch-Dest: document' \
+          -H 'Sec-Fetch-Mode: navigate' \
+          -H 'Sec-Fetch-Site: cross-site' \
+          -H 'Priority: u=0, i' \
+          -H 'Pragma: no-cache' \
+          -H 'Cache-Control: no-cache'
+      }
+
       RANDOM_SECTION=$(
-        ${pkgs.curl}/bin/curl -sSL http://www.perseus.tufts.edu/hopper/xmltoc?doc=Perseus%3Atext%3A1999.04.0007%3Asmythp%3D1 \
+        good_curl -sSL http://www.perseus.tufts.edu/hopper/xmltoc?doc=Perseus%3Atext%3A1999.04.0007%3Asmythp%3D1 \
           | ${pkgs.gnugrep}/bin/grep -o 'ref="[^"]*"' \
           | ${pkgs.coreutils}/bin/shuf -n1 \
           | ${pkgs.gnused}/bin/sed 's/^ref="//;s/"$//'
       )
 
       url="http://www.perseus.tufts.edu/hopper/text?doc=$RANDOM_SECTION"
-      ${pkgs.curl}/bin/curl -sSL "$url"\
+      good_curl -sSL "$url"\
         | ${pkgs.htmlq}/bin/htmlq '#text_main' \
         | ${pkgs.gnused}/bin/sed 's/<\/\?hr>//g' \
         | ${pkgs.pandoc}/bin/pandoc -f html -t plain --wrap=none

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
   ];
@@ -82,5 +82,9 @@
     };
   };
 
+  home-manager.users.me = {
+    stylix.targets.firefox.profileNames = ["default"];
+  };
+
   environment.variables.BROWSER = "firefox";
 }

configs/ccc.nix

@@ -1,8 +1,9 @@
 {pkgs, ...}:
 # https://paste.sr.ht/~erictapen/11716989e489b600f237041b6d657fdf0ee17b34
 let
-  certificate = pkgs.stdenv.mkDerivation rec {
+  name = "dst-root-ca-x3.pem";
-    name = "dst-root-ca-x3.pem";
+  certificate = pkgs.stdenv.mkDerivation {
+    inherit name;
     src = builtins.toFile "${name}.sed" ''
       1,/DST Root CA X3/d
       1,/-----END CERTIFICATE-----/p

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"
           ];
         };
       };
@@ -106,7 +102,7 @@ in
           zathura = swallow "${pkgs.zathura}/bin/zathura";
           im = "${pkgs.openssh}/bin/ssh weechat@makanek -t tmux attach-session -t IM";
           yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
-          yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata --audio-format opus --audio-quality 0 -xic"; # Download with audio
+          yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata --audio-format mp3 --audio-quality 0 -xic"; # Download with audio
         };
     }
     {
@@ -139,15 +135,14 @@ in
         };
       };
     }
-    { programs.command-not-found.enable = true; }
     {
       programs.gnupg = {
         agent = {
           enable = true;
           pinentryPackage = pkgs.pinentry-qt;
-          settings = rec {
+          settings = let defaultCacheTtl = 2 * 60 * 60; in {
-            default-cache-ttl = 2 * 60 * 60;
+            default-cache-ttl = defaultCacheTtl;
-            max-cache-ttl = 4 * default-cache-ttl;
+            max-cache-ttl = 4 * defaultCacheTtl;
           };
         };
       };
@@ -166,7 +161,7 @@ in
     }
     {
       services.getty = {
-        greetingLine = lib.mkForce "";
+        greetingLine = lib.mkForce "As-salamu alaykum wa rahmatullahi wa barakatuh!";
         helpLine = lib.mkForce "";
       };
     }
@@ -215,13 +210,12 @@ in
     ./direnv.nix
     ./docker.nix
     ./dunst.nix
-    ./flix.nix
     ./fonts.nix
     ./fzf.nix
     ./git.nix
     ./hledger.nix
     ./htop.nix
-    ./fu-berlin.nix
+    ./uni.nix
     ./i3.nix
     ./i3status-rust.nix
     ./keyboard.nix
@@ -236,9 +230,8 @@ in
     ./nix.nix
     ./newsboat.nix
     ./flameshot.nix
-    ./fritzbox.nix
     ./packages.nix
-    ./picom.nix
+    ./virtualization.nix
     ./stardict.nix
     ./polkit.nix
     ./printing.nix
@@ -262,38 +255,18 @@ in
       '';
     }
     ./tor.nix
-    ./stw-berlin.nix
     ./mastodon-bot.nix
-    {
-      fileSystems."${remoteDir}/fritz" = {
-        device = "//192.168.178.1/FRITZ.NAS/Backup";
-        fsType = "cifs";
-        options = [
-          "username=ftpuser"
-          "password=ftppassword"
-          "noauto"
-          "nounix"
-          "rw"
-          # "noserverino" # ref https://askubuntu.com/a/1265165
-          "uid=${toString config.users.users.me.uid}"
-          "gid=${toString config.users.groups.users.gid}"
-          "x-systemd.automount"
-          "x-systemd.device-timeout=1"
-          "x-systemd.idle-timeout=1min"
-        ];
-      };
-    }
     {
       home-manager.users.me = {
-        xdg.userDirs = rec {
+        xdg.userDirs = let pictures = "${config.users.users.me.home}/cloud/nextcloud/Bilder"; in {
           enable = true;
           documents = "${config.users.users.me.home}/cloud/nextcloud/Documents";
           desktop = "/tmp";
           download = "${config.users.users.me.home}/sync/Downloads";
           music = "${config.users.users.me.home}/mobile/audio";
-          pictures = "${config.users.users.me.home}/cloud/nextcloud/Bilder";
           publicShare = "${config.users.users.me.home}/cloud/nextcloud/tmp";
           videos = pictures;
+          pictures = pictures;
         };
       };
     }

configs/distrobump.nix

@@ -1,15 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
-  imports = [
-    (import <stockholm/makefu/3modules/bump-distrowatch.nix> {
-      inherit lib config;
-      pkgs = pkgs // {writeDash = pkgs.writers.writeDash;};
-    })
-  ];
-
-  makefu.distrobump.enable = false;
-}

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,15 +115,15 @@ in {
       source-serif-pro
       theano
       niveumPackages.tocharian-font
-      vistafonts
+      vista-fonts
       vollkorn
       zilla-slab
     ]; # google-fonts league-of-moveable-type
-    fontconfig.defaultFonts = rec {
+    fontconfig.defaultFonts = let emoji = ["Noto Color Emoji"]; in {
       monospace = ["Noto Sans Mono"] ++ emoji;
       serif = ["Noto Serif" "Noto Naskh Arabic" "Noto Serif Devanagari"];
       sansSerif = ["Noto Sans Display" "Noto Naskh Arabic" "Noto Sans Hebrew" "Noto Sans Devanagari" "Noto Sans CJK JP" "Noto Sans Coptic" "Noto Sans Syriac Western"];
-      emoji = ["Noto Color Emoji"];
+      inherit emoji;
     };
     # xelatex fails with woff files
     # ref https://tex.stackexchange.com/questions/392144/xelatex-and-fontspec-crash-trying-to-find-woff-file-for-some-fonts-but-not-other

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/fysi.nix

@@ -1,55 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (import ../lib/email.nix) defaults;
-  sshIdentity = name: "${config.users.users.me.home}/.ssh/${name}";
-in {
-  age.secrets = {
-    email-password-fysi = {
-      file = ../secrets/email-password-fysi.age;
-      owner = config.users.users.me.name;
-      group = config.users.users.me.group;
-      mode = "400";
-    };
-  };
-
-  home-manager.users.me = {
-    accounts.email.accounts = {
-      fysi =
-        lib.recursiveUpdate defaults
-        rec {
-          address = "kieran@fysi.tech";
-          userName = address;
-          passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-fysi.path}";
-          flavor = "fastmail.com";
-        };
-    };
-
-    programs.ssh.matchBlocks = rec {
-      "nextcloud.fysi.dev" = {
-        hostname = "116.203.82.203";
-        user = "root";
-      };
-      "lingua.miaengiadina.ch" = {
-        hostname = "135.181.85.233";
-        user = "root";
-      };
-      "cms-dev.woc2023.app".identityFile = sshIdentity "fysiweb";
-      "cms-master.woc2023.app".identityFile = sshIdentity "fysiweb";
-      "fysi-dev1" = {
-        hostname = "94.130.229.139";
-        user = "root";
-        identityFile = sshIdentity "fysiweb";
-      };
-      ${fysi-dev1.hostname} = fysi-dev1;
-      "fysi-shared0" = {
-        hostname = "49.12.205.235";
-        user = "root";
-        identityFile = sshIdentity "fysiweb";
-      };
-    };
-  };
-}

configs/fzf.nix

@@ -5,9 +5,11 @@
   };
 
   home-manager.users.me = {
-    programs.fzf = rec {
+    programs.fzf = let
-      enable = true;
       defaultCommand = "${pkgs.fd}/bin/fd --type f --strip-cwd-prefix --follow --no-ignore-vcs --exclude .git";
+    in {
+      enable = true;
+      defaultCommand = defaultCommand;
       defaultOptions = ["--height=40%"];
       changeDirWidgetCommand = "${pkgs.fd}/bin/fd --type d";
       changeDirWidgetOptions = [

configs/gaming.nix

@@ -0,0 +1,19 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = [
+    pkgs.zeroad
+    pkgs.mari0
+    pkgs.luanti # fka minetest
+    # pkgs.openarena
+    # pkgs.teeworlds
+    pkgs.nethack
+    # pkgs.freeciv
+    # pkgs.lincity-ng
+    # pkgs.superTuxKart
+  ];
+  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

@@ -5,11 +5,6 @@
   niveumPackages,
   ...
 }: let
-  dashboard = pkgs.writers.writeDashBin "dashboard" ''
-    ${pkgs.alacritty}/bin/alacritty --option font.size=4 --class dashboard --command ${pkgs.writers.writeDash "dashboard-inner" ''
-      exec ${pkgs.procps}/bin/watch -c -n 10 ${niveumPackages.q}/bin/q
-    ''}
-  '';
   inherit (import ../lib) defaultApplications;
   klem = niveumPackages.klem.override {
     config.dmenu = "${pkgs.dmenu}/bin/dmenu -i -p klem";
@@ -86,15 +81,20 @@ in {
     };
   };
 
-  programs.slock.enable = true;
+  environment.systemPackages = [
-
+    pkgs.xsecurelock
-  environment.systemPackages = [dashboard];
+  ];
+  environment.sessionVariables = {
+    XSECURELOCK_NO_COMPOSITE = "1";
+    XSECURELOCK_BACKGROUND_COLOR = "navy";
+    XSECURELOCK_PASSWORD_PROMPT = "time_hex";
+  };
 
   services.displayManager.defaultSession = "none+i3";
   services.xserver = {
     windowManager.i3 = {
       enable = true;
-      package = pkgs.i3-gaps;
+      package = pkgs.i3;
     };
   };
 
@@ -130,12 +130,12 @@ in {
       titlebar = false;
       border = 1;
     };
-    bars = [
+    bars = let position = "bottom"; in [
-      (config.home-manager.users.me.lib.stylix.i3.bar
+      (lib.recursiveUpdate config.home-manager.users.me.stylix.targets.i3.exportedBarConfig
-        // rec {
+        {
           workspaceButtons = true;
           mode = "hide"; # "dock";
-          position = "bottom";
+          inherit position;
           statusCommand = toString (pkgs.writers.writeDash "i3status-rust" ''
             export I3RS_GITHUB_TOKEN="$(cat ${config.age.secrets.github-token-i3status-rust.path})"
             export OPENWEATHERMAP_API_KEY="$(cat ${config.age.secrets.openweathermap-api-key.path})"
@@ -269,37 +269,12 @@ in {
         # XF86Launch1 (thinkvantage)
       };
   in {
-    wayland.windowManager.sway = {
+    stylix.targets.i3.enable = true;
-      enable = true;
-      config = {
-        menu = "rofi -modi run,ssh,window -show run";
-        inherit modifier modes gaps bars floating window colors keybindings;
-        input = {
-          "*" = {
-            xkb_layout = "de";
-            xkb_variant = "T3";
-          };
-        };
-        terminal = (defaultApplications pkgs).terminal;
-        up = "k";
-        down = "j";
-        left = "h";
-        right = "l";
-        seat = {
-          "*" = {
-            hide_cursor = "when-typing enable";
-          };
-        };
-        startup = [
-          {command = "echo hello";}
-        ];
-      };
-    };
 
     xsession.windowManager.i3 = {
       enable = true;
       extraConfig = ''
-        bindsym --release ${modifier}+Shift+w exec /run/wrappers/bin/slock
+        bindsym --release ${modifier}+Shift+w exec xsecurelock
 
         exec "${pkgs.obsidian}/bin/obsidian"
         for_window [class="obsidian"] , move scratchpad
@@ -308,22 +283,11 @@ in {
         exec "${pkgs.writers.writeDash "irc" "exec ${pkgs.alacritty}/bin/alacritty --class message -e ssh weechat@makanek -t tmux attach-session -t IM"}"
         exec "${pkgs.writers.writeDash "email" "exec ${pkgs.alacritty}/bin/alacritty --class message -e aerc"}"
 
-        assign [class="dashboard"] ${infoWorkspace}
+        exec --no-startup-id ${pkgs.xss-lock}/bin/xss-lock -- xsecurelock
-        exec ${dashboard}/bin/dashboard
       '';
-      config = lib.mkMerge [
+      config = {
-        {
+          inherit modifier gaps modes bars floating window colors;
-          inherit modifier gaps modes bars floating window colors keybindings;
+          keybindings = keybindings // {
-        }
-        {
-          keybindings = let
-            new-workspace = pkgs.writers.writeDash "new-workspace" ''
-              i3-msg workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
-            '';
-            move-to-new-workspace = pkgs.writers.writeDash "new-workspace" ''
-              i3-msg move container to workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
-            '';
-          in {
             "${modifier}+ß" = "exec ${niveumPackages.menu-calc}/bin/=";
             "${modifier}+F6" = "exec ${pkgs.xorg.xkill}/bin/xkill";
             "${modifier}+F9" = "exec ${pkgs.redshift}/bin/redshift -O 4000 -b 0.85";
@@ -334,8 +298,7 @@ in {
             # "${modifier}+x" = "exec ${new-workspace}";
             "XF86Display" = "exec ${niveumPackages.dmenu-randr}/bin/dmenu-randr";
           };
-        }
+      };
-      ];
     };
   };
 }

configs/keyboard.nix

@@ -2,27 +2,63 @@
   pkgs,
   lib,
   ...
-}: let
+}:
+let
 
   commaSep = builtins.concatStringsSep ",";
-  xkbOptions = ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
+  xkbOptions = [
+    "compose:caps"
+    "terminate:ctrl_alt_bksp"
+    "grp:ctrls_toggle"
+  ];
   languages = {
-    deutsch = { code = "de"; variant = "T3"; };
+    deutsch = {
-    greek = { code = "gr"; variant = "polytonic"; };
+      code = "de";
-    russian = { code = "ru"; variant = "phonetic"; };
+      variant = "T3";
-    arabic = { code = "ara"; variant = "buckwalter"; }; # ../lib/keyboards/arabic;
+    };
+    greek = {
+      code = "gr";
+      variant = "polytonic";
+    };
+    russian = {
+      code = "ru";
+      variant = "phonetic";
+    };
+    arabic = {
+      code = "ara";
+      variant = "buckwalter";
+    }; # ../lib/keyboards/arabic;
     coptic = ../lib/keyboards/coptic;
     avestan = ../lib/keyboards/avestan;
     gothic = ../lib/keyboards/gothic;
-    farsi = { code = "ir"; variant = "qwerty"; };
+    farsi = {
-    syriac = { code = "sy"; variant = "syc_phonetic"; };
+      code = "ir";
-    sanskrit = { code = "in"; variant = "san-kagapa"; };
+      variant = "qwerty";
-    gujarati = {code = "in"; variant = "guj-kagapa"; };
+    };
-    urdu = {code = "in"; variant = "urd-phonetic"; };
+    syriac = {
-    hebrew = {code = "il"; variant = "phonetic";};
+      code = "sy";
+      variant = "syc_phonetic";
+    };
+    sanskrit = {
+      code = "in";
+      variant = "san-kagapa";
+    };
+    gujarati = {
+      code = "in";
+      variant = "guj-kagapa";
+    };
+    urdu = {
+      code = "in";
+      variant = "urd-phonetic";
+    };
+    hebrew = {
+      code = "il";
+      variant = "phonetic";
+    };
   };
   defaultLanguage = languages.deutsch;
-in {
+in
+{
   services.libinput.enable = true;
 
   # man 7 xkeyboard-config
@@ -41,7 +77,8 @@ in {
           lib.mapAttrsToList (name: value: {
             name = "symbols/${name}";
             path = value;
-          }) (lib.filterAttrs (_: value: !(value ? "code")) languages) ++ [
+          }) (lib.filterAttrs (_: value: !(value ? "code")) languages)
+          ++ [
             {
               name = "symbols/ir";
               path = ../lib/keyboards/farsi;
@@ -54,25 +91,40 @@ in {
 
   environment.etc."x11-locale".source = toString pkgs.xorg.libX11 + "share/X11/locale";
 
+  home-manager.users.me = {
+    home.file =
+      lib.mapAttrs' (name: path: lib.nameValuePair ".xkb/symbols/${name}" { source = path; })
+        (lib.recursiveUpdate (lib.filterAttrs (_: value: !(value ? "code")) languages) {
+          ".xkb/symbols/ir".source = ../lib/keyboards/farsi;
+        });
+  };
+
   console.keyMap = "de";
 
-  environment.systemPackages =
+  environment.systemPackages = lib.mapAttrsToList (
-    lib.mapAttrsToList
+    language: settings:
-    (language: settings:
     let
       code = if settings ? "code" then settings.code else language;
       variant = if settings ? "variant" then settings.variant else "";
     in
-      pkgs.writers.writeDashBin "kb-${language}" ''
+    pkgs.writers.writeDashBin "kb-${language}" ''
-        ${pkgs.xorg.setxkbmap}/bin/setxkbmap ${defaultLanguage.code},${code} ${defaultLanguage.variant},${variant} ${toString (map (option: "-option ${option}") xkbOptions)}
+      if [ -z $SWAYSOCK ]; then
-      '')
+        ${pkgs.xorg.setxkbmap}/bin/setxkbmap ${defaultLanguage.code},${code} ${defaultLanguage.variant},${variant} ${
-    languages;
+          toString (map (option: "-option ${option}") xkbOptions)
+        }
+      else
+        swaymsg -s $SWAYSOCK 'input * xkb_layout "${defaultLanguage.code},${code}"'
+        swaymsg -s $SWAYSOCK 'input * xkb_variant "${defaultLanguage.variant},${variant}"'
+        swaymsg -s $SWAYSOCK 'input * xkb_options "${lib.concatStringsSep "," xkbOptions}"'
+      fi
+    ''
+  ) languages;
 
   # improve held key rate
   services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xset}/bin/xset r rate 300 50";
 
   systemd.user.services.gxkb = {
-    wantedBy = ["graphical-session.target"];
+    wantedBy = [ "graphical-session.target" ];
     serviceConfig = {
       SyslogIdentifier = "gxkb";
       ExecStart = "${pkgs.gxkb}/bin/gxkb";

configs/khal.nix

@@ -10,11 +10,6 @@
     username = "kieran";
     passwordFile = config.age.secrets.nextcloud-password-kieran.path;
   };
-  fysiCloud = {
-    davEndpoint = "https://nextcloud.fysi.dev/remote.php/dav";
-    username = "kmein";
-    passwordFile = config.age.secrets.nextcloud-password-fysi.path;
-  };
 in {
   age.secrets = {
     nextcloud-password-kieran = {

configs/mpv.nix

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

configs/neovim.nix

@@ -38,7 +38,7 @@
     (pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
     (niveumPackages.vim.override {
       # stylixColors = config.lib.stylix.colors;
-      colorscheme = "base16-gruvbox-light-medium";
+      colorscheme = "base16-gruvbox-dark-medium";
     })
 
     # language servers
@@ -46,13 +46,14 @@
     pkgs.haskellPackages.haskell-language-server
     pkgs.texlab
     pkgs.nil
+    pkgs.gopls
     pkgs.nixfmt-rfc-style
     pkgs.rust-analyzer
     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 {};
@@ -63,9 +62,15 @@ in {
   };
 
   environment.systemPackages = with pkgs; [
+    (pkgs.writers.writeDashBin "amfora" ''
+      ${pkgs.st}/bin/st -e ${pkgs.amfora}/bin/amfora
+    '')
+    (pkgs.writers.writeDashBin "gpodder" ''
+      GPODDER_DOWNLOAD_DIR=${config.users.users.me.home}/mobile/audio/Text/podcasts exec ${pkgs.gpodder}/bin/gpodder "$@"
+    '')
     # INTERNET
     aria2
-    tdesktop
+    telegram-desktop
     whois
     dnsutils
     # FILE MANAGERS
@@ -94,9 +99,10 @@ in {
     # HARDWARE TOOLS
     gnome-disk-utility
     arandr # xrandr for noobs
+    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
@@ -114,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
@@ -130,6 +136,7 @@ in {
     rink # unit converter
     niveumPackages.auc
     niveumPackages.noise-waves
+    niveumPackages.stag
     niveumPackages.cheat-sh
     niveumPackages.polyglot
     niveumPackages.qrpaste
@@ -144,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
@@ -197,20 +200,13 @@ in {
       ${pkgs.openssh}/bin/ssh makanek "cd /var/lib/weechat/logs && grep --ignore-case --color=always --recursive $@" | ${pkgs.less}/bin/less --raw-control-chars
     '')
 
-    (pkgs.writers.writeDashBin "ncmpcpp-zaatar" ''MPD_HOST=${(import ../lib/local-network.nix).zaatar} exec ${pkgs.ncmpcpp}/bin/ncmpcpp "$@"'')
-    (pkgs.writers.writeDashBin "mpc-zaatar" ''MPD_HOST=${(import ../lib/local-network.nix).zaatar} exec ${pkgs.mpc_cli}/bin/mpc "$@"'')
-
     inputs.scripts.packages.x86_64-linux.alarm
 
     spotify
     ncspot
     playerctl
 
-    nix-index
-    niveumPackages.nix-index-update
-
     #krebs
-    niveumPackages.dic
     pkgs.nur.repos.mic92.ircsink
 
     (haskellPackages.ghcWithHoogle (hs: [
@@ -237,9 +233,8 @@ in {
     dhall
 
     html-tidy
-    nodePackages.csslint
-    nodePackages.jsonlint
     deno # better node.js
+    go
     texlive.combined.scheme-full
     latexrun
     (aspellWithDicts (dict: [dict.de dict.en dict.en-computers]))

configs/picom.nix

@@ -1,25 +0,0 @@
-{
-  services.picom = {
-    enable = true;
-    # activeOpacity = 1;
-    fade = true;
-    fadeDelta = 1;
-    # inactiveOpacity = 0.9;
-    # shadow = true;
-    # menuOpacity = 0.9;
-    # shadowOpacity = 0.3;
-    fadeExclude = [
-      "class_g = 'slock'" # don't want a transparent lock screen!
-      "name *?= 'slock'"
-      "focused = 1"
-    ];
-    opacityRules = [
-      # opacity-rule overrides both inactive and active opacity
-
-      # video in browser tabs
-      # substring /regex match of title bar text
-      "99:name *?= 'Youtube'"
-      "99:WM_CLASS@:s *= 'mpv$'"
-    ];
-  };
-}

configs/redshift.nix

@@ -1 +1 @@
-{services.redshift.enable = false;}
+{ services.redshift.enable = true; }

configs/spacetime.nix

@@ -3,5 +3,6 @@
   location = {
     latitude = 52.517;
     longitude = 13.3872;
+    provider = "geoclue2";
   };
 }

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
@@ -11,35 +12,11 @@ in {
       eval $(${pkgs.gnome3.gnome-keyring}/bin/gnome-keyring-daemon --daemonize --components=ssh,secrets)
       export SSH_AUTH_SOCK
     '';
-    # services.gpg-agent = rec {
-    #   enable = false;
-    #   enableSshSupport = true;
-    #   defaultCacheTtlSsh = 2 * 60 * 60;
-    #   maxCacheTtlSsh = 4 * defaultCacheTtlSsh;
-    #   sshKeys = [
-    #     "568047C91DE03A23883E340F15A9C24D313E847C"
-    #     "BB3EE102DB8CD45540A78A6B18B511B67061F6B4" # kfm@manakish ed25519
-    #     "3F8986755818B5762A096BE212777EAAC441DD9D" # fysiweb rsa
-    #     "0E4ABD229432486CC432639BB0986B2CDE365105" # agenix ed25519
-    #     "A1E8D32CBFCDBD2DE798E2298D795CCFD785AE06" # kfm@kabsa ed25519
-    #   ];
-    # };
   };
 
-  # environment.extraInit = ''
-  # if [[ -z "$SSH_AUTH_SOCK" ]]; then
-  #   export SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)"
-  # fi
-  # '';
-
-  # environment.interactiveShellInit = ''
-  # GPG_TTY="$(tty)"
-  # export GPG_TTY
-  # ${pkgs.gnupg}/bin/gpg-connect-agent updatestartuptty /bye > /dev/null
-  # '';
-
   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

@@ -18,7 +18,7 @@ in {
   stylix.enable = true;
   stylix.image = generatedWallpaper;
 
-  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml";
+  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml";
 
   stylix.cursor = {
     name = "capitaine-cursors-white";
@@ -26,6 +26,9 @@ in {
     size = 12;
   };
 
+  home-manager.users.me = {
+    stylix.autoEnable = true;
+  };
 
   # environment.etc."stylix/wallpaper.png".source = generatedWallpaper;
 
@@ -67,7 +70,7 @@ in {
     };
 
     emoji = {
-      package = pkgs.noto-fonts-emoji;
+      package = pkgs.noto-fonts-color-emoji;
       name = "Noto Color Emoji";
     };
 

configs/tmux.nix

@@ -13,7 +13,7 @@
     aggressiveResize = true;
     escapeTime = 50;
     historyLimit = 7000;
-    shortcut = "a";
+    shortcut = "b";
     extraConfig = ''
       set -g mouse on
 
@@ -37,15 +37,6 @@
       set -g status-left-length 32
       set -g status-right-length 150
 
-      set -g status-bg colour242
-
-      setw -g window-status-format "#[fg=colour12,bg=colour233] #I #[fg=white,bg=colour237] #W "
-      setw -g window-status-current-format "#[fg=colour12,bg=colour233] * #[fg=white,bg=colour237,bold] #W "
-
-      set -g status-left ""
-      set -g status-right "#[fg=colour255,bg=colour237,bold] #(hostname -I) #[default]#[fg=colour12,bg=colour233] %FT%R "
-      set -g status-justify left
-
       set -g status-position bottom
     '';
   };

configs/uni.nix

@@ -7,11 +7,11 @@
   username = "meinhak99";
   inherit (import ../lib/email.nix) defaults pronouns;
   inherit (import ../lib) remoteDir;
-  fu-defaults = rec {
+  fu-defaults = let mailhost = "mail.zedat.fu-berlin.de"; in {
-    imap.host = "mail.zedat.fu-berlin.de";
+    imap.host = mailhost;
     imap.port = 993;
     imap.tls.enable = true;
-    smtp.host = imap.host;
+    smtp.host = mailhost;
     smtp.port = 465;
     smtp.tls.enable = true;
     folders.drafts = "Entwürfe";
@@ -30,34 +30,31 @@ in {
       };
     };
     accounts.email.accounts = {
-      fu-student =
+      letos =
+        lib.recursiveUpdate defaults
+        {
+          userName = "slfletos";
+          address = "letos.sprachlit@hu-berlin.de";
+          passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-letos.path}";
+          imap.host = "mailbox.cms.hu-berlin.de";
+          imap.port = 993;
+          smtp.host = "mailhost.cms.hu-berlin.de";
+          smtp.port = 25;
+          smtp.tls.useStartTls = true;
+        };
+      fu =
         lib.recursiveUpdate defaults
         (lib.recursiveUpdate fu-defaults
-          rec {
+          (let userName = "meinhak99"; in {
-            userName = "meinhak99";
+            userName = userName;
             address = "kieran.meinhardt@fu-berlin.de";
             aliases = ["${userName}@fu-berlin.de"];
             passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-meinhak99.path}";
-            aerc.extraAccounts.signature-file = toString (pkgs.writeText "signature" signature.text);
-            signature = {
-              showSignature = "append";
-              text = ''
-                ${defaults.realName}
-                ${pronouns}
-
-                ---
-                Studentische Hilfskraft / ZODIAC
-                Freie Universität Berlin
-
-                Telefon: +49 30 838 58118
-                Arnimallee 10, Raum 106, 14195 Berlin
-              '';
-            };
             himalaya = {
               enable = true;
               settings.backend = "imap";
             };
-          });
+          }));
     };
   };
 
@@ -68,6 +65,12 @@ in {
       group = config.users.users.me.group;
       mode = "400";
     };
+    email-password-letos = {
+      file = ../secrets/email-password-letos.age;
+      owner = config.users.users.me.name;
+      group = config.users.users.me.group;
+      mode = "400";
+    };
     fu-sftp-key = {
       file = ../secrets/fu-sftp-key.age;
       owner = "root";
@@ -110,24 +113,31 @@ in {
         ];
       };
     };
-  in {
+  in home-directory-mount "meinhak99";
-    "${remoteDir}/fu/zodiac" = {
-      device = "//trove.storage.fu-berlin.de/GESCHKULT";
-      fsType = "cifs";
-      options =
-        fu-berlin-cifs-options
-        ++ [
-          "credentials=${config.age.secrets.cifs-credentials-zodiac.path}"
-        ];
-    };
-  } // home-directory-mount "meinhak99"
-    // home-directory-mount "xm7234fu";
-
-  age.secrets = {
-    cifs-credentials-zodiac.file = ../secrets/cifs-credentials-zodiac.age;
-  };
 
   environment.systemPackages = [
+    (pkgs.writers.writeDashBin "hu-vpn-split" ''
+      ${pkgs.openfortivpn}/bin/openfortivpn \
+        --password="$(cat "${config.age.secrets.email-password-letos.path}")" \
+        --config=${
+        pkgs.writeText "hu-berlin-split.config" ''
+          host = forti-ssl.vpn.hu-berlin.de
+          port = 443
+          username = slfletos@split_tunnel
+        ''
+      }
+    '')
+    (pkgs.writers.writeDashBin "hu-vpn-full" ''
+      ${pkgs.openfortivpn}/bin/openfortivpn \
+        --password="$(cat "${config.age.secrets.email-password-letos.path}")" \
+        --config=${
+        pkgs.writeText "hu-berlin-full.config" ''
+          host = forti-ssl.vpn.hu-berlin.de
+          port = 443
+          username = slfletos@tunnel_all
+        ''
+      }
+    '')
     (pkgs.writers.writeDashBin "fu-vpn" ''
       if ${pkgs.wirelesstools}/bin/iwgetid | ${pkgs.gnugrep}/bin/grep --invert-match eduroam
       then
@@ -138,16 +148,4 @@ in {
       fi
     '')
   ];
-
-  systemd.services.fu-vpn = {
-    enable = false;
-    wants = ["network-online.target"];
-    serviceConfig.LoadCredential = "password:${config.age.secrets.email-password-meinhak99.path}";
-    script = ''
-      if ${pkgs.wirelesstools}/bin/iwgetid | ${pkgs.gnugrep}/bin/grep --invert-match eduroam
-      then
-        cat "$CREDENTIALS_DIRECTORY/password" | ${pkgs.openconnect}/bin/openconnect vpn.fu-berlin.de --user ${username} --passwd-on-stdin
-      fi
-    '';
-  };
 }

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

configs/wpa_supplicant.nix

@@ -1,6 +1,9 @@
+{ config, ... }:
 {
   networking.wireless = {
     enable = true;
-    networks.Aether.pskRaw = "e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a";
+    secretsFile = config.age.secrets.wifi.path;
+    # networks.Aether.pskRaw = "e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a";
+    networks.Schilfpalast.pskRaw = "ext:schilfpalast";
   };
 }

configs/zsh.nix

@@ -6,15 +6,6 @@
   promptColours.success = "cyan";
   promptColours.failure = "red";
 in {
-  environment.systemPackages = [pkgs.atuin];
-  environment.variables.ATUIN_CONFIG_DIR = toString (pkgs.writeTextDir "/config.toml" ''
-    auto_sync = true
-    update_check = false
-    sync_address = "http://zaatar.r:8888"
-    sync_frequency = 0
-    style = "compact"
-  '');
-
   programs.zsh = let
     zsh-completions = pkgs.fetchFromGitHub {
       owner = "zsh-users";
@@ -67,13 +58,6 @@ in {
       zstyle ':vcs_info:*' formats "%c%u%F{cyan}%b%f"
       zstyle ':vcs_info:*' actionformats "(%a) %c%u%F{cyan}%b%f"
 
-      # atuin distributed shell history
-      export ATUIN_NOBIND="true" # disable all keybdinings of atuin
-      eval "$(atuin init zsh)"
-      bindkey '^r' _atuin_search_widget # bind ctrl+r to atuin
-      # use zsh only session history
-      fc -p
-
       precmd () {
         vcs_info
         if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ] || [ -n "$SSH_CONNECTION" ]; then

flake.nix

@@ -2,25 +2,25 @@
   description = "niveum: packages, modules, systems";
 
   inputs = {
+    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";
@@ -29,420 +29,429 @@
 
     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" ];
+    {
-    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,
+      menstruation-backend,
-    agenix,
+      menstruation-telegram,
-    retiolum,
+      scripts,
-    nixinate,
+      tinc-graph,
-    flake-utils,
+      recht,
-    nix-on-droid,
+      autorenkalender,
-    stylix,
+      wallpaper-generator,
-    ...
+      telebots,
-  }:
+      stockholm,
+      nix-index-database,
+      stylix,
+      voidrice,
+      ...
+    }:
+    let
+      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";
-            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" ''
-                ${pkgs.findutils}/bin/find secrets -not -path '*/.*' -type f  | ${pkgs.coreutils}/bin/sort > secrets.txt
-              '');
-            };
-          }
-          # the following error prevents remote building of ful: https://github.com/NixOS/nixpkgs/issues/177873
-          // builtins.listToAttrs (map (hostname: let
-            externalNetwork = import ./lib/external-network.nix;
-            targets = {
-              ful = "root@ful";
-              zaatar = "root@zaatar";
-              makanek = "root@makanek";
-              manakish = "root@manakish";
-              tahina = "root@tahina";
-              tabula = "root@tabula";
-              kabsa = "root@kabsa";
-              fatteh = "root@fatteh";
-              kibbeh = "root@kibbeh";
-            };
           in
-            lib.attrsets.nameValuePair "deploy-${hostname}" {
+          lib.mergeAttrsList [
-              type = "app";
+            nixinate.nixinate.x86_64-linux
-              program = toString (pkgs.writers.writeDash "deploy-${hostname}" ''
+            self
-                exec ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch \
+            {
-                  --max-jobs 2 \
+              mock-secrets = {
-                  --log-format internal-json \
+                type = "app";
-                  --flake .?submodules=1#${hostname} \
+                program = toString (
-                  --target-host ${targets.${hostname}} 2>&1 \
+                  pkgs.writers.writeDash "mock-secrets" ''
-                  | ${pkgs.nix-output-monitor}/bin/nom --json
+                    ${pkgs.findutils}/bin/find secrets -not -path '*/.*' -type f  | ${pkgs.coreutils}/bin/sort > secrets.txt
-              '');
+                  ''
-            }) (builtins.attrNames self.nixosConfigurations))
+                );
-          // {
+              };
-            deploy-ful = {
+            }
-              type = "app";
+            # the following error prevents remote building of ful: https://github.com/NixOS/nixpkgs/issues/177873
-              program = toString (pkgs.writers.writeDash "deploy-ful" ''
+            (builtins.listToAttrs (
-                exec ${pkgs.nix}/bin/nix run .?submodules=1#nixinate.ful \
+              map (
-                  --log-format internal-json 2>&1 \
+                hostname:
-                  | ${pkgs.nix-output-monitor}/bin/nom --json
+                let
-              '');
+                  targets = {
-            };
+                    ful = "root@ful";
-          };
+                    zaatar = "root@zaatar";
+                    makanek = "root@makanek";
+                    manakish = "root@manakish";
+                    tahina = "root@tahina";
+                    tabula = "root@tabula";
+                    kabsa = "root@kabsa";
+                    fatteh = "root@fatteh";
+                    kibbeh = "root@kibbeh";
+                  };
+                in
+                lib.attrsets.nameValuePair "deploy-${hostname}" {
+                  type = "app";
+                  program = toString (
+                    pkgs.writers.writeDash "deploy-${hostname}" ''
+                      exec ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch \
+                        --max-jobs 2 \
+                        --log-format internal-json \
+                        --flake .#${hostname} \
+                        --target-host ${targets.${hostname}} 2>&1 \
+                        | ${pkgs.nix-output-monitor}/bin/nom --json
+                    ''
+                  );
+                }
+              ) (builtins.attrNames self.nixosConfigurations)
+            ))
+            {
+              deploy-ful = {
+                type = "app";
+                program = toString (
+                  pkgs.writers.writeDash "deploy-ful" ''
+                    exec ${pkgs.nix}/bin/nix run .#nixinate.ful \
+                      --log-format internal-json 2>&1 \
+                      | ${pkgs.nix-output-monitor}/bin/nom --json
+                  ''
+                );
+              };
+            }
+          ];
       };
 
+      # 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;
         panoptikon = import modules/panoptikon.nix;
         power-action = import modules/power-action.nix;
         system-dependent = import modules/system-dependent.nix;
         telegram-bot = import modules/telegram-bot.nix;
+        go-webring = import modules/go-webring.nix;
       };
 
       lib = {
         panoptikon = import lib/panoptikon.nix;
       };
 
-      nixOnDroidConfigurations = {
+      nixosConfigurations =
-        moto = nix-on-droid.lib.nixOnDroidConfiguration {
+        let
-          modules = [systems/moto/configuration.nix];
+          niveumSpecialArgs = system: {
-          pkgs = import nixpkgs {
+            unstablePackages = import nixpkgs-unstable {
-            system = "aarch64-linux";
+              inherit system;
-            overlays = [nix-on-droid.overlays.default];
+              overlays = [];
-          };
+              config.allowUnfreePredicate =
-          extraSpecialArgs = {
+                pkg:
-            niveumPackages = inputs.self.packages.aarch64-linux;
+                builtins.elem (nixpkgs-unstable.lib.getName pkg) [
-            niveumLib = inputs.self.lib;
+                  "obsidian"
-            inherit inputs;
+                  "zoom"
-          };
+                ];
-          home-manager-path = home-manager.outPath;
+            };
-        };
-      };
 
-      homeConfigurations = {
+            niveumPackages = self.packages.${system};
-        maakaron = let
+            niveumLib = self.lib;
-          system = "x86_64-darwin";
+            inputs = {
-          pkgs = nixpkgs.legacyPackages.${system};
+              inherit
-        in
+                tinc-graph
-          home-manager.lib.homeManagerConfiguration {
+                self
-            inherit pkgs;
+                telebots
-            modules = [./systems/maakaron/home.nix];
+                menstruation-telegram
-            extraSpecialArgs = {
+                menstruation-backend
-              inherit inputs;
+                scripts
-              niveumPackages = inputs.self.packages.${system};
+                agenix
+                recht
+                autorenkalender
+                nixpkgs
+                wallpaper-generator
+                ;
             };
           };
-      };
+        in
-
+        {
-      nixosConfigurations = let
+          ful = nixpkgs.lib.nixosSystem rec {
-        niveumSpecialArgs = system: {
+            system = "aarch64-linux";
-          unstablePackages = import nixpkgs-unstable {
+            specialArgs = niveumSpecialArgs system;
-            inherit system;
+            modules = [
-            config.allowUnfreePredicate = pkg:
+              systems/ful/configuration.nix
-              builtins.elem (nixpkgs-unstable.lib.getName pkg) [
+              agenix.nixosModules.default
-                "obsidian"
+              self.nixosModules.passport
-                "zoom"
+              self.nixosModules.panoptikon
-              ];
+              self.nixosModules.go-webring
+              stockholm.nixosModules.reaktor2
+              retiolum.nixosModules.retiolum
+              nur.modules.nixos.default
+              { nixpkgs.overlays = [ stockholm.overlays.default ]; }
+              {
+                _module.args.nixinate = {
+                  host = "ful";
+                  sshUser = "root";
+                  buildOn = "remote";
+                  substituteOnTarget = true;
+                  hermetic = false;
+                };
+              }
+            ];
+          };
+          zaatar = nixpkgs.lib.nixosSystem rec {
+            system = "x86_64-linux";
+            specialArgs = niveumSpecialArgs system;
+            modules = [
+              systems/zaatar/configuration.nix
+              agenix.nixosModules.default
+              retiolum.nixosModules.retiolum
+            ];
+          };
+          kibbeh = nixpkgs.lib.nixosSystem rec {
+            system = "x86_64-linux";
+            specialArgs = niveumSpecialArgs system;
+            modules = [
+              systems/kibbeh/configuration.nix
+              agenix.nixosModules.default
+              retiolum.nixosModules.retiolum
+              home-manager.nixosModules.home-manager
+            ];
+          };
+          makanek = nixpkgs.lib.nixosSystem rec {
+            system = "x86_64-linux";
+            # for using inputs in other config files
+            specialArgs = niveumSpecialArgs system;
+            modules = [
+              systems/makanek/configuration.nix
+              self.nixosModules.telegram-bot
+              self.nixosModules.passport
+              agenix.nixosModules.default
+              retiolum.nixosModules.retiolum
+              nur.modules.nixos.default
+            ];
+          };
+          tahina = nixpkgs.lib.nixosSystem rec {
+            system = "x86_64-linux";
+            specialArgs = niveumSpecialArgs system;
+            modules = [
+              systems/tahina/configuration.nix
+              agenix.nixosModules.default
+              retiolum.nixosModules.retiolum
+            ];
+          };
+          tabula = nixpkgs.lib.nixosSystem rec {
+            system = "x86_64-linux";
+            specialArgs = niveumSpecialArgs system;
+            modules = [
+              systems/tabula/configuration.nix
+              agenix.nixosModules.default
+              retiolum.nixosModules.retiolum
+            ];
+          };
+          manakish = nixpkgs.lib.nixosSystem rec {
+            system = "x86_64-linux";
+            specialArgs = niveumSpecialArgs system;
+            modules = [
+              systems/manakish/configuration.nix
+              agenix.nixosModules.default
+              retiolum.nixosModules.retiolum
+              home-manager.nixosModules.home-manager
+              nix-index-database.nixosModules.default
+              nur.modules.nixos.default
+              stylix.nixosModules.stylix
+            ];
+          };
+          kabsa = nixpkgs.lib.nixosSystem rec {
+            system = "x86_64-linux";
+            specialArgs = niveumSpecialArgs system;
+            modules = [
+              systems/kabsa/configuration.nix
+              agenix.nixosModules.default
+              retiolum.nixosModules.retiolum
+              home-manager.nixosModules.home-manager
+              nur.modules.nixos.default
+              nix-index-database.nixosModules.default
+              stylix.nixosModules.stylix
+            ];
+          };
+          fatteh = nixpkgs.lib.nixosSystem rec {
+            system = "x86_64-linux";
+            specialArgs = niveumSpecialArgs system;
+            modules = [
+              systems/fatteh/configuration.nix
+              agenix.nixosModules.default
+              retiolum.nixosModules.retiolum
+              home-manager.nixosModules.home-manager
+              nur.modules.nixos.default
+              nix-index-database.nixosModules.default
+              stylix.nixosModules.stylix
+            ];
           };
-
-          niveumPackages = inputs.self.packages.${system};
-          niveumLib = inputs.self.lib;
-          inherit inputs;
         };
-      in {
+
-        ful = nixpkgs.lib.nixosSystem rec {
+      packages = eachSupportedSystem (
-          system = "aarch64-linux";
+        system:
-          specialArgs = niveumSpecialArgs system;
+        let
-          modules = [
+          pkgs = import nixpkgs {
-            systems/ful/configuration.nix
+            inherit system;
-            agenix.nixosModules.default
+            config.allowUnfree = true;
-            inputs.self.nixosModules.passport
+            overlays = [
-            inputs.self.nixosModules.panoptikon
+              nur.overlays.default
-            inputs.self.nixosModules.htgen
+              (self: super: {
-            inputs.stockholm.nixosModules.reaktor2
+                mpv = super.mpv.override {
-            retiolum.nixosModules.retiolum
+                  scripts = [
-            nur.modules.nixos.default
+                    super.mpvScripts.visualizer
-            { nixpkgs.overlays = [ inputs.stockholm.overlays.default ]; }
+                    super.mpvScripts.mpris
+                  ];
+                };
+                dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
+              })
+            ];
+          };
+          wrapScript =
             {
-              _module.args.nixinate = {
+              packages ? [ ],
-                host = "ful";
+              name,
-                sshUser = "root";
+              script,
-                buildOn = "remote";
+            }:
-                substituteOnTarget = true;
+            pkgs.writers.writeDashBin name ''PATH=$PATH:${
-                hermetic = false;
+              nixpkgs.lib.makeBinPath (
-              };
+                packages
-            }
+                ++ [
-          ];
+                  pkgs.findutils
-        };
+                  pkgs.coreutils
-        zaatar = nixpkgs.lib.nixosSystem rec {
+                  pkgs.gnused
-          system = "x86_64-linux";
+                  pkgs.gnugrep
-          specialArgs = niveumSpecialArgs system;
+                ]
-          modules = [
+              )
-            systems/zaatar/configuration.nix
+            } ${script} "$@"'';
-            agenix.nixosModules.default
+        in
-            retiolum.nixosModules.retiolum
+        {
-          ];
+          # linguistics and ancient world
-        };
+          auc = pkgs.callPackage packages/auc.nix { };
-        kibbeh = nixpkgs.lib.nixosSystem rec {
+          betacode = pkgs.callPackage packages/betacode.nix { };
-          system = "x86_64-linux";
+          brassica = pkgs.callPackage packages/brassica.nix { }; # TODO upstream
-          specialArgs = niveumSpecialArgs system;
+          devanagari = pkgs.callPackage packages/devanagari { };
-          modules = [
+          stardict-tools = pkgs.callPackage packages/stardict-tools.nix { };
-            systems/kibbeh/configuration.nix
+          heuretes = pkgs.callPackage packages/heuretes.nix { };
-            agenix.nixosModules.default
+          ipa = pkgs.writers.writePython3Bin "ipa" { flakeIgnore = [ "E501" ]; } (
-            retiolum.nixosModules.retiolum
+            builtins.readFile packages/ipa.py
-          ];
+          );
-        };
+          jsesh = pkgs.callPackage packages/jsesh.nix { }; # TODO upstream
-        makanek = nixpkgs.lib.nixosSystem rec {
+          kirciuoklis = pkgs.callPackage packages/kirciuoklis.nix { };
-          system = "x86_64-linux";
+          polyglot = pkgs.callPackage packages/polyglot.nix { };
-          # for using inputs in other config files
+          tocharian-font = pkgs.callPackage packages/tocharian-font.nix { };
-          specialArgs = niveumSpecialArgs system;
+          gfs-fonts = pkgs.callPackage packages/gfs-fonts.nix { };
-          modules = [
+          closest = pkgs.callPackage packages/closest { };
-            systems/makanek/configuration.nix
-            inputs.self.nixosModules.telegram-bot
-            inputs.self.nixosModules.htgen
-            inputs.self.nixosModules.passport
-            agenix.nixosModules.default
-            retiolum.nixosModules.retiolum
-            nur.modules.nixos.default
-          ];
-        };
-        tahina = nixpkgs.lib.nixosSystem rec {
-          system = "x86_64-linux";
-          specialArgs = niveumSpecialArgs system;
-          modules = [
-            systems/tahina/configuration.nix
-            agenix.nixosModules.default
-            retiolum.nixosModules.retiolum
-          ];
-        };
-        tabula = nixpkgs.lib.nixosSystem rec {
-          system = "x86_64-linux";
-          specialArgs = niveumSpecialArgs system;
-          modules = [
-            systems/tabula/configuration.nix
-            agenix.nixosModules.default
-            retiolum.nixosModules.retiolum
-          ];
-        };
-        manakish = nixpkgs.lib.nixosSystem rec {
-          system = "x86_64-linux";
-          specialArgs = niveumSpecialArgs system;
-          modules = [
-            systems/manakish/configuration.nix
-            agenix.nixosModules.default
-            retiolum.nixosModules.retiolum
-            home-manager.nixosModules.home-manager
-            nur.modules.nixos.default
-            stylix.nixosModules.stylix
-          ];
-        };
-        kabsa = nixpkgs.lib.nixosSystem rec {
-          system = "x86_64-linux";
-          specialArgs = niveumSpecialArgs system;
-          modules = [
-            systems/kabsa/configuration.nix
-            agenix.nixosModules.default
-            retiolum.nixosModules.retiolum
-            home-manager.nixosModules.home-manager
-            nur.modules.nixos.default
-            stylix.nixosModules.stylix
-          ];
-        };
-        fatteh = nixpkgs.lib.nixosSystem rec {
-          system = "x86_64-linux";
-          specialArgs = niveumSpecialArgs system;
-          modules = [
-            systems/fatteh/configuration.nix
-            agenix.nixosModules.default
-            retiolum.nixosModules.retiolum
-            home-manager.nixosModules.home-manager
-            nur.modules.nixos.default
-            stylix.nixosModules.stylix
-          ];
-        };
-      };
-    }
-    // flake-utils.lib.eachSystem [flake-utils.lib.system.x86_64-linux flake-utils.lib.system.x86_64-darwin flake-utils.lib.system.aarch64-linux] (system: let
-      pkgs = import nixpkgs {
-        inherit system;
-        overlays = [
-          nur.overlays.default
-          (self: super: {
-            mpv = super.mpv.override {scripts = [inputs.self.packages.${system}.mpv-visualizer super.mpvScripts.mpris];};
-            dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
-          })
-        ];
-      };
-      unstablePackages = import nixpkgs-unstable {
-        inherit system;
-      };
-      wrapScript = {
-        packages ? [],
-        name,
-        script,
-      }:
-        pkgs.writers.writeDashBin name ''PATH=$PATH:${nixpkgs.lib.makeBinPath (packages ++ [pkgs.findutils pkgs.coreutils pkgs.gnused pkgs.gnugrep])} ${script} "$@"'';
-    in {
-      packages = rec {
-        auc = pkgs.callPackage packages/auc.nix {};
-        betacode = pkgs.callPackage packages/betacode.nix {};
-        brainmelter = pkgs.callPackage packages/brainmelter.nix {};
-        brassica = pkgs.callPackage packages/brassica.nix {};
-        cheat-sh = pkgs.callPackage packages/cheat-sh.nix {};
-        closest = pkgs.callPackage packages/closest {};
-        cro = pkgs.callPackage packages/cro.nix {};
-        cyberlocker-tools = pkgs.callPackage packages/cyberlocker-tools.nix {};
-        default-gateway = pkgs.callPackage packages/default-gateway.nix {};
-        depp = pkgs.callPackage packages/depp.nix {};
-        dashboard = pkgs.callPackage packages/dashboard {};
-        devanagari = pkgs.callPackage packages/devanagari {};
-        devour = pkgs.callPackage packages/devour.nix {};
-        dic = pkgs.callPackage packages/dic.nix {};
-        dirmir = pkgs.callPackage packages/dirmir.nix {};
-        dmenu-bluetooth = pkgs.callPackage packages/dmenu-bluetooth.nix {};
-        dmenu-scrot = pkgs.callPackage packages/dmenu-scrot.nix {};
-        dns-sledgehammer = pkgs.callPackage packages/dns-sledgehammer.nix {};
-        fkill = pkgs.callPackage packages/fkill.nix {};
-        fzfmenu = pkgs.callPackage packages/fzfmenu.nix {};
-        genius = pkgs.callPackage packages/genius.nix {};
-        gfs-fonts = pkgs.callPackage packages/gfs-fonts.nix {};
-        git-preview = pkgs.callPackage packages/git-preview.nix {};
-        gpt35 = pkgs.callPackage packages/gpt.nix {model = "gpt-3.5-turbo";};
-        gpt4 = pkgs.callPackage packages/gpt.nix {model = "gpt-4";};
-        hc = pkgs.callPackage packages/hc.nix {};
-        jq-lsp = pkgs.callPackage packages/jq-lsp.nix {};
-        stardict-tools = pkgs.callPackage packages/stardict-tools.nix {};
-        heuretes = pkgs.callPackage packages/heuretes.nix {};
-        htgen = pkgs.callPackage packages/htgen.nix {};
-        image-convert-favicon = pkgs.callPackage packages/image-convert-favicon.nix {};
-        image-convert-tolino = pkgs.callPackage packages/image-convert-tolino.nix {};
-        infschmv = pkgs.callPackage packages/infschmv.nix {};
-        iolanguage = pkgs.callPackage packages/iolanguage.nix {};
-        ipa = pkgs.writers.writePython3Bin "ipa" {flakeIgnore = ["E501"];} (builtins.readFile packages/ipa.py);
-        ix = pkgs.callPackage packages/ix.nix {};
-        jsesh = pkgs.callPackage packages/jsesh.nix {};
-        k-lock = pkgs.callPackage packages/k-lock.nix {};
-        kirciuoklis = pkgs.callPackage packages/kirciuoklis.nix {};
-        klem = pkgs.callPackage packages/klem.nix {};
-        kpaste = pkgs.callPackage packages/kpaste.nix {};
-        literature-quote = pkgs.callPackage packages/literature-quote.nix {};
-        mahlzeit = pkgs.haskellPackages.callPackage packages/mahlzeit.nix {};
-        man-pandoc = pkgs.callPackage packages/man/pandoc.nix {};
-        man-pdf = pkgs.callPackage packages/man-pdf.nix {};
-        mansplain = pkgs.callPackage packages/mansplain.nix {};
-        manual-sort = pkgs.callPackage packages/manual-sort.nix {};
-        menu-calc = pkgs.callPackage packages/menu-calc.nix {};
-        meteo = pkgs.callPackage packages/meteo.nix {};
-        noise-waves = pkgs.callPackage packages/noise-waves.nix {};
-        mpv-radio = pkgs.callPackage packages/mpv-radio.nix {di-fm-key-file = "/dev/null";};
-        mpv-tuner = pkgs.callPackage packages/mpv-tuner.nix {di-fm-key-file = "/dev/null";};
-        mpv-tv = pkgs.callPackage packages/mpv-tv.nix {};
-        mpv-iptv = pkgs.callPackage packages/mpv-iptv.nix {};
-        mpv-visualizer = unstablePackages.mpvScripts.visualizer;
-        new-mac = pkgs.callPackage packages/new-mac.nix {};
-        nix-git = pkgs.callPackage packages/nix-git.nix {};
-        nix-index-update = pkgs.callPackage packages/nix-index-update.nix {inherit system;};
-        notemenu = pkgs.callPackage packages/notemenu.nix {niveumPackages = self.packages.${system};};
-        opustags = pkgs.callPackage packages/opustags.nix {};
-        pls = pkgs.callPackage packages/pls.nix {};
-        polyglot = pkgs.callPackage packages/polyglot.nix {};
-        q = pkgs.callPackage packages/q.nix {};
-        qrpaste = pkgs.callPackage packages/qrpaste.nix {};
-        random-zeno = pkgs.callPackage packages/random-zeno.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 {};
-        timer = pkgs.callPackage packages/timer.nix {};
-        tocharian-font = pkgs.callPackage packages/tocharian-font.nix {};
-        trans = pkgs.callPackage packages/trans.nix {};
-        ttspaste = pkgs.callPackage packages/ttspaste.nix {};
-        unicodmenu = pkgs.callPackage packages/unicodmenu.nix {};
-        emailmenu = pkgs.callPackage packages/emailmenu.nix {};
-        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-cheat-sh-vim = pkgs.callPackage packages/vimPlugins/cheat-sh.nix {};
-        vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix {};
-        vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix {};
-        vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix {};
-        vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix {};
-        vimPlugins-vim-colors-paramount = pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix {};
-        vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix {};
-        vimPlugins-vim-fsharp = pkgs.callPackage packages/vimPlugins/vim-fsharp.nix {};
-        vimPlugins-vim-mail = pkgs.callPackage packages/vimPlugins/vim-mail.nix {};
-        vimPlugins-vim-reason-plus = pkgs.callPackage packages/vimPlugins/vim-reason-plus.nix {};
-        vimv = pkgs.callPackage packages/vimv.nix {};
-        weechat-declarative = pkgs.callPackage packages/weechat-declarative.nix {};
-        weechatScripts-hotlist2extern = pkgs.callPackage packages/weechatScripts/hotlist2extern.nix {};
-        wttr = pkgs.callPackage packages/wttr.nix {};
 
-        itl = pkgs.callPackage packages/itl.nix {};
+          # lit
-        itools = pkgs.callPackage packages/itools.nix {itl = itl;};
+          random-zeno = pkgs.callPackage packages/random-zeno.nix { };
+          literature-quote = pkgs.callPackage packages/literature-quote.nix { };
 
-        booksplit = wrapScript {
+          # krebs
-          script = inputs.voidrice.outPath + "/.local/bin/booksplit";
+          brainmelter = pkgs.callPackage packages/brainmelter.nix { };
-          name = "booksplit";
+          cyberlocker-tools = pkgs.callPackage packages/cyberlocker-tools.nix { };
-          packages = [pkgs.ffmpeg pkgs.glibc.bin];
+          hc = pkgs.callPackage packages/hc.nix { };
-        };
+          kpaste = pkgs.callPackage packages/kpaste.nix { };
-        dmenu-randr = pkgs.callPackage packages/dmenu-randr.nix {};
+          pls = pkgs.callPackage packages/pls.nix { };
-        tag = wrapScript {
+          untilport = pkgs.callPackage packages/untilport.nix { };
-          script = inputs.voidrice.outPath + "/.local/bin/tag";
+          radio-news = pkgs.callPackage packages/radio-news.nix { };
-          name = "tag";
+
-          packages = [pkgs.ffmpeg];
+          # 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 { };
+          fkill = pkgs.callPackage packages/fkill.nix { };
+          fzfmenu = pkgs.callPackage packages/fzfmenu.nix { };
+          gpt35 = pkgs.callPackage packages/gpt.nix { model = "gpt-3.5-turbo"; };
+          gpt4 = pkgs.callPackage packages/gpt.nix { model = "gpt-4"; };
+          image-convert-favicon = pkgs.callPackage packages/image-convert-favicon.nix { };
+          image-convert-tolino = pkgs.callPackage packages/image-convert-tolino.nix { };
+          k-lock = pkgs.callPackage packages/k-lock.nix { };
+          klem = pkgs.callPackage packages/klem.nix { };
+          man-pandoc = pkgs.callPackage packages/man/pandoc.nix { }; # TODO upstream
+          man-pdf = pkgs.callPackage packages/man-pdf.nix { };
+          mansplain = pkgs.callPackage packages/mansplain.nix { };
+          manual-sort = pkgs.callPackage packages/manual-sort.nix { };
+          menu-calc = pkgs.callPackage packages/menu-calc.nix { };
+          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 { };
+          new-mac = pkgs.callPackage packages/new-mac.nix { };
+          nix-git = pkgs.callPackage packages/nix-git.nix { };
+          notemenu = pkgs.callPackage packages/notemenu.nix { niveumPackages = self.packages.${system}; };
+          opustags = pkgs.callPackage packages/opustags.nix { }; # TODO upstream
+          q = pkgs.callPackage packages/q.nix { };
+          qrpaste = pkgs.callPackage packages/qrpaste.nix { };
+          go-webring = pkgs.callPackage packages/go-webring.nix { }; # TODO upstream
+          rfc = pkgs.callPackage packages/rfc.nix { };
+          gimp = pkgs.callPackage packages/gimp.nix { };
+          scanned = pkgs.callPackage packages/scanned.nix { };
+          text2pdf = pkgs.callPackage packages/text2pdf.nix { }; # TODO upstream
+          timer = pkgs.callPackage packages/timer.nix { };
+          trans = pkgs.callPackage packages/trans.nix { }; # TODO upstream
+          ttspaste = pkgs.callPackage packages/ttspaste.nix { };
+          unicodmenu = pkgs.callPackage packages/unicodmenu.nix { };
+          emailmenu = pkgs.callPackage packages/emailmenu.nix { };
+          stag = pkgs.callPackage packages/stag.nix { }; # TODO upstream
+          vg = pkgs.callPackage packages/vg.nix { };
+          vim = pkgs.callPackage packages/vim.nix { niveumPackages = self.packages.${system}; };
+          obsidian-vim = pkgs.callPackage packages/obsidian-vim.nix { };
+          vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix { }; # TODO upstream
+          vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix { }; # TODO upstream
+          vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix { }; # TODO upstream
+          vimPlugins-mdwa-nvim = pkgs.callPackage packages/vimPlugins/mdwa-nvim.nix { }; # TODO upstream
+          vimPlugins-vim-ernest = pkgs.callPackage packages/vimPlugins/vim-ernest.nix { }; # TODO upstream
+          vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix { }; # TODO upstream
+          vimPlugins-vim-colors-paramount =
+            pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix
+              { }; # TODO upstream
+          vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix { }; # TODO upstream
+          vimPlugins-vim-fsharp = pkgs.callPackage packages/vimPlugins/vim-fsharp.nix { }; # TODO upstream
+          vimPlugins-vim-mail = pkgs.callPackage packages/vimPlugins/vim-mail.nix { }; # TODO upstream
+          vimPlugins-vim-reason-plus = pkgs.callPackage packages/vimPlugins/vim-reason-plus.nix { }; # TODO upstream
+          vimv = pkgs.callPackage packages/vimv.nix { };
+          weechat-declarative = pkgs.callPackage packages/weechat-declarative.nix { }; # TODO upstream
+          weechatScripts-hotlist2extern = pkgs.callPackage packages/weechatScripts/hotlist2extern.nix { }; # TODO upstream
+          dmenu-randr = pkgs.callPackage packages/dmenu-randr.nix { };
+          wttr = pkgs.callPackage packages/wttr.nix { }; # TODO upstream
+
+          booksplit = wrapScript {
+            script = voidrice.outPath + "/.local/bin/booksplit";
+            name = "booksplit";
+            packages = [
+              pkgs.ffmpeg
+              pkgs.glibc.bin
+            ];
+          };
+          tag = wrapScript {
+            script = voidrice.outPath + "/.local/bin/tag";
+            name = "tag";
+            packages = [ pkgs.ffmpeg ];
+          };
+        }
+      );
+    };
 }

lib/default-applications.nix

@@ -1,4 +1,4 @@
-pkgs: rec {
+pkgs: {
   terminal = "alacritty";
   browser = "${pkgs.firefox}/bin/firefox";
   fileManager = "${pkgs.pcmanfm}/bin/pcmanfm";

lib/default.nix

@@ -9,9 +9,8 @@
     argument ? "-",
   }: "${type} '${path}' ${mode} ${user} ${group} ${age} ${argument}";
 
-  restic = rec {
+  restic = let host = "zaatar.r"; port = 3571; in {
-    port = 3571;
+    inherit host port;
-    host = "zaatar.r";
     repository = "rest:http://${host}:${toString port}/";
   };
 

lib/email.nix

@@ -1,5 +1,8 @@
-rec {
+let
   thunderbirdProfile = "donnervogel";
+in
+{
+  inherit thunderbirdProfile;
   pronouns = builtins.concatStringsSep "/" [
     "er"
     "he"
@@ -14,7 +17,7 @@ rec {
   defaults = {
     thunderbird = {
       enable = true;
-      profiles = [thunderbirdProfile];
+      profiles = [ thunderbirdProfile ];
     };
     aerc.enable = true;
     realName = "Kierán Meinhardt";

lib/local-network.nix

@@ -1,10 +1,4 @@
 {
-  toum = "192.168.178.24";
+  officejet = "192.168.0.251";
-  zaatar = "192.168.178.21";
+  router = "192.168.0.1";
-  kabsa = "192.168.178.32";
-  android = "192.168.178.35";
-  manakish = "192.168.178.29";
-
-  officejet = "192.168.178.27";
-  fritzbox = "192.168.178.1";
 }

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,25 @@ 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";
+      station = "Deutschlandfunk Nova";
+    }
+    {
+      stream = "https://samaaisb107-itelservices.radioca.st/stream";
+      station = "Samaa FM 107.4 Pakistan";
     }
   ]
   ++ map (name: {

lib/vim/init.lua

@@ -91,6 +91,7 @@ local language_servers = {
   -- tsserver = {}, -- typescript-language-server
   cssls = {},
   elmls = {}, -- elm-language-server
+  gopls = {}, -- gopls
   denols = {}, -- deno built in
   bashls = {}, -- bash-language-server
   lua_ls = {
@@ -154,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
@@ -124,3 +125,12 @@ set complete+=kspell
 let g:pandoc#syntax#conceal#use = 0
 let g:pandoc#modules#disabled = []
 let g:pandoc#spell#default_langs = ['en', 'de']
+
+autocmd! User GoyoEnter Limelight
+autocmd! User GoyoLeave Limelight!
+
+
+" Disable Copilot by default
+let b:copilot_enabled = v:false
+" keymap to toggle it enabled
+nnoremap <leader>gc :let b:copilot_enabled = !b:copilot_enabled<CR>

modules/go-webring.nix

@@ -0,0 +1,140 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  inherit (lib)
+    mkEnableOption
+    mkPackageOption
+    mkOption
+    types
+    literalExpression
+    mkIf
+    ;
+  cfg = config.services.go-webring;
+
+  defaultAddress = "127.0.0.1:2857";
+in
+
+{
+  options = {
+    services.go-webring = {
+      enable = mkEnableOption "go-webring";
+
+      package = mkPackageOption pkgs "go-webring" { };
+
+      contactInstructions = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = "Contact instructions for errors";
+        example = "contact the admin and let them know what's up";
+      };
+
+      host = mkOption {
+        type = types.str;
+        description = "Host this webring runs on, primarily used for validation";
+        example = "my-webri.ng";
+      };
+
+      homePageTemplate = mkOption {
+        type = types.str;
+        description = ''
+          This should be any HTML file with the string "{{ . }}" placed
+          wherever you want the table of members inserted. This table is
+          plain HTML so you can style it with CSS.
+        '';
+      };
+
+      listenAddress = mkOption {
+        type = types.str;
+        default = defaultAddress;
+        description = "Host and port go-webring will listen on";
+      };
+
+      members = mkOption {
+        type = types.listOf (
+          types.submodule {
+            options = {
+              username = mkOption {
+                type = types.str;
+                description = "Member's name";
+              };
+              site = mkOption {
+                type = types.str;
+                description = "Member's site URL";
+              };
+            };
+          }
+        );
+        description = "List of members in the webring";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.go-webring = {
+      description = "go-webring service";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      requires = [ "network.target" ];
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = ''
+          ${lib.getExe cfg.package} \
+            ${lib.optionalString (cfg.contactInstructions != null) ("--contact " + lib.escapeShellArg cfg.contactInstructions)} \
+            --host ${cfg.host} \
+            --index ${pkgs.writeText "index.html" cfg.homePageTemplate} \
+            --listen ${cfg.listenAddress} \
+            --members ${
+              pkgs.writeText "list.txt" (
+                lib.concatMapStrings (member: member.username + " " + member.site + "\n") cfg.members
+              )
+            }
+        '';
+        User = "go-webring";
+        DynamicUser = true;
+        RuntimeDirectory = "go-webring";
+        WorkingDirectory = "/var/lib/go-webring";
+        StateDirectory = "go-webring";
+        RuntimeDirectoryMode = "0750";
+        Restart = "always";
+        RestartSec = 5;
+
+        # Hardening
+        CapabilityBoundingSet = [ "" ];
+        DeviceAllow = [ "" ];
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        PrivateDevices = true;
+        PrivateUsers = true;
+        ProcSubset = "pid";
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+          "AF_UNIX"
+        ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service"
+          "~@privileged"
+        ];
+        UMask = "0077";
+      };
+    };
+    environment.systemPackages = [ cfg.package ];
+  };
+}

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/networkmanager-declarative.nix

@@ -1,69 +0,0 @@
-# https://github.com/jmackie/nixos-networkmanager-profiles/
-{
-  lib,
-  config,
-  ...
-}:
-with lib; let
-  nm = config.networking.networkmanager;
-
-  mkProfile = profileAttrs:
-    if !(isAttrs profileAttrs)
-    then throw "error 1"
-    else {
-      enable = true;
-      mode = "0400"; # readonly (user)
-      text =
-        (foldlAttrs (accum: {
-            name,
-            value,
-          }: ''
-            ${accum}
-
-            [${name}] ${mkProfileEntry value}'')
-          "# Generated by nixos-networkmanager-profiles"
-          profileAttrs)
-        + "\n";
-    };
-
-  mkProfileEntry = entryAttrs:
-    if !(isAttrs entryAttrs)
-    then throw "error 2"
-    else
-      foldlAttrs (accum: {
-        name,
-        value,
-      }: ''
-        ${accum}
-        ${name}=${toString value}'') ""
-      entryAttrs;
-
-  foldlAttrs = op: nul: attrs:
-    foldl (accum: {
-      fst,
-      snd,
-    }:
-      op accum (nameValuePair fst snd))
-    nul
-    (lists.zipLists (attrNames attrs) (attrValues attrs));
-
-  attrLength = attrs: length (attrValues attrs);
-in {
-  options.networking.networkmanager.profiles = mkOption {
-    type = types.attrs;
-    default = {};
-  };
-
-  config = mkIf (attrLength nm.profiles > 0) {
-    environment.etc = foldlAttrs (accum: {
-      name,
-      value,
-    }:
-      accum
-      // {
-        "NetworkManager/system-connections/${name}.nmconnection" =
-          mkProfile value;
-      }) {}
-    nm.profiles;
-  };
-}

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

modules/power-action.nix

@@ -56,7 +56,7 @@ with lib; let
 
   imp = {
     systemd.services.power-action = {
-      serviceConfig = rec {
+      serviceConfig = {
         ExecStart = startScript;
         User = cfg.user;
       };

packages/auc.nix

@@ -3,33 +3,33 @@
   fetchFromGitHub,
   lib,
   pandoc,
-}: let
+}:
-  owner = "kamalist";
+stdenv.mkDerivation (finalAttrs: {
-in
+  pname = "auc";
-  stdenv.mkDerivation rec {
+  version = "2019-04-02";
-    pname = "auc";
-    version = "2019-04-02";
 
-    src = fetchFromGitHub {
+  src = fetchFromGitHub {
-      inherit owner;
+    owner = "kamalist";
-      repo = "AUC";
+    repo = "AUC";
-      rev = "66d1cd57472442b4bf3c1ed12ca5cadd57d076b3";
+    rev = "66d1cd57472442b4bf3c1ed12ca5cadd57d076b3";
-      sha256 = "0gb4asmlfr19h42f3c5wg9c9i3014if3ymrqan6w9klgzgfyh2la";
+    sha256 = "0gb4asmlfr19h42f3c5wg9c9i3014if3ymrqan6w9klgzgfyh2la";
-    };
+  };
 
-    installPhase = ''
+  installPhase = ''
-      mkdir -p $out/{bin,man/man1}
+    mkdir -p $out/{bin,man/man1}
-      install auc $out/bin
+    install auc $out/bin
-      ${pandoc}/bin/pandoc -V title=${lib.escapeShellArg pname} -V section=1 $src/README.md -s -t man -o $out/man/man1/auc.1
+    ${pandoc}/bin/pandoc -V title=${lib.escapeShellArg finalAttrs.pname} -V section=1 $src/README.md -s -t man -o $out/man/man1/auc.1
+  '';
+
+  doCheck = true;
+
+  meta = with lib; {
+    description = "Command-line Roman calendar";
+    longDescription = ''
+      AUC (Ab Urbe condita) is a command-line Roman calendar tool. Currently it shows the specified date in the format of the Ancient Romans.
     '';
-
+    license = licenses.mit;
-    meta = with lib; {
+    maintainers = [ maintainers.kmein ];
-      description = "Command-line Roman calendar";
+    platforms = platforms.all;
-      longDescription = ''
+  };
-        AUC (Ab Urbe condita) is a command-line Roman calendar tool. Currently it shows the specified date in the format of the Ancient Romans.
+})
-      '';
-      license = licenses.mit;
-      maintainers = [maintainers.kmein];
-      platforms = platforms.all;
-    };
-  }

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/dashboard/default.nix

@@ -1,247 +0,0 @@
-{
-  writers,
-  formats,
-  acpi,
-  wtf,
-  himalaya,
-  lib,
-  jq,
-  gh,
-  curl,
-  khal,
-  todoman,
-  gnused,
-  coreutils,
-  astrolog,
-  weatherCityIds ? [2950159],
-}: let
-  rowCount = 10;
-  columnCount = 6;
-
-  yaml = formats.yaml {};
-  command = args:
-    {
-      enabled = true;
-      type = "cmdrunner";
-    }
-    // args;
-  configuration.wtf = rec {
-    grid = {
-      columns = lib.replicate columnCount 32;
-      rows = lib.replicate rowCount 5;
-    };
-    mods.vdir_khal = command {
-      title = "Calendar";
-      cmd = "${khal}/bin/khal";
-      args = ["--color" "list" "--exclude-calendar" "calendarium-tridentinum"];
-      refreshInterval = "1m";
-      position = {
-        top = 4;
-        left = 0;
-        height = 4;
-        width = 2;
-      };
-    };
-    mods.vdir_todo = command {
-      enabled = true;
-      title = "Agenda";
-      cmd = writers.writeDash "vdir_todo" "${todoman}/bin/todo --color=always -h | ${coreutils}/bin/tac";
-      refreshInterval = "1m";
-      position = {
-        top = 4;
-        left = 2;
-        height = 4;
-        width = 2;
-      };
-    };
-    mods.weather = {
-      enabled = true;
-      cityids = weatherCityIds;
-      position = {
-        top = 8;
-        left = 2;
-        height = 2;
-        width = 2;
-      };
-      refreshInterval = "15m";
-      language = "DE";
-      tempUnit = "C";
-      useEmoji = true;
-      compact = true;
-    };
-    mods.top = command {
-      title = "uptime";
-      cmd = writers.writeDash "top" "top -b -n 1 -E g | ${gnused}/bin/sed -n '1,5p'";
-      refreshInterval = "30s";
-      position = {
-        top = 4;
-        left = 4;
-        height = 2;
-        width = 2;
-      };
-      enabled = true;
-    };
-    mods.resourceusage = {
-      enabled = true;
-      cpuCombined = false;
-      position = {
-        top = 6;
-        left = 4;
-        height = 2;
-        width = 2;
-      };
-      refreshInterval = "1s";
-      showCPU = true;
-      showMem = true;
-      showSwp = false;
-    };
-    mods.ipapi = {
-      enabled = false;
-      position = {
-        top = 0;
-        left = 1;
-        height = 2;
-        width = 2;
-      };
-      refreshInterval = "150s";
-    };
-    mods.battery-status = command {
-      enabled = true;
-      cmd = writers.writeDash "battery-status" ''
-        ${acpi}/bin/acpi --battery --details | sed 's/^Battery //'
-      '';
-      refreshInterval = "1m";
-      position = {
-        top = 8;
-        left = 4;
-        height = 2;
-        width = 2;
-      };
-    };
-    mods.disk-usage = command {
-      enabled = false;
-      cmd = "df";
-      args = ["-h"];
-      refreshInterval = "1m";
-      position = {
-        top = 8;
-        left = 4;
-        height = 2;
-        width = 2;
-      };
-    };
-    mods.email = command {
-      title = "Email";
-      cmd = writers.writeDash "email" ''
-        ${himalaya}/bin/himalaya accounts --output json \
-          | ${jq}/bin/jq -r 'map(.name) | join("\n")' \
-          | while read -r account
-            do
-              ${himalaya}/bin/himalaya list --account "$account" -o json \
-                | ${jq}/bin/jq -r '
-                  map(select(.flags == [])
-                  | "\u001b[33m\(.from.addr)\u001b[0m \(.subject)") | join("\n")
-                '
-            done
-      '';
-      refreshInterval = "5m";
-      position = {
-        top = 0;
-        left = 0;
-        height = 4;
-        width = 2;
-      };
-    };
-    mods.gh-status = command {
-      enabled = true;
-      title = "GitHub";
-      cmd = writers.writeDash "gh-status" ''
-        ${gh}/bin/gh api notifications \
-          | ${jq}/bin/jq -r 'map("\u001b[35m\(.repository.full_name)\u001b[0m \(.subject.title)") | join("\n")'
-      '';
-      refreshInterval = "5m";
-      position = {
-        top = 0;
-        left = 2;
-        height = 2;
-        width = 2;
-      };
-    };
-    mods.gh-issues = command {
-      enabled = true;
-      title = "GitHub";
-      cmd = writers.writeDash "gh-issues" ''
-        ${gh}/bin/gh api issues \
-          | ${jq}/bin/jq -r 'map(select(.repository.owner.login == "kmein") | "\u001b[35m\(.repository.name)\u001b[0m \(.title)") | join("\n")'
-      '';
-      refreshInterval = "5m";
-      position = {
-        top = 2;
-        left = 2;
-        height = 2;
-        width = 2;
-      };
-    };
-    mods.calendar = command {
-      title = "Calendar";
-      cmd = "cal";
-      args = ["-3" "-m" "-w"];
-      pty = true;
-      refreshInterval = "5m";
-      position = {
-        top = 8;
-        left = 0;
-        height = 2;
-        width = 2;
-      };
-    };
-    mods.astro-aspects = command {
-      title = "Aspects";
-      enabled = false;
-      cmd = writers.writeDash "astro-aspects" "${astrolog}/bin/astrolog -n -zN Berlin -d";
-      refreshInterval = "1h";
-      position = {
-        top = 7;
-        left = 3;
-        height = 1;
-        width = 2;
-      };
-    };
-    mods.feed = command {
-      enabled = true;
-      title = "Feed";
-      cmd = writers.writeDash "feed" ''
-        ${curl}/bin/curl -u "$WTF_MINIFLUX_API_KEY" --basic -s 'https://feed.kmein.de/v1/entries?status=unread&direction=desc' \
-          | ${jq}/bin/jq -r '
-            .total as $total | (
-              .entries
-              | map(select(.feed | .hide_globally| not) | "\(.feed.category.title) \u001b[32m\(.author)\u001b[0m \(.title)")
-              | join("\n")
-            )'
-      '';
-      # position = { top = 0; left = 5; height = 5; width = 1; };
-      position = {
-        top = 0;
-        left = 4;
-        height = 4;
-        width = 2;
-      };
-      refreshInterval = "15m";
-    };
-    mods.astro-positions = command {
-      enabled = false;
-      title = "Positions";
-      cmd = writers.writeDash "astro-positions" "${astrolog}/bin/astrolog -q $(date +'%m %d %Y %H:%M') -zN Berlin | ${gnused}/bin/sed -n '4,16p' | ${coreutils}/bin/cut -c 1-33";
-      refreshInterval = "1h";
-      position = {
-        top = 5;
-        left = 5;
-        height = 3;
-        width = 1;
-      };
-    };
-  };
-in
-  writers.writeDashBin "dashboard" ''
-    exec ${wtf}/bin/wtfutil --config=${yaml.generate "config.yml" configuration}
-  ''

packages/devanagari/default.nix

@@ -1,7 +1,13 @@
-{yarn2nix-moretea}:
+{yarn2nix-moretea, lib}:
 yarn2nix-moretea.mkYarnPackage {
   name = "devanagari";
-  src = ./.;
+  src = lib.fileset.toSource {
+    root = ./.;
+    fileset = lib.fileset.unions [
+      ./devanagari.js
+      ./package.json
+    ];
+  };
   packageJson = ./package.json;
   yarnLock = ./yarn.lock;
 }

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/go-webring.nix

@@ -0,0 +1,21 @@
+{ buildGoModule, fetchgit, lib }:
+buildGoModule {
+  pname = "go-webring";
+  version = "2024-12-18";
+
+  src = fetchgit {
+    url = "https://git.sr.ht/~amolith/go-webring";
+    rev = "0b5b1bf21ff91119ea2dd042ee9fe94e9d1cd8d4";
+    hash = "sha256-az6vBOGiZmzfsMjYUacXMHhDeRDmVI/arCKCpHeTcns=";
+  };
+
+  vendorHash = "sha256-3PnXB8AfZtgmYEPJuh0fwvG38dtngoS/lxyx3H+rvFs=";
+
+  meta = {
+    mainProgram = "go-webring";
+    description = "Simple webring implementation";
+    homepage = "https://git.sr.ht/~amolith/go-webring";
+    license = lib.licenses.bsd2; # cc0 as well
+    maintainers = [ lib.maintainers.kmein ];
+  };
+}

packages/hc.nix

@@ -9,19 +9,20 @@
   gnugrep,
   qrencode,
   texlive,
-  utillinux,
+  util-linux,
   zbar,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
-  name = "hc-${meta.version}";
+  name = "hc-${finalAttrs.version}";
+  version = "1.0.0";
 
   src = fetchgit {
     url = "https://cgit.krebsco.de/hc";
-    rev = "refs/tags/v${meta.version}";
+    rev = "refs/tags/v${finalAttrs.version}";
     sha256 = "09349gja22p0j3xs082kp0fnaaada14bafszn4r3q7rg1id2slfb";
   };
 
-  nativeBuildInputs = [makeWrapper];
+  nativeBuildInputs = [ makeWrapper ];
 
   buildPhase = null;
 
@@ -31,19 +32,21 @@ stdenv.mkDerivation rec {
     cp $src/bin/hc $out/bin/hc
 
     wrapProgram $out/bin/hc \
-      --prefix PATH : ${lib.makeBinPath [
+      --prefix PATH : ${
-      coreutils
+        lib.makeBinPath [
-      findutils
+          coreutils
-      gawk
+          findutils
-      gnugrep
+          gawk
-      qrencode
+          gnugrep
-      texlive.combined.scheme-full
+          qrencode
-      utillinux
+          texlive.combined.scheme-full
-      zbar
+          util-linux
-    ]}
+          zbar
+        ]
+      }
   '';
 
   meta = {
-    version = "1.0.0";
+    version = finalAttrs.version;
   };
-}
+})

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/jsesh.nix

@@ -1,7 +1,13 @@
-{pkgs ? import <nixpkgs> {}}:
+{
-pkgs.writers.writeDashBin "jsesh" ''
+  writers,
-  ${pkgs.jre}/bin/java -jar ${pkgs.fetchzip {
+  jre,
-    url = "https://github.com/rosmord/jsesh/releases/download/release-7.5.5/JSesh-7.5.5.zip";
+  fetchzip,
-    sha256 = "1z7ln51cil9pypz855x9a8p9ip2aflvknh566wcaah1kmz3fp57r";
+}:
-  }}/lib/jseshAppli-7.5.5.jar
+writers.writeDashBin "jsesh" ''
+  ${jre}/bin/java -jar ${
+    fetchzip {
+      url = "https://github.com/rosmord/jsesh/releases/download/release-7.5.5/JSesh-7.5.5.zip";
+      sha256 = "1z7ln51cil9pypz855x9a8p9ip2aflvknh566wcaah1kmz3fp57r";
+    }
+  }/lib/jseshAppli-7.5.5.jar
 ''

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/obsidian-vim.nix

@@ -22,7 +22,7 @@ neovim.override {
         \ 'path': '${obsidiantVaultDirectory}',
         \ 'syntax': 'markdown',
         \ 'ext': '.md',
-        \ 'diary_rel_path' '.',
+        \ 'diary_rel_path': '.',
         \}]
 
       let NERDTreeSortOrder = ['[[-timestamp]]']

packages/opustags.nix

@@ -6,14 +6,14 @@
   libogg,
   fetchFromGitHub,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   name = "opustags";
   version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "fmang";
     repo = "opustags";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "09z0cdg20algaj2yyhfz3hxh1biwjjvzx1pc2vdc64n8lkswqsc1";
   };
 
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
     "-DCMAKE_INSTALL_PREFIX=$out"
   ];
 
+  doCheck = true;
+
   buildInputs = [libogg];
 
   nativeBuildInputs = [cmake pkg-config];
@@ -30,4 +32,4 @@ stdenv.mkDerivation rec {
     description = "Ogg Opus tags editor";
     platforms = platforms.all;
   };
-}
+})

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/python3Packages/indic-transliteration/default.nix

@@ -6,11 +6,11 @@
   regex,
   ...
 }:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "indic_transliteration";
   version = "unstable-2020-12-15";
   src = fetchFromGitHub {
-    repo = pname;
+    repo = finalAttrs.pname;
     owner = "sanskrit-coders";
     rev = "2ea25a03af15937916b6768835e056166986c567";
     sha256 = "1pcf800hl0zkcffc47mkjq9mizsxdi0hwxlnij5bvbqdshd3w9ll";
@@ -18,4 +18,4 @@ buildPythonPackage rec {
   patches = [./regex-version.patch];
   propagatedBuildInputs = [backports_functools_lru_cache selenium regex];
   doCheck = false;
-}
+})

packages/rfc.nix

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

packages/scanned.nix

@@ -2,8 +2,12 @@
 {
   writers,
   imagemagick,
+  ghostscript,
+  lib
 }:
 writers.writeDashBin "scanned" ''
+  export PATH=${lib.makeBinPath [ imagemagick ghostscript ]}:$PATH
+
   [ $# -eq 1 -a -f "$1" -a -r "$1" ] || exit 1
 
   ${imagemagick}/bin/convert \

packages/stag.nix

@@ -0,0 +1,46 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  ncurses,
+  taglib,
+  zlib,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "stag";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "smabie";
+    repo = "stag";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-IWb6ZbPlFfEvZogPh8nMqXatrg206BTV2DYg7BMm7R4=";
+  };
+
+  buildInputs = [
+    ncurses
+    taglib
+    zlib
+  ];
+
+  buildPhase = ''
+    make all
+  '';
+
+  doCheck = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp stag $out/bin/
+
+    mkdir -p $out/man/man1
+    mv stag.1 $out/man/man1/
+  '';
+  meta = {
+    description = "public domain utf8 curses based audio file tagger";
+    homepage = "https://github.com/smabie/stag";
+    license = lib.licenses.publicDomain;
+    maintainers = [ lib.maintainers.kmein ];
+    platforms = lib.platforms.unix;
+  };
+})

packages/stardict-tools.nix

@@ -27,8 +27,9 @@ stdenv.mkDerivation {
   env.NIX_CFLAGS_COMPILE = toString [
     "-Wno-error=format-security"
   ];
-  patchPhase = ''
+  postPatch = ''
-    ${gnused}/bin/sed -i s/noinst_PROGRAMS/bin_PROGRAMS/ tools/src/Makefile.am
+    substituteInPlace tools/src/Makefile.am \
+      --replace-fail noinst_PROGRAMS bin_PROGRAMS
   '';
   installFlags = ["INSTALL_PREFIX=$(out)"];
   autoreconfPhase = ''
@@ -39,6 +40,7 @@ stdenv.mkDerivation {
     mkdir $out
     make install
   '';
+  doCheck = true;
   src = fetchFromGitHub {
     owner = "huzheng001";
     repo = "stardict-3";

packages/text2pdf.nix

@@ -2,15 +2,14 @@
   stdenv,
   fetchurl,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
-  name = "${pname}-${version}";
   pname = "text2pdf";
   version = "1.1";
   src = fetchurl {
     url = "http://www.eprg.org/pdfcorner/text2pdf/text2pdf.c";
     sha256 = "002nyky12vf1paj7az6j6ra7lljwkhqzz238v7fyp7sfgxw0f7d1";
   };
-  phases = ["buildPhase"];
+  phases = [ "buildPhase" ];
   buildPhase = ''
     mkdir -p $out/bin
     gcc -o $out/bin/text2pdf $src

packages/vim.nix

@@ -40,6 +40,13 @@
 
         editorconfig-vim
 
+        copilot-vim
+
+        goyo
+        limelight-vim
+        niveumPackages.vimPlugins-mdwa-nvim
+        niveumPackages.vimPlugins-vim-ernest
+
         fzf-vim
         fzfWrapper
         supertab
@@ -57,10 +64,9 @@
         vim-repeat
         vim-sensible
         vim-surround
-        (vimUtils.buildVimPlugin rec {
+        (vimUtils.buildVimPlugin {
           pname = "vim-dim";
           version = "1.1.0";
-          name = "${pname}-${version}";
           src = fetchFromGitHub {
             owner = "jeffkreeftmeijer";
             repo = pname;
@@ -74,6 +80,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

@@ -0,0 +1,13 @@
+{
+  vimUtils,
+  fetchFromGitHub,
+}: (vimUtils.buildVimPlugin {
+  pname = "mdwa.nvim";
+  version = "9f37270";
+  src = fetchFromGitHub {
+    owner = "tihawk";
+    repo = "mdwa.nvim";
+    rev = "9f3727037e0d85fd0930334b91b9687a5a880192";
+    hash = "sha256-h2jy2E+pN2Ma/5n9Eq2oXr9xHma2OxxVvx9EJ+bIYxA=";
+  };
+})

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

@@ -0,0 +1,14 @@
+{
+  vimUtils,
+  fetchFromGitHub,
+  lib,
+}: (vimUtils.buildVimPlugin {
+  pname = "vim-ernest";
+  version = "4b99bc3";
+  src = fetchFromGitHub {
+    owner = "lgalke";
+    repo = "vim-ernest";
+    rev = "4b99bc3fe3deb7bb958ad2f64cad93569eeb50d7";
+    hash = "sha256-AUuRnnZU39XUerBxNelEqVyDAalRm3VGNUQb15fjXjM=";
+  };
+})

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
@@ -10,8 +9,8 @@
   config = args.config or {};
 
   lib =
-    args.lib
+    lib.recursiveUpdate args.lib
-    // rec {
+    (let
       attrPaths = let
         recurse = path: value:
           if builtins.isAttrs value
@@ -19,6 +18,8 @@
           else [(lib.nameValuePair path value)];
       in
         attrs: lib.flatten (recurse [] attrs);
+    in {
+      inherit attrPaths;
 
       attrPathsSep = sep: attrs: lib.listToAttrs (map (x: x // {name = lib.concatStringsSep sep x.name;}) (attrPaths attrs));
 
@@ -34,7 +35,7 @@
       setCommand = name: value: "/set ${name} \"${toWeechatValue value}\"";
 
       filterAddreplace = name: filter: "/filter addreplace ${name} ${filter.buffer} ${toWeechatValue filter.tags} ${filter.regex}";
-    };
+    });
 
   cfg = eval.config;
 
@@ -137,7 +138,7 @@
     ))
   );
 
-  weechat = unstablePackages.weechat.override {
+  weechatPkg = pkgs.weechat.override {
     configure = _: {
       init = "/exec -oc cat ${setFile}";
 
@@ -163,14 +164,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