wip: hass with nix

2026-03-16 18:21:07 +01:00 · 2023-02-08 10:09:24 +01:00
381 changed files with 11590 additions and 13018 deletions
--- a/.bin/fix-sd.sh
+++ b/.bin/fix-sd.sh
@@ -1,21 +0,0 @@
-#!/bin/sh
-set -xfu
-
-drive="$1"
-mountpoint="/media/sd-card-$(date +%s)"
-backup_directory="$(pwd)"
-
-trap clean EXIT
-clean() {
-  umount "$mountpoint"
-  rmdir "$mountpoint"
-  fsck.exfat "$drive"
-}
-
-filenames="$(fsck.exfat "$drive" 2>&1 | sed -nE "s/.* file '(.*?)' is not allocated.*/\1/p")"
-mkdir "$mountpoint"
-mount "$drive" "$mountpoint"
-
-echo "$filenames" | while read -r filename; do
-  find "$mountpoint" -type f -name "$filename" -exec mv {} "$backup_directory" \;
-done
--- a/.bin/mp3player-write
+++ b/.bin/mp3player-write
@@ -1,114 +0,0 @@
-#!/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."
--- a/.bin/toposort.nix
+++ b/.bin/toposort.nix
@@ -1,81 +1,50 @@
 let
  lib = import <nixpkgs/lib>;
-in
-rec {
+in rec {
  inherit lib;

  input = [
    {
-      x = [
-        "pool"
-        "zfs"
-      ];
-      y = [
-        "mdadm"
-        "raid1"
-      ];
+      x = ["pool" "zfs"];
+      y = ["mdadm" "raid1"];
    }
    {
-      x = [
-        "pool"
-        "zfs"
-      ];
-      y = [
-        "disk"
-        "sda"
-      ];
+      x = ["pool" "zfs"];
+      y = ["disk" "sda"];
    }
    {
-      x = [
-        "mdadm"
-        "raid1"
-      ];
-      y = [
-        "disk"
-        "sdb"
-      ];
+      x = ["mdadm" "raid1"];
+      y = ["disk" "sdb"];
    }
    {
-      x = [
-        "mdadm"
-        "raid1"
-      ];
-      y = [
-        "disk"
-        "sdc"
-      ];
+      x = ["mdadm" "raid1"];
+      y = ["disk" "sdc"];
    }
  ];

-  outNodes = node: graph: lib.unique (builtins.map (e: e.y) (builtins.filter (v: v.x == node) graph));
+  outNodes = node: graph:
+    lib.unique
+    (builtins.map (e: e.y)
+      (builtins.filter (v: v.x == node) graph));

-  vertices = graph: lib.unique (builtins.map (x: x.y) graph ++ builtins.map (x: x.x) graph);
+  vertices = graph:
+    lib.unique
+    (builtins.map (x: x.y) graph ++ builtins.map (x: x.x) graph);

  deleteVertex = node: graph: (builtins.filter (v: v.x != node && v.y != node) graph);

-  findSink =
-    graph:
-    lib.findFirst (v: outNodes v graph == [ ]) (lib.trace graph (builtins.abort "No sink found")) (
-      vertices graph
-    );
+  findSink = graph:
+    lib.findFirst
+    (v: outNodes v graph == [])
+    (lib.trace graph (builtins.abort "No sink found"))
+    (vertices graph);

-  topSort =
-    graph:
-    if graph == [ ] then
-      [ ]
-    else if builtins.length graph == 1 then
-      let
-        only = builtins.head graph;
-      in
-      [
-        only.y
-        only.x
-      ]
-    else
-      let
-        sink = findSink graph;
-      in
-      [ sink ] ++ topSort (deleteVertex sink graph);
+  topSort = graph:
+    if graph == []
+    then []
+    else if builtins.length graph == 1
+    then let only = builtins.head graph; in [only.y only.x]
+    else let sink = findSink graph; in [sink] ++ topSort (deleteVertex sink graph);

  output = topSort input;
 }
--- a/.bin/unicode
+++ b/.bin/unicode
@@ -1,8 +0,0 @@
-import sys
-import unicodedata
-
-for index, character in enumerate(sys.stdin.read().strip()):
-  try:
-    print(index, character, hex(ord(character)), unicodedata.category(character), unicodedata.name(character))
-  except:
-    print(index, character, hex(ord(character)))
--- a/.github/workflows/flake.yml
+++ b/.github/workflows/flake.yml
@@ -2,7 +2,7 @@ name: Update flake.lock
 on:
  workflow_dispatch: # allows manual triggering
  schedule:
-    - cron: "0 0 * * 0" # runs weekly on Sunday at 00:00
+    - cron: '0 0 * * 0' # runs weekly on Sunday at 00:00

 jobs:
  lockfile:
--- a/.github/workflows/niveum.yml
+++ b/.github/workflows/niveum.yml
@@ -7,33 +7,8 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        system: [makanek, manakish, kabsa, zaatar, ful, fatteh]
+        system: [makanek,manakish,kabsa,zaatar,ful]
    steps:
-      - uses: actions/checkout@v3
-      - name: Install QEMU (ARM)
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y qemu-user-static
-        if: ${{ matrix.system == 'ful' }}
-      - name: Install Nix (ARM)
-        uses: cachix/install-nix-action@v16
-        if: ${{ matrix.system == 'ful' }}
-        with:
-          extra_nix_config: |
-            system = aarch64-linux
-      - name: Install Nix (x86_64)
-        uses: cachix/install-nix-action@v16
-        if: ${{ matrix.system != 'ful' }}
-      - name: nixos-rebuild dry-build
-        run: |
-          # remove secrets: ref https://stackoverflow.com/questions/1260748/how-do-i-remove-a-submodule/36593218
-          git submodule deinit -f secrets
-          rm -rf .git/modules/secrets
-          git rm -f secrets
-
-          # recreate secrets
-          mkdir secrets
-          cat secrets.txt | while read -r path; do touch $path; done
-          git add secrets
-
-          nix run nixpkgs#nixos-rebuild -- dry-build  --flake $GITHUB_WORKSPACE#${{matrix.system}}
+    - uses: actions/checkout@v2
+    - uses: cachix/install-nix-action@v16
+    - run: nix run .#build-${{matrix.system}}
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "secrets"]
-	path = secrets
-	url = ssh://gitea@code.kmein.de:22022/kfm/niveum-secrets.git
--- a/README.md
+++ b/README.md
@@ -1,18 +1,10 @@
 # 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.—
+>
 > 2. Transf., _snow-white, snowy_ (mostly poet.): a similitudine sic: Corpore niveum candorem, aspectu igneum ardorem assequebatur, Auct. Her. 4, 33, 44: lacerti, Verg. A. 8, 387: lac, id. E. 2, 20: hanc si capite niveae agnae exorari judicas, Sen. Q. N. 2, 36: Briseis niveo colore, Hor. C. 2, 4, 3: vestis, Ov. M. 10, 432: candidior nivei folio, Galatea, ligustri, id. ib. 13, 789: dens, id. H. 18, 18: quā notam duxit niveus videri, Hor. C. 4, 2, 59: panis, Juv. 5, 70: flumen, _clear, pellucid_, Sen. Hippol. 504: undae, Mart. 7, 32, 11: tribuni, _clothed in white togas_, Calp. Ecl. 7, 29; so, Quirites, Juv. 10, 45.

 ## Pressestimmen
-
-> das ist ja pure poesie —[riotbib](https://github.com/riotbib/)
-
-> Deine Configs sind wunderschön <3 —[flxai](https://github.com/flxai/)
-
-## To do
-
-🦗
+> das ist ja pure poesie —[xkey](https://github.com/riotbib)
--- a/ci.nix
+++ b/ci.nix
@@ -0,0 +1,98 @@
+{
+  inputs,
+  system,
+  name,
+}: let
+  nixpkgs = inputs.nixos-stable;
+  pkgs = nixpkgs.legacyPackages.${system};
+  ensureFiles = paths:
+    pkgs.runCommand "directory" {} ''
+      set -efu
+      mkdir $out
+      cd $out
+      ${
+        nixpkgs.lib.concatMapStringsSep "\n" (path: ''
+          mkdir -p "$(dirname ${nixpkgs.lib.escapeShellArg path})"
+          echo foo > ${nixpkgs.lib.escapeShellArg path}
+        '')
+        paths
+      }
+    '';
+  nixPath = nixpkgs.lib.concatStringsSep ":" ([
+      "niveum=${toString ./.}"
+      "nixos-config=${toString ./.}/systems/${name}/configuration.nix"
+      "system-secrets=${systemSecrets}"
+      "secrets=${sharedSecrets}"
+      "nixpkgs=${
+        toString (
+          if name == "kabsa" || name == "manakish"
+          then inputs.nixos-unstable
+          else inputs.nixos-stable
+        )
+      }"
+    ]
+    ++ nixpkgs.lib.mapAttrsToList (name: value: "${name}=${value}") inputs);
+  # cd ~/.password-store/shared && find * -type f | sed 's/.gpg$//'
+  sharedSecrets = ensureFiles [
+    "di.fm/key"
+    "eduroam/identity"
+    "eduroam/password"
+    "github/notification.token"
+    "hass/token"
+    "mail/cock"
+    "mail/fastmail"
+    "mail/gmail/amroplay"
+    "mail/gmail/kieran.meinhardt"
+    "mail/meinhaki"
+    "mail/dslalewa"
+    "mail/fsklassp"
+    "mail/posteo"
+    "mega/password"
+    "nextcloud-fysi/password"
+    "nextcloud/password"
+    "openweathermap.key"
+    "restic/password"
+    "traadfri.key"
+    "miniflux/password"
+    "wifi/Aether.psk"
+    "spotify/username"
+    "spotify/password"
+  ];
+  systemSecrets = let
+    basic = ["retiolum.ed25519" "retiolum.key" "syncthing/cert.pem" "syncthing/key.pem" "ssh/passphrase"];
+  in
+    {
+      zaatar = ensureFiles (["moodle.token" "telegram/moodle-dl.token" "mpd-web.key"] ++ basic);
+      kabsa = ensureFiles basic;
+      manakish = ensureFiles basic;
+      tahina = ensureFiles basic;
+      tabula = ensureFiles basic;
+      ful = ensureFiles (["root.password"] ++ basic);
+      makanek = ensureFiles ([
+          "irc/retiolum"
+          "irc/hackint"
+          "irc/libera"
+          "irc/oftc"
+          "matrix/nibbana"
+          "maxmind/license.key"
+          "moodle-dl/faye.token"
+          "nextcloud/admin"
+          "nextcloud/database"
+          "telegram/nachtischsatan.token"
+          "telegram/reverse.token"
+          "telegram/odyssey.token"
+          "telegram/betacode.token"
+          "telegram/moodle-dl.token"
+          "telegram/proverb.token"
+          "telegram/menstruation.token"
+          "telegram/cool_village.token"
+          "telegram/kmein.token"
+          "telegram/krebs.token"
+          "telegram/prometheus.token"
+          "weechat/relay"
+        ]
+        ++ basic);
+    }
+    .${name};
+in
+  toString (pkgs.writers.writeDash "build" "NIX_PATH=${nixPath} nix-build '<nixpkgs/nixos>' -A system --dry-run")
--- a/configs/admin-essentials.nix
+++ b/configs/admin-essentials.nix
@@ -1,127 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}:
-let
-  darwin = lib.strings.hasSuffix "-darwin" pkgs.stdenv.hostPlatform.system;
-in
-{
-  environment.systemPackages = [
-    pkgs.htop
-    pkgs.w3m
-    pkgs.wget
-    # ARCHIVE TOOLS
-    pkgs.unzip
-    pkgs.unrar
-    pkgs.p7zip
-    pkgs.sshuttle
-    pkgs.zip
-    # MONITORS
-    pkgs.iftop # interface bandwidth monitor
-    pkgs.lsof # list open files
-    # SHELL
-    pkgs.sqlite
-    pkgs.fd # better find
-    pkgs.tree
-    pkgs.parallel # for parallel, since moreutils shadows task spooler
-    pkgs.ripgrep # better grep
-    pkgs.rlwrap
-    pkgs.progress # display progress bars for pipes
-    pkgs.file # determine file type
-    pkgs.gdu # ncurses disk usage (ncdu is broken)
-    pkgs.rmlint # remove duplicate files
-    pkgs.jq # json toolkit
-    pkgs.jless # less(1) for json
-    pkgs.fq # toolkit for yaml, xml and binaries
-    pkgs.bc # calculator
-    pkgs.pari # gp -- better calculator
-    pkgs.ts
-    pkgs.vimv
-    pkgs.vg
-    pkgs.fkill
-    pkgs.cyberlocker-tools
-    pkgs.untilport
-    pkgs.kpaste
-    # HARDWARE
-    pkgs.pciutils # for lspci
-  ]
-  ++ lib.optionals (!darwin) [
-    pkgs.usbutils # for lsusb
-    pkgs.lshw # for lshw
-    pkgs.iotop # I/O load monitor
-    pkgs.psmisc # for killall, pstree
-  ];
-
-  security.wrappers = {
-    pmount = {
-      setuid = true;
-      owner = "root";
-      group = "root";
-      source = "${pkgs.pmount}/bin/pmount";
-    };
-    pumount = {
-      setuid = true;
-      owner = "root";
-      group = "root";
-      source = "${pkgs.pmount}/bin/pumount";
-    };
-  };
-
-  environment.interactiveShellInit = ''
-    # Use XDG_RUNTIME_DIR for temporary files if available
-    if [ -d "$XDG_RUNTIME_DIR" ]; then
-      export TMPDIR="$XDG_RUNTIME_DIR"
-    fi
-  '';
-
-  environment.shellAliases =
-    let
-      take = pkgs.writers.writeDash "take" ''
-        mkdir "$1" && cd "$1"
-      '';
-      cdt = pkgs.writers.writeDash "cdt" ''
-        cd $(mktemp -p "$XDG_RUNTIME_DIR" -d "cdt-XXXXXX")
-        pwd
-      '';
-      wcd = pkgs.writers.writeDash "wcd" ''
-        cd "$(readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname)/.."
-      '';
-      where = pkgs.writers.writeDash "where" ''
-        readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname
-      '';
-    in
-    {
-      nixi = "nix repl nixpkgs";
-      take = "source ${take}";
-      wcd = "source ${wcd}";
-      where = "source ${where}";
-      # temporary files and directories
-      cdt = "source ${cdt}";
-      vit = "$EDITOR $(mktemp)";
-      # file safety
-      mv = "${pkgs.coreutils}/bin/mv --interactive";
-      rm = "${pkgs.coreutils}/bin/rm --interactive";
-      cp = "${pkgs.coreutils}/bin/cp --interactive";
-      # colours
-      cat = "${pkgs.bat}/bin/bat --theme=ansi --style=plain";
-      l = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso --almost-all";
-      ls = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso";
-      ll = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso -l";
-      la = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso --almost-all -l";
-    }
-    // (
-      if darwin then
-        { }
-      else
-        {
-          "ß" = "${pkgs.util-linux}/bin/setsid";
-          ip = "${pkgs.iproute2}/bin/ip -c";
-          # systemd
-          s = "${pkgs.systemd}/bin/systemctl";
-          us = "${pkgs.systemd}/bin/systemctl --user";
-          j = "${pkgs.systemd}/bin/journalctl";
-          uj = "${pkgs.systemd}/bin/journalctl --user";
-        }
-    );
-}
--- a/configs/aerc.nix
+++ b/configs/aerc.nix
@@ -1,333 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}:
-{
-  age.secrets = {
-    email-password-ical-ephemeris = {
-      file = ../secrets/email-password-ical-ephemeris.age;
-      owner = config.users.users.me.name;
-      group = config.users.users.me.group;
-      mode = "400";
-    };
-    email-password-cock = {
-      file = ../secrets/email-password-cock.age;
-      owner = config.users.users.me.name;
-      group = config.users.users.me.group;
-      mode = "400";
-    };
-    email-password-posteo = {
-      file = ../secrets/email-password-posteo.age;
-      owner = config.users.users.me.name;
-      group = config.users.users.me.group;
-      mode = "400";
-    };
-  };
-
-  home-manager.users.me = {
-    accounts.email.maildirBasePath = "${config.users.users.me.home}/state/Maildir";
-
-    services.mbsync = {
-      enable = true;
-      frequency = "daily";
-      preExec = "${pkgs.coreutils}/bin/mkdir -p ${config.home-manager.users.me.accounts.email.maildirBasePath}";
-      postExec = "${pkgs.notmuch}/bin/notmuch new";
-    };
-
-    programs.notmuch = {
-      enable = true;
-      extraConfig = {
-        database.path = config.home-manager.users.me.accounts.email.maildirBasePath;
-        new.tags = "";
-        user.name = pkgs.lib.niveum.email.defaults.realName;
-        user.primary_email = config.home-manager.users.me.accounts.email.accounts.posteo.address;
-      };
-    };
-
-    programs.mbsync = {
-      enable = true;
-      extraConfig = lib.concatStringsSep "\n\n" (
-        lib.mapAttrsToList (name: account: ''
-          IMAPAccount ${name}
-          CertificateFile /etc/ssl/certs/ca-certificates.crt
-          Host ${account.imap.host}
-          PassCmd "${toString account.passwordCommand}"
-          User ${account.userName}
-          SSLType IMAPS
-          ${lib.optionalString (lib.isInt account.imap.port) "Port ${toString account.imap.port}"}
-
-          IMAPStore ${name}-remote
-          Account ${name}
-
-          MaildirStore ${name}-local
-          Path ${config.home-manager.users.me.accounts.email.maildirBasePath}/${name}/
-          SubFolders Verbatim
-
-          Channel ${name}
-          Create Near
-          Expunge None
-          Far :${name}-remote:
-          Near :${name}-local:
-          Patterns *
-          Remove None
-          SyncState *
-        '') config.home-manager.users.me.accounts.email.accounts
-      );
-    };
-
-    accounts.email.accounts = {
-      cock =
-        let
-          mailhost = "mail.cock.li";
-          address = "2210@cock.li";
-        in
-        lib.recursiveUpdate pkgs.lib.niveum.email.defaults {
-          address = address;
-          userName = address;
-          passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-cock.path}";
-          realName = "2210";
-          imap.host = mailhost;
-          imap.port = 993;
-          smtp.host = mailhost;
-          smtp.port = 25;
-          smtp.tls.useStartTls = true;
-        };
-      ical-ephemeris =
-        let
-          address = "ical.ephemeris@web.de";
-        in
-        lib.recursiveUpdate pkgs.lib.niveum.email.defaults {
-          userName = address;
-          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 = "smtp.web.de";
-          smtp.port = 587;
-          smtp.tls.useStartTls = true;
-        };
-      posteo =
-        let
-          mailhost = "posteo.de";
-          address = "kieran.meinhardt@posteo.net";
-        in
-        lib.recursiveUpdate pkgs.lib.niveum.email.defaults {
-          address = address;
-          aliases = [ "kmein@posteo.de" ];
-          userName = address;
-          imap.host = mailhost;
-          imap.port = 993;
-          imap.tls.enable = true;
-          smtp.host = mailhost;
-          smtp.port = 465;
-          smtp.tls.enable = true;
-          primary = true;
-          passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-posteo.path}";
-          himalaya = {
-            enable = true;
-            settings.backend = "imap";
-          };
-          aerc.extraAccounts.pgp-key-id = "9EDE82CC72A343A95266D0F444857074A3ACC8B7";
-        };
-    };
-
-    programs.himalaya.enable = true;
-
-    programs.thunderbird = {
-      enable = true;
-      settings = {
-      };
-      profiles.${pkgs.lib.niveum.email.thunderbirdProfile} = {
-        isDefault = true;
-        settings = {
-          "mail.default_send_format" = 1;
-          "msgcompose.default_colors" = false;
-          "msgcompose.text_color" = config.lib.stylix.colors.withHashtag.base00;
-          "msgcompose.background_color" = config.lib.stylix.colors.withHashtag.base05;
-        };
-        userChrome = '''';
-        userContent = '''';
-        withExternalGnupg = false;
-      };
-    };
-
-    programs.aerc = {
-      enable = true;
-
-      extraBinds = {
-        # Binds are of the form <key sequence> = <command to run>
-        # To use '=' in a key sequence, substitute it with "Eq": "<Ctrl+Eq>"
-        # If you wish to bind #, you can wrap the key sequence in quotes: "#" = quit
-        global = {
-          "<C-p>" = ":prev-tab<Enter>";
-          "<C-n>" = ":next-tab <Enter>";
-          "<C-t>" = ":term<Enter>";
-          "?" = ":help keys<Enter>";
-        };
-        messages = {
-          q = ":quit<Enter>";
-          j = ":next <Enter>";
-          "<Down>" = ":next<Enter>";
-          "<C-d>" = ":next 50%<Enter>";
-          "<C-f>" = ":next 100%<Enter>";
-          "<PgDn>" = ":next 100%<Enter>";
-          k = ":prev <Enter>";
-          "<Up>" = ":prev<Enter>";
-          "<C-u>" = ":prev 50%<Enter>";
-          "<C-b>" = ":prev 100%<Enter>";
-          "<PgUp>" = ":prev 100%<Enter>";
-          g = ":select 0 <Enter>";
-          G = ":select -1<Enter>";
-          J = ":next-folder <Enter>";
-          K = ":prev-folder<Enter>";
-          H = ":collapse-folder<Enter>";
-          L = ":expand-folder<Enter>";
-          "<space>" = ":read -t<Enter>:next<Enter>";
-          v = ":mark -t<Enter>";
-          V = ":mark -v<Enter>";
-          F = ":flag -t<Enter>";
-          T = ":toggle-threads<Enter>";
-          "<Enter>" = ":view<Enter>";
-          d = ":prompt 'Delete? ' 'delete-message'<Enter>";
-          D = ":move Trash<Enter>";
-          A = ":archive flat<Enter>";
-          C = ":compose<Enter>";
-          rr = ":reply -a<Enter>";
-          rq = ":reply -aq<Enter>";
-          Rr = ":reply<Enter>";
-          Rq = ":reply -q<Enter>";
-          c = ":cf<space>";
-          "$" = ":term<space>";
-          "!" = ":term<space>";
-          "|" = ":pipe<space>";
-          "/" = ":search<space>";
-          "\\" = ":filter <space>";
-          n = ":next-result<Enter>";
-          N = ":prev-result<Enter>";
-          "<Esc>" = ":clear<Enter>";
-          "*" = ":filter -x Flagged<Enter>";
-        };
-        view = {
-          tr = ":pipe ${pkgs.trans}/bin/trans -show-original n -b -no-autocorrect<Enter>"; # https://man.sr.ht/~rjarry/aerc/integrations/translator.md
-          "/" = ":toggle-key-passthrough <Enter> /";
-          q = ":close<Enter>";
-          O = ":open<Enter>";
-          S = ":save<space>";
-          "|" = ":pipe<space>";
-          D = ":move Trash<Enter>";
-          A = ":archive flat<Enter>";
-          "<C-l>" = ":open-link <space>";
-          f = ":forward <Enter>";
-          rr = ":reply -a<Enter>";
-          rq = ":reply -aq<Enter>";
-          Rr = ":reply<Enter>";
-          Rq = ":reply -q<Enter>";
-          H = ":toggle-headers<Enter>";
-          "<C-k>" = ":prev-part<Enter>";
-          "<C-j>" = ":next-part<Enter>";
-          J = ":next <Enter>";
-          K = ":prev<Enter>";
-        };
-        "view::passthrough" = {
-          "$noinherit" = "true";
-          "$ex" = "<C-x>";
-          "<Esc>" = ":toggle-key-passthrough<Enter>";
-        };
-        compose = {
-          # Keybindings used when the embedded terminal is not selected in the compose
-          # view
-          "$noinherit" = "true";
-          "$ex" = "<C-x>";
-          "<C-k>" = ":prev-field<Enter>";
-          "<C-j>" = ":next-field<Enter>";
-          "<tab>" = ":next-field<Enter>";
-          "<C-p>" = ":prev-tab<Enter>";
-          "<C-n>" = ":next-tab<Enter>";
-        };
-
-        "compose::editor" = {
-          # Keybindings used when the embedded terminal is selected in the compose view
-          "$noinherit" = "true";
-          "$ex" = "<C-x>";
-          "<C-k>" = ":prev-field<Enter>";
-          "<C-j>" = ":next-field<Enter>";
-          "<C-p>" = ":prev-tab<Enter>";
-          "<C-n>" = ":next-tab<Enter>";
-        };
-
-        "compose::review" = {
-          # Keybindings used when reviewing a message to be sent
-          y = ":send <Enter>";
-          n = ":abort<Enter>";
-          p = ":postpone<Enter>";
-          q = ":choose -o d discard abort -o p postpone postpone<Enter>";
-          e = ":edit<Enter>";
-          a = ":attach<space>";
-          d = ":detach<space>";
-        };
-
-        terminal = {
-          "$noinherit" = "true";
-          "$ex" = "<C-x>";
-          "<C-p>" = ":prev-tab<Enter>";
-          "<C-n>" = ":next-tab<Enter>";
-        };
-      };
-
-      extraConfig = {
-        ui.sort = "-r date";
-        ui.timestamp-format = "2006-01-02 15:04";
-        ui.mouse-enabled = true;
-        ui.spinner = ". , .";
-        general.unsafe-accounts-conf = true;
-        general.pgp-provider = "gpg";
-        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)";
-        };
-        filters = {
-          "text/plain" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
-          "text/calendar" = "${pkgs.aerc}/libexec/aerc/filters/calendar";
-          "text/html" = "${pkgs.aerc}/libexec/aerc/filters/html"; # Requires w3m, dante
-          # "text/html" =
-          #   "${pkgs.aerc}/share/aerc/filters/html | ${pkgs.aerc}/share/aerc/filters/colorize";
-          # "text/*" =
-          #   ''${pkgs.bat}/bin/bat -fP --theme=ansi --file-name="$AERC_FILENAME "'';
-          "message/delivery-status" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
-          "message/rfc822" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
-          "application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
-        };
-        openers =
-          let
-            as-pdf = pkgs.writers.writeDash "as-pdf" ''
-              d=$(mktemp -p "$XDG_RUNTIME_DIR" -d)
-              trap clean EXIT
-              clean() {
-                rm -rf "$d"
-              }
-              ${pkgs.libreoffice}/bin/libreoffice --headless --convert-to pdf "$1" --outdir "$d"
-              ${pkgs.zathura}/bin/zathura "$d"/*.pdf
-            '';
-          in
-          {
-            "image/*" = "${pkgs.nsxiv}/bin/nsxiv";
-            "application/pdf" = "${pkgs.zathura}/bin/zathura";
-            "application/vnd.openxmlformats-officedocument.wordprocessingml.document" = toString as-pdf;
-            "application/vnd.oasis.opendocument.text" = toString as-pdf;
-            "video/*" = "${pkgs.mpv}/bin/mpv";
-            "audio/*" = "${pkgs.mpv}/bin/mpv";
-          };
-      };
-
-      templates = {
-        # new_message = "hello!";
-      };
-    };
-  };
-}
--- a/configs/alacritty.nix
+++ b/configs/alacritty.nix
@@ -1,35 +1,68 @@
 {
  pkgs,
  lib,
+  config,
  ...
-}:
-let
-in
-{
-  environment.variables.TERMINAL = "alacritty";
-
-  home-manager.users.me = {
-    programs.alacritty = {
-      enable = true;
-      settings = {
-        keyboard.bindings = [
-          {
-            key = "Plus";
-            mods = "Control";
-            action = "IncreaseFontSize";
-          }
-          {
-            key = "Minus";
-            mods = "Control";
-            action = "DecreaseFontSize";
-          }
-          {
-            key = "Key0";
-            mods = "Control";
-            action = "ResetFontSize";
-          }
-        ];
+}: let
+  alacritty-cfg = theme:
+    (pkgs.formats.yaml {}).generate "alacritty.yml" {
+      window.opacity = 0.99;
+      bell = {
+        animation = "EaseOut";
+        duration = 100;
+        color = "#ffffff";
+      };
+      font = {
+        normal.family = "Monospace";
+        size = 6;
+      };
+      live_config_reload = true;
+      key_bindings = [
+        {
+          key = "Plus";
+          mods = "Control";
+          action = "IncreaseFontSize";
+        }
+        {
+          key = "Minus";
+          mods = "Control";
+          action = "DecreaseFontSize";
+        }
+        {
+          key = "Key0";
+          mods = "Control";
+          action = "ResetFontSize";
+        }
+      ];
+      colors = let
+        colourNames = ["black" "red" "green" "yellow" "blue" "magenta" "cyan" "white"];
+        colourPairs = lib.getAttrs colourNames theme;
+      in {
+        primary = {inherit (theme) background foreground;};
+        cursor = {inherit (theme) cursor;};
+        normal = lib.mapAttrs (_: colour: colour.dark) colourPairs;
+        bright = lib.mapAttrs (_: colour: colour.bright) colourPairs;
      };
    };
+  alacritty-pkg = pkgs.symlinkJoin {
+    name = "alacritty";
+    paths = [
+      (pkgs.writeDashBin "alacritty" ''
+        ${pkgs.alacritty}/bin/alacritty --config-file /var/theme/config/alacritty.yml msg create-window "$@" ||
+        ${pkgs.alacritty}/bin/alacritty --config-file /var/theme/config/alacritty.yml "$@"
+      '')
+      pkgs.alacritty
+    ];
+  };
+in {
+  environment.variables.TERMINAL = "alacritty";
+
+  environment.systemPackages = [
+    alacritty-pkg
+  ];
+
+  environment.etc = {
+    "themes/dark/alacritty.yml".source = alacritty-cfg (import <niveum/lib/colours/papercolor-dark.nix>);
+    "themes/light/alacritty.yml".source = alacritty-cfg (import <niveum/lib/colours/papercolor-light.nix>);
  };
 }
--- a/configs/android.nix
+++ b/configs/android.nix
@@ -1,5 +0,0 @@
-{
-  programs.adb.enable = true;
-
-  users.users.me.extraGroups = [ "adbusers" ];
-}
--- a/configs/backup.nix
+++ b/configs/backup.nix
@@ -1,31 +1,31 @@
 {
  pkgs,
  config,
-  lib,
  ...
-}:
-{
+}: let
+  inherit (import <niveum/lib>) restic;
+in {
  services.restic.backups.niveum = {
    initialize = true;
-    repository = pkgs.lib.niveum.restic.repository;
+    inherit (restic) repository;
    timerConfig = {
      OnCalendar = "8:00";
      RandomizedDelaySec = "1h";
    };
-    passwordFile = config.age.secrets.restic.path;
+    passwordFile = toString <secrets/restic/password>;
    extraBackupArgs = [
-      "--exclude=/home/kfm/sync/src/nixpkgs/.git"
+      "--exclude=/home/kfm/projects/nixpkgs/.git"
      "--exclude=node_modules"
-      "--exclude=.parcel-cache"
    ];
    paths = [
-      "/home/kfm/sync"
-      "/home/kfm/state"
+      "/home/kfm/work"
+      "/home/kfm/projects"
+      "/home/kfm/notes"
      "/home/kfm/cloud"
-      "/home/kfm/mobile"
      "/home/kfm/.gnupg"
-      "/home/kfm/.electrum"
      "/home/kfm/.ssh"
+      "/mnt/sd-card/music"
+      "/mnt/sd-card/Books"
    ];
  };

@@ -38,15 +38,15 @@

  environment.systemPackages = [
    (pkgs.writers.writeDashBin "restic-niveum" ''
-      ${pkgs.restic}/bin/restic -r ${pkgs.lib.niveum.restic.repository} -p ${config.age.secrets.restic.path} "$@"
+      ${pkgs.restic}/bin/restic -r ${restic.repository} -p ${<secrets/restic/password>} "$@"
    '')
    (pkgs.writers.writeDashBin "restic-mount" ''
-      mountdir=$(mktemp -p "$XDG_RUNTIME_DIR" -d "restic-mount-XXXXXXX")
+      mountdir=$(mktemp -d)
      trap clean EXIT
      clean() {
        rm -r "$mountdir"
      }
-      ${pkgs.restic}/bin/restic -r ${pkgs.lib.niveum.restic.repository} -p ${config.age.secrets.restic.path} mount "$mountdir"
+      ${pkgs.restic}/bin/restic -r ${restic.repository} -p ${<secrets/restic/password>} mount "$mountdir"
    '')
  ];
 }
--- a/configs/bash.nix
+++ b/configs/bash.nix
@@ -1,10 +1,10 @@
-{ pkgs, ... }:
 {
  programs.bash = {
-    promptInit = ''PS1="$(${pkgs.ncurses}/bin/tput bold)\w \$([[ \$? == 0 ]] && echo \"\[\033[1;32m\]\" || echo \"\[\033[1;31m\]\")\$$(${pkgs.ncurses}/bin/tput sgr0) "'';
+    promptInit = ''
+      PS1="$(tput bold)\w \$([[ \$? == 0 ]] && echo \"\[\033[1;32m\]\" || echo \"\[\033[1;31m\]\")\$$(tput sgr0) "'';
    interactiveShellInit = ''
      set -o vi
    '';
-    completion.enable = true;
+    enableCompletion = true;
  };
 }
--- a/configs/battery.nix
+++ b/configs/battery.nix
@@ -2,20 +2,13 @@
  config,
  pkgs,
  ...
-}:
-{
+}: {
  boot.extraModulePackages = with config.boot.kernelPackages; [
    tp_smapi
    acpi_call
  ];
-  boot.kernelModules = [
-    "tp_smapi"
-    "acpi_call"
-  ];
-  environment.systemPackages = [
-    pkgs.tpacpi-bat
-    pkgs.powertop
-  ];
+  boot.kernelModules = ["tp_smapi" "acpi_call"];
+  environment.systemPackages = [pkgs.tpacpi-bat pkgs.powertop];

  services.tlp = {
    enable = true;
--- a/configs/beets.nix
+++ b/configs/beets.nix
@@ -0,0 +1,14 @@
+{
+  lib,
+  pkgs,
+  ...
+}: {
+  environment.systemPackages = [pkgs.beets];
+  home-manager.users.me.xdg.configFile = {
+    "beets/config.yaml".source = (pkgs.formats.yaml {}).generate "config.yaml" {
+      directory = "~/cloud/syncthing/music";
+      library = "~/cloud/syncthing/common/music.db";
+      plugins = toString ["fetchart" "lastgenre"];
+    };
+  };
+}
--- a/configs/bluetooth.nix
+++ b/configs/bluetooth.nix
@@ -1,11 +1,17 @@
-{ pkgs, ... }:
 {
+  pkgs,
+  lib,
+  ...
+}: {
  hardware.bluetooth = {
    enable = true;
-    settings.general = {
-      enable = "Source,Sink,Media,Socket";
-    };
+    settings.General.Enable =
+      lib.concatStringsSep "," ["Source" "Sink" "Media" "Socket"];
  };

-  environment.systemPackages = [ pkgs.bluetuith ];
+  services.blueman.enable = true;
+
+  # environment.systemPackages = [pkgs.blueman];
+
+  home-manager.users.me = {services.blueman-applet.enable = true;};
 }
--- a/configs/bots/autorenkalender.nix
+++ b/configs/bots/autorenkalender.nix
@@ -1,26 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}:
-{
-  niveum.bots.autorenkalender = {
-    enable = true;
-    time = "07:00";
-    telegram = {
-      enable = true;
-      tokenFile = config.age.secrets.telegram-token-kmein.path;
-      chatIds = [ "@autorenkalender" ];
-      parseMode = "Markdown";
-    };
-    command = "${pkgs.autorenkalender}/bin/autorenkalender";
-  };
-
-  niveum.passport.services = [
-    {
-      title = "Autorenkalender";
-      description = "sends <a href=\"https://www.projekt-gutenberg.org/\">Projekt Gutenberg</a>'s anniversary information to Telegram.";
-      link = "https://t.me/Autorenkalender";
-    }
-  ];
-}
--- a/configs/bots/celan.nix
+++ b/configs/bots/celan.nix
@@ -1,84 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-{
-  niveum.bots.celan = {
-    enable = true;
-    time = "08:00";
-    telegram = {
-      enable = true;
-      tokenFile = config.age.secrets.telegram-token-kmein.path;
-      chatIds = [ "@PaulCelan" ];
-    };
-    mastodon = {
-      enable = true;
-      tokenFile = config.age.secrets.mastodon-token-celan.path;
-      language = "de";
-    };
-    command = toString (
-      pkgs.writers.writePython3 "random-celan.py" { libraries = [ pkgs.python3Packages.lxml ]; } ''
-        from lxml import etree
-        import random
-
-
-        def xml_text(elements):
-            return "".join("".join(t.itertext()) for t in elements).strip()
-
-
-        tree = etree.parse('${
-          pkgs.fetchurl {
-            url = "http://c.krebsco.de/celan.tei.xml";
-            hash = "sha256-HgNmJYfhuwyfm+FcNtnnYWpJpIIU1ElHLeLiIFjF9mE=";
-          }
-        }')
-        root = tree.getroot()
-
-        tei = {"tei": "http://www.tei-c.org/ns/1.0"}
-
-        poems = root.xpath(".//tei:lg[@type='poem']", namespaces=tei)
-
-        poem = random.choice(poems)
-
-        for stanza in poem.xpath("./tei:lg[@type='stanza']", namespaces=tei):
-            for line in stanza.xpath('./tei:l', namespaces=tei):
-                if line.text:
-                    print(line.text.strip())
-            print()
-
-        current_element = poem
-        while current_element is not None:
-            if current_element.tag == "{http://www.tei-c.org/ns/1.0}text":
-                text_element = current_element
-
-                title = xml_text(text_element.xpath("./tei:front/tei:docTitle",
-                                 namespaces=tei))
-                print(f"Aus: #{title.replace(" ", "_")}", end=" ")
-
-                if date := xml_text(text_element.xpath("./tei:front/tei:docDate",
-                                    namespaces=tei)):
-                    print(f"({date})")
-                break
-            current_element = current_element.getparent()
-
-        print("\n\n#PaulCelan #Celan #Lyrik #poetry")
-      ''
-    );
-  };
-
-  age.secrets = {
-    mastodon-token-celan.file = ../../secrets/mastodon-token-celan.age;
-  };
-
-  systemd.timers.bot-celan.timerConfig.RandomizedDelaySec = "10h";
-
-  niveum.passport.services = [
-    {
-      title = "Paul Celan Bot";
-      description = "sends a random poem by Paul Celan to Telegram.";
-      link = "https://t.me/PaulCelan";
-    }
-  ];
-}
--- a/configs/bots/default.nix
+++ b/configs/bots/default.nix
@@ -1,114 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}:
-let
-  reverseDirectory = "/run/telegram-reverse";
-  proverbDirectory = "/run/telegram-proverb";
-in
-{
-  imports = [
-    ./logotheca.nix
-    ./transits.nix
-    ./autorenkalender.nix
-    ./hesychius.nix
-    ./smyth.nix
-    ./nachtischsatan.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:
-        pkgs.lib.niveum.tmpfilesConfig {
-          type = "d";
-          mode = "0750";
-          age = "1h";
-          inherit path;
-        }
-      )
-      [
-        reverseDirectory
-        proverbDirectory
-      ];
-
-  niveum.passport.services = [
-    {
-      title = "Rückwarts-Bot";
-      link = "https://t.me/RueckwaertsBot";
-      description = "reverses things on Telegram.";
-    }
-    {
-      title = "BetaCode-Bot";
-      link = "https://t.me/BetaCodeBot";
-      description = "converts <a href=\"https://en.wikipedia.org/wiki/Beta_Code\">beta code</a> to polytonic Greek on Telegram.";
-    }
-    {
-      title = "Sprichwortgenerator-Bot";
-      link = "https://t.me/SprichwortGeneratorBot";
-      description = "generates useless German proverbs with optional stock photo background on Telegram.";
-    }
-  ];
-
-  age.secrets = {
-    telegram-token-reverse.file = ../../secrets/telegram-token-reverse.age;
-    telegram-token-betacode.file = ../../secrets/telegram-token-betacode.age;
-    telegram-token-proverb.file = ../../secrets/telegram-token-proverb.age;
-    telegram-token-streaming-link.file = ../../secrets/telegram-token-streaming-link.age;
-  };
-
-  systemd.services.telegram-reverse = {
-    wantedBy = [ "multi-user.target" ];
-    description = "Telegram reverse bot";
-    path = [ pkgs.ffmpeg ];
-    enable = true;
-    script = ''
-      TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${pkgs.telebots}/bin/telegram-reverse
-    '';
-    serviceConfig.Restart = "always";
-    serviceConfig.WorkingDirectory = reverseDirectory;
-    serviceConfig.LoadCredential = "token:${config.age.secrets.telegram-token-reverse.path}";
-  };
-
-  systemd.services.telegram-streaming-link = {
-    wantedBy = [ "multi-user.target" ];
-    description = "Telegram bot converting YouTube Music <-> Spotify";
-    enable = true;
-    script = ''
-      TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${pkgs.telebots}/bin/telegram-streaming-link
-    '';
-    serviceConfig.Restart = "always";
-    serviceConfig.LoadCredential = "token:${config.age.secrets.telegram-token-streaming-link.path}";
-  };
-
-  systemd.services.telegram-betacode = {
-    wantedBy = [ "multi-user.target" ];
-    description = "Telegram beta code bot";
-    enable = true;
-    script = ''
-      TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${pkgs.telebots}/bin/telegram-betacode
-    '';
-    serviceConfig.Restart = "always";
-    serviceConfig.LoadCredential = "token:${config.age.secrets.telegram-token-betacode.path}";
-  };
-
-  systemd.services.telegram-proverb = {
-    wantedBy = [ "multi-user.target" ];
-    description = "Telegram proverb bot";
-    enable = true;
-    script = ''
-      TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${pkgs.telebots}/bin/telegram-proverb
-    '';
-    serviceConfig.Restart = "always";
-    serviceConfig.WorkingDirectory = proverbDirectory;
-    serviceConfig.LoadCredential = "token:${config.age.secrets.telegram-token-proverb.path}";
-  };
-}
--- a/configs/bots/hesychius.nix
+++ b/configs/bots/hesychius.nix
@@ -1,36 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}:
-{
-  niveum.bots.hesychius = {
-    enable = true;
-    time = "08:00";
-    mastodon = {
-      enable = true;
-      language = "el";
-      tokenFile = config.age.secrets.mastodon-token-hesychius.path;
-    };
-    telegram = {
-      enable = true;
-      tokenFile = config.age.secrets.telegram-token-kmein.path;
-      chatIds = [ "@HesychiosAlexandreus" ];
-    };
-    command = "${pkgs.coreutils}/bin/shuf -n1 ${pkgs.hesychius}";
-  };
-
-  systemd.timers.bot-hesychius.timerConfig.RandomizedDelaySec = "10h";
-
-  age.secrets = {
-    mastodon-token-hesychius.file = ../../secrets/mastodon-token-hesychius.age;
-  };
-
-  niveum.passport.services = [
-    {
-      title = "Hesychius of Alexandria Bot";
-      description = "sends a random word from Hesychius of Alexandria's lexicon to Telegram.";
-      link = "https://t.me/HesychiosAlexandreus";
-    }
-  ];
-}
--- a/configs/bots/logotheca.nix
+++ b/configs/bots/logotheca.nix
@@ -1,37 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}:
-{
-  niveum.bots.logotheca = {
-    enable = true;
-    time = "08/6:00";
-    telegram = {
-      enable = true;
-      tokenFile = config.age.secrets.telegram-token-kmein.path;
-      chatIds = [ "-1001760262519" ];
-      parseMode = "Markdown";
-    };
-    matrix = {
-      enable = true;
-      homeserver = "matrix.4d2.org";
-      tokenFile = config.age.secrets.matrix-token-lakai.path;
-      chatIds = [
-        "!zlwCuPiCNMSxDviFzA:4d2.org"
-      ];
-    };
-    command = "${pkgs.literature-quote}/bin/literature-quote";
-  };
-
-  age.secrets = {
-    matrix-token-lakai.file = ../../secrets/matrix-token-lakai.age;
-  };
-
-  niveum.passport.services = [
-    {
-      title = "Literature quote bot";
-      description = "sends me and my friends three <a href=\"https://logotheca.xn--kiern-0qa.de/\">logotheca</a> quotes a day.";
-    }
-  ];
-}
--- a/configs/bots/nachtischsatan.nix
+++ b/configs/bots/nachtischsatan.nix
@@ -1,53 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}:
-let
-  nachtischsatan-bot =
-    { tokenFile }:
-    pkgs.writers.writePython3 "nachtischsatan-bot"
-      {
-        libraries = [ pkgs.python3Packages.python-telegram-bot ];
-      }
-      ''
-        from telegram.ext import Application, ContextTypes, MessageHandler, filters
-        from telegram import Update
-        import random
-        import time
-
-
-        async def flubber(update: Update, context: ContextTypes.DEFAULT_TYPE):
-            time.sleep(random.randrange(4000) / 1000)
-            await update.message.reply_text("*flubberflubber*")
-
-
-        with open('${tokenFile}', 'r') as tokenFile:
-            token = tokenFile.read().strip()
-            application = Application.builder().token(token).build()
-            application.add_handler(MessageHandler(filters.ALL, flubber))
-            application.run_polling()
-      '';
-in
-{
-  systemd.services.telegram-nachtischsatan = {
-    wantedBy = [ "multi-user.target" ];
-    description = "*flubberflubber*";
-    enable = true;
-    script = toString (nachtischsatan-bot {
-      tokenFile = config.age.secrets.telegram-token-nachtischsatan.path;
-    });
-    serviceConfig.Restart = "always";
-  };
-
-  age.secrets.telegram-token-nachtischsatan.file = ../../secrets/telegram-token-nachtischsatan.age;
-
-  niveum.passport.services = [
-    {
-      title = "Nachtischsatan-Bot";
-      link = "https://t.me/NachtischsatanBot";
-      description = "*flubberflubber*";
-    }
-  ];
-}
--- a/configs/bots/nietzsche.nix
+++ b/configs/bots/nietzsche.nix
@@ -1,33 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}:
-{
-  niveum.bots.nietzsche = {
-    enable = true;
-    time = "08:00";
-    mastodon = {
-      enable = true;
-      tokenFile = config.age.secrets.mastodon-token-nietzsche.path;
-      language = "de";
-    };
-    command = toString (
-      pkgs.writers.writeBash "random-nietzsche" ''
-        set -efu
-        random_number=$(( ($RANDOM % 10) + 1 ))
-        if [ "$random_number" -eq 1 ]; then
-          ${pkgs.random-zeno}/bin/random-zeno "/Literatur/M/Nietzsche,+Friedrich"
-        else
-          ${pkgs.random-zeno}/bin/random-zeno "/Philosophie/M/Nietzsche,+Friedrich"
-        fi
-      ''
-    );
-  };
-
-  systemd.timers.bot-nietzsche.timerConfig.RandomizedDelaySec = "10h";
-
-  age.secrets = {
-    mastodon-token-nietzsche.file = ../../secrets/mastodon-token-nietzsche.age;
-  };
-}
--- a/configs/bots/smyth.nix
+++ b/configs/bots/smyth.nix
@@ -1,72 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-  niveum.bots.smyth = {
-    enable = true;
-    time = "08:00";
-    mastodon = {
-      enable = true;
-      tokenFile = config.age.secrets.mastodon-token-smyth.path;
-      language = "en";
-    };
-    telegram = {
-      enable = true;
-      tokenFile = config.age.secrets.telegram-token-kmein.path;
-      chatIds = [ "@HerbertWeirSmyth" ];
-    };
-    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=$(
-          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"
-        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
-
-        printf '\n%s\n\n#AncientGreek' "$url"
-      ''
-    );
-  };
-
-  systemd.timers.bot-smyth.timerConfig.RandomizedDelaySec = "10h";
-
-  age.secrets = {
-    mastodon-token-smyth.file = ../../secrets/mastodon-token-smyth.age;
-  };
-
-  niveum.passport.services = [
-    {
-      title = "Herbert Weir Smyth Bot";
-      description = "sends a random section from Smyth's Ancient Greek grammar to Telegram.";
-      link = "https://t.me/HerbertWeirSmyth";
-    }
-  ];
-}
--- a/configs/bots/tlg-wotd.nix
+++ b/configs/bots/tlg-wotd.nix
@@ -1,176 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}:
-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";
-    path = [
-      pkgs.jq
-      pkgs.curl
-      pkgs.recode
-      pkgs.deno
-      pkgs.imagemagick
-      pkgs.gawk
-      pkgs.gnugrep
-      pkgs.coreutils
-    ];
-    environment = {
-      NPM_CONFIG_CACHE = "/tmp";
-      CLTK_DATA = "/tmp";
-    };
-    script = ''
-        set -efux
-
-        chat_id=@tlgwotd
-
-        export TELEGRAM_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/telegram-token")"
-        export MASTODON_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/mastodon-token")"
-
-        json_data=$(curl -sSL http://stephanus.tlg.uci.edu/Iris/Wotd | recode html..utf8)
-
-        word=$(echo "$json_data" | jq -r '.word')
-        compact_word=$(echo "$word" | sed 's/,.*$//')
-        definition=$(echo "$json_data" | jq -r '.definition | sub("<.*>"; "") | rtrimstr(" ")')
-        first_occurrence=$(echo "$json_data" | jq -r '.firstOccurrence')
-        total_occurrences=$(echo "$json_data" | jq -r '.totalOccurrences')
-        telegram_caption="*$word* ‘$definition’
-
-      First occurrence (century): $first_occurrence
-      Number of occurrences (in all Ancient Greek texts): $total_occurrences"
-        mastodon_caption="$word ‘$definition’
-
-      First occurrence (century): $first_occurrence
-      Number of occurrences (in all Ancient Greek texts): $total_occurrences"
-
-        #ancientgreek #classics #wotd #wordoftheday
-
-        transliteration=$(${
-          pkgs.writers.writePython3 "translit.py"
-            {
-              libraries = py: [ py.cltk ];
-            }
-            ''
-              import sys
-              from cltk.phonology.grc.transcription import Transcriber
-
-              probert = Transcriber("Attic", "Probert")
-              text = " ".join(sys.argv[1:])
-              ipa = probert.transcribe(text)
-
-              print(ipa)
-            ''
-        } "$compact_word")
-
-
-        photo_path=/tmp/output.png
-
-        hex_to_rgb() {
-            hex="$1"
-            r=$(printf "%d" "0x$(echo "$hex" | cut -c2-3)")
-            g=$(printf "%d" "0x$(echo "$hex" | cut -c4-5)")
-            b=$(printf "%d" "0x$(echo "$hex" | cut -c6-7)")
-            echo "$r $g $b"
-        }
-
-        calculate_luminance() {
-            r="$1"
-            g="$2"
-            b="$3"
-
-            r_l=$(echo "$r" | awk '{print ($1 / 255 <= 0.03928) ? $1 / 255 / 12.92 : (($1 / 255 + 0.055) / 1.055)^2.4}')
-            g_l=$(echo "$g" | awk '{print ($1 / 255 <= 0.03928) ? $1 / 255 / 12.92 : (($1 / 255 + 0.055) / 1.055)^2.4}')
-            b_l=$(echo "$b" | awk '{print ($1 / 255 <= 0.03928) ? $1 / 255 / 12.92 : (($1 / 255 + 0.055) / 1.055)^2.4}')
-
-            echo "$r_l $g_l $b_l" | awk '{print 0.2126*$1 + 0.7152*$2 + 0.0722*$3}'
-        }
-
-
-        hex_color="#$(echo "$compact_word" | md5sum | cut -c 1-6)"
-        if echo "$hex_color" | grep -qE '^#[0-9A-Fa-f]{6}$'; then
-            set -- $(hex_to_rgb "$hex_color")
-            r="$1"
-            g="$2"
-            b="$3"
-        fi
-
-        luminance=$(calculate_luminance "$r" "$g" "$b")
-
-        threshold="0.1"
-        echo "$r $g $b"
-        if [ "$(echo "$luminance" | awk -v threshold="$threshold" '{print ($1 > threshold)}')" -eq 1 ]; then
-            color1="black"
-            color2="#333"
-        else
-            color1="white"
-            color2=lightgrey
-        fi
-
-        magick -size 1400x846 \
-            xc:"$hex_color" \
-            -font "${pkgs.gentium}/share/fonts/truetype/GentiumBookPlus-Bold.ttf" \
-            -fill "$color1" \
-            -pointsize 150 -gravity west \
-            -annotate +100-160 "$compact_word" \
-            -font "${pkgs.gentium}/share/fonts/truetype/GentiumBookPlus-Regular.ttf" \
-            -fill "$color2" \
-            -pointsize 60 -gravity west \
-            -annotate +100+00 "$transliteration" \
-            -fill "$color1" \
-            -annotate +100+120 "‘$definition’" \
-            -fill "$color2" \
-            -pointsize 40 -gravity southwest \
-            -annotate +100+60 "attested $total_occurrences times" \
-            -pointsize 40 -gravity southeast \
-            -annotate +100+60 "$(date -I)" \
-            "$photo_path"
-
-        curl -X POST "https://api.telegram.org/bot$TELEGRAM_TOKEN/sendPhoto" \
-             -F "chat_id=\"$chat_id\"" \
-             -F "photo=@$photo_path" \
-             -F parse_mode=Markdown \
-             -F caption="$telegram_caption"
-
-        mastodon_upload_response=$(curl -X POST "${mastodonEndpoint}/api/v2/media" \
-            -H "Authorization: Bearer $MASTODON_TOKEN" \
-            -F "file=@$photo_path" \
-            -F "description=$word ‘$definition’")
-        mastodon_image_id=$(echo $mastodon_upload_response | jq -r .id)
-        curl -X POST "${mastodonEndpoint}/api/v1/statuses" \
-            -H "Authorization: Bearer $MASTODON_TOKEN" \
-            -d "status=$mastodon_caption" \
-            -d "visibility=public" \
-            -d "media_ids[]=$mastodon_image_id"
-    '';
-    serviceConfig = {
-      Type = "oneshot";
-      DynamicUser = true;
-      StateDirectory = "tlgwotd";
-      PrivateTmp = true;
-      LoadCredential = [
-        "telegram-token:${config.age.secrets.telegram-token-kmein.path}"
-        "mastodon-token:${config.age.secrets.mastodon-token-tlgwotd.path}"
-      ];
-    };
-  };
-
-  age.secrets = {
-    mastodon-token-tlgwotd.file = ../../secrets/mastodon-token-tlgwotd.age;
-  };
-
-  niveum.passport.services = [
-    {
-      title = "Thesaurus Linguae Graecae Word of the Day";
-      description = "sends <a href=\"https://stephanus.tlg.uci.edu/\">TLG</a>'s word of the day to Telegram.";
-      link = "https://t.me/tlgwotd";
-    }
-  ];
-}
--- a/configs/browser.nix
+++ b/configs/browser.nix
@@ -1,92 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}:
-{
-  environment.systemPackages = [
-    pkgs.cro
-    pkgs.tor-browser
-    pkgs.firefox
-    pkgs.brave
-  ];
-
-  home-manager.users.me = {
-    programs.firefox = {
-      enable = true;
-      profiles =
-        let
-          defaultSettings = {
-            "beacon.enabled" = false;
-            "browser.bookmarks.showMobileBookmarks" = true;
-            "browser.newtab.preload" = false;
-            "browser.search.isUS" = false;
-            "browser.search.region" = "DE";
-            "browser.send_pings" = false;
-            "browser.shell.checkDefaultBrowser" = false;
-            "browser.startup.homepage" = "chrome://browser/content/blanktab.html";
-            "browser.uidensity" = 1;
-            "browser.urlbar.placeholderName" = "Search";
-            "datareporting.healthreport.service.enabled" = false;
-            "datareporting.healthreport.uploadEnabled" = false;
-            "datareporting.policy.dataSubmissionEnabled" = false;
-            "datareporting.sessions.current.clean" = true;
-            "distribution.searchplugins.defaultLocale" = "de-DE";
-            "general.smoothScroll" = true;
-            "identity.fxaccounts.account.device.name" = config.networking.hostName;
-            "network.cookie.cookieBehavior" = 1;
-            "privacy.donottrackheader.enabled" = true;
-            "privacy.trackingprotection.enabled" = true;
-            "privacy.trackingprotection.pbmode.enabled" = true;
-            "privacy.trackingprotection.socialtracking.enabled" = true;
-            "services.sync.declinedEngines" = "passwords";
-            "services.sync.engine.passwords" = false;
-            "signon.autofillForms" = false;
-            "signon.rememberSignons" = false;
-            "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
-            "toolkit.telemetry.archive.enabled" = false;
-            "toolkit.telemetry.bhrPing.enabled" = false;
-            "toolkit.telemetry.cachedClientID" = "";
-            "toolkit.telemetry.enabled" = false;
-            "toolkit.telemetry.firstShutdownPing.enabled" = false;
-            "toolkit.telemetry.hybridContent.enabled" = false;
-            "toolkit.telemetry.newProfilePing.enabled" = false;
-            "toolkit.telemetry.prompted" = 2;
-            "toolkit.telemetry.rejected" = true;
-            "toolkit.telemetry.server" = "";
-            "toolkit.telemetry.shutdownPingSender.enabled" = false;
-            "toolkit.telemetry.unified" = false;
-            "toolkit.telemetry.unifiedIsOptIn" = false;
-            "toolkit.telemetry.updatePing.enabled" = false;
-            "ui.prefersReducedMotion" = 1;
-          };
-        in
-        {
-          default = {
-            id = 0;
-            isDefault = true;
-            settings = defaultSettings;
-            # extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-            #   ublock-origin
-            #   darkreader
-            #   sponsorblock
-            #   consent-o-matic
-            #   i-dont-care-about-cookies
-            #   # auto-tab-discard TODO what is this
-            # ];
-            userChrome = ''
-              #TabsToolbar {
-                visibility: collapse !important;
-              }
-            '';
-          };
-        };
-    };
-  };
-
-  home-manager.users.me = {
-    stylix.targets.firefox.profileNames = [ "default" ];
-  };
-
-  environment.variables.BROWSER = "firefox";
-}
--- a/configs/ccc.nix
+++ b/configs/ccc.nix
@@ -1,38 +1,28 @@
-{ pkgs, ... }:
-{
-  networking.networkmanager.ensureProfiles.profiles = {
-    "39C3" = {
-      connection = {
-        id = "39C3";
-        type = "wifi";
-      };
-      wifi = {
-        mode = "infrastructure";
-        ssid = "39C3";
-      };
-      wifi-security = {
-        auth-alg = "open";
-        key-mgmt = "wpa-eap";
-      };
-      "802-1x" = {
-        anonymous-identity = "39C3";
-        eap = "ttls;";
-        identity = "39C3";
-        password = "39C3";
-        phase2-auth = "pap";
-        altsubject-matches = "DNS:radius.c3noc.net";
-        ca-cert = "${builtins.fetchurl {
-          url = "https://letsencrypt.org/certs/isrgrootx1.pem";
-          sha256 = "sha256:1la36n2f31j9s03v847ig6ny9lr875q3g7smnq33dcsmf2i5gd92";
-        }}";
-      };
-      ipv4 = {
-        method = "auto";
-      };
-      ipv6 = {
-        addr-gen-mode = "default";
-        method = "auto";
-      };
-    };
+{pkgs, ...}:
+# https://paste.sr.ht/~erictapen/11716989e489b600f237041b6d657fdf0ee17b34
+let
+  certificate = pkgs.stdenv.mkDerivation rec {
+    name = "dst-root-ca-x3.pem";
+    src = builtins.toFile "${name}.sed" ''
+      1,/DST Root CA X3/d
+      1,/-----END CERTIFICATE-----/p
+    '';
+    nativeBuildInputs = with pkgs; [cacert gnused];
+    phases = "installPhase";
+    installPhase = ''
+      ${pkgs.gnused}/bin/sed -n -f $src ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt > $out
+    '';
+  };
+in {
+  networking.wireless.networks."36C3" = {
+    auth = ''
+      key_mgmt=WPA-EAP
+      eap=TTLS
+      identity="kmein"
+      password=" "
+      ca_cert="${certificate}"
+      altsubject_match="DNS:radius.c3noc.net"
+      phase2="auth=PAP"
+    '';
  };
 }
--- a/configs/chromium.nix
+++ b/configs/chromium.nix
@@ -0,0 +1,97 @@
+{
+  pkgs,
+  config,
+  ...
+}: {
+  programs.chromium = {
+    enable = true;
+    extensions = [
+      # "ihlenndgcmojhcghmfjfneahoeklbjjh" # cVim
+      # "fpnmgdkabkmnadcjpehmlllkndpkmiak" # Wayback Machine
+      "cjpalhdlnbpafiamejdnhcphjbkeiagm" # uBlock Origin
+      "pjjgklgkfeoeiebjogplpnibpfnffkng" # undistracted
+      "nhdogjmejiglipccpnnnanhbledajbpd" # vuejs devtools
+      "eimadpbcbfnmbkopoojfekhnkhdbieeh" # dark reader
+    ];
+  };
+
+  home-manager.users.me = {
+    programs.firefox = {
+      enable = true;
+      package = pkgs.firefox.override {
+        cfg = {
+          enableTridactylNative = true;
+        };
+      };
+      profiles = let
+        defaultSettings = {
+          "beacon.enabled" = false;
+          "browser.bookmarks.showMobileBookmarks" = true;
+          "browser.newtab.preload" = false;
+          "browser.search.isUS" = false;
+          "browser.search.region" = "DE";
+          "browser.send_pings" = false;
+          "browser.shell.checkDefaultBrowser" = false;
+          "browser.startup.homepage" = "chrome://browser/content/blanktab.html";
+          "browser.uidensity" = 1;
+          "browser.urlbar.placeholderName" = "Search";
+          "datareporting.healthreport.service.enabled" = false;
+          "datareporting.healthreport.uploadEnabled" = false;
+          "datareporting.policy.dataSubmissionEnabled" = false;
+          "datareporting.sessions.current.clean" = true;
+          "distribution.searchplugins.defaultLocale" = "de-DE";
+          "general.smoothScroll" = true;
+          "identity.fxaccounts.account.device.name" = config.networking.hostName;
+          "network.cookie.cookieBehavior" = 1;
+          "privacy.donottrackheader.enabled" = true;
+          "privacy.trackingprotection.enabled" = true;
+          "privacy.trackingprotection.pbmode.enabled" = true;
+          "privacy.trackingprotection.socialtracking.enabled" = true;
+          "services.sync.declinedEngines" = "passwords";
+          "services.sync.engine.passwords" = false;
+          "signon.autofillForms" = false;
+          "signon.rememberSignons" = false;
+          "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
+          "toolkit.telemetry.archive.enabled" = false;
+          "toolkit.telemetry.bhrPing.enabled" = false;
+          "toolkit.telemetry.cachedClientID" = "";
+          "toolkit.telemetry.enabled" = false;
+          "toolkit.telemetry.firstShutdownPing.enabled" = false;
+          "toolkit.telemetry.hybridContent.enabled" = false;
+          "toolkit.telemetry.newProfilePing.enabled" = false;
+          "toolkit.telemetry.prompted" = 2;
+          "toolkit.telemetry.rejected" = true;
+          "toolkit.telemetry.server" = "";
+          "toolkit.telemetry.shutdownPingSender.enabled" = false;
+          "toolkit.telemetry.unified" = false;
+          "toolkit.telemetry.unifiedIsOptIn" = false;
+          "toolkit.telemetry.updatePing.enabled" = false;
+          "ui.prefersReducedMotion" = 1;
+        };
+      in {
+        default = {
+          id = 0;
+          isDefault = true;
+          settings = defaultSettings;
+          # extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+          #   ublock-origin
+          #   darkreader
+          #   sponsorblock
+          #   consent-o-matic
+          #   i-dont-care-about-cookies
+          #   # auto-tab-discard TODO what is this
+          # ];
+          userChrome = ''
+            #TabsToolbar {
+              visibility: collapse !important;
+            }
+          '';
+        };
+      };
+    };
+  };
+
+  environment.systemPackages = [pkgs.brave];
+
+  environment.variables.BROWSER = "brave";
+}
--- a/configs/clipboard.nix
+++ b/configs/clipboard.nix
@@ -2,7 +2,6 @@
  config,
  pkgs,
  ...
-}:
-{
+}: {
  services.clipmenu.enable = true;
 }
--- a/configs/cloud.nix
+++ b/configs/cloud.nix
@@ -3,81 +3,66 @@
  lib,
  pkgs,
  ...
-}:
-{
-  systemd.user.services.systemd-tmpfiles-clean = {
-    enable = true;
-    wantedBy = [ "default.target" ];
-    startAt = "daily";
-    script = "systemd-tmpfiles --user --clean";
-    serviceConfig = {
-      Type = "oneshot";
-    };
+}: let
+  inherit (import <niveum/lib>) tmpfilesConfig;
+in {
+  imports = [
+    <niveum/modules/dropbox.nix>
+  ];
+
+  niveum = {
+    dropbox.enable = false;
  };

-  systemd.user.tmpfiles.users.me.rules =
-    map pkgs.lib.niveum.tmpfilesConfig [
-      {
-        type = "d";
-        mode = "0755";
-        age = "7d";
-        path = "${config.users.users.me.home}/sync/Downloads";
-      }
-      {
-        type = "d";
-        mode = "0755";
-        age = "7d";
-        path = "${config.users.users.me.home}/cloud/nextcloud/tmp";
-      }
-    ]
-    ++
-      map
-        (
-          path:
-          pkgs.lib.niveum.tmpfilesConfig {
-            type = "L+";
-            user = config.users.users.me.name;
-            group = config.users.users.me.group;
-            mode = "0755";
-            argument = "${config.users.users.me.home}/sync/${path}";
-            path = "${config.users.users.me.home}/${path}";
-          }
-        )
-        [
-          ".ssh"
-          ".gnupg"
-          ".pki"
-          ".local/share/aerc"
-        ];
-
-  services.gnome.gnome-keyring.enable = true;
-  security.pam.services.lightdm.enableGnomeKeyring = true;
+  systemd.tmpfiles.rules = map tmpfilesConfig [
+    {
+      type = "L+";
+      user = config.users.users.me.name;
+      group = "users";
+      mode = "0755";
+      argument = "${config.users.users.me.home}/cloud/Seafile/Uni";
+      path = "${config.users.users.me.home}/uni";
+    }
+    {
+      type = "L+";
+      user = config.users.users.me.name;
+      group = "users";
+      mode = "0755";
+      argument = "${config.users.users.me.home}/cloud/syncthing/common/mahlzeit";
+      path = "${config.users.users.me.home}/mahlzeit";
+    }
+  ];

  home-manager.users.me = {
+    services.gnome-keyring.enable = false;
    services.nextcloud-client = {
-      enable = true;
+      enable = false;
      startInBackground = true;
    };
+    systemd.user.services.nextcloud-client = {
+      Unit = {
+        Wants = ["gnome-keyring.service"];
+        After = ["gnome-keyring.service"];
+      };
+    };
  };

  systemd.user.services.nextcloud-syncer = {
-    enable = false;
-    wants = [ "network-online.target" ];
-    wantedBy = [ "default.target" ];
+    enable = true;
+    wants = ["network-online.target"];
+    wantedBy = ["default.target"];
    startAt = "*:00/10";
-    script =
-      let
-        kieran = {
-          user = "kieran";
-          passwordFile = config.age.secrets.nextcloud-password-kieran.path;
-          endpoint = "https://cloud.kmein.de";
-          target = "${config.users.users.me.home}/notes";
-        };
-      in
-      ''
-        mkdir -p ${lib.escapeShellArg kieran.target}
-        ${pkgs.nextcloud-client}/bin/nextcloudcmd --non-interactive --user ${kieran.user} --password "$(cat ${kieran.passwordFile})" --path /Notes ${lib.escapeShellArg kieran.target} ${kieran.endpoint}
-      '';
+    script = let
+      kieran = {
+        user = "kieran";
+        password = lib.fileContents <secrets/nextcloud/password>;
+        endpoint = "https://cloud.xn--kiern-0qa.de";
+        target = "${config.users.users.me.home}/notes";
+      };
+    in ''
+      mkdir -p ${lib.escapeShellArg kieran.target}
+      ${pkgs.nextcloud-client}/bin/nextcloudcmd --non-interactive --user ${kieran.user} --password ${lib.escapeShellArg kieran.password} --path /Notes ${lib.escapeShellArg kieran.target} ${kieran.endpoint}
+    '';
    serviceConfig = {
      Type = "oneshot";
      Restart = "on-failure";
@@ -89,26 +74,23 @@
      set -efu
      book="$({
        ${pkgs.findutils}/bin/find ${config.users.users.me.home}/cloud/syncthing/library -type f
-        ${pkgs.findutils}/bin/find ${config.users.users.me.home}/cloud/nextcloud/Books -type f
+        ${pkgs.findutils}/bin/find ${config.users.users.me.home}/cloud/Seafile/Books -type f
      } | ${pkgs.fzf}/bin/fzf)"
      exec ${pkgs.zathura}/bin/zathura "$book"
    '')
-    (
-      let
-        kieran = {
-          user = "kieran.meinhardt@gmail.com";
-          passwordFile = config.age.secrets.mega-password.path;
-        };
-        megatools =
-          command:
-          ''${pkgs.megatools}/bin/megatools ${command} --username ${lib.escapeShellArg kieran.user} --password "$(cat ${kieran.passwordFile})"'';
-      in
+    (let
+      kieran = {
+        user = "kieran.meinhardt@gmail.com";
+        password = lib.fileContents <secrets/mega/password>;
+      };
+      megatools = command: "${pkgs.megatools}/bin/megatools ${command} --username ${lib.escapeShellArg kieran.user} --password ${lib.escapeShellArg kieran.password}";
+    in
      pkgs.writers.writeDashBin "book-mega" ''
        set -efu
        selection="$(${megatools "ls"} | ${pkgs.fzf}/bin/fzf)"
        test -n "$selection" || exit 1

-        tmpdir="$(mktemp -p "$XDG_RUNTIME_DIR" -d)"
+        tmpdir="$(mktemp -d)"
        trap clean EXIT
        clean() {
          rm -rf "$tmpdir"
@@ -119,50 +101,37 @@
          ${megatools "get"} "$selection"
          exec ${pkgs.zathura}/bin/zathura "$(basename "$selection")"
        )
-      ''
-    )
+      '')
  ];

-  age.secrets.mega-password = {
-    file = ../secrets/mega-password.age;
-    owner = config.users.users.me.name;
-    group = config.users.users.me.group;
-    mode = "400";
+  fileSystems."/media/moodle" = {
+    device = "zaatar.r:/moodle";
+    fsType = "nfs";
+    options = [
+      "x-systemd.idle-timeout=600"
+      "noauto"
+      "x-systemd.automount"
+    ];
  };

-  services.syncthing = {
+  services.syncthing = rec {
    enable = true;
    user = "kfm";
    openDefaultPorts = true;
    configDir = "/home/kfm/.config/syncthing";
    dataDir = "/home/kfm/.config/syncthing";
-    cert = config.age.secrets.syncthing-cert.path;
-    key = config.age.secrets.syncthing-key.path;
-    settings = {
-      devices = pkgs.lib.niveum.syncthingIds;
-      folders = {
-        "${config.users.users.me.home}/sync" = {
-          devices = [
-            "kabsa"
-            "manakish"
-            "fatteh"
-          ];
-          label = "sync";
-          versioning.type = "trashcan";
-          versioning.params.cleanoutDays = 100;
-        };
-        "${config.users.users.me.home}/mobile" = {
-          devices = [
-            "kabsa"
-            "manakish"
-            "fatteh"
-            "kibbeh"
-          ];
-          id = "mobile";
-          label = "mobile";
-          versioning.type = "trashcan";
-          versioning.params.cleanoutDays = 100;
-        };
+    cert = toString <system-secrets/syncthing/cert.pem>;
+    key = toString <system-secrets/syncthing/key.pem>;
+    inherit ((import <niveum/lib>).syncthing) devices;
+    folders = let
+      cloud-dir = "${config.users.users.me.home}/cloud";
+    in {
+      "${cloud-dir}/syncthing/common".devices = ["kabsa" "manakish"];
+      "${cloud-dir}/syncthing/library".devices = ["kabsa" "manakish" "heym"];
+      "${cloud-dir}/syncthing/mundoiu".devices = ["kabsa" "manakish" "heym"];
+      "${cloud-dir}/syncthing/music" = {
+        devices = ["kabsa" "manakish" "heym" "zaatar"];
+        id = "music";
      };
    };
  };
--- a/configs/compton.nix
+++ b/configs/compton.nix
@@ -0,0 +1,12 @@
+{
+  services.picom = {
+    enable = true;
+    activeOpacity = 1;
+    fade = true;
+    fadeDelta = 10;
+    inactiveOpacity = 0.8;
+    shadow = true;
+    menuOpacity = 0.9;
+    shadowOpacity = 0.3;
+  };
+}
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -2,15 +2,25 @@
  pkgs,
  lib,
  config,
+  options,
  ...
-}:
-let
+}: let
  inherit (lib.strings) makeBinPath;
-in
-{
+  inherit (import <niveum/lib>) localAddresses kieran;
+  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
+  defaultApplications = (import <niveum/lib>).defaultApplications {inherit pkgs;};
+in {
  imports = [
+    <home-manager/nixos>
+    <niveum/modules/system-dependent.nix>
    {
-      boot.supportedFilesystems = [ "ntfs" ];
+      boot.supportedFilesystems = ["ntfs"];
+    }
+    {
+      nix.nixPath = [
+        "/var/src"
+        "nixpkgs-overlays=${toString ../overlays}"
+      ];
    }
    {
      nixpkgs = {
@@ -18,38 +28,28 @@ in
          allowUnfree = true;
          packageOverrides = pkgs: {
            dmenu = pkgs.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
+            gfs-fonts = pkgs.callPackage <niveum/packages/gfs-fonts.nix> {};
+            tocharian-font = pkgs.callPackage <niveum/packages/tocharian-font.nix> {};
+            iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> {};
+            ix = pkgs.callPackage <niveum/packages/ix.nix> {};
          };
          permittedInsecurePackages = [
+            "qtwebkit-5.212.0-alpha4"
          ];
        };
      };
    }
    {
-      boot.tmp.cleanOnBoot = true;
+      boot.cleanTmpDir = true;
      boot.loader.timeout = 1;
    }
-    {
-      age.secrets = {
-        di-fm-key = {
-          file = ../secrets/di-fm-key.age;
-          owner = config.users.users.me.name;
-          group = config.users.users.me.group;
-          mode = "400";
-        };
-        restic = {
-          file = ../secrets/restic.age;
-          owner = config.users.users.me.name;
-          group = config.users.users.me.group;
-          mode = "400";
-        };
-      };
-    }
    {
      home-manager.users.me = {
        programs.zathura = {
          enable = true;
          options = {
            selection-clipboard = "clipboard";
+            recolor-keephue = true;
            # first-page-column = "1:1"; # makes side-by-side mode start on the left side
          };
        };
@@ -62,146 +62,117 @@ in

      users.users.me = {
        name = "kfm";
-        description = pkgs.lib.niveum.kieran.name;
-        hashedPasswordFile = config.age.secrets.kfm-password.path;
+        description = kieran.name;
+        hashedPassword = "$6$w9hXyGFl/.IZBXk$5OiWzS1G.5hImhh1YQmZiCXYNAJhi3X6Y3uSLupJNYYXPLMsQpx2fwF4Xr2uYzGMV8Foqh8TgUavx1APD9rcb/";
        isNormalUser = true;
        uid = 1000;
-        extraGroups = [
-          "pipewire"
-          "audio"
-        ];
-      };
-
-      nix.settings.trusted-users = [ config.users.users.me.name ];
-
-      age.secrets = {
-        kfm-password.file = ../secrets/kfm-password.age;
      };

      home-manager.users.me.xdg.enable = true;
    }
    {
-      environment.interactiveShellInit = "export PATH=$PATH";
-      environment.shellAliases =
-        let
-          swallow = command: "${pkgs.swallow}/bin/swallow ${command}";
-        in
-        {
-          o = "${pkgs.xdg-utils}/bin/xdg-open";
-          ns = "nix-shell --run zsh";
-          pbcopy = "${pkgs.xclip}/bin/xclip -selection clipboard -in";
-          pbpaste = "${pkgs.xclip}/bin/xclip -selection clipboard -out";
-          tmux = "${pkgs.tmux}/bin/tmux -2";
-          sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv";
-          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 mp3 --audio-quality 0 -xic"; # Download with audio
-        };
+      environment.interactiveShellInit = "export PATH=$PATH:$HOME/projects/niveum";
+      environment.shellAliases = let
+        wcd = pkgs.writers.writeDash "wcd" ''
+          cd "$(readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname)/.."
+        '';
+        where = pkgs.writers.writeDash "where" ''
+          readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname
+        '';
+        take = pkgs.writers.writeDash "take" ''
+          mkdir "$1" && cd "$1"
+        '';
+        cdt = pkgs.writers.writeDash "cdt" ''
+          cd "$(mktemp -d)"
+          pwd
+        '';
+        swallow = command: "${scripts.swallow}/bin/swallow ${command}";
+      in {
+        "ß" = "${pkgs.util-linux}/bin/setsid";
+        cat = "${pkgs.bat}/bin/bat --style=plain";
+        chromium-incognito = "chromium --user-data-dir=$(mktemp -d /tmp/chr.XXXXXX) --no-first-run --incognito";
+        cp = "cp --interactive";
+        ip = "${pkgs.iproute2}/bin/ip -c";
+        l = "ls --color=auto --time-style=long-iso --almost-all";
+        ls = "ls --color=auto --time-style=long-iso";
+        ll = "ls --color=auto --time-style=long-iso -l";
+        la = "ls --color=auto --time-style=long-iso --almost-all -l";
+        mv = "mv --interactive";
+        nixi = "nix repl '<nixpkgs>'";
+        ns = "nix-shell --run zsh";
+        o = "${pkgs.xdg-utils}/bin/xdg-open";
+        pbcopy = "${pkgs.xclip}/bin/xclip -selection clipboard -in";
+        pbpaste = "${pkgs.xclip}/bin/xclip -selection clipboard -out";
+        rm = "rm --interactive";
+        s = "${pkgs.systemd}/bin/systemctl";
+        take = "source ${take}";
+        cdt = "source ${cdt}";
+        vit = "$EDITOR $(mktemp)";
+        tmux = "${pkgs.tmux}/bin/tmux -2";
+        sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv";
+        zathura = swallow "${pkgs.zathura}/bin/zathura";
+        us = "${pkgs.systemd}/bin/systemctl --user";
+        wcd = "source ${wcd}";
+        im = "${pkgs.openssh}/bin/ssh weechat@makanek -t tmux attach-session -t IM";
+        where = "source ${where}";
+        yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
+        yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -xic"; # Download with audio
+      };
    }
    {
      i18n = {
        defaultLocale = "en_DK.UTF-8";
-        supportedLocales = [ "all" ];
+        supportedLocales = ["all"];
      };
    }
    {
-      services.displayManager.cosmic-greeter.enable = false;
-      services.desktopManager.cosmic.enable = true;
-      services.system76-scheduler.enable = true;
-
-      users.users.applicative = {
-        name = "applicative";
-        description = "<*>";
-        hashedPasswordFile = config.age.secrets.kfm-password.path;
-        isNormalUser = true;
-        extraGroups = [
-          "pipewire"
-          "audio"
-        ];
-      };
-
-      # to run nspawn in nix sandbox
-      nix.settings = {
-        auto-allocate-uids = true;
-        system-features = [ "uid-range" ];
-        experimental-features = [
-          "auto-allocate-uids"
-          "cgroups"
-        ];
-      };
-
-      services.restic.backups.niveum = {
-        extraBackupArgs = [
-          "--exclude=${config.users.users.applicative.home}/src/nixpkgs/.git"
-        ];
-        paths = [
-          config.users.users.applicative.home
-        ];
-      };
-
-      security.sudo.extraRules = [
-        {
-          # still required for systemd-nspawn
-          users = [ config.users.users.applicative.name ];
-          commands = [ "ALL" ];
-        }
-      ];
-
-      home-manager.users.applicative = {
-        xdg.enable = true;
-        home.stateVersion = "25.11";
-        # programs.git = config.home-manager.users.me.programs.git;
-        # programs.alacritty = config.home-manager.users.me.programs.alacritty;
-      };
-    }
-    {
-      services.displayManager = {
-        autoLogin = {
-          enable = true;
-          user = config.users.users.me.name;
-        };
-      };
      services.xserver = {
        enable = true;
-        displayManager.lightdm = {
-          enable = true;
-          greeters.gtk = {
+        displayManager = {
+          autoLogin = {
            enable = true;
-            indicators = [
-              "~spacer"
-              "~host"
-              "~spacer"
-              "~session"
-              "~power"
-            ];
+            user = config.users.users.me.name;
+          };
+          lightdm = {
+            enable = true;
+            greeters.gtk = {
+              enable = true;
+              indicators = ["~spacer" "~host" "~spacer" "~session" "~power"];
+            };
          };
        };
      };
    }
    {
-      programs.gnupg = {
-        agent = {
+      security.wrappers = {
+        pmount = {
+          setuid = true;
+          owner = "root";
+          group = "root";
+          source = "${pkgs.pmount}/bin/pmount";
+        };
+        pumount = {
+          setuid = true;
+          owner = "root";
+          group = "root";
+          source = "${pkgs.pmount}/bin/pumount";
+        };
+      };
+    }
+    {programs.command-not-found.enable = true;}
+    {
+      home-manager.users.me = {
+        services.gpg-agent = rec {
          enable = true;
-          pinentryPackage = pkgs.pinentry-qt;
-          settings =
-            let
-              defaultCacheTtl = 2 * 60 * 60;
-            in
-            {
-              default-cache-ttl = defaultCacheTtl;
-              max-cache-ttl = 4 * defaultCacheTtl;
-            };
+          enableZshIntegration = true;
+          defaultCacheTtl = 2 * 60 * 60;
+          maxCacheTtl = 4 * defaultCacheTtl;
        };
      };

      environment.systemPackages = [
        pkgs.gnupg
-        (pkgs.pass.withExtensions (e: [
-          e.pass-otp
-          e.pass-import
-          e.pass-genphrase
-        ]))
+        (pkgs.pass.withExtensions (e: [e.pass-otp e.pass-import e.pass-genphrase]))
      ];
    }
    {
@@ -209,25 +180,26 @@ in
    }
    {
      services.getty = {
-        greetingLine = lib.mkForce "As-salamu alaykum wa rahmatullahi wa barakatuh!";
+        greetingLine = lib.mkForce "";
        helpLine = lib.mkForce "";
      };
    }
    {
-      networking.hosts = lib.mapAttrs' (name: address: {
-        name = address;
-        value = [ "${name}.local" ];
-      }) pkgs.lib.niveum.localAddresses;
+      networking.hosts =
+        lib.mapAttrs' (name: address: {
+          name = address;
+          value = ["${name}.local"];
+        })
+        localAddresses;
    }
    {
      home-manager.users.me.home.stateVersion = "22.05";
-      home-manager.backupFileExtension = "bak";
    }
    {
      systemd.user.services.udiskie = {
-        after = [ "udisks2.service" ];
-        wants = [ "udisks2.service" ];
-        wantedBy = [ "graphical-session.target" ];
+        after = ["udisks2.service"];
+        wants = ["udisks2.service"];
+        wantedBy = ["graphical-session.target"];
        serviceConfig = {
          ExecStart = "${pkgs.udiskie}/bin/udiskie --verbose --no-config --notify";
        };
@@ -238,77 +210,67 @@ in
        dconf.enable = true;
        dconf.settings = {
          # Change the default terminal for Nemo
-          "org/cinnamon/desktop/applications/terminal".exec = lib.getExe pkgs.niveum-terminal;
+          "org/cinnamon/desktop/applications/terminal".exec = defaultApplications.terminal;
        };
      };
    }
-    ./android.nix
-    ./stylix.nix
    ./alacritty.nix
    ./backup.nix
    ./bash.nix
+    ./beets.nix
    ./bluetooth.nix
-    ./aerc.nix
+    ./ccc.nix
    ./khal.nix
-    ./browser.nix
+    ./chromium.nix
    ./clipboard.nix
    ./cloud.nix
+    ./compton.nix
    ./direnv.nix
+    ./distrobump.nix
+    ./docker.nix
    ./dunst.nix
+    ./flix.nix
    ./fonts.nix
    ./fzf.nix
    ./git.nix
    ./hledger.nix
    ./htop.nix
-    ./uni.nix
+    ./hu-berlin.nix
    ./i3.nix
-    ./i3status-rust.nix
-    ./keyboard
-    ./kdeconnect.nix
-    { services.upower.enable = true; }
+    ./keyboard.nix
    ./lb.nix
    ./mpv.nix
    ./mime.nix
    ./neovim.nix
+    ./neomutt.nix
+    ./nix.nix
    ./newsboat.nix
-    ./flameshot.nix
+    ./flameshot-once.nix
    ./packages.nix
-    ./virtualization.nix
    ./stardict.nix
    ./polkit.nix
+    ./power-action.nix
    ./printing.nix
+    # ./openweathermap.nix
+    ./wallpaper.nix
    ./redshift.nix
+    ./retiolum.nix
    ./rofi.nix
+    ./spacetime.nix
+    ./seafile.nix
    ./ssh.nix
+    ./sshd.nix
    ./sound.nix
    ./sudo.nix
+    ./nsxiv.nix
+    ./themes.nix
    ./tmux.nix
+    # ./traadfri.nix
    ./unclutter.nix
    ./vscode.nix
-    ./wallpaper.nix
+    ./watson.nix
    ./zsh.nix
-    {
-      home-manager.users.me.home.file.".zshrc".text = ''
-        # nothing to see here
-      '';
-    }
-    {
-      home-manager.users.me = {
-        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";
-            publicShare = "${config.users.users.me.home}/cloud/nextcloud/tmp";
-            videos = pictures;
-            pictures = pictures;
-          };
-      };
-    }
+    ./tor.nix
+    ./mastodon-bot.nix
  ];
 }
--- a/configs/direnv.nix
+++ b/configs/direnv.nix
@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-let
+{pkgs, ...}: let
  nixify = pkgs.writers.writeDashBin "nixify" ''
    set -efuC

@@ -17,12 +16,8 @@ let
      ''${EDITOR:-vim} shell.nix
    fi
  '';
-in
-{
-  environment.systemPackages = [
-    pkgs.direnv
-    nixify
-  ];
+in {
+  environment.systemPackages = [pkgs.direnv nixify];

  home-manager.users.me.programs.direnv = {
    enable = true;
--- a/configs/distrobump.nix
+++ b/configs/distrobump.nix
@@ -0,0 +1,15 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    (import <stockholm/makefu/3modules/bump-distrowatch.nix> {
+      inherit lib config;
+      pkgs = pkgs // {writeDash = pkgs.writers.writeDash;};
+    })
+  ];
+
+  makefu.distrobump.enable = false;
+}
--- a/configs/docker.nix
+++ b/configs/docker.nix
@@ -0,0 +1,16 @@
+{
+  lib,
+  pkgs,
+  ...
+}: {
+  virtualisation.docker = {
+    enable = true;
+    # for ICE wifi, ref https://gist.github.com/sunsided/7840e89ff4e11b64a2d7503fafa0290c
+    extraOptions = lib.concatStringsSep " " [
+      "--bip=172.39.1.5/24"
+      "--fixed-cidr=172.39.1.0/25"
+    ];
+  };
+  users.users.me.extraGroups = ["docker"];
+  environment.systemPackages = [pkgs.docker pkgs.docker-compose];
+}
--- a/configs/dunst.nix
+++ b/configs/dunst.nix
@@ -1,35 +1,26 @@
 {
-  lib,
+  config,
  pkgs,
  ...
-}:
-let
-  sgr = code: string: ''\u001b[${code}m${string}\u001b[0m'';
-in
-{
-  environment.systemPackages = [
-    (pkgs.writers.writeDashBin "notifications" ''
-      ${pkgs.dunst}/bin/dunstctl history \
-        | ${pkgs.jq}/bin/jq -r '
-          .data[]
-          | map("${sgr "90" ''\(.appname.data)''} ${sgr "1" ''\(.summary.data)''} ${sgr "31" ''\(.body.data | gsub("\n"; " | "))''}")
-          | join("\n")'
-    '')
-  ];
-
+}: let
+  inherit (import <niveum/lib>) defaultApplications colours theme;
+in {
  home-manager.users.me.services.dunst = {
    enable = true;
-    iconTheme = pkgs.lib.niveum.theme.icon;
+    iconTheme = (theme pkgs).icon;
    settings = {
      global = {
        transparency = 10;
+        font = "Monospace 8";
        geometry = "200x5-30+20";
+        frame_color = colours.foreground;
        follow = "mouse";
        indicate_hidden = true;
        notification_height = 0;
        separator_height = 2;
        padding = 8;
        horizontal_padding = 8;
+        separator_color = "auto";
        sort = true;
        markup = "full";
        format = "%a\\n<b>%s</b>\\n%b";
@@ -45,20 +36,29 @@ in
        sticky_history = true;
        history_length = 20;
        dmenu = "${pkgs.rofi}/bin/rofi -display-run dunst -show run";
-        browser = lib.getExe pkgs.niveum-browser;
+        browser = (defaultApplications pkgs).browser;
        verbosity = "mesg";
        corner_radius = 0;
        mouse_left_click = "do_action";
        mouse_right_click = "close_current";
        mouse_middle_click = "close_all";
      };
-      urgency_low = {
+      urgency_low = rec {
+        frame_color = background;
+        background = colours.foreground;
+        foreground = colours.background;
        timeout = 5;
      };
-      urgency_normal = {
+      urgency_normal = rec {
+        frame_color = background;
+        background = colours.foreground;
+        foreground = colours.background;
        timeout = 10;
      };
-      urgency_critical = {
+      urgency_critical = rec {
+        frame_color = background;
+        background = colours.red.dark;
+        foreground = colours.background;
        timeout = 0;
      };
    };
--- a/configs/flameshot-once.nix
+++ b/configs/flameshot-once.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (import <niveum/lib>) defaultApplications;
+  flameshot-once = pkgs.callPackage <stockholm/krebs/5pkgs/simple/flameshot-once> {};
+in {
+  environment.systemPackages = [
+    (flameshot-once.override {
+      name = "flameshot-once-kmein";
+      config = {
+        imgur = {
+          enable = true;
+          createUrl = "http://p.r/image";
+          deleteUrl = "http://p.r/image/delete/%1";
+          xdg-open.browser = (defaultApplications pkgs).browser;
+        };
+        settings.General = {
+          autoCloseIdleDaemon = true;
+          drawColor = "#ff0000";
+          drawThickness = 2;
+          checkForUpdates = false;
+          showDesktopNotification = true;
+          disabledTrayIcon = true;
+          showHelp = false;
+          squareMagnifier = true;
+          uploadWithoutConfirmation = true;
+          buttons = [
+            "TYPE_ARROW"
+            "TYPE_CIRCLE"
+            "TYPE_CIRCLECOUNT"
+            "TYPE_COPY"
+            "TYPE_DRAWER"
+            "TYPE_EXIT"
+            "TYPE_IMAGEUPLOADER"
+            "TYPE_MARKER"
+            "TYPE_MOVESELECTION"
+            "TYPE_PENCIL"
+            "TYPE_PIXELATE"
+            "TYPE_RECTANGLE"
+            "TYPE_SAVE"
+            "TYPE_SELECTION"
+            # "TYPE_SELECTIONINDICATOR"
+            "TYPE_TEXT"
+            "TYPE_UNDO"
+          ];
+        };
+      };
+    })
+  ];
+}
--- a/configs/flameshot.nix
+++ b/configs/flameshot.nix
@@ -1,23 +0,0 @@
-{
-  lib,
-  pkgs,
-  ...
-}:
-{
-  home-manager.users.me = {
-    services.flameshot = {
-      enable = true;
-      settings.General = {
-        autoCloseIdleDaemon = true;
-        drawColor = "#ff0000";
-        drawThickness = 2;
-        showDesktopNotification = true;
-        disabledTrayIcon = true;
-        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)'';
-      };
-    };
-  };
-}
--- a/configs/flix.nix
+++ b/configs/flix.nix
@@ -0,0 +1,80 @@
+{
+  config,
+  pkgs,
+  ...
+}: let
+  flixLocation = "/media/flix";
+  cacheLocation = "/var/cache/flix";
+  indexFilename = "index";
+  flixUser = "flix";
+  flixGroup = "users";
+  inherit (import <niveum/lib>) tmpfilesConfig;
+in {
+  fileSystems.${flixLocation} = {
+    device = "prism.r:/export";
+    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"
+    ];
+  };
+
+  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}/download/index ./${indexFilename}";
+    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
+      cd "${flixLocation}/download"
+
+      [ -f "${cacheLocation}/${indexFilename}" ] || exit 1
+
+      ${pkgs.dmenu}/bin/dmenu -i -p flix -l 5 "$@" < ${cacheLocation}/${indexFilename} \
+        | ${pkgs.findutils}/bin/xargs -I '{}' ${pkgs.util-linux}/bin/setsid ${pkgs.xdg-utils}/bin/xdg-open '{}'
+    '')
+  ];
+}
--- a/configs/fonts.nix
+++ b/configs/fonts.nix
@@ -1,32 +1,24 @@
-{
-  pkgs,
-  ...
-}:
-let
-  zip-font =
-    name: arguments:
-    let
-      directory = pkgs.fetchzip arguments;
-    in
-    pkgs.runCommand name { } ''
+{pkgs, ...}: let
+  zip-font = name: arguments: let
+    directory = pkgs.fetchzip arguments;
+  in
+    pkgs.runCommand name {} ''
      mkdir -p $out/share/fonts/{truetype,opentype,woff}
      ${pkgs.findutils}/bin/find ${directory} -name '*.ttf' -exec install '{}' $out/share/fonts/truetype \;
      ${pkgs.findutils}/bin/find ${directory} -name '*.otf' -exec install '{}' $out/share/fonts/opentype \;
      ${pkgs.findutils}/bin/find ${directory} -name '*.woff' -exec install '{}' $out/share/fonts/woff \;
    '';
-  simple-ttf =
-    name: arguments:
-    let
-      file = pkgs.fetchurl arguments;
-    in
-    pkgs.runCommand name { } ''
+  simple-ttf = name: arguments: let
+    file = pkgs.fetchurl arguments;
+  in
+    pkgs.runCommand name {} ''
      mkdir -p $out/share/fonts/truetype
      install ${file} $out/share/fonts/truetype
    '';

  egyptianHiero = zip-font "EgyptianHiero" {
    url = "https://github.com/MKilani/Djehuty/archive/master.zip";
-    sha256 = "sha256-S3vZxdeBj57KJsF+zaZw7sQw8T+z1aVC2CnpnZ0/x2c=";
+    sha256 = "sha256-KbY4vedm757NWfDlgmNhslbZd+2Vs+o5PjtMMGDt61Y=";
  };
  antinoou = zip-font "Antinoou" {
    url = "https://www.evertype.com/fonts/coptic/AntinoouFont.zip";
@@ -35,9 +27,13 @@ let
  };
  newGardiner = zip-font "NewGardiner" {
    url = "https://mjn.host.cs.st-andrews.ac.uk/egyptian/fonts/NewGardiner.zip";
-    hash = "sha256-nP0y4ILt+0mlkDRdCNSeO2Gequ8wyix/qQdmujTNw3Y=";
+    sha256 = "1jd0qa6shh9pqqyig2w43m9l9rv1i50l73jzkhb6g6mqxbhb1mip";
    stripRoot = false;
  };
+  junicode2 = zip-font "JunicodeTwo" {
+    url = "https://github.com/psb1558/Junicode-font/archive/48bf476db278c844c67542b04d1e0e4c71f139d2.zip";
+    sha256 = "1ryicc155vkvgv3315ddliigwa01afwyb4c4f6pnqcns03af001i";
+  };
  newAthenaUnicode = zip-font "NewAthenaUnicode" {
    url = "https://classicalstudies.org/sites/default/files/userfiles/files/NAU5_005.zip";
    sha256 = "1g7qk9gl4nq2dz41bvck1nzilhin44j8691cxax3dlp77bbn9bxr";
@@ -46,28 +42,15 @@ let
    url = "http://files.qenherkhopeshef.org/jsesh/JSeshFont.ttf";
    sha256 = "1203jrk2xzvgckcc5hx88kja1i3h8gm1wiyla5j6gspc0hbv56ry";
  };
-  egyptianTextBeta = simple-ttf "EgyptianText-1.0beta" {
+  egyptianText = simple-ttf "EgyptianText-1.0beta" {
    url = "http://c.krebsco.de/EgyptianText-v1.0-beta.ttf";
    sha256 = "0cfjbk7xxnxhlp6v922psm5j1xzrv6wfk226ji2wz2yfrnkbcbsv";
  };
-  coranica = simple-ttf "Coranica" {
-    url = "https://corpuscoranicum.de/fonts/coranica_1164.ttf";
-    sha256 = "0igi8q8b2p38x9jq8c98afsl7bf8rj32zj2052yyjgj9r88y4yi5";
-  };
-  koineGreek = simple-ttf "KoineGreek.ttf" {
-    url = "https://github.com/Center-for-New-Testament-Restoration/font/raw/af83eed50105344edaa5e5eddaf87696e271468c/KoineGreek.ttf";
-    hash = "sha256-YtC+nj7+Jl8k00rqAAqySYc8iTAOL7PixXc+LfSmnS0=";
-  };
-  egyptianText = simple-ttf "EgyptianText" {
-    url = "https://github.com/microsoft/font-tools/raw/1092cb23520967830001a0807eb21d6a44dda522/EgyptianOpenType/font/eot.ttf";
-    sha256 = "1n294vhcx90270pnsw1dbk6izd61fjvbnjrh4hcf98ff3s540x0c";
-  };
-in
-{
+in {
  fonts = {
-    enableDefaultPackages = true;
+    enableDefaultFonts = true;
    fontDir.enable = true;
-    packages = with pkgs; [
+    fonts = with pkgs; [
      alegreya
      alegreya-sans
      amiri
@@ -78,26 +61,22 @@ in
      charis-sil
      doulos-sil
      newAthenaUnicode
-      coranica
      corefonts
      crimson
      eb-garamond
-      ipaexfont
      jsesh
      egyptianHiero
      egyptianText
-      egyptianTextBeta
      font-awesome_6
      etBook
      newGardiner
-      junicode
-      koineGreek
-      # brill
+      junicode2
      ezra-sil
      fira
      font-awesome
      galatia-sil
      gentium
+      gfs-fonts
      gyre-fonts
      ibm-plex
      jetbrains-mono
@@ -106,12 +85,11 @@ in
      lmodern
      merriweather
      ocr-a
-      montserrat
      roboto
      roboto-mono
      noto-fonts
-      noto-fonts-cjk-sans
-      noto-fonts-color-emoji
+      noto-fonts-cjk
+      noto-fonts-emoji
      roboto-slab
      scheherazade-new
      source-code-pro
@@ -119,32 +97,16 @@ in
      source-serif-pro
      theano
      tocharian-font
-      vista-fonts
+      vistafonts
      vollkorn
      zilla-slab
    ]; # google-fonts league-of-moveable-type
-    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"
-        ];
-        inherit emoji;
-      };
+    fontconfig.defaultFonts = rec {
+      monospace = ["Noto Sans Mono"] ++ emoji;
+      serif = ["Noto Serif" "Noto Naskh Arabic" "Noto Serif Devanagari"];
+      sansSerif = ["Noto Sans Display" "Noto Kufi Arabic" "Noto Sans Devanagari" "Noto Sans CJK JP"];
+      emoji = ["Noto Color 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
    fontconfig.localConf = ''
--- a/configs/fzf.nix
+++ b/configs/fzf.nix
@@ -1,27 +1,37 @@
-{ pkgs, ... }:
 {
-  programs.fzf = {
-    fuzzyCompletion = true;
-    keybindings = true;
+  pkgs,
+  lib,
+  ...
+}: {
+  environment = {
+    systemPackages = [pkgs.fzf];
+    variables = rec {
+      FZF_DEFAULT_COMMAND = "${pkgs.fd}/bin/fd --type f --strip-cwd-prefix --follow --no-ignore-vcs --exclude .git";
+      FZF_DEFAULT_OPTS =
+        lib.escapeShellArgs ["--height=40%"];
+      FZF_ALT_C_COMMAND = "${pkgs.fd}/bin/fd --type d";
+      FZF_ALT_C_OPTS = lib.escapeShellArgs [
+        "--preview='${pkgs.tree}/bin/tree -L 1 \"{}\"'"
+        "--bind=space:toggle-preview"
+        "--preview-window=hidden"
+      ];
+      FZF_CTRL_T_COMMAND = FZF_DEFAULT_COMMAND;
+      FZF_CTRL_T_OPTS =
+        lib.escapeShellArgs ["--preview='head -$LINES {}'"];
+    };
  };

-  home-manager.users.me = {
-    programs.fzf =
-      let
-        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 = [
-          "--preview='${pkgs.tree}/bin/tree -L 1 {}'"
-          "--bind=space:toggle-preview"
-          "--preview-window=hidden"
-        ];
-        fileWidgetCommand = defaultCommand;
-        fileWidgetOptions = [ "--preview='head -$LINES {}'" ];
-      };
-  };
+  programs.zsh.interactiveShellInit = ''
+    if [[ $options[zle] = on ]]; then
+      . ${pkgs.fzf}/share/fzf/completion.zsh
+      . ${pkgs.fzf}/share/fzf/key-bindings.zsh
+    fi
+  '';
+
+  programs.bash.interactiveShellInit = ''
+    if [[ :$SHELLOPTS: =~ :(vi|emacs): ]]; then
+      . ${pkgs.fzf}/share/fzf/completion.bash
+      . ${pkgs.fzf}/share/fzf/key-bindings.bash
+    fi
+  '';
 }
--- a/configs/gaming.nix
+++ b/configs/gaming.nix
@@ -1,23 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = [
-    pkgs.zeroad
-    pkgs.mari0
-    pkgs.luanti # fka minetest
-    # pkgs.openarena
-    # pkgs.teeworlds
-    pkgs.nethack
-    # pkgs.freeciv
-    # pkgs.lincity-ng
-    # pkgs.superTuxKart
-
-    pkgs.morris
-    pkgs.gnome-chess
-    pkgs.gnuchess
-  ];
-  networking.firewall = {
-    # for 0ad multiplayer
-    allowedTCPPorts = [ 20595 ];
-    allowedUDPPorts = [ 20595 ];
-  };
-}
--- a/configs/git.nix
+++ b/configs/git.nix
@@ -1,21 +1,24 @@
 {
  pkgs,
+  config,
  lib,
  ...
-}:
-{
+}: let
+  inherit (import <niveum/lib>) kieran ignorePaths;
+in {
  environment.systemPackages = [
    pkgs.mr
-    pkgs.gitFull
+    pkgs.git
    pkgs.git-crypt
-    pkgs.gitflow
-    pkgs.gh
-    pkgs.git-extras
-    # pkgs.git-trim
-    pkgs.git-absorb
+    pkgs.gitAndTools.gitflow
+    pkgs.gitAndTools.gh
+    pkgs.gitAndTools.git-extras
+    pkgs.gitAndTools.git-trim
+    pkgs.gitAndTools.git-absorb
    pkgs.gitstats
    pkgs.patch
    pkgs.patchutils
+    pkgs.git-preview
  ];

  environment.shellAliases = {
@@ -26,8 +29,10 @@
  home-manager.users.me = {
    programs.git = {
      enable = true;
-      package = pkgs.gitFull;
-      settings.alias = {
+      package = pkgs.gitAndTools.gitFull;
+      userName = kieran.name;
+      userEmail = kieran.email;
+      aliases = {
        br = "branch";
        co = "checkout";
        ci = "commit";
@@ -40,13 +45,19 @@
        logs = "log --pretty=oneline";
        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 = pkgs.lib.niveum.ignorePaths;
-      settings.user.name = pkgs.lib.niveum.kieran.name;
-      settings.user.email = pkgs.lib.niveum.kieran.email;
-      settings.pull.ff = "only";
-      settings.rebase.autoStash = true;
-      settings.merge.autoStash = true;
-      settings.push.autoSetupRemove = true;
+      ignores = ignorePaths;
+      extraConfig = {
+        pull.ff = "only";
+        rebase.autoStash = true;
+        merge.autoStash = 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";
+      };
    };
  };
 }
--- a/configs/gnome.nix
+++ b/configs/gnome.nix
@@ -1,5 +0,0 @@
-{
-  services.xserver.enable = true;
-  services.xserver.displayManager.lightdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-}
--- a/configs/hledger.nix
+++ b/configs/hledger.nix
@@ -1,30 +1,36 @@
 {
+  config,
  pkgs,
  ...
-}:
-let
-  ledgerDirectory = "/home/kfm/sync/src/ledger";
-  hora = pkgs.callPackage ../packages/hora.nix { timeLedger = "${ledgerDirectory}/time.timeclock"; };
-in
-{
-  environment.systemPackages =
-    let
-      git = "${pkgs.git}/bin/git -C ${ledgerDirectory}";
-    in
-    [
-      hora
-      pkgs.hledger
-      (pkgs.writers.writeDashBin "hledger-git" ''
-        if [ "$1" = entry ]; then
-          ${pkgs.hledger}/bin/hledger balance -V > "${ledgerDirectory}/balance.txt"
-          ${git} add balance.txt
-          ${git} commit --all --message="$(date -Im)"
-        else
-          ${git} $*
-        fi
-      '')
-      (pkgs.writers.writeDashBin "hledger-edit" ''
-        $EDITOR ${ledgerDirectory}/current.journal
-      '')
-    ];
+}: {
+  imports = [<niveum/modules/hledger.nix>];
+
+  environment.systemPackages = let
+    timeLedger = "$HOME/projects/ledger/time.timeclock";
+  in [
+    (pkgs.writers.writeDashBin "hora-edit" ''
+      $EDITOR + "${timeLedger}" && ${pkgs.git}/bin/git -C "$(${pkgs.coreutils}/bin/dirname ${timeLedger})" commit --all --message "$(${pkgs.coreutils}/bin/date -Im)"
+    '')
+    (pkgs.writers.writeDashBin "hora" ''
+      ${pkgs.hledger}/bin/hledger -f "${timeLedger}" "$@"
+    '')
+    (pkgs.writers.writeDashBin "hora-filli" ''
+      ${pkgs.hledger}/bin/hledger -f "${timeLedger}" register fillidefilla -O csv \
+        -b "$(date -d "$(date +%Y-%m)-20 last month" +%Y-%m-%d)" \
+        -e "$(date -d "$(date +%Y-%m)-20" +%Y-%m-%d)" \
+        | sed 's/(fillidefilla:\(.*\))/\1/g' \
+        | xsv select date,amount,total,account,description
+    '')
+  ];
+
+  niveum.hledger = {
+    enable = true;
+    ledgerFile = "$HOME/projects/ledger/all.journal";
+    server = {
+      enable = false;
+      user = config.users.users.me;
+      package = pkgs.hledger-web;
+    };
+    package = pkgs.hledger;
+  };
 }
--- a/configs/htop.nix
+++ b/configs/htop.nix
@@ -20,20 +20,10 @@
        show_thread_names = false;
        sort_descending = true;
        sort_key = "PERCENT_CPU";
-        tree_view = false;
+        tree_view = true;
        update_process_names = false;
-        right_meters = [
-          "Uptime"
-          "Tasks"
-          "LoadAverage"
-          "Battery"
-        ];
-        left_meters = [
-          "LeftCPUs2"
-          "RightCPUs2"
-          "Memory"
-          "Swap"
-        ];
+        right_meters = ["Uptime" "Tasks" "LoadAverage" "Battery"];
+        left_meters = ["LeftCPUs2" "RightCPUs2" "Memory" "Swap"];
      };
    };
  };
--- a/configs/hu-berlin.nix
+++ b/configs/hu-berlin.nix
@@ -0,0 +1,80 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (lib.strings) fileContents;
+  inherit (import <niveum/lib>) sshPort;
+  eduroam = {
+    identity = fileContents <secrets/eduroam/identity>;
+    password = fileContents <secrets/eduroam/password>;
+  };
+  hu-berlin-cifs-options = [
+    "uid=${toString config.users.users.me.uid}"
+    "gid=${toString config.users.groups.users.gid}"
+    "sec=ntlmv2"
+    "workgroup=german"
+    "username=meinhaki"
+    "password=${lib.strings.fileContents <secrets/mail/meinhaki>}"
+    "noauto"
+    "x-systemd.requires=hu-vpn.service"
+    "x-systemd.automount"
+    "x-systemd.device-timeout=1"
+    "x-systemd.idle-timeout=1min"
+  ];
+in {
+  fileSystems."/media/hu-berlin/germpro2" = {
+    device = "//hugerm31c.user.hu-berlin.de/germpro2/ling";
+    fsType = "cifs";
+    options = hu-berlin-cifs-options;
+  };
+
+  fileSystems."/media/hu-berlin/germhome" = {
+    device = "//hugerm31c.user.hu-berlin.de/germhome/ling/meinhaki";
+    fsType = "cifs";
+    options = hu-berlin-cifs-options;
+  };
+
+  home-manager.users.me.programs.ssh = {
+    matchBlocks = {
+      "alew.hu-berlin.de" = {
+        user = "centos";
+        hostname = "141.20.187.219";
+      };
+    };
+  };
+
+  environment.systemPackages = [
+    (pkgs.writers.writeDashBin "hu-ip" ''
+      ${pkgs.w3m}/bin/w3m -dump meineip.hu-berlin.de | head --lines=-4 | tail --lines=+3
+    '')
+    (
+      pkgs.writers.writePython3Bin "hu-eduroam-install"
+      {
+        libraries = with pkgs.python3Packages; [distro pyopenssl dbus-python];
+        flakeIgnore = ["E501" "E123" "W504" "E722" "F821" "E226" "E126" "E265" "W291"];
+      }
+      (builtins.readFile (builtins.fetchurl {
+        url = "https://www.cms.hu-berlin.de/de/dl/netze/wlan/config/eduroam/linux-installer/eduroam-linux-hub.py";
+        sha256 = "19x2kvwxx13265b2hj5fjf53g0liw6dw7xf9j9cav67cswmz60kf";
+      }))
+    )
+  ];
+
+  systemd.services.hu-vpn = {
+    enable = true;
+    wants = ["network-online.target"];
+    script = ''
+      ${pkgs.openfortivpn}/bin/openfortivpn -c ${
+        pkgs.writeText "hu-berlin.config" ''
+          host = forti-ssl.vpn.hu-berlin.de
+          port = 443
+          trusted-cert = 42193a913d276d9eb86217612956e1e6464d6f07bed5393a4787c87adc4bd359
+          username = ${eduroam.identity}
+          password = ${eduroam.password}
+        ''
+      }
+    '';
+  };
+}
--- a/configs/i3.nix
+++ b/configs/i3.nix
@@ -3,43 +3,43 @@
  pkgs,
  lib,
  ...
-}:
-let
-  klem = pkgs.klem.override {
-    options.dmenu = "${pkgs.dmenu}/bin/dmenu -i -p klem";
-    options.scripts = {
-      "p.r paste" = pkgs.writers.writeDash "p.r" ''
+}: let
+  inherit (import <niveum/lib>) defaultApplications colours;
+  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
+  klem = import <niveum/packages/scripts/klem.nix> {
+    inherit pkgs lib;
+    config.scripts = {
+      "p.r" = pkgs.writers.writeDash "p.r" ''
        ${pkgs.curl}/bin/curl -fSs http://p.r --data-binary @- \
          | ${pkgs.coreutils}/bin/tail --lines=1 \
          | ${pkgs.gnused}/bin/sed 's/\\<r\\>/krebsco.de/'
      '';
-      "envs.sh paste" = pkgs.writers.writeDash "envs-host" ''
-        ${pkgs.curl}/bin/curl -F "file=@-" https://envs.sh
-      '';
-      # this segfaults
-      # "envs.sh mirror" = pkgs.writers.writeDash "envs-mirror" ''
-      #   ${pkgs.curl}/bin/curl -F "url=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
+      # "envs.sh host" = pkgs.writers.writeDash "envs-host" ''
+      #   ${pkgs.curl}/bin/curl -F "file=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
      # '';
+      "envs.sh mirror" = pkgs.writers.writeDash "envs-mirror" ''
+        ${pkgs.curl}/bin/curl -F "url=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
+      '';
      "envs.sh shorten" = pkgs.writers.writeDash "envs-shorten" ''
        ${pkgs.curl}/bin/curl -F "shorten=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
      '';
-      "go.r shorten" = pkgs.writers.writeDash "go.r" ''
+      "ix.io" = pkgs.writers.writeDash "ix.io" ''
+        ${pkgs.curl}/bin/curl -fSs -F 'f:1=<-' ix.io
+      '';
+      "go.r" = pkgs.writers.writeDash "go.r" ''
        ${pkgs.curl}/bin/curl -fSs http://go.r -F "uri=$(${pkgs.coreutils}/bin/cat)"
      '';
-      "4d2.org paste" = pkgs.writers.writeDash "4d2-paste" ''
-        ${pkgs.curl}/bin/curl -F "file=@-" https://depot.4d2.org/
-      '';
-      "0x0.st shorten" = pkgs.writers.writeDash "0x0.st" ''
+      "0x0.st" = pkgs.writers.writeDash "0x0.st" ''
        ${pkgs.curl}/bin/curl -fSs https://0x0.st -F "shorten=$(${pkgs.coreutils}/bin/cat)"
      '';
      "rot13" = pkgs.writers.writeDash "rot13" ''
        ${pkgs.coreutils}/bin/tr '[A-Za-z]' '[N-ZA-Mn-za-m]'
      '';
      "ipa" = pkgs.writers.writeDash "ipa" ''
-        ${pkgs.ipa}/bin/ipa
+        ${scripts.ipa}/bin/ipa
      '';
      "betacode" = pkgs.writers.writeDash "betacode" ''
-        ${pkgs.betacode}/bin/betacode
+        ${scripts.betacode}/bin/betacode
      '';
      "curl" = pkgs.writers.writeDash "curl" ''
        ${pkgs.curl}/bin/curl -fSs "$(${pkgs.coreutils}/bin/cat)"
@@ -47,48 +47,20 @@ let
      ocr = pkgs.writers.writeDash "ocr" ''
        ${pkgs.tesseract4}/bin/tesseract -l eng+deu - stdout
      '';
-      emojai = pkgs.writers.writeDash "emojai" ''
-        ${pkgs.curl}/bin/curl https://www.emojai.app/api/generate -X POST -H 'Content-Type: application/json' --data-raw "$(${pkgs.jq}/bin/jq -sR '{emoji:.}')" | ${pkgs.jq}/bin/jq -r .result
-      '';
-    };
-  };
-in
-{
-  age.secrets = {
-    github-token-i3status-rust = {
-      file = ../secrets/github-token-i3status-rust.age;
-      owner = config.users.users.me.name;
-      group = config.users.users.me.group;
-      mode = "400";
-    };
-    openweathermap-api-key = {
-      file = ../secrets/openweathermap-api-key.age;
-      owner = config.users.users.me.name;
-      group = config.users.users.me.group;
-      mode = "400";
-    };
-    miniflux-api-token = {
-      file = ../secrets/miniflux-api-token.age;
-      owner = config.users.users.me.name;
-      group = config.users.users.me.group;
-      mode = "400";
    };
  };

-  environment.systemPackages = [
-    pkgs.xsecurelock
-  ];
-  environment.sessionVariables = {
-    XSECURELOCK_NO_COMPOSITE = "1";
-    XSECURELOCK_BACKGROUND_COLOR = "navy";
-    XSECURELOCK_PASSWORD_PROMPT = "time_hex";
-  };
-
-  services.displayManager.defaultSession = "none+i3";
+  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 {
  services.xserver = {
+    displayManager.defaultSession = "none+i3";
    windowManager.i3 = {
      enable = true;
-      package = pkgs.i3;
    };
  };

@@ -107,76 +79,33 @@ in
    '';
  };

-  home-manager.users.me =
-    let
+  home-manager.users.me.xsession.windowManager.i3 = {
+    enable = true;
+    config = rec {
+      fonts = {
+        names = ["Sans"];
+        size = 10.0;
+      };
      modifier = "Mod4";
-      infoWorkspace = "ℹ";
-      messageWorkspace = "✉";
-      modes.resize = {
-        "Escape" = ''mode "default"'';
-        "Return" = ''mode "default"'';
-        "h" = "resize shrink width 10 px or 5 ppt";
-        "j" = "resize grow height 10 px or 5 ppt";
-        "k" = "resize shrink height 10 px or 5 ppt";
-        "l" = "resize grow width 10 px or 5 ppt";
-      };
-      gaps.inner = 4;
-      floating = {
-        titlebar = false;
-        border = 1;
-      };
-      bars =
-        let
-          position = "bottom";
-        in
-        [
-          (lib.recursiveUpdate config.home-manager.users.me.stylix.targets.i3.exportedBarConfig {
-            workspaceButtons = true;
-            mode = "hide"; # "dock";
-            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})"
-                exec ${config.home-manager.users.me.programs.i3status-rust.package}/bin/i3status-rs ${config.home-manager.users.me.home.homeDirectory}/.config/i3status-rust/config-${position}.toml
-              ''
-            );
-            fonts = {
-              names = [
-                "${config.stylix.fonts.sansSerif.name}"
-                "FontAwesome 6 Free"
-              ];
-              size = config.stylix.fonts.sizes.desktop * 0.8;
-            };
-          })
-        ];
      window = {
        titlebar = false;
-        border = 2;
+        border = 1;
        hideEdgeBorders = "smart";
        commands = [
          {
-            criteria = {
-              class = "floating";
-            };
+            criteria = {class = "floating";};
            command = "floating enable";
          }
          {
-            criteria = {
-              class = "fzfmenu";
-            };
+            criteria = {class = "fzfmenu";};
            command = "floating enable";
          }
          {
-            criteria = {
-              class = ".*";
-            };
+            criteria = {class = ".*";};
            command = "border pixel 2";
          }
          {
-            criteria = {
-              class = "mpv";
-            };
+            criteria = {class = "mpv";};
            command = lib.strings.concatStringsSep ", " [
              "floating enable"
              "sticky enable"
@@ -187,144 +116,187 @@ in
          }
        ];
      };
-      colors =
-        let
-          background = config.lib.stylix.colors.withHashtag.base00;
-        in
+      floating = {
+        titlebar = false;
+        border = 1;
+      };
+      colors = let
+        scheme = {
+          background = colours.background;
+          text = colours.foreground;
+        };
+      in rec {
+        focused =
+          scheme
+          // {
+            border = colours.blue.bright;
+            indicator = colours.blue.bright;
+            childBorder = colours.blue.bright;
+          };
+        unfocused =
+          scheme
+          // {
+            border = colours.background;
+            indicator = colours.background;
+            childBorder = colours.background;
+          };
+        focusedInactive = unfocused;
+        urgent =
+          scheme
+          // {
+            border = colours.red.bright;
+            indicator = colours.red.bright;
+            childBorder = colours.red.bright;
+          };
+        placeholder =
+          scheme
+          // {
+            border = colours.green.bright;
+            indicator = colours.green.bright;
+            childBorder = colours.green.bright;
+          };
+      };
+      bars = [
        {
-          unfocused = {
-            border = lib.mkForce background;
-            childBorder = lib.mkForce background;
+          workspaceButtons = false;
+          fonts = {
+            names = ["Monospace" "Font Awesome 6 Free"];
+            size = 8.0;
          };
-        };
-      keybindings =
-        lib.listToAttrs (
-          map (
-            x: lib.nameValuePair "${modifier}+Shift+${toString x}" "move container to workspace ${toString x}"
-          ) (lib.range 1 9)
-        )
-        // lib.listToAttrs (
-          map (x: lib.nameValuePair "${modifier}+${toString x}" "workspace ${toString x}") (lib.range 1 9)
-        )
-        // {
-          "${modifier}+i" = "workspace ${infoWorkspace}";
-          "${modifier}+m" = "workspace ${messageWorkspace}";
+          mode = "dock"; # "hide";
+          position = "bottom";
+          colors = rec {
+            background = colours.background;
+            separator = background;
+            statusline = colours.foreground;
+            bindingMode = {
+              background = colours.red.bright;
+              border = colours.background;
+              text = colours.foreground;
+            };
+          };
+          statusCommand = "env I3RS_GITHUB_TOKEN=${lib.strings.fileContents <secrets/github/notification.token>} ${pkgs.i3status-rust}/bin/i3status-rs ${
+            (pkgs.formats.toml {}).generate "i3status-rust.toml" (import <niveum/lib/i3status-rust.nix> {
+              inherit (config.niveum) batteryName wirelessInterface;
+              inherit colours;
+              inherit pkgs;
+            })
+          }";
+        }
+      ];
+      modes.resize = {
+        "Escape" = ''mode "default"'';
+        "Return" = ''mode "default"'';
+        "h" = "resize shrink width 10 px or 5 ppt";
+        "j" = "resize grow height 10 px or 5 ppt";
+        "k" = "resize shrink height 10 px or 5 ppt";
+        "l" = "resize grow width 10 px or 5 ppt";
+      };
+      keybindings = {
+        "${modifier}+Shift+h" = "move left 25 px";
+        "${modifier}+Shift+j" = "move down 25 px";
+        "${modifier}+Shift+k" = "move up 25 px";
+        "${modifier}+Shift+l" = "move right 25 px";
+        "${modifier}+h" = "focus left";
+        "${modifier}+j" = "focus down";
+        "${modifier}+k" = "focus up";
+        "${modifier}+l" = "focus right";

-          "${modifier}+Shift+h" = "move left 25 px";
-          "${modifier}+Shift+j" = "move down 25 px";
-          "${modifier}+Shift+k" = "move up 25 px";
-          "${modifier}+Shift+l" = "move right 25 px";
-          "${modifier}+h" = "focus left";
-          "${modifier}+j" = "focus down";
-          "${modifier}+k" = "focus up";
-          "${modifier}+l" = "focus right";
+        "${modifier}+Shift+b" = "move window to workspace prev";
+        "${modifier}+Shift+n" = "move window to workspace next";
+        "${modifier}+Shift+x" = "exec ${move-to-new-workspace}";
+        "${modifier}+b" = "workspace prev";
+        "${modifier}+n" = "workspace next";
+        "${modifier}+x" = "exec ${new-workspace}";

-          # "${modifier}+Shift+b" = "move container to workspace prev";
-          # "${modifier}+Shift+n" = "move container to workspace next";
-          # "${modifier}+b" = "workspace prev";
-          # "${modifier}+n" = "workspace next";
+        "${modifier}+Shift+c" = "reload";
+        "${modifier}+Shift+q" = "kill";
+        "${modifier}+Shift+r" = "restart";

-          "${modifier}+Shift+c" = "reload";
-          "${modifier}+Shift+q" = "kill";
-          "${modifier}+Shift+r" = "restart";
+        "${modifier}+z" = "sticky toggle";
+        "${modifier}+Shift+z" = "floating toggle";

-          "${modifier}+z" = "sticky toggle";
-          "${modifier}+Shift+z" = "floating toggle";
+        "${modifier}+s" = "scratchpad show";
+        "${modifier}+Shift+s" = "move scratchpad";

-          "${modifier}+Shift+s" = "move scratchpad";
-          "${modifier}+s" = ''[class="^(?i)(?!obsidian).*"] scratchpad show'';
-          "${modifier}+o" = ''[class="obsidian"] scratchpad show'';
+        "${modifier}+c" = "split h";
+        "${modifier}+e" = "layout toggle split";
+        "${modifier}+f" = "fullscreen toggle";
+        "${modifier}+r" = "mode resize";
+        "${modifier}+v" = "split v";
+        "${modifier}+w" = "layout tabbed";
+        "${modifier}+q" = "exec ${pkgs.writers.writeDash "newsboat-sync" ''
+          notify-send --app-name="newsboat" "Updating ..."
+          newsboat -x reload
+          notify-send --app-name="newsboat" "Finished updating."
+        ''}";

-          "${modifier}+c" = "split h";
-          "${modifier}+e" = "layout toggle split";
-          "${modifier}+f" = "fullscreen toggle";
-          "${modifier}+r" = "mode resize";
-          "${modifier}+v" = "split v";
-          "${modifier}+w" = "layout tabbed";
-          "${modifier}+q" = "exec ${config.services.clipmenu.package}/bin/clipmenu";
+        # "${modifier}+Shift+y" = "exec ${pkgs.qutebrowser}/bin/qutebrowser";
+        "${modifier}+Return" = "exec ${(defaultApplications pkgs).terminal}";
+        "${modifier}+t" = "exec ${(defaultApplications pkgs).fileManager}";
+        "${modifier}+y" = "exec ${(defaultApplications pkgs).browser}";
+        "${modifier}+0" = "exec ${scripts.menu-calc}/bin/=";

-          "${modifier}+Return" = "exec ${lib.getExe pkgs.niveum-terminal}";
-          "${modifier}+t" = "exec ${lib.getExe pkgs.niveum-filemanager}";
-          "${modifier}+y" = "exec ${lib.getExe pkgs.niveum-browser}";
+        "${modifier}+Shift+w" = "exec ${scripts.k-lock}/bin/k-lock";
+        "${modifier}+d" = "exec ${pkgs.writers.writeDash "run" ''exec rofi -modi run,ssh,window -show run''}";
+        "${modifier}+Shift+d" = "exec ${
+          pkgs.writers.writeDash "notemenu" ''
+            set -efu
+            PATH=$PATH:${
+              lib.makeBinPath [pkgs.rofi pkgs.findutils pkgs.coreutils]
+            }

-          "${modifier}+d" =
-            "exec ${pkgs.writers.writeDash "run" ''exec rofi -modi run,ssh,window -show run''}";
-          "${modifier}+Shift+d" = "exec ${lib.getExe pkgs.notemenu}";
-          "${modifier}+p" = "exec rofi-pass";
-          "${modifier}+Shift+p" = "exec rofi-pass --insert";
-          "${modifier}+u" = "exec ${lib.getExe pkgs.unicodmenu}";
-          "${modifier}+Shift+u" =
-            "exec ${pkgs.writers.writeDash "last-unicode" ''${pkgs.xdotool}/bin/xdotool type --delay 1000 "$(${pkgs.gawk}/bin/awk 'END{print $1}' ~/.cache/unicodmenu)"''}";
-
-          "${modifier}+F7" = "exec ${pkgs.writers.writeDash "showkeys-toggle" ''
-            if ${pkgs.procps}/bin/pgrep screenkey; then
-              exec ${pkgs.procps}/bin/pkill screenkey
-            else
-              exec ${pkgs.screenkey}/bin/screenkey
+            cd ~/notes
+            note_file=$({
+              echo diary/$(date -I).md
+              echo diary/$(date -I -d yesterday).md
+              find . ! -name '.*' -type f -printf "%T@ %p\n" | sort --reverse --numeric-sort | cut --delimiter=" " --fields=2-
+            } | rofi -dmenu -i -p 'notes')
+            if test "$note_file"
+            then
+              alacritty --working-directory ~/notes -e "$EDITOR" "$note_file"
            fi
-          ''}";
-          "${modifier}+F12" = "exec ${klem}/bin/klem";
-          "XF86AudioLowerVolume" = "exec ${lib.getExe pkgs.pamixer} -d 5";
-          "XF86AudioMute" = "exec ${lib.getExe pkgs.pamixer} -t";
-          "XF86AudioRaiseVolume" = "exec ${pkgs.pamixer}/bin/pamixer -i 5";
-          "XF86Calculator" = "exec ${lib.getExe pkgs.st} -c floating -e ${pkgs.bc}/bin/bc";
-          "XF86AudioPause" = "exec ${lib.getExe pkgs.playerctl} play-pause";
-          "XF86AudioPlay" = "exec ${lib.getExe pkgs.playerctl} play-pause";
-          "XF86AudioNext" = "exec ${lib.getExe pkgs.playerctl} next";
-          "XF86AudioPrev" = "exec ${lib.getExe pkgs.playerctl} previous";
-          "XF86AudioStop" = "exec ${lib.getExe pkgs.playerctl} stop";
+          ''
+        }";
+        "${modifier}+p" = "exec rofi-pass";
+        "${modifier}+Shift+p" = "exec rofi-pass --insert";
+        "${modifier}+u" = "exec ${scripts.unicodmenu}/bin/unicodmenu";

-          # key names detected with xorg.xev:
-          # XF86WakeUp (fn twice)
-          # XF86Battery (fn f3)
-          # XF86Sleep (fn f4) - actually suspends
-          # XF86WLAN
-          # XF86WebCam (fn f6)
-          # XF86TouchpadToggle (fn f8)
-          # XF86Suspend (fn f12) - actually suspends to disk
-          # Num_Lock (fn Roll) - numlocks
-          # XF86Audio{Prev,Next,Mute,Play,Stop}
-          # XF86Forward
-          # XF86Back
-          # XF86Launch1 (thinkvantage)
-        };
-    in
-    {
-      stylix.targets.i3.enable = true;
+        "${modifier}+F6" = "exec ${pkgs.xorg.xkill}/bin/xkill";
+        "${modifier}+F7" = "exec ${scripts.showkeys-toggle}/bin/showkeys-toggle";
+        "${modifier}+F8" = "exec switch-theme toggle";
+        "${modifier}+F9" = "exec ${pkgs.redshift}/bin/redshift -O 4000 -b 0.85";
+        "${modifier}+F10" = "exec ${pkgs.redshift}/bin/redshift -x";
+        "${modifier}+F11" = "exec ${pkgs.xcalib}/bin/xcalib -invert -alter";
+        "${modifier}+F12" = "exec ${klem}/bin/klem";
+        "Print" = "exec flameshot-once";
+        "XF86AudioLowerVolume" = "exec ${pkgs.pamixer}/bin/pamixer -d 5";
+        "XF86AudioMute" = "exec ${pkgs.pamixer}/bin/pamixer -t";
+        "XF86AudioRaiseVolume" = "exec ${pkgs.pamixer}/bin/pamixer -i 5";
+        "XF86Calculator" = "exec ${pkgs.st}/bin/st -c floating -e ${pkgs.bc}/bin/bc";
+        "XF86AudioPause" = "exec ${pkgs.playerctl}/bin/playerctl pause";
+        "XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
+        "XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
+        "XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
+        "XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl stop";
+        "XF86ScreenSaver" = "exec ${scripts.k-lock}/bin/k-lock";

-      xsession.windowManager.i3 = {
-        enable = true;
-        extraConfig = ''
-          bindsym --release ${modifier}+Shift+w exec xsecurelock
+        "XF86Display" = "exec ${scripts.dmenurandr}/bin/dmenurandr";

-          exec "${lib.getExe pkgs.obsidian}"
-          for_window [class="obsidian"] , move scratchpad
-
-          assign [class="message"] ${messageWorkspace}
-          exec "${pkgs.writers.writeDash "irc" "exec ${lib.getExe pkgs.alacritty} --class message -e ssh weechat@makanek -t tmux attach-session -t IM"}"
-          exec "${pkgs.writers.writeDash "email" "exec ${lib.getExe pkgs.alacritty} --class message -e aerc"}"
-
-          exec --no-startup-id ${pkgs.xss-lock}/bin/xss-lock -- xsecurelock
-        '';
-        config = {
-          inherit
-            modifier
-            gaps
-            modes
-            bars
-            floating
-            window
-            colors
-            ;
-          keybindings = keybindings // {
-            "${modifier}+F9" = "exec ${pkgs.redshift}/bin/redshift -O 4000 -b 0.85";
-            "${modifier}+F10" = "exec ${pkgs.redshift}/bin/redshift -x";
-            "Print" = "exec flameshot gui";
-            # "${modifier}+Shift+x" = "exec ${move-to-new-workspace}";
-            # "${modifier}+x" = "exec ${new-workspace}";
-            "XF86Display" = "exec ${lib.getExe pkgs.dmenu-randr}";
-          };
-        };
+        # key names detected with xorg.xev:
+        # XF86WakeUp (fn twice)
+        # XF86Battery (fn f3)
+        # XF86Sleep (fn f4) - actually suspends
+        # XF86WLAN
+        # XF86WebCam (fn f6)
+        # XF86TouchpadToggle (fn f8)
+        # XF86Suspend (fn f12) - actually suspends to disk
+        # Num_Lock (fn Roll) - numlocks
+        # XF86Audio{Prev,Next,Mute,Play,Stop}
+        # XF86Forward
+        # XF86Back
+        # XF86Launch1 (thinkvantage)
      };
    };
+  };
 }
--- a/configs/i3status-rust.nix
+++ b/configs/i3status-rust.nix
@@ -1,85 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}:
-{
-  age.secrets = {
-    miniflux-api-token = {
-      file = ../secrets/miniflux-api-token.age;
-      owner = config.users.users.me.name;
-      group = config.users.users.me.group;
-      mode = "400";
-    };
-  };
-
-  home-manager.users.me = {
-    programs.i3status-rust = {
-      enable = true;
-      bars.bottom = {
-        icons = "awesome6";
-        settings = {
-          theme.overrides =
-            let
-              colours = config.lib.stylix.colors.withHashtag;
-            in
-            {
-              idle_bg = colours.base00;
-              idle_fg = colours.base05;
-              good_bg = colours.base00;
-              good_fg = colours.base0B;
-              warning_bg = colours.base00;
-              warning_fg = colours.base0A;
-              critical_bg = colours.base00;
-              critical_fg = colours.base09;
-              info_bg = colours.base00;
-              info_fg = colours.base04;
-              separator_bg = colours.base00;
-              separator = " ";
-            };
-        };
-        blocks = [
-          {
-            block = "music";
-            format = "{$icon $combo $play |}";
-            separator = " – ";
-          }
-          {
-            block = "net";
-            format = " $icon HU";
-            missing_format = "";
-            device = "ppp0";
-          }
-          {
-            block = "net";
-            format = " $icon FU";
-            missing_format = "";
-            device = "tun0";
-          }
-          {
-            block = "battery";
-            format = "$icon $percentage $time";
-            device = "DisplayDevice";
-            driver = "upower";
-          }
-          {
-            block = "sound";
-          }
-          {
-            block = "disk_space";
-            format = "$icon $available";
-          }
-          {
-            block = "memory";
-            format = "$icon $mem_used.eng(prefix:G)";
-          }
-          { block = "load"; }
-          {
-            block = "time";
-            format = "$icon $timestamp.datetime(f:'%Y-%m-%d (%W %a) %H:%M', l:de_DE)";
-          }
-        ];
-      };
-    };
-  };
-}
--- a/configs/keyboard.nix
+++ b/configs/keyboard.nix
@@ -0,0 +1,75 @@
+{
+  pkgs,
+  lib,
+  ...
+}: let
+  commaSep = builtins.concatStringsSep ",";
+  xkbOptions = ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
+  languages = {
+    de = "T3";
+    gr = "polytonic";
+    ru = "phonetic";
+    ara = "buckwalter";
+    cop = "";
+    ave = "";
+    "in" = "san-kagapa";
+    il = "phonetic";
+  };
+  defaultLanguage = "de";
+in {
+  # man 7 xkeyboard-config
+  services.xserver = {
+    layout = "de";
+    # T3: https://upload.wikimedia.org/wikipedia/commons/a/a9/German-Keyboard-Layout-T3-Version1-large.png
+    # buckwalter: http://www.qamus.org/transliteration.htm
+    xkbVariant = "T3";
+    xkbOptions = commaSep xkbOptions;
+    libinput.enable = true;
+    xkbDir = pkgs.symlinkJoin {
+      name = "x-keyboard-directory";
+      paths = [
+        "${pkgs.xkeyboard_config}/etc/X11/xkb"
+        (pkgs.linkFarm "custom-x-keyboards" [
+          {
+            name = "symbols/cop";
+            path = pkgs.fetchurl {
+              url = "http://www.moheb.de/download/cop";
+              sha256 = "1l0h6aq536hyinrh0i0ia355y229bjrlibii0sya5bmqh46vycia";
+            };
+          }
+          {
+            name = "symbols/ave";
+            path = pkgs.fetchurl {
+              url = "https://blog.simos.info/wp-content/uploads/2010/06/avestan.txt";
+              sha256 = "192zmmm3gxyhim39dsax7r87gsay2w5v2xkhwmvsfipjb60hwp5g";
+            };
+          }
+        ])
+      ];
+    };
+  };
+
+  console.keyMap = "de";
+
+  environment.systemPackages =
+    lib.mapAttrsToList
+    (language: variant:
+      pkgs.writers.writeDashBin "kb-${language}" ''
+        ${pkgs.xorg.setxkbmap}/bin/setxkbmap ${defaultLanguage},${language} ${languages.${defaultLanguage}},${variant} ${toString (map (option: "-option ${option}") xkbOptions)}
+      '')
+    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"];
+    serviceConfig = {
+      SyslogIdentifier = "gxkb";
+      ExecStart = "${pkgs.gxkb}/bin/gxkb";
+      Restart = "always";
+      RestartSec = "15s";
+      StartLimitBurst = 0;
+    };
+  };
+}
--- a/configs/keyboard/XCompose
+++ b/configs/keyboard/XCompose
@@ -1,34 +0,0 @@
-# Import default rules from the system Compose file
-include "%L"
-
-# Custom definitions
-<Multi_key> <U0634> <U0634> : "ژ" U0698 # ز + ز = ژ
-<Multi_key> <U063A> <U063A> : "گ" U06AF # غ + غ = گ
-<Multi_key> <U0641> <U0641> : "ڤ" U06A4 # ف + ف = ڤ
-<Multi_key> <U062C> <U062C> : "چ" U0686 # ج + ج = چ
-<Multi_key> <U0628> <U0628> : "پ" U067E # ب + ب = پ
-<Multi_key> <U0643> <U0643> : "ک" U06A9 # ك + ك = ک
-<Multi_key> <U064A> <U064A> : "ی" U06CC # ي + ي = ی
-<Multi_key> <U0647> <U064A> : "ۀ" U06C0 # ه + ي = ۀ
-<Multi_key> <E> <E> : "ɛ" U025B
-<Multi_key> <O> <O> : "ɔ" U0254
-<Multi_key> <s> <h> : "ʃ" U0283
-<Multi_key> <g> <h> : "ɣ" U0283
-<Multi_key> <b> <h> : "β" U0283
-<Multi_key> <p> <h> : "ɸ" U0283
-<Multi_key> <z> <h> : "ʒ" U0292
-<Multi_key> <e> <i> : "ɪ" U026A
-<Multi_key> <e> <u> : "ʊ" U028A
-<Multi_key> <colon> <colon> : "ː" U02D0
-<Multi_key> <question> <period> : "ʔ" U0294
-<Multi_key> <period> <question> : "ʕ" U0295
-<Multi_key> <apostrophe> <period> : "ˈ" U02C8
-<Multi_key> <period> <apostrophe> : "ˌ" U02CC
-<dead_belowring> <nobreakspace> : "̥" U0325 # COMBINING RING BELOW
-<dead_belowbreve> <nobreakspace> : "̮" U032E # COMBINING BREVE BELOW
-<dead_invertedbreve> <nobreakspace> : "̑" U0311 # COMBINING INVERTED BREVE
-<dead_belowmacron> <nobreakspace> : "̱" U0331 # COMBINING MACRON BELOW
-<dead_belowcircumflex> <nobreakspace> : "̯" U032F # COMBINING INVERTED BREVE BELOW
-<dead_circumflex> <Multi_key> <underscore> <e> : "ᵊ" U1D4A
-
-# TODO zwnj
--- a/configs/keyboard/avestan
+++ b/configs/keyboard/avestan
@@ -1,60 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////
-//
-// Generated keyboard layout file with the Keyboard Layout Editor.
-// For more about the software, see http://code.google.com/p/keyboardlayouteditor
-//
-// Version 0.2, changed AD09.
-
-partial default alphanumeric_keys
-xkb_symbols "avestan"
-{
-	name[Group1] = "Iran - Avestan";
-
-	key <AB01> { [ U10B30,         U10B32 ] }; // ð¬° ð¬²
-	key <AB02> { [ U10B11,         U10B12 ] }; // ð¬‘ ð¬’
-	key <AB03> { [ U10B17,          UE102 ] }; // ð¬— î„‚
-	key <AB04> { [ U10B2C,         U10B13 ] }; // ð¬¬ ð¬“
-	key <AB05> { [ U10B20,         U10B21 ] }; // ð¬  ð¬¡
-	key <AB06> { [ U10B25,         U10B27 ] }; // ð¬¥ ð¬§
-	key <AB07> { [ U10B28,         U10B29 ] }; // ð¬¨ ð¬©
-	key <AB08> { [ U10B3C,         U10B39 ] }; // ð¬¼ ð¬¹
-	key <AB09> { [ U10B3E,         U10B3D ] }; // ð¬¾ ð¬½
-	key <AB10> { [ U10B3F, periodcentered ] }; // ð¬¿ Â·
-
-	key <AC01> { [ U10B00,         U10B01 ] }; // ð¬€ ð¬
-	key <AC02> { [ U10B2F,         U10B31 ] }; // ð¬¯ ð¬±
-	key <AC03> { [ U10B1B,         U10B1C ] }; // ð¬› ð¬œ
-	key <AC04> { [ U10B1F,         U10B16 ] }; // ð¬Ÿ ð¬–
-	key <AC05> { [ U10B14,         U10B15 ] }; // ð¬” ð¬•
-	key <AC06> { [ U10B35,          UE100 ] }; // ð¬µ î„€
-	key <AC07> { [ U10B18,         U10B24 ] }; // ð¬˜ ð¬¤
-	key <AC08> { [ U10B10,          UE101 ] }; // ð¬ î„
-	key <AC09> { [ U10B2E,          UE103 ] }; // ð¬® î„ƒ
-	key <AC10> { [ U10B3B,         U10B3A ] }; // ð¬» ð¬º
-	key <AC11> { [ U10B1D                 ] }; // ð¬
-
-	key <AD01> { [ U10B22,         U10B23 ] }; // ð¬¢ ð¬£
-	key <AD02> { [ U10B33,         U10B34 ] }; // ð¬³ ð¬´
-	key <AD03> { [ U10B08,         U10B09 ] }; // ð¬ˆ ð¬‰
-	key <AD04> { [ U10B2D,         U10B26 ] }; // ð¬ ð¬¦
-	key <AD05> { [ U10B19,         U10B1A ] }; // ð¬™ ð¬š
-	key <AD06> { [ U10B2B,         U10B2A ] }; // ð¬« ð¬ª
-	key <AD07> { [ U10B0E,         U10B0F ] }; // ð¬Ž ð¬
-	key <AD08> { [ U10B0C,         U10B0D ] }; // ð¬Œ ð¬
-	key <AD09> { [ U10B0A,         U10B0B ] }; // ð¬Š ð¬‹
-	key <AD10> { [ U10B1E                 ] }; // ð¬ž
-	key <AD11> { [ U10B06,         U10B07 ] }; // ð¬† ð¬‡
-	key <AD12> { [ U10B02,         U10B03 ] }; // ð¬‚ ð¬ƒ
-
-	key <AE01> { [ U10B78                 ] }; // ð¸
-	key <AE02> { [ U10B79                 ] }; // ð¹
-	key <AE03> { [ U10B7A                 ] }; // ðº
-	key <AE04> { [ U10B7B                 ] }; // ð»
-	key <AE05> { [ U10B7C                 ] }; // ð¼
-	key <AE06> { [ U10B7D                 ] }; // ð½
-	key <AE07> { [ U10B7E                 ] }; // ð¾
-	key <AE08> { [ U10B7F                 ] }; // ð¿
-
-	key <BKSL> { [ U10B04,         U10B05 ] }; // ð¬„ ð¬…
-	key <LSGT> { [ U10B04,         U10B05 ] }; // ð¬„ ð¬…
-};
--- a/configs/keyboard/coptic
+++ b/configs/keyboard/coptic
@@ -1,79 +0,0 @@
-// Coptic keyboard symbols for XKB and PC keyboard
-// based on the mapping of logos
-// (C) 2006 Moheb Mekhaiel <mohebm@gmx.de>
-//
-// Permission is granted to anyone to use, distribute and modify
-// this file in any way, provided that the above copyright notice
-// is left intact and the author of the modification summarizes
-// the changes in this header.
-//
-// This file is distributed without any expressed or implied warranty.
-
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-    name[Group1]= "Coptic";
-
-    key <TLDE>  { [ U0308,      U0311,      U0361,      U2CE5 ] };
-
-    key <AE01>  { type[Group1] = "FOUR_LEVEL",
-                  [ 1,          U0304,      VoidSymbol, U2CE6 ] };
-    key <AE02>  { [ 2,          U0306,      U2CFD,      U2CE7 ] };
-    key <AE03>  { [ 3,          U0374,      U2056,      U2CE8 ] };
-    key <AE04>  { [ 4,          U0375,      U2058,      U2CE9 ] };
-    key <AE05>  { [ 5,          U0307,      U2059,      U2CEA ] };
-    key <AE06>  { [ 6,          U0323,      U2C8B,      U2C8A ] };
-    key <AE07>  { [ 7,          U2CE4 ] };
-    key <AE08>  { [ 8,          U002A,      U2026 ] };
-    key <AE09>  { [ 9,          parenleft,  U201C,      plusminus ] };
-    key <AE10>  { [ 0,          parenright, U201D,      degree ] };
-    key <AE11>  { [ U00B7,      underscore, U2013,      U2014 ] };
-    key <AE12>  { [ U2E17,      U0305,      U033F ] };
-    key <BKSL>  { [ U0300,      U007C,      backslash,  U007C ] };
-
-    key <AD01>  { [ U2C91,      U2C90 ] };
-    key <AD02>  { [ U2CB1,      U2CB0 ] };
-    key <AD03>  { [ U2C89,      U2C88 ] };
-    key <AD04>  { [ U2CA3,      U2CA2 ] };
-    key <AD05>  { [ U2CA7,      U2CA6,      U03EF,      U03EE ] };
-    key <AD06>  { [ U2CAF,      U2CAE ] };
-    key <AD07>  { [ U2CA9,      U2CA8 ] };
-    key <AD08>  { [ U2C93,      U2C92 ] };
-    key <AD09>  { [ U2C9F,      U2C9E ] };
-    key <AD10>  { [ U2CA1,      U2CA0 ] };
-    key <AD11>  { [ bracketleft,braceleft,  U2018 ] };
-    key <AD12>  { [ bracketright,braceright,U2019 ] };
-
-    key <AC01>  { [ U2C81,      U2C80 ] };
-    key <AC02>  { [ U2CA5,      U2CA4,      U03E3,      U03E2 ] };
-    key <AC03>  { [ U2C87,      U2C86,      U03EF,      U03EE ] };
-    key <AC04>  { [ U2CAB,      U2CAA,      U03E5,      U03E4 ] };
-    key <AC05>  { [ U2C85,      U2C84,      U03EB,      U03EA ] };
-    key <AC06>  { [ U2C8F,      U2C8E,      U03E9,      U03E8 ] };
-    key <AC07>  { [ U03EB,      U03EA,      U03EB,      U03EA ] };
-    key <AC08>  { [ U2C95,      U2C94,      U03E7,      U03E6 ] };
-    key <AC09>  { [ U2C97,      U2C96 ] };
-    key <AC10>  { [ semicolon,  colon,      U2053,      dead_doubleacute ] };
-    key <AC11>  { [ apostrophe, U2CFF,      U0022 ] };
-
-    key <AB01>  { [ U2C8D,      U2C8C ] };
-    key <AB02>  { [ U2C9D,      U2C9C ] };
-    key <AB03>  { [ U2CAD,      U2CAC,       U03ED,      U03EC ] };
-    key <AB04>  { [ U03E3,      U03E2,       U03E3,      U03E2 ] };
-    key <AB05>  { [ U2C83,      U2C82 ] };
-    key <AB06>  { [ U2C9B,      U2C9A ] };
-    key <AB07>  { [ U2C99,      U2C98 ] };
-    key <AB08>  { [ comma,      less,        U00AB,      U2039 ] };
-    key <AB09>  { [ period,     greater,     U00BB,      U203A ] };
-    key <AB10>  { [ U0301,      U2CFE,       slash,      question ] };
-
-    key <RALT>  { type[Group1]="TWO_LEVEL",
-                  [ ISO_Level3_Shift, Multi_key ]   };
-
-    modifier_map Mod5   { <RALT> };
-
-    //include "level3(ralt_switch_multikey)"
-
-  // End alphanumeric section
-};
-
--- a/configs/keyboard/default.nix
+++ b/configs/keyboard/default.nix
@@ -1,139 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-let
-
-  commaSep = builtins.concatStringsSep ",";
-  xkbOptions = [
-    "compose:caps"
-    "terminate:ctrl_alt_bksp"
-    "grp:ctrls_toggle"
-  ];
-  languages = {
-    deutsch = {
-      code = "de";
-      variant = "T3";
-    };
-    greek = {
-      code = "gr";
-      variant = "polytonic";
-    };
-    russian = {
-      code = "ru";
-      variant = "phonetic";
-    };
-    arabic = {
-      code = "ara";
-      variant = "buckwalter";
-    };
-    coptic = ./coptic;
-    avestan = ./avestan;
-    gothic = ./gothic;
-    farsi = {
-      code = "ir";
-      variant = "qwerty";
-    };
-    syriac = {
-      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
-{
-  services.libinput.enable = true;
-
-  # man 7 xkeyboard-config
-  services.xserver = {
-    exportConfiguration = lib.mkForce true; # link /usr/share/X11 properly
-    xkb.layout = defaultLanguage.code;
-    # T3: https://upload.wikimedia.org/wikipedia/commons/a/a9/German-Keyboard-Layout-T3-Version1-large.png
-    # buckwalter: http://www.qamus.org/transliteration.htm
-    xkb.variant = defaultLanguage.variant;
-    xkb.options = commaSep xkbOptions;
-    xkb.extraLayouts = {
-      coptic = {
-        languages = [ "cop" ];
-        description = "Coptic is the latest stage of the Egyptian language and was used by Egyptian Christians. The Coptic script is based on the Greek alphabet with some letters borrowed from Demotic Egyptian.";
-        symbolsFile = ./coptic;
-      };
-      avestan = {
-        languages = [ "ave" ];
-        description = "Avestan is an ancient Iranian language known primarily from its use in the sacred texts of Zoroastrianism, the Avesta. It is an Indo-Iranian language that was spoken in ancient Persia.";
-        symbolsFile = ./avestan;
-      };
-      gothic = {
-        languages = [ "got" ];
-        description = "Gothic is an extinct East Germanic language that was spoken by the Goths. It is known primarily from the Codex Argenteus, a 6th-century manuscript containing a translation of the Bible into Gothic.";
-        symbolsFile = ./gothic;
-      };
-      farsi = {
-        languages = [ "fas" ];
-        description = "Farsi, also known as Persian, is an Indo-Iranian language spoken primarily in Iran, Afghanistan (where it is known as Dari), and Tajikistan (where it is called Tajik). It has a rich literary tradition and is written in a modified Arabic script.";
-        symbolsFile = ./farsi;
-      };
-    };
-  };
-
-  environment.etc."x11-locale".source = toString pkgs.xorg.libX11 + "share/X11/locale";
-
-  home-manager.users.me = {
-    home.file = {
-      ".XCompose".source = ./XCompose;
-    };
-  };
-
-  console.keyMap = "de";
-
-  environment.systemPackages = lib.mapAttrsToList (
-    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}" ''
-      if [ -z $SWAYSOCK ]; then
-        ${pkgs.xorg.setxkbmap}/bin/setxkbmap ${defaultLanguage.code},${code} ${defaultLanguage.variant},${variant} ${
-          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 // config.services.xserver.xkb.extraLayouts);
-
-  # 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" ];
-    serviceConfig = {
-      SyslogIdentifier = "gxkb";
-      ExecStart = "${pkgs.gxkb}/bin/gxkb";
-      Restart = "always";
-      RestartSec = "15s";
-      StartLimitBurst = 0;
-    };
-  };
-}
--- a/configs/keyboard/farsi
+++ b/configs/keyboard/farsi
@@ -1,114 +0,0 @@
-// https://github.com/gpuminingir/Farsi-Phonetic-Keyboard-Linux
-// by @gpuminingir
-
-partial alphanumeric_keys
-xkb_symbols "qwerty" {
-  // Classic Finnish keyboard layout without dead keys and {[]} on asdf + AltG
-  name[Group1]="Persian (QWERTY)";
-  include "ir(pesq_part_basic)"
-  include "ir(pesq_part_ext)"
-  include "ir(pesq_part_keypad)"
-  include "nbsp(zwnj2nb3nnb4)"
-  include "level3(ralt_switch)"  
-};
-
-hidden partial alphanumeric_keys
-xkb_symbols "pesq_part_basic" {
-  // Persian digits
-  key <AE01> { [ Arabic_1, exclam, exclam ] }; // ١ ! !
-  key <AE02> { [ Arabic_2, at, at ] }; // ٢ @ @
-  key <AE03> { [ Arabic_3, numbersign, numbersign ] }; // ٣ # #
-  key <AE04> { [ Farsi_4, dollar, dollar ] }; // ۴ $ $
-  key <AE05> { [ Farsi_5, percent, percent ] }; // ۵ % %
-  key <AE06> { [ Farsi_6, asciicircum, asciicircum ] }; // ۶ ^ ^
-  key <AE07> { [ Arabic_7, ampersand, ampersand ] }; // ٧ & &
-  key <AE08> { [ Arabic_8, KP_Multiply, KP_Multiply ] }; // ٨ * *
-  key <AE09> { [ Arabic_9, Armenian_parenright, Armenian_parenright, Armenian_parenleft ] }; // ٩ ) ) (
-  key <AE10> { [ Farsi_0, Armenian_parenleft, Armenian_parenleft ] }; // ۰ ( (
-  key <AE11> { [ underbar, KP_Subtract, KP_Subtract ] }; // _ – –
-  key <AE12> { [ KP_Equal, KP_Add, KP_Add ] }; // = + +
-
-  // Persian letters and symbols
-  key <AD01> { [ Arabic_qaf, Arabic_ghain ] }; // ق غ
-  key <AD02> { [ Arabic_sheen ] }; // ش
-  key <AD03> { [ Arabic_ain ] }; // ع
-  key <AD04> { [ Arabic_ra ] }; // ر
-  key <AD05> { [ Arabic_teh, Arabic_tah ] }; // ت ط
-  key <AD06> { [ Farsi_yeh ] }; // ى
-  key <AD07> { [ Arabic_waw ] }; // و
-  key <AD08> { [ Farsi_yeh ] }; // ى
-  key <AD09> { [ Arabic_waw ] }; // و
-  key <AD10> { [ Arabic_peh ] }; // پ
-  key <AD11> { [ bracketright, braceleft ] }; // ] } {
-  key <AD12> { [ bracketleft, braceright ] }; // [ { }
-
-  key <AC01> { [ Arabic_alef, Arabic_maddaonalef, Arabic_maddaonalef ] }; // ا آ آ
-  key <AC02> { [ Arabic_seen, Arabic_sad, Arabic_sheen, Arabic_sheen ] }; // س ص  ش 
-  key <AC03> { [ Arabic_dal, Arabic_thal ] }; // د ذ ذ
-  key <AC04> { [ Arabic_feh ] }; // ف
-  key <AC05> { [ Arabic_gaf, Arabic_ghain ] }; // گ
-  key <AC06> { [ Arabic_heh, Arabic_hah ] }; // ە ح ه
-  key <AC07> { [ Arabic_jeem, Arabic_jeh ] }; // ج ژ ژ
-  key <AC08> { [ Arabic_keheh ] }; // ک
-  key <AC09> { [ Arabic_lam ] }; // ل
-  key <AC10> { [ Arabic_semicolon, colon ] }; // ؛ : ։
-  key <AC11> { [ Arabic_comma, quotedbl, quotedbl ] }; // ، ” ”
-
-  key <AB01> { [ Arabic_zain, Arabic_dad, Arabic_zah, Arabic_zah ] }; //  ض ض ز خ
-  key <AB02> { [ Arabic_khah, Arabic_zah ] }; // ظ خ
-  key <AB03> { [ Arabic_theh, Arabic_tcheh ] }; // چ ث
-  key <AB04> { [ Arabic_hamza, Arabic_waw ] }; // و
-  key <AB05> { [ Arabic_beh ] }; // ب
-  key <AB06> { [ Arabic_noon ] }; // ن
-  key <AB07> { [ Arabic_meem ] }; // م
-  key <AB08> { [ Arabic_comma, rightcaret, leftcaret ] }; // , > <
-  key <AB09> { [ period, leftcaret, rightcaret ] }; // . < >
-  key <AB10> { [ slash,		Arabic_question_mark,	question ] }; // / ?
-
-  key <AE11> { [ minus, underscore ] };
-  key <AE12> { [ equal, plus, 0x1002212 ] };
-  key <BKSL> { [ backslash, bar, 0x1002010 ] };
-  key <TLDE> { [ U02DC, UFDFC, UFDF2 ] }; // ˜ ﷼ ﷲ
-};
-
-hidden partial alphanumeric_keys
-xkb_symbols "pesq_part_ext" {
-  // Persian and ASCII digits
-  key <AE01> { [ Farsi_1, exclam, grave, 1 ] };
-  key <AE02> { [ Farsi_2, 0x100066c, at, 2 ] };
-  key <AE03> { [ Farsi_3, 0x100066b, numbersign, 3 ] };
-  key <AE04> { [ Farsi_4, 0x100fdfc, dollar, 4 ] };
-  key <AE05> { [ Farsi_5, 0x100066a, percent, 5 ] };
-  key <AE06> { [ Farsi_6, multiply, asciicircum, 6 ] };
-  key <AE07> { [ Farsi_7, Arabic_comma, ampersand, 7 ] };
-  key <AE08> { [ Farsi_8, asterisk, enfilledcircbullet, 8 ] };
-  key <AE09> { [ Farsi_9, parenright, 0x100200e, 9 ] };
-  key <AE10> { [ Farsi_0, parenleft, 0x100200f, 0 ] };
-};
-
-hidden partial alphanumeric_keys
-xkb_symbols "pesq_part_keypad" {
-  // Persian digits and Mathematical operators
-  key <KPDV> { [ division, XF86_Ungrab ] };
-  key <KPMU> { [ multiply, XF86_ClearGrab ] };
-  key <KPSU> { [ 0x1002212, XF86_Prev_VMode ] };
-  key <KPAD> { [ plus, XF86_Next_VMode ] };
-
-  key <KPEN> { [ KP_Enter ] };
-  key <KPEQ> { [ equal ] };
-
-  key <KP7> { [ KP_Home, Farsi_7 ] };
-  key <KP8> { [ KP_Up, Farsi_8 ] };
-  key <KP9> { [ KP_Prior, Farsi_9 ] };
-
-  key <KP4> { [ KP_Left, Farsi_4 ] };
-  key <KP5> { [ KP_Begin, Farsi_5 ] };
-  key <KP6> { [ KP_Right, Farsi_6 ] };
-
-  key <KP1> { [ KP_End, Farsi_1 ] };
-  key <KP2> { [ KP_Down, Farsi_2 ] };
-  key <KP3> { [ KP_Next, Farsi_3 ] };
-
-  key <KP0> { [ KP_Insert, Farsi_0 ] };
-  key <KPDL> { [ KP_Delete, 0x100066b ] };
-};
--- a/configs/keyboard/gothic
+++ b/configs/keyboard/gothic
@@ -1,69 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////
-//
-// Generated keyboard layout file with the Keyboard Layout Editor.
-// For more about the software, see http://code.google.com/p/keyboardlayouteditor
-//
-// Version 0.2, changed AD09.
-
-partial default alphanumeric_keys
-xkb_symbols "Gothic"
-{
-	name[Group1] = "Gothic";
-
-	key <AB01> { [ U10336,         U10336 ] }; // Z: 𐌶
-	key <AB02> { [ U10347,         U10347 ] }; // X: 𐍇
-	key <AB03> { [ U10343,         U10343 ] }; // C: 𐍃
-	key <AB04> { [ U10338,         U10338 ] }; // V: 𐌸
-	key <AB05> { [ U10331,         U10331 ] }; // B: 𐌱
-	key <AB06> { [ U1033D,         U10341 ] }; // n: 𐌽           N: 𐍁
-	key <AB07> { [ U1033C,         U1033C ] }; // M: 𐌼
-	key <AB08> { [ U10B3C,         U10B39 ] };
-	key <AB09> { [ U10349,         U10349 ] };
-	key <AB10> { [ U10B3F, periodcentered ] };
-
-	key <AC01> { [ U10330,         U10330 ] }; // A: 𐌰
-	key <AC02> { [ U10343,         U10343 ] }; // S: 𐍃
-	key <AC03> { [ U10333,         U10338 ] }; // d: 𐌳             D: 𐌸
-	key <AC04> { [ U10346,         U10346 ] }; // F: 𐍆
-	key <AC05> { [ U10332,         U10332 ] }; // G: 𐌲
-	key <AC06> { [ U10337,         U10337 ] }; // H: 𐌷
-	key <AC07> { [ U1033E,         U1033E ] }; // J: 𐌾
-	key <AC08> { [ U1033A,         U1033A ] }; // K: 𐌺
-	key <AC09> { [ U1033B,         U1033B ] }; // L: 𐌻
-        key <AC10> { [ semicolon,	colon ]	};
-        key <AC11> { [ apostrophe,	quotedbl ] };
-
-	key <AD01> { [ U10335,         U10335 ] }; // Q: 𐌵
-	key <AD02> { [ U10345,         U10345 ] }; // W: 𐍅
-	key <AD03> { [ U10334,         U10334 ] }; // E: 𐌴
-	key <AD04> { [ U10342,         U10342 ] }; // R: 𐍂
-	key <AD05> { [ U10344,         U10338 ] }; // t: 𐍄                T: 𐌸
-	key <AD06> { [ U10348,         U1034A ] }; // y: 𐍈                 Y: 𐍊
-	key <AD07> { [ U1033F,         U1033F ] }; // U: 𐌿
-	key <AD08> { [ U10339,         U10339 ] }; // I: 𐌹
-	key <AD09> { [ U10349,         U10349 ] }; // O: 𐍉
-	key <AD10> { [ U10340,	       U10340 ] }; // P: 𐍀
-	key <AD11> { [ bracketleft,         braceleft ] };
-	key <AD12> { [ bracketright,         braceright ] };
-
-    key <TLDE> {	[     grave,	asciitilde	]	};
-    key <AE01> {	[	  1,	exclam 		]	};
-    key <AE02> {	[	  2,	at		]	};
-    key <AE03> {	[	  3,	numbersign	]	};
-    key <AE04> {	[	  4,	dollar		]	};
-    key <AE05> {	[	  5,	percent		]	};
-    key <AE06> {	[	  6,	asciicircum	]	};
-    key <AE07> {	[	  7,	ampersand	]	};
-    key <AE08> {	[	  8,	asterisk	]	};
-    key <AE09> {	[	  9,	parenleft	]	};
-    key <AE10> {	[	  0,	parenright	]	};
-    key <AE11> {	[     minus,	underscore	]	};
-    key <AE12> {	[     equal,	plus		]	};
-
-    key <AB08> {	[     comma,	less		]	};
-    key <AB09> {	[    period,	greater		]	};
-    key <AB10> {	[     slash,	question	]	};
-
-	key <BKSL> { [ U10B04,         U10B05 ] };
-	key <LSGT> { [ U10B04,         U10B05 ] };
-};
--- a/configs/khal.nix
+++ b/configs/khal.nix
@@ -3,31 +3,19 @@
  pkgs,
  lib,
  ...
-}:
-let
+}: let
  davHome = "~/.local/share/dav";
  kmeinCloud = {
-    davEndpoint = "https://cloud.kmein.de/remote.php/dav";
+    davEndpoint = "https://cloud.xn--kiern-0qa.de/remote.php/dav";
    username = "kieran";
-    passwordFile = config.age.secrets.nextcloud-password-kieran.path;
+    password = lib.fileContents <secrets/nextcloud/password>;
  };
-in
-{
-  age.secrets = {
-    nextcloud-password-kieran = {
-      file = ../secrets/nextcloud-password-kieran.age;
-      owner = config.users.users.me.name;
-      group = config.users.users.me.group;
-      mode = "400";
-    };
-    nextcloud-password-fysi = {
-      file = ../secrets/nextcloud-password-fysi.age;
-      owner = config.users.users.me.name;
-      group = config.users.users.me.group;
-      mode = "400";
-    };
+  fysiCloud = {
+    davEndpoint = "https://nextcloud.fysi.dev/remote.php/dav";
+    username = "kmein";
+    password = lib.fileContents <secrets/nextcloud-fysi/password>;
  };
-
+in {
  environment.systemPackages = [
    pkgs.khal
    pkgs.vdirsyncer
@@ -47,11 +35,12 @@ in

  systemd.user.services.vdirsyncer = {
    enable = true;
-    wants = [ "network-online.target" ];
-    wantedBy = [ "default.target" ];
+    wants = ["network-online.target"];
+    wantedBy = ["default.target"];
    startAt = "*:00/10";
    script = ''
-      ${pkgs.vdirsyncer}/bin/vdirsyncer sync && ${pkgs.khal}/bin/khal printcalendars # https://lostpackets.de/khal/configure.html#syncing
+      ${pkgs.vdirsyncer}/bin/vdirsyncer sync
+      ${pkgs.khal}/bin/khal printcalendars # https://lostpackets.de/khal/configure.html#syncing
    '';
    serviceConfig = {
      Type = "oneshot";
@@ -100,9 +89,30 @@ in
      "khal/config".text = ''
        [calendars]

-        [[kalender_local]]
-        path = ${davHome}/calendar/*
-        type = discover
+        [[alew]]
+        path = ${davHome}/calendar/alew
+        color = "light gray"
+
+        [[personal]]
+        path = ${davHome}/calendar/personal
+        color = "light cyan"
+
+        [[uni]]
+        path = ${davHome}/calendar/uni-1
+        color = "yellow"
+
+        [[fysi]]
+        path = ${davHome}/calendar/fysi-1
+        color = "light magenta"
+
+        [[fysi_team]]
+        path = ${davHome}/calendar/personal_shared_by_fdf
+        color = "light red"
+
+        [[birthdays]]
+        path = ${davHome}/contacts/contacts
+        type = birthdays
+        color = "light green"

        [default]
        highlight_event_days = True
@@ -134,7 +144,13 @@ in
        [pair kalender]
        a = "kalender_local"
        b = "kalender_cloud"
-        collections = ["from b"]
+        collections = ["personal", "alew", "uni-1"]
+        conflict_resolution = "b wins"
+
+        [pair fysi]
+        a = "kalender_local"
+        b = "fysi_cloud"
+        collections = ["fysi-1", "personal_shared_by_fdf"]
        conflict_resolution = "b wins"

        [storage kontakte_local]
@@ -151,13 +167,19 @@ in
        type = "carddav"
        url = "${kmeinCloud.davEndpoint}/addressbooks/users/${kmeinCloud.username}/"
        username = "${kmeinCloud.username}"
-        password.fetch = ["command", "cat", "${kmeinCloud.passwordFile}"]
+        password = "${kmeinCloud.password}"

        [storage kalender_cloud]
        type = "caldav"
        url = "${kmeinCloud.davEndpoint}/calendars/${kmeinCloud.username}/"
        username = "${kmeinCloud.username}"
-        password.fetch = ["command", "cat", "${kmeinCloud.passwordFile}"]
+        password = "${kmeinCloud.password}"
+
+        [storage fysi_cloud]
+        type = "caldav"
+        url = "${fysiCloud.davEndpoint}/calendars/${fysiCloud.username}/"
+        username = "${fysiCloud.username}"
+        password = "${fysiCloud.password}"
      '';
    };
  };
--- a/configs/lb.nix
+++ b/configs/lb.nix
@@ -2,15 +2,14 @@
  lib,
  pkgs,
  ...
-}:
-{
+}: {
  systemd.services.lb-subscription = {
    enable = true;
-    wants = [ "network-online.target" ];
+    wants = ["network-online.target"];
    startAt = "weekly";
    serviceConfig = {
      user = "kfm";
-      WorkingDirectory = "/home/kfm/cloud/nextcloud/Books/Germanistik/LB";
+      WorkingDirectory = "/home/kfm/cloud/Seafile/Books/Germanistik/LB";
    };
    script = ''
      first_year=2019
--- a/configs/mastodon-bot.nix
+++ b/configs/mastodon-bot.nix
@@ -0,0 +1,19 @@
+{pkgs, ...}: {
+  systemd.services.imaginary-illuminations = {
+    enable = false;
+    wants = ["network-online.target"];
+    serviceConfig = {
+      User = "kfm";
+      Group = "users";
+      WorkingDirectory = "/home/kfm/cloud/Seafile/Documents/Media/imaginary-illuminations";
+      Restart = "on-failure";
+      RestartSec = "15s";
+    };
+    startAt = "7:00";
+    script = ''
+      ${pkgs.deno}/bin/deno run -A post.ts
+    '';
+  };
+
+  systemd.timers.imaginary-illuminations.timerConfig.RandomizedDelaySec = "14h";
+}
--- a/configs/mime.nix
+++ b/configs/mime.nix
@@ -2,13 +2,6 @@
  home-manager.users.me = {
    xdg.mimeApps = {
      enable = true;
-      associations = {
-        added = {
-          "x-scheme-handler/tg" = "org.telegram.desktop.desktop";
-        };
-        removed = {
-        };
-      };
      defaultApplications = {
        "application/epub+zip" = "org.pwmt.zathura.desktop";
        "application/pdf" = "org.pwmt.zathura.desktop";
@@ -26,7 +19,7 @@
        "x-scheme-handler/mailto" = "firefox.desktop";
        "x-scheme-handler/unknown" = "firefox.desktop";
        "x-scheme-handler/webcal" = "firefox.desktop";
-        "x-scheme-handler/tg" = "org.telegram.desktop.desktop";
+        "inode/directory" = "pcmanfm.desktop";
      };
    };
  };
--- a/configs/monitoring.nix
+++ b/configs/monitoring.nix
@@ -2,8 +2,7 @@
  config,
  pkgs,
  ...
-}:
-{
+}: {
  services.nginx.virtualHosts.default = {
    locations."= /stub_status".extraConfig = "stub_status;";
  };
@@ -42,12 +41,12 @@

  systemd.services.promtail = {
    description = "Promtail service for Loki";
-    wantedBy = [ "multi-user.target" ];
+    wantedBy = ["multi-user.target"];

    serviceConfig = {
      ExecStart = ''
        ${pkgs.grafana-loki}/bin/promtail --config.file ${
-          (pkgs.formats.yaml { }).generate "promtail.yaml" {
+          (pkgs.formats.yaml {}).generate "promtail.yaml" {
            server = {
              http_listen_port = 28183;
              grpc_listen_port = 0;
@@ -56,7 +55,9 @@
            clients = [
              {
                url = "http://${
-                  if config.networking.hostName == "makanek" then "127.0.0.1" else "makanek.r"
+                  if config.networking.hostName == "makanek"
+                  then "127.0.0.1"
+                  else "makanek.r"
                }:3100/loki/api/v1/push";
              }
            ];
@@ -70,7 +71,7 @@
                };
                relabel_configs = [
                  {
-                    source_labels = [ "__journal__systemd_unit" ];
+                    source_labels = ["__journal__systemd_unit"];
                    target_label = "unit";
                  }
                ];
--- a/configs/mpv.nix
+++ b/configs/mpv.nix
@@ -3,11 +3,10 @@
  lib,
  config,
  ...
-}:
-let
-  swallow = command: "${pkgs.swallow}/bin/swallow ${command}";
-in
-{
+}: let
+  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
+  swallow = command: "${scripts.swallow}/bin/swallow ${command}";
+in {
  environment.shellAliases.smpv = swallow "mpv";

  nixpkgs.overlays = [
@@ -21,14 +20,9 @@ in
      enable = true;
      config = {
        ytdl-format = "bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best";
-        ytdl-raw-options = lib.concatStringsSep "," [
-          ''sub-lang="de,en"''
-          "write-sub="
-          "write-auto-sub="
-        ];
+        ytdl-raw-options = lib.concatStringsSep "," [''sub-lang="de,en"'' "write-sub=" "write-auto-sub="];
        screenshot-template = "%F-%wH%wM%wS-%#04n";
        script-opts = "ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp";
-        ao = "pulse"; # no pipewire for me :(
      };
      bindings = {
        "Alt+RIGHT" = "add video-rotate 90";
@@ -41,8 +35,8 @@ in
        "Alt+j" = "add video-pan-y -0.05";
      };
      scripts = [
-        pkgs.mpvScripts.quality-menu
-        pkgs.mpvScripts.visualizer
+        pkgs.mpvScripts.youtube-quality
+        (pkgs.callPackage <niveum/packages/mpv-visualizer.nix> {})
      ];
    };
  };
--- a/configs/mycelium.nix
+++ b/configs/mycelium.nix
@@ -1,12 +0,0 @@
-{ lib, pkgs, ... }:
-{
-  services.mycelium = {
-    enable = true;
-    openFirewall = true;
-  };
-
-  networking.hosts = lib.mapAttrs' (name: address: {
-    name = address;
-    value = [ "${name}.m" ];
-  }) pkgs.lib.niveum.myceliumAddresses;
-}
--- a/configs/neomutt.nix
+++ b/configs/neomutt.nix
@@ -0,0 +1,172 @@
+{
+  pkgs,
+  lib,
+  ...
+}: let
+  mainMailbox = "posteo";
+
+  accounts = import <niveum/lib/email.nix> {inherit lib mainMailbox;};
+
+  neomuttConfig = emailAccounts: let
+    as-pdf = pkgs.writers.writeDash "as-pdf" ''
+      d=$(mktemp -d)
+      trap clean EXIT
+      clean() {
+        rm -rf "$d"
+      }
+      ${pkgs.libreoffice}/bin/libreoffice --headless --convert-to pdf "$1" --outdir "$d"
+      ${pkgs.zathura}/bin/zathura "$d"/*.pdf
+    '';
+  in ''
+    set mailcap_path = ${
+      pkgs.writeText "mailcap" ''
+        text/plain; $EDITOR %s ;
+        text/html; ${pkgs.lynx}/bin/lynx -assume_charset=%{charset} -display_charset=utf-8 -dump %s; nametemplate=%s.html; copiousoutput;
+        image/*; ${pkgs.nsxiv}/bin/nsxiv %s ;
+        video/*; ${pkgs.util-linux}/bin/setsid ${pkgs.mpv}/bin/mpv --quiet %s &; copiousoutput
+        audio/*; ${pkgs.mpv}/bin/mpv %s ;
+        application/pdf; ${pkgs.zathura}/bin/zathura %s ;
+        application/pgp-encrypted; ${pkgs.gnupg}/bin/gpg -d '%s'; copiousoutput;
+        application/pgp-keys; ${pkgs.gnupg}/bin/gpg --import '%s'; copiousoutput;
+        application/vnd.openxmlformats-officedocument.wordprocessingml.document; ${as-pdf} %s;
+        application/vnd.oasis.opendocument.text; ${as-pdf} %s;
+        application/vnd.openxmlformats*; ${pkgs.libreoffice}/bin/soffice '%s';
+      ''
+    }:$mailcap_path
+
+    set sidebar_visible
+    set sidebar_format = "%D%?F? [%F]?%* %?N?%N/?%S"
+    set sidebar_width = 25                  # Plenty of space
+    set sidebar_divider_char = '│'          # Pretty line-drawing character
+    set mail_check_stats
+
+    set index_format="%2C %Z %D %-15.15L %s"
+    set date_format="%F %R"
+
+    set sort = 'reverse-date'
+    set sleep_time = 0		# Pause 0 seconds for informational messages
+    set markers = no		# Disables the `+` displayed at line wraps
+    set mark_old = no		# Unread mail stay unread until read
+    set wait_key = no		# mutt won't ask "press key to continue"
+    set fast_reply			# skip to compose when replying
+    set forward_format = "Fwd: %s"	# format of subject when forwarding
+    set reverse_name		# reply as whomever it was to
+    set include=ask-no			# don't include message in replies
+    auto_view text/html		# automatically show html (mailcap uses lynx)
+    auto_view application/pgp-encrypted
+    alternative_order text/plain text/enriched text/html
+
+    set abort_noattach abort_noattach_regex="\<(attach|attached|attachments?|anbei|Anhang|angehängt)\>"
+    set attach_save_dir=/tmp
+    set fast_reply
+
+    set narrow_tree # narrow threads for more depth
+
+    bind index,pager B sidebar-toggle-visible   # Use 'B' to switch the Sidebar on and off
+    bind index,pager \Ck sidebar-prev
+    bind index,pager \Cj sidebar-next
+    bind index,pager \Co sidebar-open
+    bind index,pager \Cp sidebar-prev-new
+    bind index,pager \Cn sidebar-next-new
+
+    macro index * <limit>~F\r
+    macro index + <limit>all\r
+
+    set query_command = "khard email --parsable %s"
+    bind editor <Tab> complete-query
+    bind editor ^T    complete
+
+    set mail_check = 90
+    set timeout = 15
+    # set imap_check_subscribed
+    set use_from
+
+
+    set header_cache="~/.cache/mutt" message_cachedir="~/.cache/mutt"
+
+    source ${
+      pkgs.writeText "accounts.neomuttrc" ''
+        set realname = "Kierán Meinhardt"
+        account-hook . 'unset imap_user imap_pass smtp_user smtp_pass'
+        # set accordingly: postponed trash record
+        ${
+          lib.concatStringsSep "\n\n" (lib.mapAttrsToList (name: account: let
+              imapRoot = "imaps://${account.user}@${account.imap}";
+            in ''
+              account-hook ${account.user}@${account.imap} 'set imap_user="${account.user}" imap_pass="${account.password}"'
+              account-hook ${account.user}@${account.smtp} 'set smtp_user="${account.user}" smtp_pass="${account.password}"'
+              folder-hook  ${account.user}@${account.imap} 'set smtp_url="${account.smtpSettings "${account.user}@${account.smtp}"}" from="${account.address}" record="${imapRoot}/${account.folders.sent}" postponed="${imapRoot}/${account.folders.drafts}" trash="${imapRoot}/${account.folders.trash}"'
+              named-mailboxes "${name}←" "${imapRoot}" "${name}→" "${imapRoot}/${account.folders.sent}"
+            '')
+            emailAccounts)
+        }
+      ''
+    }
+
+    set spoolfile="${mainMailbox}"
+
+    source ${
+      pkgs.writeText "colors.neomuttrc" ''
+        # Default index colors:
+        color index_number blue default
+        color index red default '.*'
+        color index_flags lightcyan default '.*'
+        color index_author yellow default '.*'
+        color index_subject default default '.*'
+
+        # New mail is boldened:
+        color index_author lightyellow default "~N"
+        color index_subject lightwhite default "~N"
+
+        # Flagged mail is highlighted:
+        color index_flags lightmagenta default '~F'
+
+        # Other colors and aesthetic settings:
+        mono bold bold
+        mono underline underline
+        mono error bold
+        mono indicator reverse
+        # color sidebar_flagged red black
+        mono sidebar_new bold
+        color error red default
+        color message cyan default
+        color search brightmagenta default
+        color hdrdefault lightblack default
+        color quoted green default
+        color quoted1 blue default
+        color quoted2 cyan default
+        color quoted3 yellow default
+        color quoted4 red default
+        color quoted5 brightred default
+        color signature lightblack default
+        color tree color235 default
+
+        # Regex highlighting:
+        color header red default "^(Date)"
+        color header yellow default "^(From)"
+        color header white default "^(B?CC)"
+        color header brightwhite default "^(Subject)"
+        color body cyan default "[\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+" # Email addresses
+        color body brightblue default "(https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+" # URL
+        color body yellow default "^(\t| )*(-|\\*) \.*" # List items as yellow
+        color body red default "(BAD signature)|^gpg: BAD signature from.*"
+        color body brightgreen default "(Good signature)|^gpg: Good signature .*"
+        color body brightyellow default "^gpg: "
+        mono body bold "^gpg: Good signature"
+        mono body bold "^gpg: BAD signature from.*"
+        color body red default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
+      ''
+    }
+  '';
+in {
+  environment.systemPackages = [pkgs.neomutt];
+  environment.shellAliases =
+    lib.mapAttrs' (accountName: account:
+      lib.nameValuePair
+      "mua-${accountName}"
+      "${pkgs.neomutt}/bin/neomutt -F ${pkgs.writeText "neomuttrc-${accountName}" (neomuttConfig {"${accountName}" = accounts.${accountName};})}")
+    accounts
+    // {mua = "${pkgs.neomutt}/bin/neomutt -f ${mainMailbox}←";};
+
+  home-manager.users.me.xdg.configFile."neomutt/neomuttrc".text = neomuttConfig accounts;
+}
--- a/configs/neovim.nix
+++ b/configs/neovim.nix
@@ -1,65 +1,80 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-let
-  vim-kmein = (
-    pkgs.vim-kmein.override {
-      # stylixColors = config.lib.stylix.colors;
-      colorscheme = "base16-gruvbox-dark-medium";
-    }
-  );
-in
-{
-  environment.variables.EDITOR = lib.getExe vim-kmein;
+{pkgs, ...}: {
+  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;
-        };
+  nixpkgs.config.packageOverrides = pkgs: {
+    vimPlugins =
+      pkgs.vimPlugins
+      // {
+        cheat-sh-vim = pkgs.callPackage <niveum/packages/vimPlugins/cheat-sh.nix> {};
+        vim-fetch = pkgs.callPackage <niveum/packages/vimPlugins/vim-fetch.nix> {};
+        vim-colors-paramount = pkgs.callPackage <niveum/packages/vimPlugins/vim-colors-paramount.nix> {};
+        vim-256noir = pkgs.callPackage <niveum/packages/vimPlugins/vim-256noir.nix> {};
+        icalendar-vim = pkgs.callPackage <niveum/packages/vimPlugins/icalendar-vim.nix> {};
+        jq-vim = pkgs.callPackage <niveum/packages/vimPlugins/jq-vim.nix> {};
+        vim-fsharp = pkgs.callPackage <niveum/packages/vimPlugins/vim-fsharp.nix> {};
+        vim-reason-plus = pkgs.callPackage <niveum/packages/vimPlugins/vim-reason-plus.nix> {};
+        vim-mail = pkgs.callPackage <niveum/packages/vimPlugins/vim-mail.nix> {};
      };
-    };
  };

  environment.systemPackages = [
-    pkgs.vim-typewriter
-    vim-kmein
-
-    # language servers
-    pkgs.pyright
-    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 # XML LSP
-    pkgs.jq-lsp
-    pkgs.dhall-lsp-server
+    (pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
+    (pkgs.neovim.override {
+      configure = {
+        customRC = builtins.readFile <niveum/lib/vim/init.vim>;
+        packages.nvim = with pkgs.vimPlugins; {
+          start = [
+            ale
+            fzf-vim
+            fzfWrapper
+            supertab
+            undotree
+            tabular
+            # vimwiki
+            vim-colors-paramount
+            vim-commentary
+            vim-css-color
+            vim-eunuch
+            vim-fetch
+            vim-fugitive
+            vim-gitgutter
+            vim-repeat
+            vim-sensible
+            vim-surround
+            (pkgs.vimUtils.buildVimPlugin rec {
+              pname = "vim-dim";
+              version = "1.1.0";
+              name = "${pname}-${version}";
+              src = pkgs.fetchFromGitHub {
+                owner = "jeffkreeftmeijer";
+                repo = pname;
+                rev = version;
+                sha256 = "sha256-lyTZUgqUEEJRrzGo1FD8/t8KBioPrtB3MmGvPeEVI/g=";
+              };
+            })
+          ];
+          opt = [
+            csv
+            elm-vim
+            emmet-vim
+            haskell-vim
+            icalendar-vim
+            jq-vim
+            rust-vim
+            typescript-vim
+            vim-javascript
+            vim-ledger
+            vim-nix
+            vimtex
+            vim-pandoc
+            vim-pandoc-syntax
+            vim-256noir
+          ];
+        };
+      };
+    })
  ];
 }
--- a/configs/networkmanager.nix
+++ b/configs/networkmanager.nix
@@ -1,8 +1,49 @@
 {
+  lib,
  pkgs,
  ...
-}:
-{
+}: let
+  profile = name: custom:
+    lib.recursiveUpdate {
+      connection.id = name;
+      connection.type = "wifi";
+      connection.interface-name = "wlp3s0";
+      connection.permissions = "";
+      wifi.mac-address-blacklist = "";
+      wifi.ssid = name;
+      wifi.mode = "infrastructure";
+      ipv4.dns-search = "";
+      ipv4.method = "auto";
+      ipv6.addr-gen-mode = "stable-privacy";
+      ipv6.dns-search = "";
+      ipv6.method = "auto";
+      proxy = {};
+    }
+    custom;
+  eduroamProfile = {
+    connection.uuid = "eae9fee6-a7d2-4120-a609-440b457d6fcf";
+    wifi-security = {
+      group = "ccmp;tkip;";
+      key-mgmt = "wpa-eap";
+      pairwise = "ccmp;";
+      proto = "rsn;";
+    };
+    "802-1x" = {
+      altsubject-matches = "DNS:srv1-radius.cms.hu-berlin.de;DNS:srv2-radius.cms.hu-berlin.de;";
+      anonymous-identity = "anonymous@wlan.hu-berlin.de";
+      ca-cert = pkgs.fetchurl {
+        url = "https://www.cms.hu-berlin.de/de/dl/netze/wlan/config/eduroam/t-telesec_globalroot_class_2.pem";
+        sha256 = "0if8aqd06sid7a0vw009zpa087wxcgdd2x6z2zs4pis5kvyqj2dk";
+      };
+      eap = "ttls;";
+      identity = lib.strings.fileContents <secrets/eduroam/identity>;
+      password = lib.strings.fileContents <secrets/eduroam/password>;
+      phase2-auth = "pap";
+    };
+  };
+in {
+  imports = [<niveum/modules/networkmanager-declarative.nix>];
+
  programs.nm-applet.enable = true;

  networking.networkmanager = {
@@ -13,10 +54,43 @@
    ];
    wifi.macAddress = "random";
    ethernet.macAddress = "random";
-    unmanaged = [ "docker*" ];
+    unmanaged = ["docker*"];
+    profiles = lib.mapAttrs profile {
+      Aether = {
+        connection.uuid = "7138bb0f-1aeb-4905-890e-a6628427aa21";
+        ipv6.addr-gen-mode = "stable";
+        wifi.cloned-mac-address = "stable";
+        wifi-security = {
+          psk = lib.strings.fileContents <secrets/wifi/Aether.psk>;
+          auth-alg = "open";
+          key-mgmt = "wpa-psk";
+        };
+      };
+      FactoryCommunityGuest = {
+        connection.uuid = "fb1f2e52-651e-48b5-a72c-1accddf31afb";
+        connection.timestamp = "1631885129";
+        wifi.seen-bssids = "54:EC:2F:19:30:DC;54:EC:2F:19:5C:9C;54:EC:2F:58:E4:3C;";
+        wifi-security = {
+          psk = "Factory4ever";
+          auth-alg = "open";
+          key-mgmt = "wpa-psk";
+        };
+      };
+      o2-WLAN66 = {
+        connection.uuid = "c563aec3-f344-4ffb-8d1c-60a6cdac8fe0";
+        wifi-security = {
+          psk = "PK3468KV488T934U";
+          auth-alg = "open";
+          key-mgmt = "wpa-psk";
+        };
+      };
+      "WIFI@DB".connection.uuid = "4eff4e94-8850-4e9f-a338-1787d0d90479";
+      eduroam = eduroamProfile;
+      eduroam_5GHz = eduroamProfile;
+    };
  };

-  users.users.me.extraGroups = [ "networkmanager" ];
+  users.users.me.extraGroups = ["networkmanager"];

  environment.systemPackages = [
    pkgs.speedtest-cli
--- a/configs/newsboat.nix
+++ b/configs/newsboat.nix
@@ -1,18 +1,120 @@
 {
  pkgs,
  config,
+  lib,
  ...
-}:
-{
+}: let
+  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
+
+  ytdl-format = "'bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best'";
+
+  youtube-download = "${pkgs.ts}/bin/ts ${pkgs.yt-dlp}/bin/yt-dlp -f ${ytdl-format} --add-metadata";
+
+  newsboat-home = "${config.users.users.me.home}/cloud/Seafile/Documents/newsboat";
+  linkhandler = pkgs.writers.writeDash "linkhandler" ''
+    # Feed script a url or file location.
+    # If an image, it will view in sxiv,
+    # if a video or gif, it will view in mpv
+    # if a music file or pdf, it will download,
+    # otherwise it opens link in browser.
+
+    # If no url given. Opens browser. For using script as $BROWSER.
+    [ -z "$1" ] && { "$BROWSER"; exit; }
+
+    case "$1" in
+        *mkv|*webm|*mp4|*youtube.com/watch*|*youtube.com/playlist*|*youtu.be*|*bitchute.com*|*videos.lukesmith.xyz*|*odysee.com*)
+            setsid -f ${pkgs.mpv}/bin/mpv -quiet "$1" >/dev/null 2>&1 ;;
+        *png|*jpg|*jpe|*jpeg|*gif)
+            curl -sL "$1" > "/tmp/$(echo "$1" | sed "s/.*\///")" && sxiv -a "/tmp/$(echo "$1" | sed "s/.*\///")"  >/dev/null 2>&1 & ;;
+        *mp3|*flac|*opus|*mp3?source*)
+            setsid -f tsp curl -LO "$1" >/dev/null 2>&1 ;;
+        *)
+            if [ -f "$1" ]; then "$TERMINAL" -e "$EDITOR" "$1"
+        else setsid -f "$BROWSER" "$1" >/dev/null 2>&1; fi ;;
+    esac
+  '';
+
+  newsboat-config = pkgs.writeText "config" ''
+    auto-reload no
+    reload-threads 8
+    prepopulate-query-feeds yes
+
+    # dont keep a search history
+    history-limit 0
+
+    datetime-format %F
+
+    text-width 85
+
+    external-url-viewer "${pkgs.urlscan}/bin/urlscan -dc -r '${linkhandler} {}'"
+    browser ${linkhandler}
+    macro , open-in-browser
+    macro c set browser "${pkgs.xsel}/bin/xsel -b <<<" ; open-in-browser ; set browser ${linkhandler}
+    macro v set browser "${pkgs.util-linux}/bin/setsid -f ${pkgs.mpv}/bin/mpv" ; open-in-browser ; set browser ${linkhandler}
+    macro y set browser "${youtube-download}" ; open-in-browser ; set browser ${linkhandler}
+
+    bind-key j down
+    bind-key k up
+    bind-key j next articlelist
+    bind-key k prev articlelist
+    bind-key J next-feed articlelist
+    bind-key K prev-feed articlelist
+    bind-key G end
+    bind-key g home
+    bind-key d pagedown
+    bind-key u pageup
+    bind-key l open
+    bind-key h quit
+    bind-key a toggle-article-read
+    bind-key n next-unread
+    bind-key N prev-unread
+    bind-key D pb-download
+    bind-key U show-urls
+    bind-key x pb-delete
+
+    save-path ${newsboat-home}/saved/
+
+    highlight all "---.*---" yellow default
+    # highlight feedlist ".*(0/0))" default default
+    highlight article "^Title:.*" yellow default bold
+    highlight article "^Author:.*" yellow default
+    highlight article "^Flags:.*" red default
+    highlight article "\\[[0-9][0-9]*\\]" color66 default bold
+    highlight article "\\[image [0-9][0-9]*\\]" color109 default bold
+    highlight article "\\[embedded flash: [0-9][0-9]*\\]" color66 default bold
+
+    color listfocus blue default
+    color listfocus_unread blue default bold
+    color info red default bold
+
+    urls-source "miniflux"
+    miniflux-url "https://feed.kmein.de"
+    miniflux-login "kfm"
+    miniflux-password "${lib.strings.fileContents <secrets/miniflux/password>}"
+  '';
+
+  newsboat-sql = "${pkgs.sqlite}/bin/sqlite3 ${newsboat-home}/cache.db";
+in {
  environment.systemPackages = [
-    (pkgs.writers.writeDashBin "miniflux-watch-later" ''
-      miniflux_api_token=$(cat ${config.age.secrets.miniflux-api-token.path})
-      random_feed_item=$(
-        ${pkgs.curl}/bin/curl -u "$miniflux_api_token" --basic -s 'https://feed.kmein.de/v1/entries?starred=true&limit=0' \
-        | ${pkgs.jq}/bin/jq -r '.entries[].id' \
-        | ${pkgs.coreutils}/bin/shuf -n1
-      )
-      ${pkgs.xdg-utils}/bin/xdg-open "https://feed.kmein.de/starred/entry/$random_feed_item"
+    pkgs.newsboat
+    (pkgs.writers.writeDashBin "newsboat-unread-count" ''
+      if [ -f ${newsboat-home}/cache.db.lock ]; then
+        ${pkgs.jq}/bin/jq -n '{state: "Info", text: "↻", icon: "rss"}'
+      else
+
+        ${pkgs.jq}/bin/jq -n \
+          --argjson unread "$(${newsboat-sql} "SELECT COUNT(DISTINCT id) FROM rss_item WHERE unread=1")" \
+          --argjson watchLater "$(${newsboat-sql} "SELECT COUNT(DISTINCT id) FROM rss_item WHERE flags='e' AND deleted=0")" \
+          '{
+            state: (if $unread > 0 then "Good" else "Idle" end),
+            text: (if $unread > 0 then "\($unread)" else "[\($watchLater)]" end),
+            icon: "rss"
+          }'
+      fi
+    '')
+    (pkgs.writers.writeDashBin "mpv-watch-later" ''
+      ${newsboat-sql} "SELECT url FROM rss_item WHERE flags='e' AND deleted=0 ORDER BY pubDate DESC" \
+        | ${pkgs.findutils}/bin/xargs ${pkgs.mpv}/bin/mpv
    '')
  ];
 }
--- a/configs/nix.nix
+++ b/configs/nix.nix
@@ -1,13 +1,13 @@
-{
-  pkgs,
-  ...
-}:
-{
+{pkgs, ...}: {
  nixpkgs = {
    config.allowUnfree = true;
+    overlays = [
+      (import <nix-writers/pkgs>)
+      (import <stockholm/krebs/5pkgs>)
+    ];
  };
  nix = {
-    package = pkgs.nixVersions.stable;
-    settings.experimental-features = [ "nix-command" "flakes" ];
+    package = pkgs.nixUnstable;
+    extraOptions = "experimental-features = nix-command flakes";
  };
 }
--- a/configs/nsxiv.nix
+++ b/configs/nsxiv.nix
@@ -0,0 +1,66 @@
+{
+  pkgs,
+  lib,
+  ...
+}: let
+  important-directories = pkgs.writeText "directories" ''
+    h	~/
+    d	~/cloud/Dropbox/
+    g	~/cloud/gdrive/
+    s	~/cloud/Seafile/
+    kk	~/cloud/keybase/private/kmein/
+    kp	~/cloud/keybase/public/kmein/
+    t	/tmp
+    D	~/Downloads
+    cf	''${XDG_CONFIG_HOME:-$HOME/.config}
+  '';
+in {
+  environment.systemPackages = [pkgs.nsxiv];
+
+  # TODO fix
+  home-manager.users.me.xdg.configFile."nsxiv/exec/key-handler".source = pkgs.writers.writeDash "key-handler" ''
+    PATH=$PATH:${
+      lib.makeBinPath [
+        pkgs.gnused
+        pkgs.gawk
+        pkgs.dmenu
+        pkgs.coreutils
+        pkgs.libnotify
+        pkgs.imagemagick
+        pkgs.xclip
+      ]
+    }
+
+    echo >&2 key "$1" pressed
+    while read file; do
+        case "$1" in
+        "c")
+          [ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" ${important-directories} | awk '{print $2}' | dmenu -l 20 -i -p "Copy file(s) to where?" | sed "s|~|$HOME|g")"
+          [ -z "$destdir" ] && exit
+          [ ! -d "$destdir" ] && notify-send "$destdir is not a directory, cancelled." && exit
+          cp "$file" "$destdir" && notify-send -i "$(readlink -f "$file")" "$file copied to $destdir." &
+          ;;
+        "m")
+          [ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" ${important-directories} | awk '{print $2}' | dmenu -l 20 -i -p "Move file(s) to where?" | sed "s|~|$HOME|g")"
+          [ -z "$destdir" ] && exit
+          [ ! -d "$destdir" ] && notify-send "$destdir is not a directory, cancelled." && exit
+          mv "$file" "$destdir" && notify-send -i "$(readlink -f "$file")" "$file moved to $destdir." &
+          ;;
+        "r")
+          convert -rotate 90 "$file" "$file" ;;
+        "R")
+          convert -rotate -90 "$file" "$file" ;;
+        "f")
+          convert -flop "$file" "$file" ;;
+        "y")
+          echo -n "$file" | xclip -selection clipboard &&
+          notify-send "$file copied to clipboard" & ;;
+        "Y")
+          readlink -f "$file" | xclip -selection clipboard &&
+            notify-send "$(readlink -f "$file") copied to clipboard" & ;;
+        "d")
+          [ "$(printf "No\\nYes" | dmenu -i -p "Really delete $file?")" = "Yes" ] && rm "$file" && notify-send "$file deleted." ;;
+        esac
+      done
+  '';
+}
--- a/configs/openweathermap.nix
+++ b/configs/openweathermap.nix
@@ -2,23 +2,21 @@
  pkgs,
  lib,
  ...
-}:
-let
+}: let
  openweathermap-repo = pkgs.fetchFromGitHub {
    owner = "ip1981";
    repo = "openweathermap";
    rev = "9cfef7b14ac5af7109449b54b1cb352b4c76167a";
    sha256 = "0sm43wicvw2fy7nq65s8vch6jjb5bszqr4ilnhibayamj4jcpw53";
  };
-  openweathermap = pkgs.haskellPackages.callCabal2nix "openweathermap" openweathermap-repo { };
+  openweathermap = pkgs.haskellPackages.callCabal2nix "openweathermap" openweathermap-repo {};
  openweathermap-key = lib.strings.fileContents <secrets/openweathermap.key>;
-in
-{
+in {
  nixpkgs.config.packageOverrides = pkgs: {
    weather = pkgs.writers.writeDashBin "weather" ''
      ${openweathermap}/bin/openweathermap --api-key ${openweathermap-key} "$@"
    '';
  };

-  environment.systemPackages = [ pkgs.weather ];
+  environment.systemPackages = [pkgs.weather];
 }
--- a/configs/packages.nix
+++ b/configs/packages.nix
@@ -1,23 +1,25 @@
 {
-  config,
  pkgs,
+  lib,
  ...
-}:
-let
-  worldradio = pkgs.callPackage ../packages/worldradio.nix { };
+}: let
+  hc = pkgs.callPackage <stockholm/tv/5pkgs/simple/hc.nix> {utillinux = pkgs.util-linux;};
+  worldradio = pkgs.callPackage <niveum/packages/worldradio.nix> {};
+  menstruation = pkgs.callPackage <menstruation-backend> {};
+  pandoc-doc = pkgs.callPackage <niveum/packages/man/pandoc.nix> {};

-  zoteroStyle =
-    {
-      name,
-      sha256,
-    }:
-    {
-      name = "${name}.csl";
-      path = pkgs.fetchurl {
-        url = "https://www.zotero.org/styles/${name}";
-        inherit sha256;
-      };
+  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
+
+  zoteroStyle = {
+    name,
+    sha256,
+  }: {
+    name = "${name}.csl";
+    path = pkgs.fetchurl {
+      url = "https://www.zotero.org/styles/${name}";
+      inherit sha256;
    };
+  };
  cslDirectory = pkgs.linkFarm "citation-styles" [
    (zoteroStyle {
      name = "chicago-author-date-de";
@@ -29,12 +31,11 @@ let
    })
    (zoteroStyle {
      name = "apa";
-      sha256 = "sha256-sUf0Ov5c9aTUoLsYSRbQl3Qs9ELkb5/Tky35kH7pKuE=";
+      sha256 = "sha256-yq4fW6hQknycLjaj5fPbXLrQlGBp5myXiOSHBU90jEc=";
    })
  ];

-  astrolog = pkgs.astrolog.overrideAttrs (
-    old:
+  astrolog = pkgs.astrolog.overrideAttrs (old:
    old
    // {
      installPhase = ''
@@ -53,166 +54,178 @@ let
          /^:I /s/80/120/ # wider text output
        ' $out/astrolog/astrolog.as
      '';
-    }
-  );
-in
-{
+    });
+
+  recht = pkgs.callPackage <recht> {};
+in {
  home-manager.users.me.home.file = {
    ".csl".source = cslDirectory;
    ".local/share/pandoc/csl".source = cslDirectory; # as of pandoc 2.11, it includes citeproc
  };

  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
-    telegram-desktop
+    firefox
+    tdesktop
+    w3m
+    wget
    whois
    dnsutils
    # FILE MANAGERS
    lf
-    pcmanfm
+    cinnamon.nemo
    # MEDIA
    ffmpeg
-    simplescreenrecorder
    imagemagick
    exiftool
-    nsxiv
-    graphviz
+    # ARCHIVE TOOLS
+    unzip
+    unrar
+    p7zip
+    zip
+    # MONITORS
+    htop
+    iotop # I/O load monitor
+    iftop # interface bandwidth monitor
+    lsof # list open files
+    psmisc # for killall, pstree
    # SHELL
    bat # better cat
+    fd # better find
+    file # determine file type
    dos2unix
    genpass # generate passwords
-    (pkgs.writers.writeDashBin "genpassphrase" ''${pkgs.genpass}/bin/genpass --passphrase | ${pkgs.gnused}/bin/sed 's/ /-/g;s/\(^\|-\)\([a-z]\)/\1\U\2/g;s/$/-'$(${pkgs.coreutils}/bin/date +%Y)'/' '')
-    gcc
+    gdu # ncurses disk usage (ncdu is broken)
+    rmlint # remove duplicate files
    python3Packages.jsonschema # json validation
+    jq # json toolkit
    pup # html toolkit
-    xan # csv toolkit
-    magic-wormhole-rs # file transfer
+    htmlq
+    xsv # csv toolkit
+    fq # toolkit for yaml, xml and binaries
    man-pages
    man-pages-posix
+    tree
    exfat # to mount windows drives
+    parallel # for parallel, since moreutils shadows task spooler
+    ripgrep # better grep
+    rlwrap
+    progress # display progress bars for pipes
    # HARDWARE TOOLS
-    gnome-disk-utility
+    usbutils # for lsusb
+    pciutils # for lspci
+    lshw # for lshw
    arandr # xrandr for noobs
-    wdisplays
    libnotify # for notify-send
    xclip # clipboard CLI
-    dragon-drop # drag and drop
+    xdragon # drag and drop
    xorg.xkill # kill by clicking
-    portfolio # personal finance overview
    audacity
    calibre
    electrum
    inkscape
-    gimp
-    gthumb
    astrolog
-    obsidian
-    lemmeknow # identify strings
-    aichat # chat with llms
    anki-bin # flashcards
    jbofihe # lojbanic software
    zoom-us # video conferencing
-    (pkgs.writers.writeDashBin "im" ''
-      weechat_password=$(${pkgs.pass}/bin/pass weechat)
-      exec ${weechat}/bin/weechat -t -r '/mouse enable; /remote add makanek http://${pkgs.lib.niveum.machines.makanek.externalIp}:8002 -password='"$weechat_password"'; /remote connect makanek'
-    '')
    alejandra # nix formatter
    pdfgrep # search in pdf
    pdftk # pdf toolkit
    mupdf
-    poppler-utils # pdf toolkit
-    kdePackages.okular # the word is nucular
+    poppler_utils # pdf toolkit
+    okular # the word is nucular
    xournalpp # for annotating pdfs
    pdfpc # presenter console for pdf slides
    hc # print files as qr codes
    yt-dlp
    espeak
+    bc # calculator
+    pari # gp -- better calculator
    rink # unit converter
-    auc
-    noise-waves
-    stag
-    cheat-sh
-    polyglot
-    qrpaste
-    ttspaste
-    new-mac # get a new mac address
-    scanned
-    default-gateway
-    kirciuoklis
-    image-convert-favicon
-    heuretes
-    ipa # XSAMPA to IPA converter
-    pls
-    mpv-tv
-    mpv-iptv
-    devanagari
-    betacode # ancient greek betacode to unicode converter
-    jq-lsp
-    swallow # window swallowing
-    literature-quote
-    booksplit
-    dmenu-randr
-    manual-sort
-    wttr
-    unicodmenu
-    emailmenu
-    closest
-    trans
-    (mpv-radio.override {
-      di-fm-key-file = config.age.secrets.di-fm-key.path;
-    })
-    (mpv-radio.override {
-      di-fm-key-file = config.age.secrets.di-fm-key.path;
-      executableName = "cro-radio";
-      mpvCommand = "${cro}/bin/cro";
-    })
-    (mpv-tuner.override {
-      di-fm-key-file = config.age.secrets.di-fm-key.path;
-    })
+    scripts.auc
+    scripts.stackoverflow
+    scripts.infschmv
+    scripts.qrpaste
+    scripts.ttspaste
+    scripts.new-mac # get a new mac address
+    scripts.scanned
+    scripts.default-gateway
+    scripts.showkeys-toggle
+    scripts.kirciuoklis
+    scripts.favicon
+    scripts.heuretes
+    scripts.ipa # XSAMPA to IPA converter
+    scripts.playlist
+    scripts.mpv-tv
+    scripts.devanagari
+    scripts.betacode # ancient greek betacode to unicode converter
+    scripts.meteo
+    scripts.mahlzeit
+    recht
+    scripts.vimv
+    scripts.swallow # window swallowing
+    scripts.literature-quote
+    jless # less(1) for json
+    scripts.notetags
+    scripts.booksplit
+    scripts.dmenurandr
+    scripts.interdimensional-cable
+    scripts.dmenubluetooth
+    scripts.manual-sort
+    scripts.much-scripts
+    scripts.dns-sledgehammer
+    ts
+    scripts.vg
+    scripts.fkill
+    scripts.wttr
+    scripts.unicodmenu
+    scripts.closest
+    scripts.trans
+    scripts.mpv-radio
    # kmein.slide
    termdown
-    image-convert-tolino
-    rfc
-    tag
-    timer
+    scripts.alarm
+    scripts.tolino-screensaver
+    scripts.rfc
+    scripts.tag
+    scripts.timer
+    python3Packages.eyeD3
+    scripts.menu-calc
    nix-prefetch-git
-    nix-git
-    nixfmt-rfc-style
-    comma
+    scripts.nix-git
+    nixfmt
    par
    qrencode

-    pkgs.agenix
-    pkgs.alarm
+    menstruation

    (pkgs.writers.writeDashBin "worldradio" ''
      shuf ${worldradio} | ${pkgs.findutils}/bin/xargs ${pkgs.mpv}/bin/mpv --no-video
    '')

    (pkgs.writers.writeDashBin "chats" ''
-      ${pkgs.openssh}/bin/ssh -p ${toString pkgs.lib.niveum.machines.makanek.sshPort} ${pkgs.lib.niveum.machines.makanek.externalIp} "cd /var/lib/weechat/logs && grep --ignore-case --color=always --recursive $@" | ${pkgs.less}/bin/less --raw-control-chars
+      ${pkgs.openssh}/bin/ssh makanek "cd /var/lib/weechat/logs && grep --ignore-case --color=always --recursive $@" | ${pkgs.less}/bin/less --raw-control-chars
    '')

-    niveum-ssh
+    (pkgs.writers.writeDashBin "ncmpcpp-zaatar" ''MPD_HOST=${(import <niveum/lib/local-network.nix>).zaatar} exec ${pkgs.ncmpcpp}/bin/ncmpcpp "$@"'')
+    (pkgs.writers.writeDashBin "mpc-zaatar" ''MPD_HOST=${(import <niveum/lib/local-network.nix>).zaatar} exec ${pkgs.mpc_cli}/bin/mpc "$@"'')

    spotify
+    ncspot
    playerctl

-    #krebs
-    pkgs.nur.repos.mic92.ircsink
+    nix-index
+    scripts.nix-index-update

-    (haskellPackages.ghcWithHoogle (hs: [
-      hs.text
-      hs.lens
-      hs.bytestring
-    ]))
+    #krebs
+    dic
+    cyberlocker-tools
+    untilport
+    kpaste
+    irc-announce
+    git-preview
+    ircaids

    (python3.withPackages (py: [
      py.black
@@ -226,32 +239,27 @@ in
    ]))
    # python3Packages.poetry

-    dhall-nix
-    dhall-bash
-    dhall-json
-    dhall
-
    html-tidy
+    nodePackages.csslint
+    nodePackages.jsonlint
+    nodePackages.prettier
+    nodePackages.typescript
+    nodePackages.yarn
    deno # better node.js
-    go
+    nodejs
+    nodePackages.javascript-typescript-langserver
    texlive.combined.scheme-full
    latexrun
-    (aspellWithDicts (dict: [
-      dict.de
-      dict.en
-      dict.en-computers
-    ]))
+    (aspellWithDicts (dict: [dict.de dict.en dict.en-computers]))
    # haskellPackages.pandoc-citeproc
-    text2pdf
+    scripts.text2pdf
    lowdown
    glow # markdown to term
    libreoffice
    # gnumeric
    dia
    pandoc
-    librsvg # pandoc depends on this to include SVG in documents
-    # man-pandoc
-    typst
+    pandoc-doc
    # proselint
    asciidoctor
    wordnet
@@ -261,27 +269,12 @@ in
    # nightly.rust
    shellcheck

-    # photography
-    gphoto2
-    darktable
-
    (pkgs.writers.writeDashBin "hass-cli" ''
-      HASS_SERVER=http://zaatar.r:8123 HASS_TOKEN="$(cat ${config.age.secrets.home-assistant-token.path})"  exec ${pkgs.home-assistant-cli}/bin/hass-cli "$@"
+      HASS_SERVER=http://zaatar.r:8123 HASS_TOKEN=${lib.strings.fileContents <secrets/hass/token>} exec ${pkgs.home-assistant-cli}/bin/hass-cli "$@"
    '')
-
-    # xml
-    saxonb_9_1
-    libxml2
-    zotero
+    scripts.rofi-hass
  ];

-  age.secrets.home-assistant-token = {
-    file = ../secrets/home-assistant-token.age;
-    owner = config.users.users.me.name;
-    group = config.users.users.me.group;
-    mode = "400";
-  };
-
  home-manager.users.me.xdg.configFile."pycodestyle".text = ''
    [pycodestyle]
    max-line-length = 110
--- a/configs/polkit.nix
+++ b/configs/polkit.nix
@@ -1,8 +1,6 @@
-{ config, ... }:
-let
+{config, ...}: let
  user = config.users.users.me.name;
-in
-{
+in {
  security.polkit.extraConfig = ''
    polkit.addRule(function(action, subject) {
      if (subject.user == "${user}" && action.id == "org.freedesktop.systemd1.manage-units") {
--- a/configs/power-action.nix
+++ b/configs/power-action.nix
@@ -2,18 +2,18 @@
  pkgs,
  config,
  ...
-}:
-let
+}: let
  suspend = pkgs.writers.writeDash "suspend" "${pkgs.systemd}/bin/systemctl suspend";
-in
-{
-  services.power-action = {
+in {
+  imports = [<stockholm/krebs/3modules/power-action.nix>];
+
+  krebs.power-action = {
    enable = true;
    plans.suspend = {
      upperLimit = 7;
      lowerLimit = 0;
      charging = false;
-      action = pkgs.writers.writeDash "suspend-wrapper" ''
+      action = pkgs.writeDash "suspend-wrapper" ''
        /run/wrappers/bin/sudo ${suspend}
      '';
    };
@@ -21,6 +21,6 @@ in
  };

  security.sudo.extraConfig = ''
-    ${config.services.power-action.user} ALL= (root) NOPASSWD: ${suspend}
+    ${config.krebs.power-action.user} ALL= (root) NOPASSWD: ${suspend}
  '';
 }
--- a/configs/printing.nix
+++ b/configs/printing.nix
@@ -1,11 +1,10 @@
-{ pkgs, lib, ... }:
-let
+{pkgs, ...}: let
+  inherit (import <niveum/lib>) localAddresses;
  hp-driver = pkgs.hplip;
-in
-{
+in {
  services.printing = {
    enable = true;
-    drivers = [ hp-driver ];
+    drivers = [hp-driver];
  };

  environment.systemPackages = [
@@ -13,13 +12,13 @@ in
  ];

  # allow connecting to .local printers
-  services.avahi.nssmdns4 = true;
+  services.avahi.nssmdns = true;

  hardware.printers.ensurePrinters = [
    {
      name = "OfficeJet";
      location = "Zimmer";
-      deviceUri = "https://${pkgs.lib.niveum.localAddresses.officejet}";
+      deviceUri = "https://${localAddresses.officejet}";
      model = "drv:///hp/hpcups.drv/hp-officejet_4650_series.ppd";
      ppdOptions = {
        Duplex = "DuplexNoTumble"; # DuplexNoTumble DuplexTumble None
@@ -32,6 +31,7 @@ in
  ];
 }
 /*
-  HP/hp-officejet_4650_series.ppd.gz
-  drv:///hp/hpcups.drv/hp-officejet_4650_series.ppd
+HP/hp-officejet_4650_series.ppd.gz
+drv:///hp/hpcups.drv/hp-officejet_4650_series.ppd
 */
+
--- a/configs/redshift.nix
+++ b/configs/redshift.nix
@@ -1 +1 @@
-{ services.redshift.enable = true; }
+{services.redshift.enable = false;}
--- a/configs/retiolum.nix
+++ b/configs/retiolum.nix
@@ -2,14 +2,15 @@
  config,
  pkgs,
  ...
-}:
-{
-  networking.hosts = {
-    "42:0:ca48:f98f:63d7:31ce:922b:245d" = [ "go" ];
-  };
+}: {
+  imports = [
+    <retiolum/modules/retiolum>
+  ];
+
+  networking.hosts = {"42:0:ca48:f98f:63d7:31ce:922b:245d" = ["go"];};

  services.tinc.networks.retiolum = {
-    rsaPrivateKeyFile = config.age.secrets.retiolum-rsa.path;
-    ed25519PrivateKeyFile = config.age.secrets.retiolum-ed25519.path;
+    rsaPrivateKeyFile = toString <system-secrets/retiolum.key>;
+    ed25519PrivateKeyFile = toString <system-secrets/retiolum.ed25519>;
  };
 }
--- a/configs/rofi.nix
+++ b/configs/rofi.nix
@@ -1,7 +1,14 @@
-{ pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (import <niveum/lib>) colours;
+in {
  home-manager.users.me.programs.rofi = {
    enable = true;
+    font = "Monospace 10";
+    theme = "${pkgs.rofi}/share/rofi/themes/Arc.rasi";
    pass = {
      enable = true;
      extraConfig = ''
@@ -14,6 +21,6 @@
        help_color="#FF0000"
      ''; # help_color set by https://github.com/mrossinek/dotfiles/commit/13fc5f24caa78c8f20547bf473266879507f13bf
    };
-    plugins = [ pkgs.rofi-calc ];
+    plugins = [pkgs.rofi-calc];
  };
 }
--- a/configs/seafile.nix
+++ b/configs/seafile.nix
@@ -0,0 +1,23 @@
+{
+  pkgs,
+  config,
+  ...
+}: {
+  services.xserver.displayManager.sessionCommands = "${pkgs.seafile-client}/bin/seafile-applet &";
+
+  home-manager.users.me.xdg.configFile = {
+    "Seafile/Seafile Client.conf".source = (pkgs.formats.ini {}).generate "Seafile Client.conf" {
+      Behavior = {
+        hideDockIcon = false;
+        hideMainWindowWhenStarted = true;
+      };
+      Settings = {
+        computerName = config.networking.hostName;
+        lastShiburl = "https://box.hu-berlin.de";
+      };
+      UsedServerAddresses.main = "https://box.hu-berlin.de";
+    };
+  };
+
+  environment.systemPackages = [pkgs.seafile-client];
+}
--- a/configs/sound.nix
+++ b/configs/sound.nix
@@ -1,7 +1,12 @@
-{ pkgs, ... }:
-{
+{pkgs, ...}: {
+  sound.enable = true;
+
+  # realtime audio for pulseaudio
+  security.rtkit.enable = true;
+
  services.pipewire = {
-    enable = true;
+    enable = false;
+    systemWide = false;
    alsa = {
      enable = true;
      support32Bit = true;
@@ -10,14 +15,26 @@
    jack.enable = true;
  };

-  systemd.user.services.pipewire-pulse.path = [ pkgs.pulseaudio ];
-
-  services.avahi = {
+  hardware.pulseaudio = {
    enable = true;
-    publish.enable = true;
-    publish.userServices = true;
+    package = pkgs.pulseaudioFull;
+    # copy server:/run/pulse/.config/pulse/cookie to client:~/.config/pulse/cookie to authenticate a client machine
+    zeroconf.discovery.enable = true;
+    extraConfig = ''
+      load-module ${
+        toString [
+          "module-tunnel-sink-new"
+          "server=zaatar.r"
+          "sink_name=zaatar"
+          "channels=2"
+          "rate=44100"
+        ]
+      }
+    '';
  };

+  users.users.me.extraGroups = ["pipewire" "audio"];
+
  environment.systemPackages = [
    pkgs.pavucontrol
    pkgs.ncpamixer
--- a/configs/spacetime.nix
+++ b/configs/spacetime.nix
@@ -3,6 +3,5 @@
  location = {
    latitude = 52.517;
    longitude = 13.3872;
-    provider = "geoclue2";
  };
 }
--- a/configs/ssh.nix
+++ b/configs/ssh.nix
@@ -1,21 +1,30 @@
-{ pkgs, lib, ... }:
 {
-  users.users.me.openssh.authorizedKeys.keys = pkgs.lib.niveum.kieran.sshKeys;
-  programs.ssh.startAgent = true;
-  services.gnome.gcr-ssh-agent.enable = false;
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  inherit (import <niveum/lib>) sshPort kieran;
+  externalNetwork = import <niveum/lib/external-network.nix>;
+  sshIdentity = name: "${config.users.users.me.home}/.ssh/${name}";
+  ssh-passphrase = lib.strings.fileContents <system-secrets/ssh/passphrase>;
+in {
+  services.xserver.displayManager.sessionCommands = toString (pkgs.writeScript "ssh-add" ''
+    #!${pkgs.expect}/bin/expect -f
+    spawn ${pkgs.openssh}/bin/ssh-add
+    expect "Enter passphrase for *:"
+    send "${ssh-passphrase}\n";
+    expect "Identity added: *"
+    interact
+  '');

-  home-manager.users.me = {
-    # https://discourse.nixos.org/t/gnome-keyring-and-ssh-agent-without-gnome/11663
-    xsession.profileExtra = ''
-      eval $(${pkgs.gnome3.gnome-keyring}/bin/gnome-keyring-daemon --daemonize --components=ssh,secrets)
-      export SSH_AUTH_SOCK
-    '';
-  };
+  programs.ssh.startAgent = true;
+
+  users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys pkgs;

  home-manager.users.me.programs.ssh = {
    enable = true;
-    enableDefaultConfig = false;
-    matchBlocks = {
+    matchBlocks = rec {
      "github.com" = {
        hostname = "ssh.github.com";
        port = 443;
@@ -23,44 +32,57 @@
      zaatar = {
        hostname = "zaatar.r";
        user = "root";
-        port = pkgs.lib.niveum.sshPort;
+        port = sshPort;
      };
      makanek = {
-        hostname = pkgs.lib.niveum.externalNetwork.makanek;
+        hostname = externalNetwork.makanek;
        user = "root";
-        port = pkgs.lib.niveum.sshPort;
+        port = sshPort;
      };
      ful = {
-        hostname = pkgs.lib.niveum.externalNetwork.ful;
+        hostname = externalNetwork.ful;
        user = "root";
-        port = pkgs.lib.niveum.sshPort;
+        port = sshPort;
      };
      tahina = {
        hostname = "tahina.r";
        user = "root";
-        port = pkgs.lib.niveum.sshPort;
+        port = sshPort;
      };
      tabula = {
        hostname = "tabula.r";
        user = "root";
-        port = pkgs.lib.niveum.sshPort;
+        port = sshPort;
      };
      manakish = {
        hostname = "manakish.r";
        user = "kfm";
-        port = pkgs.lib.niveum.sshPort;
+        port = sshPort;
      };
      kabsa = {
        hostname = "kabsa.r";
        user = "kfm";
-        port = pkgs.lib.niveum.sshPort;
+        port = sshPort;
      };
-      fatteh = {
-        hostname = "fatteh.r";
-        user = "kfm";
-        port = pkgs.lib.niveum.sshPort;
+      "nextcloud.fysi.dev" = {
+        hostname = "116.203.82.203";
+        user = "root";
+      };
+      "lingua.miaengiadina.ch" = {
+        hostname = "135.181.85.233";
+        user = "root";
+      };
+      "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";
      };
-      "*.onion".proxyCommand = "nc -xlocalhost:9050 %h %p";
    };
  };
 }
--- a/configs/sshd.nix
+++ b/configs/sshd.nix
@@ -1,21 +1,19 @@
 {
  config,
+  lib,
  pkgs,
  ...
-}:
-{
+}: let
+  inherit (import <niveum/lib>) sshPort kieran;
+in {
  users.motd = "Welcome to ${config.networking.hostName}!";

  services.openssh = {
    enable = true;
-    ports = [ pkgs.lib.niveum.machines.${config.networking.hostName}.sshPort ];
-    settings = {
-      PasswordAuthentication = false;
-      X11Forwarding = true;
-    };
+    ports = [sshPort];
+    passwordAuthentication = false;
+    forwardX11 = true;
  };

-  users.users.root.openssh.authorizedKeys.keys = pkgs.lib.niveum.kieran.sshKeys ++ [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPoiRIn1dBUtpApcUyGbZKN+m5KBSgKIDQjdnQ8vU0xU kfm@kibbeh" # travel laptop
-  ];
+  users.users.root.openssh.authorizedKeys.keys = kieran.sshKeys pkgs;
 }
--- a/configs/stardict.nix
+++ b/configs/stardict.nix
@@ -1,10 +1,9 @@
 {
+  config,
  pkgs,
  lib,
  ...
-}:
-let
-  locker = x: "https://c.krebsco.de/${x}";
+}: let
  dictionaries = {
    lojban = {
      jbo-deu = pkgs.fetchzip {
@@ -30,7 +29,7 @@ let
        sha256 = "1kmbdjqinrcxkc6jdyyrq5rl2wzhnrychyynnh91yhrjwjxlh44k";
      };
      Woodhouse = pkgs.fetchzip {
-        url = locker "Woodhouse.zip";
+        url = "https://c.krebsco.de/Woodhouse.zip";
        sha256 = "1dvnc2679yb048q2f3hr2h34acvhan0n3iir6h9ajlrdzz48mlkq";
        stripRoot = false;
      };
@@ -69,135 +68,109 @@ let
        sha256 = "1bjja3n3layfd08xa1r0a6375dxh5zi6hlv7chkhgnx800cx7hxn";
      };
      Roget = pkgs.fetchzip {
-        url = locker "stardict-Roget_s_II_The_New_Thesaurus_3th_Ed-2.4.2.tar.bz2";
-        hash = "sha256-f2GcNf3+dqZ/sKBpywjdHHC7Rp6FJseY93edRJK3/us=";
+        url = "http://download.huzheng.org/bigdict/stardict-Roget_s_II_The_New_Thesaurus_3th_Ed-2.4.2.tar.bz2";
+        sha256 = "1szyny9497bpyyccf9l5kr3bnw0wvl4cnsd0n1zscxpyzlsrqqbz";
      };
      JargonFile = pkgs.fetchzip {
-        url = locker "stardict-dictd-jargon-2.4.2.tar.bz2";
-        hash = "sha256-RFEcz8XzNO+Yk5s8dKSzvF+aOvq2bKysA7VenLKC1yQ=";
+        url = "http://download.huzheng.org/dict.org/stardict-dictd-jargon-2.4.2.tar.bz2";
+        sha256 = "096phar9qpmm0fnaqv5nz8x9lpxwnfj78g4vjfcfyd7kqp7iqla4";
      };
      Oxford-Collocations = pkgs.fetchzip {
-        url = locker "stardict-Oxford_Collocations_Dictionary_2nd_Ed-2.4.2.tar.bz2";
+        url = "http://download.huzheng.org/bigdict/stardict-Oxford_Collocations_Dictionary_2nd_Ed-2.4.2.tar.bz2";
        sha256 = "1zkfs0zxkcn21z2lhcabrs77v4ma9hpv7qm119hpyi1d8ajcw07q";
      };
      Langenscheidt-Deu-En = pkgs.fetchzip {
-        url = locker "stardict-Handw_rterbuch_Deutsch_Englisc-2.4.2.tar.bz2";
+        url = "http://download.huzheng.org/babylon/german/stardict-Handw_rterbuch_Deutsch_Englisc-2.4.2.tar.bz2";
        sha256 = "12q9i5azq7ylyrpb6jqbaf1rxalc3kzcwjvbinvb0yabdxb80y30";
      };
      Langenscheidt-En-Deu = pkgs.fetchzip {
-        url = locker "stardict-Handw_rterbuch_Englisch_Deutsc-2.4.2.tar.bz2";
+        url = "http://download.huzheng.org/babylon/german/stardict-Handw_rterbuch_Englisch_Deutsc-2.4.2.tar.bz2";
        sha256 = "087b05h155j5ldshfgx91pz81h6ijq2zaqjirg7ma8ig3l96zb59";
      };
      Duden_Das_Fremdworterbuch = pkgs.fetchzip {
-        url = locker "stardict-Duden_Das_Fremdworterbuch-2.4.2.tar.bz2";
+        url = "http://download.huzheng.org/babylon/german/stardict-Duden_Das_Fremdworterbuch-2.4.2.tar.bz2";
        sha256 = "1zrcay54ccl031s6dvjwsah5slhanmjab87d81rxlcy8fx0xd8wq";
      };
      Duden_De_De = pkgs.fetchzip {
-        url = locker "stardict-Duden_De_De-2.4.2.tar.bz2";
+        url = "http://download.huzheng.org/babylon/german/stardict-Duden_De_De-2.4.2.tar.bz2";
        sha256 = "1fhay04w5aaj83axfmla2ql34nb60gb05dgv0k94ig7p8x4yxxlf";
      };
      ConciseOED = pkgs.fetchzip {
-        url = locker "stardict-Concise_Oxford_English_Dictionary-2.4.2.tar.bz2";
+        url = "http://download.huzheng.org/bigdict/stardict-Concise_Oxford_English_Dictionary-2.4.2.tar.bz2";
        sha256 = "19kpcxbhqzpmhi94mp48nalgmsh6s7rsx1gb4kwkhirp2pbjcyl7";
      };
      Duden_Synonym = pkgs.fetchzip {
-        url = locker "stardict-Duden_Synonym-2.4.2.tar.bz2";
+        url = "http://download.huzheng.org/babylon/german/stardict-Duden_Synonym-2.4.2.tar.bz2";
        sha256 = "0cx086zvb86bmz7i8vnsch4cj4fb0cp165g4hig4982zakj6f2jd";
      };
    };
-    sanskrit =
-      let
-        repo = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f";
-      in
-      {
-        BoehtlingkRoth = pkgs.fetchzip {
-          url = "${repo}/sa-head/german-entries/tars/Bohtlingk-and-Roth-Grosses-Petersburger-Worterbuch__2021-10-05_14-23-18Z__19MB.tar.gz";
-          sha256 = "13414a8rgd7hd5ffar6nl68nk3ys60wjkgb7m11hp0ahaasmf6ly";
-          stripRoot = false;
-        };
-        BoehtlingkRothKurz = pkgs.fetchzip {
-          url = "${repo}/sa-head/german-entries/tars/Bohtlingk-Sanskrit-Worterbuch-in-kurzerer-Fassung__2021-10-05_14-23-18Z__10MB.tar.gz";
-          sha256 = "15yx31yrk40k9nn6kaysp4pprzj8dpd13dj3wafklc3izm8lr2wq";
-          stripRoot = false;
-        };
-        MonierWilliams = pkgs.fetchzip {
-          url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/mw-cologne__2021-10-06_00-16-23Z__16MB.tar.gz";
-          sha256 = "0p99ybxwxmmd94hf035hvm2hhnfy84av7qq79xf28bh2rbx6s9ng";
-          stripRoot = false;
-        };
-        MonierWilliamsEnglish = pkgs.fetchzip {
-          url = "${repo}/en-head/tars/mw-english-sanskrit__2021-10-05_14-23-18Z__3MB.tar.gz";
-          sha256 = "09a61hhii4b1m2fkrlh4rm2xnlgwrllh84iypbc6wyj00w9jkl3x";
-          stripRoot = false;
-        };
-        Borooah = pkgs.fetchzip {
-          url = "${repo}/en-head/tars/borooah__2021-10-05_14-23-18Z__2MB.tar.gz";
-          sha256 = "0qmmfbynqgv125v48383i51ky9yi69zibhh7vwk95gyar2yrprn2";
-          stripRoot = false;
-        };
-        ApteEnglish = pkgs.fetchzip {
-          url = "${repo}/en-head/tars/apte-english-sanskrit-cologne__2021-10-06_00-12-51Z__1MB.tar.gz";
-          sha256 = "064ysm24ydc534ca689y5i2flnra8jkmh8zn0gsb6n8hdsb0d1lq";
-          stripRoot = false;
-        };
+    sanskrit = let
+      repo = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f";
+    in {
+      BoehtlingkRoth = pkgs.fetchzip {
+        url = "${repo}/sa-head/german-entries/tars/Bohtlingk-and-Roth-Grosses-Petersburger-Worterbuch__2021-10-05_14-23-18Z__19MB.tar.gz";
+        sha256 = "13414a8rgd7hd5ffar6nl68nk3ys60wjkgb7m11hp0ahaasmf6ly";
+        stripRoot = false;
      };
+      BoehtlingkRothKurz = pkgs.fetchzip {
+        url = "${repo}/sa-head/german-entries/tars/Bohtlingk-Sanskrit-Worterbuch-in-kurzerer-Fassung__2021-10-05_14-23-18Z__10MB.tar.gz";
+        sha256 = "15yx31yrk40k9nn6kaysp4pprzj8dpd13dj3wafklc3izm8lr2wq";
+        stripRoot = false;
+      };
+      MonierWilliams = pkgs.fetchzip {
+        url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/mw-cologne__2021-10-06_00-16-23Z__16MB.tar.gz";
+        sha256 = "0p99ybxwxmmd94hf035hvm2hhnfy84av7qq79xf28bh2rbx6s9ng";
+        stripRoot = false;
+      };
+      MonierWilliamsEnglish = pkgs.fetchzip {
+        url = "${repo}/en-head/tars/mw-english-sanskrit__2021-10-05_14-23-18Z__3MB.tar.gz";
+        sha256 = "09a61hhii4b1m2fkrlh4rm2xnlgwrllh84iypbc6wyj00w9jkl3x";
+        stripRoot = false;
+      };
+      Borooah = pkgs.fetchzip {
+        url = "${repo}/en-head/tars/borooah__2021-10-05_14-23-18Z__2MB.tar.gz";
+        sha256 = "0qmmfbynqgv125v48383i51ky9yi69zibhh7vwk95gyar2yrprn2";
+        stripRoot = false;
+      };
+      ApteEnglish = pkgs.fetchzip {
+        url = "${repo}/en-head/tars/apte-english-sanskrit-cologne__2021-10-06_00-12-51Z__1MB.tar.gz";
+        sha256 = "064ysm24ydc534ca689y5i2flnra8jkmh8zn0gsb6n8hdsb0d1lq";
+        stripRoot = false;
+      };
+    };
    oed = {
      OED1 = pkgs.fetchzip {
-        url = locker "stardict-Oxford_English_Dictionary_2nd_Ed._P1-2.4.2.tar.bz2";
+        url = "http://download.huzheng.org/bigdict/stardict-Oxford_English_Dictionary_2nd_Ed._P1-2.4.2.tar.bz2";
        sha256 = "0i5vv1rv44yfwyf9bfbdrb9brzhhpvz2jnh39fv8hh107nkv2vcf";
      };
      OED2 = pkgs.fetchzip {
-        url = locker "stardict-Oxford_English_Dictionary_2nd_Ed._P2-2.4.2.tar.bz2";
+        url = "http://download.huzheng.org/bigdict/stardict-Oxford_English_Dictionary_2nd_Ed._P2-2.4.2.tar.bz2";
        sha256 = "1pk234pbq4pk55d8sjk0pp9j5sajm82f8804kf2xm2x5p387q1rg";
      };
    };
-    coptic = {
-      Crum = pkgs.fetchzip {
-        url = locker "stardict-Coptic-English_all_dialects-2.4.2.tar.bz2";
-        sha256 = "1fi281mb9yzv40wjsdapi8fzpa7x2yscz582lv2qnss9g8zzzzr9";
-      };
-    };
    russian = {
      LingvoGermanRussian = pkgs.fetchzip {
-        url = locker "stardict-GR-LingvoUniversal-2.4.2.tar.bz2";
+        url = "http://download.huzheng.org/lingvo/stardict-GR-LingvoUniversal-2.4.2.tar.bz2";
        sha256 = "0p353gs2z4vj70hqsdhffjaaw3a4zlmcs46flipmf35lm5wmaj0g";
      };
      LingvoRussianGerman = pkgs.fetchzip {
-        url = locker "stardict-RG-LingvoUniversal-2.4.2.tar.bz2";
+        url = "http://download.huzheng.org/lingvo/stardict-RG-LingvoUniversal-2.4.2.tar.bz2";
        sha256 = "03f9wdmkgpjifpms7dyh10ma29wf3ka1j3zlp1av0cybhdldk2a8";
      };
    };
-    turkish = {
-      BabylonTurkishEnglish = pkgs.fetchzip {
-        url = locker "stardict-babylon-Babylon_Turkish_English-2.4.2.tar.bz2";
-        sha256 = "1zpzgk3w0536gww31bj58cmn3imnkndyjwbcr7bay8ibq2kzv44z";
-      };
-      BabylonEnglishTurkish = pkgs.fetchzip {
-        url = locker "stardict-babylon-Babylon_English_Turkish-2.4.2.tar.bz2";
-        sha256 = "0myx31xzb7nrn5m657h0bwdgm5xp93ccwp6lcpbxgjxdjm3q0hc5";
-      };
-    };
  };

-  makeStardictDataDir =
-    dicts: pkgs.linkFarm "dictionaries" (lib.mapAttrsToList (name: path: { inherit name path; }) dicts);
+  makeStardictDataDir = dicts: pkgs.linkFarm "dictionaries" (lib.mapAttrsToList (name: path: {inherit name path;}) dicts);

-  makeStardict =
-    name: dicts:
+  makeStardict = name: dicts:
    pkgs.writers.writeDashBin name ''
      set -efu
      export SDCV_PAGER=${toString sdcvPager}
      exec ${pkgs.sdcv}/bin/sdcv --color --only-data-dir --data-dir ${makeStardictDataDir dicts} "$@"
    '';

-  sdcvPager = pkgs.writers.writeDash "sdcvPager" ''
-    export PATH=${
-      lib.makeBinPath [
-        pkgs.gnused
-        pkgs.ncurses
-        pkgs.less
-      ]
-    }
+  sdcvPager = pkgs.writeDash "sdcvPager" ''
+    export PATH=${lib.makeBinPath [pkgs.gnused pkgs.ncurses pkgs.less]}
    sed "
      s!<sup>1</sup>!¹!gI
      s!<sup>2</sup>!²!gI
@@ -300,98 +273,96 @@ let
      s!</\?p[^>]*>!!gI
    " | less -FR
  '';
-in
-{
-  # environment.etc.stardict.source = toString (makeStardictDataDir ({
-  #     Crum = pkgs.fetchzip {
-  #       url = "http://download.huzheng.org/misc/stardict-Coptic-English_all_dialects-2.4.2.tar.bz2";
-  #       sha256 = "1fi281mb9yzv40wjsdapi8fzpa7x2yscz582lv2qnss9g8zzzzr9";
-  #     };
-  #     SmithBiographyMythology = pkgs.fetchzip {
-  #       url = "https://github.com/latin-dict/Smith1873/releases/download/v1.0/Smith1873-stardict.zip";
-  #       sha256 = "01h5fxacp2m60xir8kzslkfy772vs3vmz07zhdwfhcwdaxif2af2";
-  #     };
-  #     SmithAntiquities = pkgs.fetchzip {
-  #       url = "https://github.com/latin-dict/Smith1890/releases/download/v1.0/Smith1890-stardict.zip";
-  #       sha256 = "0vpsv62p2lrzmgys4d1swpnc6lqhdi7rxwkj2ngy3lz5dk3fysyb";
-  #     };
-  #   }
-  #   // dictionaries.classics
-  #   // dictionaries.sanskrit
-  #   // dictionaries.oed
-  #   // dictionaries.russian
-  #   // dictionaries.englishGerman
-  #   // dictionaries.turkish));
+in {
+  environment.etc.stardict.source = toString (makeStardictDataDir ({
+      Crum = pkgs.fetchzip {
+        url = "http://download.huzheng.org/misc/stardict-Coptic-English_all_dialects-2.4.2.tar.bz2";
+        sha256 = "1fi281mb9yzv40wjsdapi8fzpa7x2yscz582lv2qnss9g8zzzzr9";
+      };
+      SmithBiographyMythology = pkgs.fetchzip {
+        url = "https://github.com/latin-dict/Smith1873/releases/download/v1.0/Smith1873-stardict.zip";
+        sha256 = "01h5fxacp2m60xir8kzslkfy772vs3vmz07zhdwfhcwdaxif2af2";
+      };
+      SmithAntiquities = pkgs.fetchzip {
+        url = "https://github.com/latin-dict/Smith1890/releases/download/v1.0/Smith1890-stardict.zip";
+        sha256 = "0vpsv62p2lrzmgys4d1swpnc6lqhdi7rxwkj2ngy3lz5dk3fysyb";
+      };
+    }
+    // dictionaries.classics
+    // dictionaries.sanskrit
+    // dictionaries.oed
+    // dictionaries.russian
+    // dictionaries.englishGerman));

  environment.systemPackages = [
+    # pkgs.goldendict
    (makeStardict "lsj" dictionaries.classics)
    (makeStardict "sa" dictionaries.sanskrit)
    (makeStardict "oed" dictionaries.oed)
    (makeStardict "sd-russian" dictionaries.russian)
    (makeStardict "sd" dictionaries.englishGerman)
    (makeStardict "jbo" dictionaries.lojban)
-    (makeStardict "cop" dictionaries.coptic)
-    (makeStardict "sd-turkish" dictionaries.turkish)
  ];
 }
 /*
-  https://github.com/latin-dict/Georges1910/releases/download/v1.0/Georges1910-stardict.zip
-  https://github.com/nikita-moor/latin-dictionary/releases/download/2020-02-14/LiddellScott1940-stardict.zip
-  http://download.huzheng.org/bigdict/stardict-Cambridge_Dictionary_of_American_Idioms-2.4.2.tar.bz2
-  http://download.huzheng.org/bigdict/stardict-Concise_Oxford_Thesaurus_2nd_Ed-2.4.2.tar.bz2
-  http://download.huzheng.org/bigdict/stardict-Urban_Dictionary_P1-2.4.2.tar.bz2
-  http://download.huzheng.org/bigdict/stardict-Urban_Dictionary_P2-2.4.2.tar.bz2
+https://github.com/latin-dict/Georges1910/releases/download/v1.0/Georges1910-stardict.zip
+https://github.com/nikita-moor/latin-dictionary/releases/download/2020-02-14/LiddellScott1940-stardict.zip
+http://download.huzheng.org/bigdict/stardict-Cambridge_Dictionary_of_American_Idioms-2.4.2.tar.bz2
+http://download.huzheng.org/bigdict/stardict-Concise_Oxford_Thesaurus_2nd_Ed-2.4.2.tar.bz2
+http://download.huzheng.org/bigdict/stardict-Urban_Dictionary_P1-2.4.2.tar.bz2
+http://download.huzheng.org/bigdict/stardict-Urban_Dictionary_P2-2.4.2.tar.bz2

-  Duden_Rechtschreibung = pkgs.fetchzip {
-    url = "http://download.huzheng.org/babylon/german/stardict-Duden_Rechtschreibung-2.4.2.tar.bz2";
-    sha256 = "0xiprb45s88w62rn8rlbjrsagbiliay9hszsiy20glwabf6zsfji";
-  };
-  Duden = pkgs.fetchzip {
-    url = "http://download.huzheng.org/de/stardict-duden-2.4.2.tar.bz2";
-    sha256 = "049i4ynfqqxykv1nlkyks94mvn14s22qdax5gg7hx1ks5y4xw64j";
-  };
-  FreeOnlineDictionaryOfComputing = pkgs.fetchzip {
-    url = "http://download.huzheng.org/dict.org/stardict-dictd_www.dict.org_foldoc-2.4.2.tar.bz2";
-    sha256 = "1lw2i8dzxpx929cpgvv0x366dnh4drr10wzqmrhcd0kvwglqawgm";
-  };
-  Cappeller = pkgs.fetchzip {
-    url = "${repo}/sa-head/german-entries/tars/capeller-sanskrit-german__2021-10-05_14-23-18Z__1MB.tar.gz";
-    sha256 = "0jwrj2aih2lrcjg0lqm8jrvq9vsas9s8j4c9ggbg2n0jyz03kci3";
-    stripRoot = false;
-  };
-  Yates = pkgs.fetchzip {
-    url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/yates__2021-10-05_14-23-18Z__2MB.tar.gz";
-    sha256 = "1k7gbalysf48pwa06zfykrqhdk466g35xy64b30k4z8bybgdn8z2";
-    stripRoot = false;
-  };
-  Wilson = pkgs.fetchzip {
-    url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/wilson__2021-10-05_14-23-18Z__3MB.tar.gz";
-    sha256 = "0r5z1xif56zlw9r2jp3fvwmcjv4f2fhd9r17j30nah9awx2m1isg";
-    stripRoot = false;
-  };
-  SpokenSanskrit = pkgs.fetchzip {
-    url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/spokensanskrit__2019-01-12_05-13-52Z__12MB.tar.gz";
-    sha256 = "0x8j657mawvdcyd1knzvf33yp15z77d661n3h6g9hcj7wn9s5xyk";
-    stripRoot = false;
-  };
-  Grassmann = pkgs.fetchzip {
-    url = "${repo}/sa-head/german-entries/tars/grassman-sanskrit-german__2021-10-05_14-23-18Z__2MB.tar.gz";
-    sha256 = "0jalsykaxkl6wzrky72lz8g3jdz26lmjpyibbfaf7a5vvnr55k02";
-    stripRoot = false;
-  };
-  Benfey = pkgs.fetchzip {
-    url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/benfey__2021-10-05_14-23-18Z__2MB.tar.gz";
-    sha256 = "0lj3hgphqgnihn482g9kgjwbvdrcd38vc29v1fi36srn08qdhvcb";
-    stripRoot = false;
-  };
-  ApteSa = pkgs.fetchzip {
-    url = "${repo}/sa-head/en-entries/tars/apte-sa__2021-12-18_13-20-56Z__6MB.tar.gz";
-    sha256 = "0cq1dd02d1pvmjnibbs2cscifjnk2z0nqccf5yzzilxkzsrarh32";
-    stripRoot = false;
-  };
-  MacDonell = pkgs.fetchzip {
-    url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/macdonell__2021-10-05_14-23-18Z__2MB.tar.gz";
-    sha256 = "1yzmj0393mxvjv4n2lnvd2c722v2bmxxiyq7pscdwni3bxip3h8s";
-    stripRoot = false;
-  };
+Duden_Rechtschreibung = pkgs.fetchzip {
+  url = "http://download.huzheng.org/babylon/german/stardict-Duden_Rechtschreibung-2.4.2.tar.bz2";
+  sha256 = "0xiprb45s88w62rn8rlbjrsagbiliay9hszsiy20glwabf6zsfji";
+};
+Duden = pkgs.fetchzip {
+  url = "http://download.huzheng.org/de/stardict-duden-2.4.2.tar.bz2";
+  sha256 = "049i4ynfqqxykv1nlkyks94mvn14s22qdax5gg7hx1ks5y4xw64j";
+};
+FreeOnlineDictionaryOfComputing = pkgs.fetchzip {
+  url = "http://download.huzheng.org/dict.org/stardict-dictd_www.dict.org_foldoc-2.4.2.tar.bz2";
+  sha256 = "1lw2i8dzxpx929cpgvv0x366dnh4drr10wzqmrhcd0kvwglqawgm";
+};
+Cappeller = pkgs.fetchzip {
+  url = "${repo}/sa-head/german-entries/tars/capeller-sanskrit-german__2021-10-05_14-23-18Z__1MB.tar.gz";
+  sha256 = "0jwrj2aih2lrcjg0lqm8jrvq9vsas9s8j4c9ggbg2n0jyz03kci3";
+  stripRoot = false;
+};
+Yates = pkgs.fetchzip {
+  url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/yates__2021-10-05_14-23-18Z__2MB.tar.gz";
+  sha256 = "1k7gbalysf48pwa06zfykrqhdk466g35xy64b30k4z8bybgdn8z2";
+  stripRoot = false;
+};
+Wilson = pkgs.fetchzip {
+  url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/wilson__2021-10-05_14-23-18Z__3MB.tar.gz";
+  sha256 = "0r5z1xif56zlw9r2jp3fvwmcjv4f2fhd9r17j30nah9awx2m1isg";
+  stripRoot = false;
+};
+SpokenSanskrit = pkgs.fetchzip {
+  url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/spokensanskrit__2019-01-12_05-13-52Z__12MB.tar.gz";
+  sha256 = "0x8j657mawvdcyd1knzvf33yp15z77d661n3h6g9hcj7wn9s5xyk";
+  stripRoot = false;
+};
+Grassmann = pkgs.fetchzip {
+  url = "${repo}/sa-head/german-entries/tars/grassman-sanskrit-german__2021-10-05_14-23-18Z__2MB.tar.gz";
+  sha256 = "0jalsykaxkl6wzrky72lz8g3jdz26lmjpyibbfaf7a5vvnr55k02";
+  stripRoot = false;
+};
+Benfey = pkgs.fetchzip {
+  url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/benfey__2021-10-05_14-23-18Z__2MB.tar.gz";
+  sha256 = "0lj3hgphqgnihn482g9kgjwbvdrcd38vc29v1fi36srn08qdhvcb";
+  stripRoot = false;
+};
+ApteSa = pkgs.fetchzip {
+  url = "${repo}/sa-head/en-entries/tars/apte-sa__2021-12-18_13-20-56Z__6MB.tar.gz";
+  sha256 = "0cq1dd02d1pvmjnibbs2cscifjnk2z0nqccf5yzzilxkzsrarh32";
+  stripRoot = false;
+};
+MacDonell = pkgs.fetchzip {
+  url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/macdonell__2021-10-05_14-23-18Z__2MB.tar.gz";
+  sha256 = "1yzmj0393mxvjv4n2lnvd2c722v2bmxxiyq7pscdwni3bxip3h8s";
+  stripRoot = false;
+};
 */
+
--- a/configs/stylix.nix
+++ b/configs/stylix.nix
@@ -1,72 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}:
-{
-  # https://danth.github.io/stylix/tricks.html
-  stylix.enable = true;
-
-  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml";
-
-  stylix.cursor = {
-    name = "capitaine-cursors-white";
-    package = pkgs.capitaine-cursors;
-    size = 12;
-  };
-
-  home-manager.users.me = {
-    stylix.autoEnable = true;
-  };
-
-  # environment.etc."stylix/wallpaper.png".source = generatedWallpaper;
-
-  # stylix.polarity = "either";
-  # stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/${
-  # onedark
-  # synth-midnight-dark
-  # apprentice # https://romainl.github.io/Apprentice/
-  # one-light
-  # onedark
-  # material # https://github.com/ntpeters/base16-materialtheme-scheme
-  # material-palenight
-  # material-lighter
-  # tomorrow # https://github.com/chriskempson/tomorrow-theme
-  # tomorrow-night
-  # gruvbox-light-medium # https://github.com/dawikur/base16-gruvbox-scheme
-  # gruvbox-dark-medium
-  # selenized-light # https://github.com/jan-warchol/selenized
-  # selenized-dark
-  # papercolor-light
-  # papercolor-dark
-  # dracula # https://draculatheme.com/
-  # }.yaml";
-
-  stylix.fonts = {
-    serif = {
-      package = pkgs.noto-fonts;
-      name = "Noto Serif";
-    };
-
-    sansSerif = {
-      package = pkgs.noto-fonts;
-      name = "Noto Sans";
-    };
-
-    monospace = {
-      package = pkgs.noto-fonts;
-      name = "Noto Sans Mono";
-    };
-
-    emoji = {
-      package = pkgs.noto-fonts-color-emoji;
-      name = "Noto Color Emoji";
-    };
-
-    sizes = {
-      terminal = 6;
-      applications = 10;
-    };
-  };
-}
--- a/configs/sudo.nix
+++ b/configs/sudo.nix
@@ -6,5 +6,5 @@
    '';
  };

-  users.users.me.extraGroups = [ "wheel" ];
+  users.users.me.extraGroups = ["wheel"];
 }
--- a/configs/telegram-bots/astrology.nix
+++ b/configs/telegram-bots/astrology.nix
@@ -3,8 +3,9 @@
  pkgs,
  lib,
  ...
-}:
-let
+}: let
+  unstable = import <nixos-unstable> {inherit (config.nixpkgs) config;};
+
  toSymbols = pkgs.writers.writeDash "to-symbols" ''
    ${pkgs.gnused}/bin/sed '
      s/\bTri\b/△/;
@@ -41,36 +42,19 @@ let
      s/^\s*//
    '
  '';
-in
-{
-  niveum.bots.transits = {
+in {
+  niveum.telegramBots.transits = {
    enable = true;
    time = "*:0/1";
-    mastodon = {
-      enable = true;
-      tokenFile = config.age.secrets.mastodon-token-transits.path;
-    };
-    telegram = {
-      enable = true;
-      tokenFile = config.age.secrets.telegram-token-kmein.path;
-      chatIds = [ "-1001796440545" ];
-    };
-    command = toString (
-      pkgs.writers.writeDash "common-transits" ''
-        set -efu
-
-        now=$(${pkgs.coreutils}/bin/date +%_H:%M | ${pkgs.gnused}/bin/sed 's/^\s*//')
-        date=$(${pkgs.coreutils}/bin/date +'%m %d %Y')
-        (
-          cd ${pkgs.astrolog}/bin
-          # ./astrolog -Yt -Yd -q 10 22 1999 6:32 -zN Kassel -td $date -R Uranus Neptune Pluto "North Node"
-          ./astrolog -qd $date -zN Berlin -Yt -Yd -d -R Uranus Neptune Pluto "North Node" -A 2
-        ) | ${toSymbols} | ${pkgs.coreutils}/bin/sort -n | ${pkgs.gnugrep}/bin/grep "^$now" || :
-      ''
-    );
-  };
-
-  age.secrets = {
-    mastodon-token-transits.file = ../../secrets/mastodon-token-transits.age;
+    token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
+    chatIds = ["-1001796440545"];
+    command = toString (pkgs.writers.writeDash "common-transits" ''
+      now=$(${pkgs.coreutils}/bin/date +%_H:%M | ${pkgs.gnused}/bin/sed 's/^\s*//')
+      date=$(${pkgs.coreutils}/bin/date +'%m %d %Y')
+      {
+        ${unstable.astrolog}/bin/astrolog -qd $date -zN Berlin -Yt -Yd -d -R Uranus Neptune Pluto "North Node" -A 2
+        ${unstable.astrolog}/bin/astrolog -Yt -Yd -q 10 22 1999 6:32 -zN Kassel -td $date -R Uranus Neptune Pluto "North Node"
+      } | ${toSymbols} | ${pkgs.coreutils}/bin/sort -n | ${pkgs.gnugrep}/bin/grep "^$now" || :
+    '');
  };
 }
--- a/configs/telegram-bots/autorenkalender.nix
+++ b/configs/telegram-bots/autorenkalender.nix
@@ -0,0 +1,31 @@
+{
+  pkgs,
+  lib,
+  ...
+}: let
+  autorenkalender-package = pkgs.fetchFromGitHub {
+    owner = "kmein";
+    repo = "autorenkalender";
+    rev = "cf49a7b057301332d980eb47042a626add93db66";
+    sha256 = "1pa7sjg33vdnjianrqldv445jdzzv3mn231ljk1j58hs0cd505gs";
+  };
+  autorenkalender =
+    pkgs.python3Packages.callPackage autorenkalender-package {};
+in {
+  niveum.telegramBots.autorenkalender = {
+    enable = true;
+    time = "07:00";
+    token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
+    chatIds = ["@autorenkalender"];
+    parseMode = "Markdown";
+    command = "${autorenkalender}/bin/autorenkalender";
+  };
+
+  niveum.passport.services = [
+    {
+      title = "Autorenkalender";
+      description = "sends <a href=\"https://www.projekt-gutenberg.org/\">Projekt Gutenberg</a>'s anniversary information to Telegram.";
+      link = "https://t.me/Autorenkalender";
+    }
+  ];
+}
--- a/configs/telegram-bots/celan.nix
+++ b/configs/telegram-bots/celan.nix
@@ -0,0 +1,35 @@
+{
+  pkgs,
+  lib,
+  ...
+}: let
+  celan = pkgs.fetchzip {
+    url = "http://c.krebsco.de/celan.tar.gz";
+    sha256 = "sha256-nA+EwAH2vkeolsy9AoPLEMt1uGKDZe/aPrS95CZvuus=";
+  };
+in {
+  niveum.telegramBots.celan = {
+    enable = true;
+    time = "08:00";
+    token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
+    chatIds = ["@PaulCelan"];
+    command = toString (pkgs.writers.writeDash "random-celan" ''
+      cd ${celan}
+      poem="$(${pkgs.findutils}/bin/find . -type f | ${pkgs.coreutils}/bin/shuf -n1)"
+      source="$(${pkgs.coreutils}/bin/dirname "$poem" | ${pkgs.gnused}/bin/sed 's#^\./##;s/[-_]/ /g;s!/! › !g;s/0\([0-9]\+\)/\1/g')"
+      cat "$poem"
+      echo
+      printf "Aus: %s\n" "$source"
+    '');
+  };
+
+  systemd.timers.telegram-bot-celan.timerConfig.RandomizedDelaySec = "10h";
+
+  niveum.passport.services = [
+    {
+      title = "Paul Celan Bot";
+      description = "sends a random poem by Paul Celan to Telegram.";
+      link = "https://t.me/PaulCelan";
+    }
+  ];
+}
--- a/configs/telegram-bots/default.nix
+++ b/configs/telegram-bots/default.nix
@@ -0,0 +1,84 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  nixpkgs-21-11 = import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixos-21.11.tar.gz") {
+    config.permittedInsecurePackages = [
+      "python3.9-poetry-1.1.12"
+    ];
+  };
+  telebots = nixpkgs-21-11.callPackage <telebots> {};
+  reverseDirectory = "/run/telegram-reverse";
+  proverbDirectory = "/run/telegram-proverb";
+  inherit (import <niveum/lib>) tmpfilesConfig;
+in {
+  imports = [
+    ./literature-quote.nix
+    ./astrology.nix
+    ./autorenkalender.nix
+    ./hesychius.nix
+    ./smyth.nix
+    ./nachtischsatan.nix
+    ./tlg-wotd.nix
+    ./celan.nix
+    <niveum/modules/telegram-bot.nix>
+  ];
+
+  systemd.tmpfiles.rules = map (path:
+    tmpfilesConfig {
+      type = "d";
+      mode = "0750";
+      age = "1h";
+      inherit path;
+    }) [reverseDirectory proverbDirectory];
+
+  niveum.passport.services = [
+    {
+      title = "Rückwarts-Bot";
+      link = "https://t.me/RueckwaertsBot";
+      description = "reverses things on Telegram.";
+    }
+    {
+      title = "BetaCode-Bot";
+      link = "https://t.me/BetaCodeBot";
+      description = "converts <a href=\"https://en.wikipedia.org/wiki/Beta_Code\">beta code</a> to polytonic Greek on Telegram.";
+    }
+    {
+      title = "Sprichwortgenerator-Bot";
+      link = "https://t.me/SprichwortGeneratorBot";
+      description = "generates useless German proverbs with optional stock photo background on Telegram.";
+    }
+  ];
+
+  systemd.services.telegram-reverse = {
+    wantedBy = ["multi-user.target"];
+    description = "Telegram reverse bot";
+    path = [pkgs.ffmpeg];
+    environment.TELEGRAM_BOT_TOKEN = lib.strings.fileContents <system-secrets/telegram/reverse.token>;
+    enable = true;
+    script = "${telebots}/bin/telegram-reverse";
+    serviceConfig.Restart = "always";
+    serviceConfig.WorkingDirectory = reverseDirectory;
+  };
+
+  systemd.services.telegram-betacode = {
+    wantedBy = ["multi-user.target"];
+    description = "Telegram beta code bot";
+    environment.TELEGRAM_BOT_TOKEN = lib.strings.fileContents <system-secrets/telegram/betacode.token>;
+    enable = true;
+    script = "${telebots}/bin/telegram-betacode";
+    serviceConfig.Restart = "always";
+  };
+
+  systemd.services.telegram-proverb = {
+    wantedBy = ["multi-user.target"];
+    description = "Telegram proverb bot";
+    environment.TELEGRAM_BOT_TOKEN = lib.strings.fileContents <system-secrets/telegram/proverb.token>;
+    enable = true;
+    script = "${telebots}/bin/telegram-proverb";
+    serviceConfig.Restart = "always";
+    serviceConfig.WorkingDirectory = proverbDirectory;
+  };
+}
--- a/configs/telegram-bots/hesychius.nix
+++ b/configs/telegram-bots/hesychius.nix
@@ -0,0 +1,25 @@
+{
+  pkgs,
+  lib,
+  ...
+}: let
+  hesychius = <scripts> + "/hesychius/hesychius.txt";
+in {
+  niveum.telegramBots.hesychius = {
+    enable = true;
+    time = "08:00";
+    token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
+    chatIds = ["@HesychiosAlexandreus"];
+    command = "${pkgs.coreutils}/bin/shuf -n1 ${hesychius}";
+  };
+
+  systemd.timers.telegram-bot-hesychius.timerConfig.RandomizedDelaySec = "10h";
+
+  niveum.passport.services = [
+    {
+      title = "Hesychius of Alexandria Bot";
+      description = "sends a random word from Hesychius of Alexandria's lexicon to Telegram.";
+      link = "https://t.me/HesychiosAlexandreus";
+    }
+  ];
+}
--- a/configs/telegram-bots/literature-quote.nix
+++ b/configs/telegram-bots/literature-quote.nix
@@ -0,0 +1,24 @@
+{
+  pkgs,
+  lib,
+  ...
+}: let
+  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
+  inherit (scripts) literature-quote;
+in {
+  niveum.telegramBots.quotebot = {
+    enable = true;
+    time = "08/6:00";
+    token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
+    chatIds = ["-1001760262519"];
+    command = "${literature-quote}/bin/literature-quote";
+    parseMode = "Markdown";
+  };
+
+  niveum.passport.services = [
+    {
+      title = "Literature quote bot";
+      description = "sends me and my friends three <a href=\"https://logotheca.xn--kiern-0qa.de/\">logotheca</a> quotes a day.";
+    }
+  ];
+}
--- a/configs/telegram-bots/nachtischsatan.nix
+++ b/configs/telegram-bots/nachtischsatan.nix
@@ -0,0 +1,45 @@
+{
+  pkgs,
+  lib,
+  ...
+}: let
+  nachtischsatan-bot = {token}:
+    pkgs.writers.writePython3 "nachtischsatan-bot" {
+      libraries = [pkgs.python3Packages.python-telegram-bot];
+    } ''
+      from telegram.ext import Updater, MessageHandler
+      from telegram.ext.filters import Filters
+      import random
+      import time
+
+
+      def flubber(update, context):
+          time.sleep(random.randrange(4000) / 1000)
+          update.message.reply_text("*flubberflubber*")
+
+
+      updater = Updater('${token}')
+
+      updater.dispatcher.add_handler(MessageHandler(Filters.all, flubber))
+      updater.start_polling()
+      updater.idle()
+    '';
+in {
+  systemd.services.telegram-nachtischsatan = {
+    wantedBy = ["multi-user.target"];
+    description = "*flubberflubber*";
+    enable = true;
+    script = toString (nachtischsatan-bot {
+      token = lib.strings.fileContents <system-secrets/telegram/nachtischsatan.token>;
+    });
+    serviceConfig.Restart = "always";
+  };
+
+  niveum.passport.services = [
+    {
+      title = "Nachtischsatan-Bot";
+      link = "https://t.me/NachtischsatanBot";
+      description = "*flubberflubber*";
+    }
+  ];
+}
--- a/configs/telegram-bots/smyth.nix
+++ b/configs/telegram-bots/smyth.nix
@@ -0,0 +1,37 @@
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  niveum.telegramBots.smyth = {
+    enable = true;
+    time = "08:00";
+    token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
+    chatIds = ["@HerbertWeirSmyth"];
+    command = toString (pkgs.writers.writeDash "random-smyth" ''
+      set -efu
+
+      RANDOM_SECTION=$(
+        ${pkgs.curl}/bin/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/"$//'
+      )
+
+      ${pkgs.curl}/bin/curl -sSL http://www.perseus.tufts.edu/hopper/text?doc=$RANDOM_SECTION\
+        | ${pkgs.htmlq}/bin/htmlq '#text_main' \
+        | ${pkgs.gnused}/bin/sed 's/<\/\?hr>//g' \
+        | ${pkgs.pandoc}/bin/pandoc -f html -t plain --wrap=none
+    '');
+  };
+
+  systemd.timers.telegram-bot-smyth.timerConfig.RandomizedDelaySec = "10h";
+
+  niveum.passport.services = [
+    {
+      title = "Herbert Weir Smyth Bot";
+      description = "sends a random section from Smyth's Ancient Greek grammar to Telegram.";
+      link = "https://t.me/HerbertWeirSmyth";
+    }
+  ];
+}
--- a/configs/telegram-bots/tlg-wotd.nix
+++ b/configs/telegram-bots/tlg-wotd.nix
@@ -0,0 +1,28 @@
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  niveum.telegramBots.tlg-wotd = {
+    enable = true;
+    time = "9:30";
+    token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
+    chatIds = ["@tlgwotd"];
+    command = toString (pkgs.writers.writeDash "tlg-wotd" ''
+      ${pkgs.curl}/bin/curl -sSL http://stephanus.tlg.uci.edu/Iris/Wotd \
+      | ${pkgs.recode}/bin/recode html..utf8 \
+      | ${pkgs.jq}/bin/jq -r '
+        "*\(.word)* '\'''\(.definition | sub("<.*>"; "") | rtrimstr(" "))'\'''\n\nFirst occurrence: \(.firstOccurrence)\nNumber of occurrences: \(.totalOccurrences)"
+      '
+    '');
+    parseMode = "Markdown";
+  };
+
+  niveum.passport.services = [
+    {
+      title = "Thesaurus Linguae Graecae Word of the Day";
+      description = "sends <a href=\"https://stephanus.tlg.uci.edu/\">TLG</a>'s word of the day to Telegram.";
+      link = "https://t.me/tlgwotd";
+    }
+  ];
+}
--- a/configs/themes.nix
+++ b/configs/themes.nix
@@ -0,0 +1,82 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  switch-theme = pkgs.writers.writeDashBin "switch-theme" ''
+    set -efux
+    if [ "$1" = toggle ]; then
+      if [ "$(${pkgs.coreutils}/bin/cat /var/theme/current_theme)" = dark ]; then
+        ${placeholder "out"}/bin/switch-theme light
+      else
+        ${placeholder "out"}/bin/switch-theme dark
+      fi
+    elif test -e "/etc/themes/$1"; then
+      mkdir -p /var/theme/config
+      ${pkgs.rsync}/bin/rsync --chown=${config.users.users.me.name}:users -a --delete "/etc/themes/$1/" /var/theme/config/
+      echo "$1" > /var/theme/current_theme
+      ${pkgs.coreutils}/bin/chown ${config.users.users.me.name}:users /var/theme/current_theme
+      ${pkgs.xorg.xrdb}/bin/xrdb -merge /var/theme/config/xresources
+      ${pkgs.procps}/bin/pkill -HUP xsettingsd
+    else
+      echo "theme $1 not found"
+    fi
+  '';
+in {
+  systemd.services.xsettingsd = {
+    wantedBy = ["multi-user.target"];
+    after = ["display-manager.service"];
+    environment.DISPLAY = ":0";
+    serviceConfig = {
+      ExecStart = "${pkgs.xsettingsd}/bin/xsettingsd -c /var/theme/config/xsettings.conf";
+      User = config.users.users.me.name;
+      Restart = "always";
+      RestartSec = "15s";
+    };
+  };
+
+  systemd.tmpfiles.rules = [
+    "d /var/theme/ 755 ${config.users.users.me.name} users"
+  ];
+
+  environment.systemPackages = [
+    switch-theme
+    pkgs.capitaine-cursors
+  ];
+
+  home-manager.users.me = {
+    home.pointerCursor = {
+      name = "capitaine-cursors-white";
+      package = pkgs.capitaine-cursors;
+      size = 16;
+    };
+  };
+
+  environment.etc = {
+    "themes/light/xsettings.conf".text = ''
+      Net/ThemeName "Adwaita"
+    '';
+    "themes/light/xresources".text = ''
+      *background: #ffffff
+      *foreground: #000000
+    '';
+    "themes/dark/xsettings.conf".text = ''
+      Net/ThemeName "Adwaita-dark"
+    '';
+    "themes/dark/xresources".text = ''
+      *background: #000000
+      *foreground: #ffffff
+    '';
+  };
+
+  system.activationScripts.theme.text = ''
+    export DISPLAY=:0
+    if test -e /var/theme/current_theme; then
+      ${switch-theme}/bin/switch-theme "$(cat /var/theme/current_theme)" ||
+      ${switch-theme}/bin/switch-theme dark
+    else
+      ${switch-theme}/bin/switch-theme dark
+    fi
+  '';
+}
--- a/configs/theming.nix
+++ b/configs/theming.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  theme = (import <niveum/lib>).theme pkgs;
+in {
+  environment.systemPackages = [theme.gtk.package theme.icon.package theme.cursor.package];
+
+  services.xserver.displayManager.lightdm.greeters.gtk = {
+    theme = {inherit (theme.gtk) name package;};
+    iconTheme = {inherit (theme.icon) name package;};
+  };
+
+  home-manager.users.me = {
+    gtk = {
+      enable = true;
+      iconTheme = theme.icon;
+      theme = theme.gtk;
+    };
+    qt = {
+      enable = true;
+      platformTheme = "gtk";
+    };
+    home.pointerCursor =
+      theme.cursor
+      // {
+        size = 16;
+        x11.enable = true;
+      };
+  };
+}
--- a/configs/tmux.nix
+++ b/configs/tmux.nix
@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{pkgs, ...}: {
  environment.systemPackages = [
    pkgs.tmuxp
    pkgs.reptyr # move programs over to a tmux session
@@ -14,7 +13,7 @@
    aggressiveResize = true;
    escapeTime = 50;
    historyLimit = 7000;
-    shortcut = "b";
+    shortcut = "a";
    extraConfig = ''
      set -g mouse on

@@ -38,6 +37,15 @@
      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
    '';
  };
--- a/configs/tor.nix
+++ b/configs/tor.nix
@@ -1,30 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  sshPort = pkgs.lib.niveum.machines.${config.networking.hostName}.sshPort;
-in
-{
+{pkgs, ...}: {
  services.tor.enable = true;
-  services.tor.client.enable = true;
-  environment.systemPackages = [
-    pkgs.tor
-    pkgs.torsocks
-  ];
-
-  services.tor.relay.onionServices = {
-    "ssh" = {
-      version = 3;
-      map = [
-        {
-          port = sshPort;
-          target.port = sshPort;
-          target.addr = "127.0.0.1";
-        }
-      ];
-    };
-  };
+  environment.systemPackages = [pkgs.tor];
 }
--- a/Show More
+++ b/Show More