feat(tahina): init as guest laptop

2026-03-16 18:21:07 +01:00 · 2022-03-29 00:21:20 +02:00
149 changed files with 1156 additions and 4906 deletions
--- a/.bin/anki-poem.sh
+++ b/.bin/anki-poem.sh
@@ -1,29 +0,0 @@
-#!/bin/sh
-file="${1?please supply a poetry file}"
-[ -f "$file" ] || {
-  echo "'$file' is no file"
-  exit 1
-}
-
-poem="$(mktemp)"
-clean () {
-  rm "$poem"
-}
-trap clean EXIT
-sed '/^$/d' "$file" > "$poem"
-
-htmlize() {
-  awk 'ORS="<br/>"' \
-    | head -c -5          # remove final <br/> characters
-}
-
-for line_number in $(seq 1 "$(wc -l "$poem" | cut -d' ' -f1)"); do
-  if [ "$line_number" -gt 3 ] && [ "$line_number" -gt 1 ]; then
-    sed -n "$((line_number - 3)),$((line_number - 1))p" "$poem"
-  else
-    sed -n "1,$((line_number - 1))p" "$poem"
-  fi | htmlize
-  printf '\t'
-  sed -n "${line_number},+1p" "$poem" | htmlize
-  printf '\n'
-done
--- a/.bin/calendars.sh
+++ b/.bin/calendars.sh
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-directory="$(mktemp -d)"
-trap clean EXIT
-clean() {
-  rm -rf "$directory"
-}
-
-year=$(date +%Y)
-output=/tmp/$year.pdf
-
-for month in $(seq 1 12); do
-  printf "\r%d" "$month" 1>&2
-  astrolog -zN Berlin -qm "$month" "$year" -X -K -XA -Xr -Xm -Xb -Xo "$(printf "%s/%02d.bmp" "$directory" "$month")" -Xw 1080 720 2>/dev/null
-done
-printf "\r"
-
-convert "$directory/*.bmp" "$output"
-echo "$output"
--- a/.bin/dummy-alert
+++ b/.bin/dummy-alert
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-name=$RANDOM
-url='http://localhost:9093/api/v1/alerts'
-
-echo "firing up alert $name"
-
-# change url o
-curl -XPOST $url -d "[{
-	\"status\": \"firing\",
-	\"labels\": {
-		\"alertname\": \"$name\",
-		\"service\": \"my-service\",
-		\"severity\":\"warning\",
-		\"instance\": \"$name.example.net\"
-	},
-	\"annotations\": {
-		\"summary\": \"High latency is high!\"
-	},
-	\"generatorURL\": \"http://prometheus.int.example.net/<generating_expression>\"
-}]"
-
-echo ""
-
-echo "press enter to resolve alert"
-read
-
-echo "sending resolve"
-curl -XPOST $url -d "[{
-	\"status\": \"resolved\",
-	\"labels\": {
-		\"alertname\": \"$name\",
-		\"service\": \"my-service\",
-		\"severity\":\"warning\",
-		\"instance\": \"$name.example.net\"
-	},
-	\"annotations\": {
-		\"summary\": \"High latency is high!\"
-	},
-	\"generatorURL\": \"http://prometheus.int.example.net/<generating_expression>\"
-}]"
-
-echo ""
--- a/.bin/json2csv.jq
+++ b/.bin/json2csv.jq
@@ -1,5 +0,0 @@
-#!/usr/bin/env -S jq -r -f
-(map(keys) | add | unique) as $cols
-| map(. as $row | $cols | map($row[.])) as $rows
-| $cols, $rows[]
-| @csv
--- a/.bin/prospekte.sh
+++ b/.bin/prospekte.sh
@@ -1,65 +0,0 @@
-#!/bin/sh
-lidl() {
-  echo LIDL
-  curl -sSL 'https://endpoints.lidl-flyer.com/v3/region-overview/lidl/de-DE/0.json' \
-    | jq -r '
-      .categories
-      | map(select(.name == "Filial-Angebote") | .subcategories | map(.flyers))
-      | flatten
-      | flatten
-      | .[]
-      | .pdfUrl
-    '
-}
-
-aldi_nord() {
-  echo ALDI nord
-  echo 'https://magazine.aldi-nord.de/aldi-nord/aldi-aktuell/GetPDF.ashx'
-  echo 'https://magazine.aldi-nord.de/aldi-nord/aldi-vorschau/GetPDF.ashx'
-}
-
-rewe_berlin() {(
-  store_id=662366923
-  publisher_id=1062
-
-  echo REWE
-  curl -sSL 'https://www.bonialserviceswidget.de/de/stores/'$store_id'/brochures?storeId='$store_id'&publisherId='$publisher_id | while read -r brochure_id; do
-    curl -sSL 'https://www.bonialserviceswidget.de/de/v5/brochureDetails/'"$brochure_id"'?publisherId='$publisher_id  | jq -r .pdfUrl
-  done
-)}
-
-kaufland() {(
-  region_code=8920
-  echo KAUFLAND
-  curl -sSL https://filiale.kaufland.de/prospekte.html | htmlq --attribute href '.flyer a' | grep -Eo 'DE_de_KDZ[^/]*' | sed "s/_3000_/_${region_code}_/" | while read -r flyer_id; do
-    curl -sSL "https://endpoints.leaflets.kaufland.com/v3/$flyer_id/flyer.json?regionCode=$region_code" | jq -r .flyer.pdfUrl
-  done
-)}
-
-netto_schwarz() {
-  echo 'NETTO (schwarz)'
-  curl -sSL 'https://squid-api.tjek.com/v2/catalogs?dealer_ids=90f2VL&order_by=created' \
-    | jq -r '.[] | .id' \
-    | while read -r flyer_id; do
-      curl -sSL "https://squid-api.tjek.com/v2/catalogs/$flyer_id/download" \
-        | jq -r .pdf_url
-    done
-}
-
-dir="$(mktemp -d)"
-trap clean EXIT
-
-clean() {
-  rm -rf "$dir"
-}
-
-prospekt_url="$( (
-  lidl
-  aldi_nord
-  rewe_berlin
-  kaufland
-  netto_schwarz
-) | fzf)"
-
-curl -sSL "$prospekt_url" -o "$dir/prospekt.pdf"
-zathura "$dir/prospekt.pdf"
--- a/.bin/screencap.sh
+++ b/.bin/screencap.sh
@@ -1,16 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i sh -p coreutils byzanz xorg.xwininfo gnused
-
-# shellcheck shell=sh
-# ref https://gist.github.com/aforemny/0994cb7f06ea30d56c8b9681ff5d2054
-
-set -eux
-
-eval "$(xwininfo | \
-  sed -n -e 's/^ \+Absolute upper-left X: \+\([0-9]\+\).*/x=\1/p' \
-         -e 's/^ \+Absolute upper-left Y: \+\([0-9]\+\).*/y=\1/p' \
-         -e 's/^ \+Width: \+\([0-9]\+\).*/w=\1/p' \
-         -e 's/^ \+Height: \+\([0-9]\+\).*/h=\1/p')"
-
-trap "pkill -f 'sleep 360d'" INT
-byzanz-record -e "sleep 360d" -c -x $x -y $y -w $w -h $h "$@"
--- a/.bin/toposort.nix
+++ b/.bin/toposort.nix
@@ -1,50 +0,0 @@
-let
-  lib = import <nixpkgs/lib>;
-in rec {
-  inherit lib;
-
-  input = [
-    {
-      x = ["pool" "zfs"];
-      y = ["mdadm" "raid1"];
-    }
-    {
-      x = ["pool" "zfs"];
-      y = ["disk" "sda"];
-    }
-    {
-      x = ["mdadm" "raid1"];
-      y = ["disk" "sdb"];
-    }
-    {
-      x = ["mdadm" "raid1"];
-      y = ["disk" "sdc"];
-    }
-  ];
-
-  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);
-
-  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);
-
-  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/ttrss-unread
+++ b/.bin/ttrss-unread
@@ -1,18 +0,0 @@
-#/usr/bin/env -S deno run -A:q
-set -x
-session_cache="$HOME/.cache/tt-rss.session"
-ttrss_endpoint=https://feed.kmein.de/api/
-ttrss_user=k
-ttrss_password=$(pass shared/tt-rss/password)
-
-login() {
-  if [ -f "$session_cache" ]; then
-    session_id="$(cat "$session_cache")"
-  else
-    session_id="$(curl -d '{"op":"login","user":"'"$ttrss_user"'","password":"'"$ttrss_password"'"}' "$ttrss_endpoint" | jq -r .content.session_id)"
-    echo "$session_id" > "$session_cache"
-  fi
-}
-
-login
-curl -d '{"sid":"'"$session_id"'","op":"getUnread"}' "$ttrss_endpoint" | jq .content
--- a/.bin/tuesday-1800
+++ b/.bin/tuesday-1800
@@ -1,16 +0,0 @@
-#!/bin/sh
-set -efux
-expected_max_results=1024 # the upper bound on the number of restaurants
-radius=250
-
-echo '[out:json];node(id:260050809)->.cbase;
-(
-  node(around.cbase:'$radius')[amenity=fast_food];
-  node(around.cbase:'$radius')[amenity=restaurant];
-);out;' \
-  | curl -sSL -d @- -X POST http://overpass-api.de/api/interpreter \
-  | jq --argjson random "$(shuf -i 0-$expected_max_results -n 1)" '
-    .elements
-    | length as $length
-    | .[$random % $length]
-  '
--- a/.bin/watson2fdf.sh
+++ b/.bin/watson2fdf.sh
@@ -1,26 +0,0 @@
-project=Filli
-year=2022
-
-for month in Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec; do
-  from="$(date +%F -d "$month 1, $year")"
-  to="$(date +%F -d "$month 1, $year + 1 month")"
-  watson report --json --from "$from" --to "$to" --project "$project"
-done | jq --slurp '
-  def in_array($arr):
-      . as $value | any($arr[]; . == $value);
-
-  map(
-    ["engadin-app","fysiweb","val-muestair","mia-engiadina","ol"] as $official_projects
-    | (.timespan.from | .[0:7]) as $timespan
-    | .projects | .[0]
-    | .time as $total_time
-    | .tags
-    | select(. != null)
-    | map(select(.name | in_array($official_projects)))
-    | (map(.time)|add) as $official_time
-    | map({key:.name, value:.time}) | from_entries
-    | .other |= ($total_time - $official_time)
-    | map_values(. / (60*60) | ceil)
-    | .month |= $timespan
-  )
-'
--- a/.github/workflows/niveum.yml
+++ b/.github/workflows/niveum.yml
@@ -7,7 +7,7 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        system: [makanek,manakish,kabsa,zaatar,ful]
+        system: [makanek,manakish,kabsa,zaatar]
    steps:
    - uses: actions/checkout@v2
    - uses: cachix/install-nix-action@v16
--- a/ci.nix
+++ b/ci.nix
@@ -3,7 +3,7 @@
  system,
  name,
 }: let
-  nixpkgs = inputs.nixos-stable;
+  inherit (inputs) nixpkgs;
  pkgs = nixpkgs.legacyPackages.${system};
  ensureFiles = paths:
    pkgs.runCommand "directory" {} ''
@@ -23,13 +23,6 @@
      "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$//'
@@ -37,37 +30,30 @@
    "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"];
+    basic = ["retiolum.ed25519" "retiolum.key" "syncthing/cert.pem" "syncthing/key.pem"];
  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"
@@ -87,7 +73,6 @@
          "telegram/menstruation.token"
          "telegram/cool_village.token"
          "telegram/kmein.token"
-          "telegram/krebs.token"
          "telegram/prometheus.token"
          "weechat/relay"
        ]
--- a/configs/alacritty.nix
+++ b/configs/alacritty.nix
@@ -3,20 +3,29 @@
  lib,
  config,
  ...
-}: let
-  alacritty-cfg = theme:
-    (pkgs.formats.yaml {}).generate "alacritty.yml" {
-      window.opacity = 0.99;
-      bell = {
-        animation = "EaseOut";
-        duration = 100;
-        color = "#ffffff";
+}: {
+  environment.variables.TERMINAL = "alacritty";
+
+  environment.systemPackages = [
+    pkgs.alacritty
+  ];
+
+  home-manager.users.me.xdg.configFile = let
+    inherit (import <niveum/lib>) colours;
+    colourNames = ["black" "red" "green" "yellow" "blue" "magenta" "cyan" "white"];
+    colourPairs = lib.getAttrs colourNames colours;
+  in {
+    "alacritty/alacritty.yml".source = (pkgs.formats.yaml {}).generate "alacritty.yml" {
+      background_opacity = 0.9;
+      colors = {
+        primary = {inherit (colours) background foreground;};
+        normal = lib.mapAttrs (_: colour: colour.dark) colourPairs;
+        bright = lib.mapAttrs (_: colour: colour.bright) colourPairs;
      };
      font = {
        normal.family = "Monospace";
        size = 6;
      };
-      live_config_reload = true;
      key_bindings = [
        {
          key = "Plus";
@@ -34,35 +43,6 @@
          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/backup.nix
+++ b/configs/backup.nix
@@ -20,12 +20,9 @@ in {
    paths = [
      "/home/kfm/work"
      "/home/kfm/projects"
-      "/home/kfm/notes"
      "/home/kfm/cloud"
      "/home/kfm/.gnupg"
      "/home/kfm/.ssh"
-      "/mnt/sd-card/music"
-      "/mnt/sd-card/Books"
    ];
  };

--- a/configs/battery.nix
+++ b/configs/battery.nix
@@ -8,7 +8,7 @@
    acpi_call
  ];
  boot.kernelModules = ["tp_smapi" "acpi_call"];
-  environment.systemPackages = [pkgs.tpacpi-bat pkgs.powertop];
+  environment.systemPackages = [pkgs.tpacpi-bat];

  services.tlp = {
    enable = true;
--- a/configs/bluetooth.nix
+++ b/configs/bluetooth.nix
@@ -9,9 +9,7 @@
      lib.concatStringsSep "," ["Source" "Sink" "Media" "Socket"];
  };

-  services.blueman.enable = true;
+  environment.systemPackages = [pkgs.blueman];

-  # environment.systemPackages = [pkgs.blueman];
-
-  home-manager.users.me = {services.blueman-applet.enable = true;};
+  home-manager.users.me = {services.blueman-applet.enable = false;};
 }
--- a/configs/chromium.nix
+++ b/configs/chromium.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
+{pkgs, ...}: {
  programs.chromium = {
    enable = true;
    extensions = [
@@ -11,86 +7,9 @@
      "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
@@ -1,7 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  services.clipmenu.enable = true;
-}
--- a/configs/cloud.nix
+++ b/configs/cloud.nix
@@ -3,9 +3,7 @@
  lib,
  pkgs,
  ...
-}: let
-  inherit (import <niveum/lib>) tmpfilesConfig;
-in {
+}: {
  imports = [
    <niveum/modules/dropbox.nix>
  ];
@@ -14,59 +12,17 @@ in {
    dropbox.enable = false;
  };

-  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";
-    }
-  ];
+  system.activationScripts.home-symlinks = ''
+    ln -sfn ${config.users.users.me.home}/cloud/syncthing/common/mahlzeit ${config.users.users.me.home}/mahlzeit
+    ln -sfn ${config.users.users.me.home}/cloud/Seafile/Wiki ${config.users.users.me.home}/notes
+    ln -sfn ${config.users.users.me.home}/cloud/Seafile/Uni ${config.users.users.me.home}/uni
+  '';

  home-manager.users.me = {
-    services.gnome-keyring.enable = false;
    services.nextcloud-client = {
-      enable = false;
+      enable = true;
      startInBackground = true;
    };
-    systemd.user.services.nextcloud-client = {
-      Unit = {
-        Wants = ["gnome-keyring.service"];
-        After = ["gnome-keyring.service"];
-      };
-    };
-  };
-
-  systemd.user.services.nextcloud-syncer = {
-    enable = true;
-    wants = ["network-online.target"];
-    wantedBy = ["default.target"];
-    startAt = "*:00/10";
-    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";
-    };
  };

  environment.systemPackages = [
@@ -76,32 +32,8 @@ in {
        ${pkgs.findutils}/bin/find ${config.users.users.me.home}/cloud/syncthing/library -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"
+      ${pkgs.zathura}/bin/zathura "$book"
    '')
-    (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 -d)"
-        trap clean EXIT
-        clean() {
-          rm -rf "$tmpdir"
-        }
-
-        (
-          cd "$tmpdir"
-          ${megatools "get"} "$selection"
-          exec ${pkgs.zathura}/bin/zathura "$(basename "$selection")"
-        )
-      '')
  ];

  fileSystems."/media/moodle" = {
--- a/configs/compton.nix
+++ b/configs/compton.nix
@@ -1,10 +1,6 @@
 {
-  services.picom = {
+  services.compton = {
    enable = true;
-    activeOpacity = 1;
-    fade = true;
-    fadeDelta = 10;
-    inactiveOpacity = 0.8;
    shadow = true;
    menuOpacity = 0.9;
    shadowOpacity = 0.3;
--- a/configs/copyq.nix
+++ b/configs/copyq.nix
@@ -0,0 +1,40 @@
+{
+  config,
+  pkgs,
+  ...
+}: let
+  copyqConfig = pkgs.writers.writeDash "copyq-config" ''
+    ${pkgs.copyq}/bin/copyq config check_clipboard true
+    ${pkgs.copyq}/bin/copyq config check_selection false
+    ${pkgs.copyq}/bin/copyq config copy_clipboard true
+    ${pkgs.copyq}/bin/copyq config copy_selection false
+
+    ${pkgs.copyq}/bin/copyq config activate_closes true
+    ${pkgs.copyq}/bin/copyq config clipboard_notification_lines 0
+    ${pkgs.copyq}/bin/copyq config clipboard_tab \&clipboard
+    ${pkgs.copyq}/bin/copyq config disable_tray false
+    ${pkgs.copyq}/bin/copyq config hide_tabs false
+    ${pkgs.copyq}/bin/copyq config hide_toolbar false
+    ${pkgs.copyq}/bin/copyq config item_popup_interval true
+    ${pkgs.copyq}/bin/copyq config maxitems 1000
+    ${pkgs.copyq}/bin/copyq config move true
+    ${pkgs.copyq}/bin/copyq config text_wrap true
+  '';
+in {
+  environment.systemPackages = [pkgs.copyq];
+
+  systemd.user.services.copyq = {
+    wantedBy = ["graphical-session.target"];
+    environment = {
+      DISPLAY = ":${toString config.services.xserver.display}";
+    };
+    serviceConfig = {
+      SyslogIdentifier = "copyq";
+      ExecStart = "${pkgs.copyq}/bin/copyq";
+      ExecStartPost = copyqConfig;
+      Restart = "always";
+      RestartSec = "15s";
+      StartLimitBurst = 0;
+    };
+  };
+}
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -7,8 +7,6 @@
 }: let
  inherit (lib.strings) makeBinPath;
  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>
@@ -33,10 +31,15 @@ in {
            iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> {};
            ix = pkgs.callPackage <niveum/packages/ix.nix> {};
          };
-          permittedInsecurePackages = [
-            "qtwebkit-5.212.0-alpha4"
-          ];
        };
+        overlays = [
+          (self: super: {
+            scripts = import <niveum/packages/scripts> {
+              pkgs = super;
+              lib = super.lib;
+            };
+          })
+        ];
      };
    }
    {
@@ -49,7 +52,6 @@ in {
          enable = true;
          options = {
            selection-clipboard = "clipboard";
-            recolor-keephue = true;
            # first-page-column = "1:1"; # makes side-by-side mode start on the left side
          };
        };
@@ -69,6 +71,33 @@ in {
      };

      home-manager.users.me.xdg.enable = true;
+      home-manager.users.me.dconf.enable = false;
+    }
+    {
+      sound.enable = true;
+
+      hardware.pulseaudio = {
+        enable = true;
+        package = pkgs.pulseaudioFull;
+        extraModules = [pkgs.pulseaudio-modules-bt];
+        # 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 = ["audio"];
+
+      environment.systemPackages = [pkgs.pavucontrol pkgs.ncpamixer pkgs.pamixer pkgs.pulsemixer];
    }
    {
      environment.interactiveShellInit = "export PATH=$PATH:$HOME/projects/niveum";
@@ -86,13 +115,13 @@ in {
          cd "$(mktemp -d)"
          pwd
        '';
-        swallow = command: "${scripts.swallow}/bin/swallow ${command}";
+        swallow = command: "${pkgs.scripts.swallow}/bin/swallow ${command}";
      in {
-        "ß" = "${pkgs.util-linux}/bin/setsid";
+        "ß" = "${pkgs.utillinux}/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";
+        ip = "${pkgs.iproute}/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";
@@ -100,7 +129,7 @@ in {
        mv = "mv --interactive";
        nixi = "nix repl '<nixpkgs>'";
        ns = "nix-shell --run zsh";
-        o = "${pkgs.xdg-utils}/bin/xdg-open";
+        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";
@@ -109,22 +138,17 @@ in {
        cdt = "source ${cdt}";
        vit = "$EDITOR $(mktemp)";
        tmux = "${pkgs.tmux}/bin/tmux -2";
-        sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv";
+        sxiv = swallow "${pkgs.sxiv}/bin/sxiv";
        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"];
+        yt = "${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -ic"; # Download video link
+        yta = "${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -xic"; # Download with audio
      };
    }
+    {i18n.defaultLocale = "en_DK.UTF-8";}
    {
      services.xserver = {
        enable = true;
@@ -146,29 +170,20 @@ in {
    {
      security.wrappers = {
        pmount = {
-          setuid = true;
          owner = "root";
-          group = "root";
+          group = "users";
          source = "${pkgs.pmount}/bin/pmount";
        };
        pumount = {
-          setuid = true;
          owner = "root";
-          group = "root";
+          group = "users";
          source = "${pkgs.pmount}/bin/pumount";
        };
      };
    }
    {programs.command-not-found.enable = true;}
    {
-      home-manager.users.me = {
-        services.gpg-agent = rec {
-          enable = true;
-          enableZshIntegration = true;
-          defaultCacheTtl = 2 * 60 * 60;
-          maxCacheTtl = 4 * defaultCacheTtl;
-        };
-      };
+      programs.gnupg.agent.enable = true;

      environment.systemPackages = [
        pkgs.gnupg
@@ -192,28 +207,6 @@ in {
        })
        localAddresses;
    }
-    {
-      home-manager.users.me.home.stateVersion = "22.05";
-    }
-    {
-      systemd.user.services.udiskie = {
-        after = ["udisks2.service"];
-        wants = ["udisks2.service"];
-        wantedBy = ["graphical-session.target"];
-        serviceConfig = {
-          ExecStart = "${pkgs.udiskie}/bin/udiskie --verbose --no-config --notify";
-        };
-      };
-      services.udisks2.enable = true;
-      programs.dconf.enable = true;
-      home-manager.users.me = {
-        dconf.enable = true;
-        dconf.settings = {
-          # Change the default terminal for Nemo
-          "org/cinnamon/desktop/applications/terminal".exec = defaultApplications.terminal;
-        };
-      };
-    }
    ./alacritty.nix
    ./backup.nix
    ./bash.nix
@@ -222,8 +215,8 @@ in {
    ./ccc.nix
    ./khal.nix
    ./chromium.nix
-    ./clipboard.nix
    ./cloud.nix
+    ./copyq.nix
    ./compton.nix
    ./direnv.nix
    ./distrobump.nix
@@ -251,7 +244,7 @@ in {
    ./polkit.nix
    ./power-action.nix
    ./printing.nix
-    # ./openweathermap.nix
+    ./openweathermap.nix
    ./wallpaper.nix
    ./redshift.nix
    ./retiolum.nix
@@ -260,17 +253,14 @@ in {
    ./seafile.nix
    ./ssh.nix
    ./sshd.nix
-    ./sound.nix
    ./sudo.nix
-    ./nsxiv.nix
-    ./themes.nix
+    ./sxiv.nix
+    ./theming.nix
    ./tmux.nix
-    # ./traadfri.nix
+    ./traadfri.nix
    ./unclutter.nix
    ./vscode.nix
    ./watson.nix
    ./zsh.nix
-    ./tor.nix
-    ./mastodon-bot.nix
  ];
 }
--- a/configs/direnv.nix
+++ b/configs/direnv.nix
@@ -10,7 +10,7 @@
      cat > shell.nix <<'EOF'
    { pkgs ? import <nixpkgs> {} }:
    pkgs.mkShell {
-      packages = [];
+      buildInputs = [];
    }
    EOF
      ''${EDITOR:-vim} shell.nix
--- a/configs/docker.nix
+++ b/configs/docker.nix
@@ -12,5 +12,5 @@
    ];
  };
  users.users.me.extraGroups = ["docker"];
-  environment.systemPackages = [pkgs.docker pkgs.docker-compose];
+  environment.systemPackages = [pkgs.docker pkgs.docker_compose];
 }
--- a/configs/flameshot-once.nix
+++ b/configs/flameshot-once.nix
@@ -4,11 +4,11 @@
  ...
 }: let
  inherit (import <niveum/lib>) defaultApplications;
-  flameshot-once = pkgs.callPackage <stockholm/krebs/5pkgs/simple/flameshot-once> {};
+  flameshot-once =
+    pkgs.callPackage <stockholm/krebs/5pkgs/simple/flameshot-once> {};
 in {
  environment.systemPackages = [
    (flameshot-once.override {
-      name = "flameshot-once-kmein";
      config = {
        imgur = {
          enable = true;
@@ -16,36 +16,29 @@ in {
          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"
-          ];
-        };
+        timeout = 1000;
+        drawColor = "#ff0000";
+        drawThickness = 2;
+        showDesktopNotification = true;
+        buttons = [
+          "ARROW"
+          "BLUR"
+          "CIRCLE"
+          "CIRCLECOUNT"
+          "COPY"
+          "DRAWER"
+          "EXIT"
+          "IMAGEUPLOADER"
+          "MARKER"
+          "MOVESELECTION"
+          "PENCIL"
+          "RECTANGLE"
+          "SAVE"
+          "SELECTION"
+          "SELECTIONINDICATOR"
+          "TEXT"
+          "UNDO"
+        ];
      };
    })
  ];
--- a/configs/flix.nix
+++ b/configs/flix.nix
@@ -74,7 +74,7 @@ in {
      [ -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 '{}'
+        | ${pkgs.findutils}/bin/xargs -I '{}' ${pkgs.utillinux}/bin/setsid ${pkgs.xdg_utils}/bin/xdg-open '{}'
    '')
  ];
 }
--- a/configs/fonts.nix
+++ b/configs/fonts.nix
@@ -1,123 +1,42 @@
-{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 {} ''
-      mkdir -p $out/share/fonts/truetype
-      install ${file} $out/share/fonts/truetype
-    '';
+{pkgs, ...}: {
+  nixpkgs.config.joypixels.acceptLicense = true;

-  egyptianHiero = zip-font "EgyptianHiero" {
-    url = "https://github.com/MKilani/Djehuty/archive/master.zip";
-    sha256 = "sha256-KbY4vedm757NWfDlgmNhslbZd+2Vs+o5PjtMMGDt61Y=";
-  };
-  antinoou = zip-font "Antinoou" {
-    url = "https://www.evertype.com/fonts/coptic/AntinoouFont.zip";
-    sha256 = "0jwihj08n4yrshcx07dnaml2x9yws6dgyjkvg19jqbz17drbp3sw";
-    stripRoot = false;
-  };
-  newGardiner = zip-font "NewGardiner" {
-    url = "https://mjn.host.cs.st-andrews.ac.uk/egyptian/fonts/NewGardiner.zip";
-    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";
-  };
-  jsesh = simple-ttf "JSesh" {
-    url = "http://files.qenherkhopeshef.org/jsesh/JSeshFont.ttf";
-    sha256 = "1203jrk2xzvgckcc5hx88kja1i3h8gm1wiyla5j6gspc0hbv56ry";
-  };
-  egyptianText = simple-ttf "EgyptianText-1.0beta" {
-    url = "http://c.krebsco.de/EgyptianText-v1.0-beta.ttf";
-    sha256 = "0cfjbk7xxnxhlp6v922psm5j1xzrv6wfk226ji2wz2yfrnkbcbsv";
-  };
-in {
  fonts = {
    enableDefaultFonts = true;
    fontDir.enable = true;
    fonts = with pkgs; [
      alegreya
      alegreya-sans
-      amiri
-      annapurna-sil
-      antinoou
-      cantarell-fonts
-      cardo
-      charis-sil
-      doulos-sil
-      newAthenaUnicode
      corefonts
-      crimson
      eb-garamond
-      jsesh
-      egyptianHiero
-      egyptianText
-      font-awesome_6
-      etBook
-      newGardiner
-      junicode2
-      ezra-sil
      fira
-      font-awesome
-      galatia-sil
-      gentium
-      gfs-fonts
-      gyre-fonts
+      font-awesome-ttf
      ibm-plex
-      jetbrains-mono
-      libertinus
-      libre-bodoni
+      inconsolata
+      iosevka
+      libertine
      lmodern
-      merriweather
-      ocr-a
-      roboto
-      roboto-mono
      noto-fonts
      noto-fonts-cjk
      noto-fonts-emoji
+      roboto
+      roboto-mono
      roboto-slab
-      scheherazade-new
      source-code-pro
-      source-sans-pro
      source-serif-pro
-      theano
+      source-sans-pro
+      ubuntu_font_family
+      gfs-fonts
+      jetbrains-mono
+      twemoji-color-font
+      joypixels
      tocharian-font
-      vistafonts
-      vollkorn
-      zilla-slab
-    ]; # google-fonts league-of-moveable-type
-    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"];
+    ];
+    fontconfig.defaultFonts = {
+      monospace = ["JetBrains Mono" "JoyPixels"];
+      serif = ["Roboto Slab"];
+      sansSerif = ["Roboto" "Noto Sans"];
+      emoji = ["JoyPixels"];
    };
-    # 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 = ''
-      <fontconfig>
-      <!-- Reject WOFF fonts We don't register WOFF(2) fonts with fontconfig because of the W3C spec -->
-       <selectfont>
-        <rejectfont>
-         <glob>*.woff*</glob>
-        </rejectfont>
-       </selectfont>
-      </fontconfig>
-    '';
  };
 }
--- a/configs/fzf.nix
+++ b/configs/fzf.nix
@@ -5,19 +5,18 @@
 }: {
  environment = {
    systemPackages = [pkgs.fzf];
-    variables = rec {
-      FZF_DEFAULT_COMMAND = "${pkgs.fd}/bin/fd --type f --strip-cwd-prefix --follow --no-ignore-vcs --exclude .git";
+    variables = {
      FZF_DEFAULT_OPTS =
-        lib.escapeShellArgs ["--height=40%"];
+        lib.escapeShellArgs ["--height=40%" "--layout=reverse"];
      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_COMMAND = "${pkgs.fd}/bin/fd --type f";
      FZF_CTRL_T_OPTS =
-        lib.escapeShellArgs ["--preview='head -$LINES {}'"];
+        lib.escapeShellArgs ["--preview='${pkgs.bat}/bin/bat \"{}\"'"];
    };
  };

--- a/configs/git.nix
+++ b/configs/git.nix
@@ -9,7 +9,6 @@ in {
  environment.systemPackages = [
    pkgs.mr
    pkgs.git
-    pkgs.git-crypt
    pkgs.gitAndTools.gitflow
    pkgs.gitAndTools.gh
    pkgs.gitAndTools.git-extras
@@ -51,12 +50,12 @@ in {
        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";
+        # 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/hledger.nix
+++ b/configs/hledger.nix
@@ -5,24 +5,6 @@
 }: {
  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";
--- a/configs/hu-berlin.nix
+++ b/configs/hu-berlin.nix
@@ -65,16 +65,31 @@ in {
  systemd.services.hu-vpn = {
    enable = true;
    wants = ["network-online.target"];
+    conflicts = ["openvpn-hu-berlin.service"];
    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}
+          username = ${eduroam.identity}@split_tunnel
          password = ${eduroam.password}
        ''
      }
    '';
  };
+
+  systemd.services.openvpn-hu-berlin.conflicts = ["hu-vpn.service"];
+
+  services.openvpn.servers.hu-berlin = {
+    autoStart = false;
+    authUserPass = {
+      username = eduroam.identity;
+      password = eduroam.password;
+    };
+    config = fileContents (pkgs.fetchurl {
+      url = "https://www.cms.hu-berlin.de/de/dl/netze/vpn/openvpn/hu-berlin.ovpn";
+      sha256 = "15b55aibik5460svjq2gwxrcyh6ay4k8savd6cd5lncgndmd8p8h";
+    });
+  };
 }
--- a/configs/i3.nix
+++ b/configs/i3.nix
@@ -5,7 +5,6 @@
  ...
 }: 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 = {
@@ -14,15 +13,6 @@
          | ${pkgs.coreutils}/bin/tail --lines=1 \
          | ${pkgs.gnused}/bin/sed 's/\\<r\\>/krebsco.de/'
      '';
-      # "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
-      '';
      "ix.io" = pkgs.writers.writeDash "ix.io" ''
        ${pkgs.curl}/bin/curl -fSs -F 'f:1=<-' ix.io
      '';
@@ -36,10 +26,13 @@
        ${pkgs.coreutils}/bin/tr '[A-Za-z]' '[N-ZA-Mn-za-m]'
      '';
      "ipa" = pkgs.writers.writeDash "ipa" ''
-        ${scripts.ipa}/bin/ipa
+        ${pkgs.scripts.ipa}/bin/ipa
      '';
      "betacode" = pkgs.writers.writeDash "betacode" ''
-        ${scripts.betacode}/bin/betacode
+        ${pkgs.scripts.betacode}/bin/betacode
+      '';
+      "devanagari" = pkgs.writers.writeDash "devanagari" ''
+        ${pkgs.scripts.devanagari}/bin/devanagari
      '';
      "curl" = pkgs.writers.writeDash "curl" ''
        ${pkgs.curl}/bin/curl -fSs "$(${pkgs.coreutils}/bin/cat)"
@@ -61,6 +54,7 @@ in {
    displayManager.defaultSession = "none+i3";
    windowManager.i3 = {
      enable = true;
+      package = pkgs.i3-gaps;
    };
  };

@@ -100,10 +94,6 @@ in {
            criteria = {class = "fzfmenu";};
            command = "floating enable";
          }
-          {
-            criteria = {class = ".*";};
-            command = "border pixel 2";
-          }
          {
            criteria = {class = "mpv";};
            command = lib.strings.concatStringsSep ", " [
@@ -116,6 +106,7 @@ in {
          }
        ];
      };
+      gaps.inner = 4;
      floating = {
        titlebar = false;
        border = 1;
@@ -129,9 +120,9 @@ in {
        focused =
          scheme
          // {
-            border = colours.blue.bright;
-            indicator = colours.blue.bright;
-            childBorder = colours.blue.bright;
+            border = colours.cyan.bright;
+            indicator = colours.cyan.bright;
+            childBorder = colours.cyan.bright;
          };
        unfocused =
          scheme
@@ -160,10 +151,10 @@ in {
        {
          workspaceButtons = false;
          fonts = {
-            names = ["Monospace" "Font Awesome 6 Free"];
+            names = ["Sans"];
            size = 8.0;
          };
-          mode = "dock"; # "hide";
+          mode = "hide"; # "dock"
          position = "bottom";
          colors = rec {
            background = colours.background;
@@ -175,7 +166,7 @@ in {
              text = colours.foreground;
            };
          };
-          statusCommand = "env I3RS_GITHUB_TOKEN=${lib.strings.fileContents <secrets/github/notification.token>} ${pkgs.i3status-rust}/bin/i3status-rs ${
+          statusCommand = "${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;
@@ -204,10 +195,10 @@ in {

        "${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}+Shift+x" = "exec --no-startup-id ${move-to-new-workspace}";
        "${modifier}+b" = "workspace prev";
        "${modifier}+n" = "workspace next";
-        "${modifier}+x" = "exec ${new-workspace}";
+        "${modifier}+x" = "exec --no-startup-id ${new-workspace}";

        "${modifier}+Shift+c" = "reload";
        "${modifier}+Shift+q" = "kill";
@@ -225,20 +216,15 @@ in {
        "${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}+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}+0" = "exec ${pkgs.scripts.menu-calc}/bin/=";

-        "${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+w" = "exec ${pkgs.scripts.k-lock}/bin/k-lock";
+        "${modifier}+d" = "exec ${pkgs.writers.writeDash "run" ''exec ${pkgs.rofi}/bin/rofi -modi run,window,ssh,filebrowser -show run''}";
        "${modifier}+Shift+d" = "exec ${
          pkgs.writers.writeDash "notemenu" ''
            set -efu
@@ -250,38 +236,36 @@ in {
            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-
+              find . -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"
+              i3-sensible-terminal -e "$EDITOR" "$note_file"
            fi
          ''
        }";
-        "${modifier}+p" = "exec rofi-pass";
-        "${modifier}+Shift+p" = "exec rofi-pass --insert";
-        "${modifier}+u" = "exec ${scripts.unicodmenu}/bin/unicodmenu";
+        "${modifier}+p" = "exec --no-startup-id ${pkgs.pass}/bin/passmenu -l 5";
+        "${modifier}+u" = "exec ${pkgs.scripts.unicodmenu}/bin/unicodmenu";

-        "${modifier}+F6" = "exec ${pkgs.xorg.xkill}/bin/xkill";
-        "${modifier}+F7" = "exec ${scripts.showkeys-toggle}/bin/showkeys-toggle";
-        "${modifier}+F8" = "exec switch-theme toggle";
+        "${modifier}+F7" = "exec ${pkgs.scripts.showkeys-toggle}/bin/showkeys-toggle";
+        "${modifier}+F8" = "exec ${pkgs.xorg.xkill}/bin/xkill";
        "${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";
+        "XF86AudioLowerVolume" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -d 5";
+        "XF86AudioMute" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -t";
+        "XF86AudioRaiseVolume" = "exec --no-startup-id ${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";
+        "XF86AudioPause" = "exec --no-startup-id ${pkgs.playerctl}/bin/playerctl pause";
+        "XF86AudioPlay" = "exec --no-startup-id ${pkgs.playerctl}/bin/playerctl play-pause";
+        "XF86AudioNext" = "exec --no-startup-id ${pkgs.playerctl}/bin/playerctl next";
+        "XF86AudioPrev" = "exec --no-startup-id ${pkgs.playerctl}/bin/playerctl previous";
+        "XF86AudioStop" = "exec --no-startup-id ${pkgs.playerctl}/bin/playerctl stop";
+        "XF86ScreenSaver" = "exec ${pkgs.scripts.k-lock}/bin/k-lock";

-        "XF86Display" = "exec ${scripts.dmenurandr}/bin/dmenurandr";
+        "XF86Display" = "exec ${pkgs.scripts.dmenurandr}/bin/dmenurandr";

        # key names detected with xorg.xev:
        # XF86WakeUp (fn twice)
--- a/configs/keyboard.nix
+++ b/configs/keyboard.nix
@@ -4,72 +4,17 @@
  ...
 }: 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;
+    layout = commaSep ["de" "gr"];
+    xkbVariant = commaSep ["T3" "polytonic"];
+    xkbOptions =
+      commaSep ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
    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/khal.nix
+++ b/configs/khal.nix
@@ -16,22 +16,7 @@
    password = lib.fileContents <secrets/nextcloud-fysi/password>;
  };
 in {
-  environment.systemPackages = [
-    pkgs.khal
-    pkgs.vdirsyncer
-    pkgs.khard
-    pkgs.todoman
-    (pkgs.writers.writeDashBin "todo-procrastinate" ''
-      [ $# -eq 1 ] || {
-        echo "Usage: $0 TODO_ID" >&2
-        exit 1
-      }
-      todo_id=$1
-      new_timestamp=$(${pkgs.todoman}/bin/todo --porcelain show "$todo_id" | ${pkgs.jq}/bin/jq '.due + 24 * 60 * 60')
-      new_date=$(${pkgs.coreutils}/bin/date +"%Y-%m-%d %H:%M" -d "@$new_timestamp")
-      ${pkgs.todoman}/bin/todo edit "$todo_id" --due "$new_date"
-    '')
-  ];
+  environment.systemPackages = [pkgs.khal pkgs.vdirsyncer pkgs.khard pkgs.todoman];

  systemd.user.services.vdirsyncer = {
    enable = true;
--- a/configs/mastodon-bot.nix
+++ b/configs/mastodon-bot.nix
@@ -1,19 +0,0 @@
-{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
@@ -7,18 +7,18 @@
        "application/pdf" = "org.pwmt.zathura.desktop";
        "application/vnd.oasis.opendocument.text" = "writer.desktop";
        "application/vnd.openxmlformats-officedocument.wordprocessingml.document" = "writer.desktop";
-        "image/jpeg" = "nsxiv.desktop";
-        "image/png" = "nsxiv.desktop";
+        "image/jpeg" = "sxiv.desktop";
+        "image/png" = "sxiv.desktop";
        "image/vnd.djvu+multipage" = "org.pwmt.zathura.desktop";
-        "text/html" = "firefox.desktop";
+        "text/html" = "brave-browser.desktop";
        "text/markdown" = "nvim.desktop";
        "text/plain" = "nvim.desktop";
-        "x-scheme-handler/about" = "firefox.desktop";
-        "x-scheme-handler/http" = "firefox.desktop";
-        "x-scheme-handler/https" = "firefox.desktop";
-        "x-scheme-handler/mailto" = "firefox.desktop";
-        "x-scheme-handler/unknown" = "firefox.desktop";
-        "x-scheme-handler/webcal" = "firefox.desktop";
+        "x-scheme-handler/about" = "brave-browser.desktop";
+        "x-scheme-handler/http" = "brave-browser.desktop";
+        "x-scheme-handler/https" = "brave-browser.desktop";
+        "x-scheme-handler/mailto" = "brave-browser.desktop";
+        "x-scheme-handler/unknown" = "brave-browser.desktop";
+        "x-scheme-handler/webcal" = "brave-browser.desktop";
        "inode/directory" = "pcmanfm.desktop";
      };
    };
--- a/configs/monitoring.nix
+++ b/configs/monitoring.nix
@@ -14,7 +14,6 @@
      nginx.enable = false;
      node = {
        enable = true;
-        openFirewall = true;
        enabledCollectors = [
          "conntrack"
          "diskstats"
@@ -39,6 +38,8 @@
    };
  };

+  networking.firewall.allowedTCPPorts = [config.services.prometheus.exporters.node.port];
+
  systemd.services.promtail = {
    description = "Promtail service for Loki";
    wantedBy = ["multi-user.target"];
--- a/configs/mpv.nix
+++ b/configs/mpv.nix
@@ -4,8 +4,7 @@
  config,
  ...
 }: let
-  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
-  swallow = command: "${scripts.swallow}/bin/swallow ${command}";
+  swallow = command: "${pkgs.scripts.swallow}/bin/swallow ${command}";
 in {
  environment.shellAliases.smpv = swallow "mpv";

@@ -19,10 +18,8 @@ in {
    programs.mpv = {
      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="];
        screenshot-template = "%F-%wH%wM%wS-%#04n";
-        script-opts = "ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp";
      };
      bindings = {
        "Alt+RIGHT" = "add video-rotate 90";
--- a/configs/neomutt.nix
+++ b/configs/neomutt.nix
@@ -5,32 +5,132 @@
 }: let
  mainMailbox = "posteo";

-  accounts = import <niveum/lib/email.nix> {inherit lib mainMailbox;};
+  accounts.uni = {
+    user = "meinhark";
+    password = lib.strings.fileContents <secrets/eduroam/password>;
+    address = "kieran.felix.meinhardt@hu-berlin.de";
+    imap = "mailbox.cms.hu-berlin.de";
+    smtp = "mailhost.cms.hu-berlin.de";
+    smtpSettings = smtp: "smtp://${smtp}";
+    folders = {
+      drafts = "Drafts";
+      sent = "Sent";
+      trash = "Trash";
+    };
+  };

-  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 ''
+  accounts.uni-old = {
+    user = "meinhark";
+    password = lib.strings.fileContents <secrets/eduroam/password>;
+    address = "meinhark@informatik.hu-berlin.de";
+    imap = "mailbox.informatik.hu-berlin.de";
+    smtp = "mailhost.informatik.hu-berlin.de";
+    smtpSettings = smtp: "smtp://${smtp}";
+    folders = {
+      drafts = "Drafts";
+      sent = "Sent";
+      trash = "Trash";
+    };
+  };
+
+  accounts.work-uni = {
+    user = "meinhaki";
+    password = lib.strings.fileContents <secrets/mail/meinhaki>;
+    address = "kieran.meinhardt@hu-berlin.de";
+    imap = "mailbox.cms.hu-berlin.de";
+    smtp = "mailhost.cms.hu-berlin.de";
+    smtpSettings = smtp: "smtp://${smtp}";
+    folders = {
+      drafts = "Drafts";
+      sent = "Sent";
+      trash = "Trash";
+    };
+  };
+
+  accounts.work-fysi = rec {
+    user = "kieran@fysi.tech";
+    address = user;
+    password = lib.strings.fileContents <secrets/mail/fastmail>;
+    imap = "imap.fastmail.com";
+    smtp = "smtp.fastmail.com";
+    smtpSettings = smtp: "smtps://${smtp}:465";
+    folders = {
+      drafts = "Drafts";
+      sent = "Sent";
+      trash = "Trash";
+    };
+  };
+
+  accounts.cock = rec {
+    user = "2210@cock.li";
+    address = user;
+    password = lib.strings.fileContents <secrets/mail/cock>;
+    imap = "mail.cock.li";
+    smtp = imap;
+    smtpSettings = smtp: "smtp://${smtp}:587";
+    folders = {
+      drafts = "Drafts";
+      sent = "Sent";
+      trash = "Trash";
+    };
+  };
+
+  accounts."${mainMailbox}" = rec {
+    user = "kieran.meinhardt@posteo.net";
+    address = user;
+    password = lib.strings.fileContents <secrets/mail/posteo>;
+    imap = "posteo.de";
+    smtp = imap;
+    smtpSettings = smtp: "smtp://${smtp}";
+    folders = {
+      drafts = "Drafts";
+      sent = "Sent";
+      trash = "Trash";
+    };
+  };
+
+  accounts.google-amro = rec {
+    user = "amroplay@gmail.com";
+    address = user;
+    password = lib.strings.fileContents <secrets/mail/gmail/amroplay>;
+    imap = "imap.gmail.com";
+    smtp = "smtp.gmail.com";
+    smtpSettings = smtp: "smtps://${smtp}:465";
+    folders = {
+      drafts = "[Gmail]/Drafts";
+      sent = "[Gmail]/Sent Mail";
+      trash = "[Gmail]/Bin";
+    };
+  };
+
+  accounts.google-kieran = rec {
+    user = "kieran.meinhardt@gmail.com";
+    address = user;
+    password = lib.strings.fileContents <secrets/mail/gmail/kieran.meinhardt>;
+    imap = "imap.gmail.com";
+    smtp = "smtp.gmail.com";
+    smtpSettings = smtp: "smtps://${smtp}:465";
+    folders = {
+      drafts = "[Gmail]/Entwürfe";
+      sent = "[Gmail]/Gesendet";
+      trash = "[Gmail]/Papierkorb";
+    };
+  };
+in {
+  environment.systemPackages = [pkgs.neomutt];
+  environment.shellAliases.mua = "${pkgs.neomutt}/bin/neomutt -f ${mainMailbox}←";
+
+  home-manager.users.me.xdg.configFile."neomutt/neomuttrc".text = ''
    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
+        image/*; ${pkgs.sxiv}/bin/sxiv %s ;
+        video/*; ${pkgs.utillinux}/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

@@ -98,7 +198,7 @@
              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)
+            accounts)
        }
      ''
    }
@@ -112,11 +212,11 @@
        color index red default '.*'
        color index_flags lightcyan default '.*'
        color index_author yellow default '.*'
-        color index_subject default default '.*'
+        color index_subject lightblack default '.*'

        # New mail is boldened:
-        color index_author lightyellow default "~N"
-        color index_subject lightwhite default "~N"
+        color index_author lightyellow black "~N"
+        color index_subject lightwhite black "~N"

        # Flagged mail is highlighted:
        color index_flags lightmagenta default '~F'
@@ -158,15 +258,4 @@
      ''
    }
  '';
-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
@@ -44,17 +44,6 @@
            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
--- a/configs/networkmanager.nix
+++ b/configs/networkmanager.nix
@@ -48,7 +48,7 @@ in {

  networking.networkmanager = {
    enable = true;
-    plugins = [
+    packages = [
      pkgs.networkmanager-openvpn
      pkgs.networkmanager-fortisslvpn
    ];
--- a/configs/newsboat.nix
+++ b/configs/newsboat.nix
@@ -1,42 +1,17 @@
 {
  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";
+  youtube-download = "${pkgs.ts}/bin/ts ${pkgs.youtube-dl}/bin/youtube-dl -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
-  '';
+  linkhandler-bin = "${pkgs.scripts.linkhandler}/bin/linkhandler";

  newsboat-config = pkgs.writeText "config" ''
    auto-reload no
-    reload-threads 8
    prepopulate-query-feeds yes

    # dont keep a search history
@@ -46,12 +21,12 @@

    text-width 85

-    external-url-viewer "${pkgs.urlscan}/bin/urlscan -dc -r '${linkhandler} {}'"
-    browser ${linkhandler}
+    external-url-viewer "${pkgs.urlscan}/bin/urlscan -dc -r '${linkhandler-bin} {}'"
+    browser ${linkhandler-bin}
    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}
+    macro c set browser "${pkgs.xsel}/bin/xsel -b <<<" ; open-in-browser ; set browser ${linkhandler-bin}
+    macro v set browser "${pkgs.utillinux}/bin/setsid -f ${pkgs.mpv}/bin/mpv" ; open-in-browser ; set browser ${linkhandler-bin}
+    macro y set browser "${youtube-download}" ; open-in-browser ; set browser ${linkhandler-bin}

    bind-key j down
    bind-key k up
@@ -75,7 +50,7 @@
    save-path ${newsboat-home}/saved/

    highlight all "---.*---" yellow default
-    # highlight feedlist ".*(0/0))" default default
+    highlight feedlist ".*(0/0))" black default
    highlight article "^Title:.*" yellow default bold
    highlight article "^Author:.*" yellow default
    highlight article "^Flags:.*" red default
@@ -83,37 +58,25 @@
    highlight article "\\[image [0-9][0-9]*\\]" color109 default bold
    highlight article "\\[embedded flash: [0-9][0-9]*\\]" color66 default bold

+    color background white default
+    color listnormal white default
+    color listnormal_unread white 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>}"
+    color article white default
  '';
-
-  newsboat-sql = "${pkgs.sqlite}/bin/sqlite3 ${newsboat-home}/cache.db";
 in {
+  nixpkgs.config.packageOverrides = pkgs: {
+    newsboat = pkgs.writers.writeDashBin "newsboat" ''
+      ${pkgs.newsboat}/bin/newsboat -C ${newsboat-config} -c ${newsboat-home}/cache.db -u ${newsboat-home}/urls "$@"
+    '';
+  };
+
  environment.systemPackages = [
    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.sqlite}/bin/sqlite3 ${newsboat-home}/cache.db "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/packages.nix
+++ b/configs/packages.nix
@@ -3,12 +3,12 @@
  lib,
  ...
 }: let
-  hc = pkgs.callPackage <stockholm/tv/5pkgs/simple/hc.nix> {utillinux = pkgs.util-linux;};
+  hc = pkgs.callPackage <stockholm/tv/5pkgs/simple/hc.nix> {};
  worldradio = pkgs.callPackage <niveum/packages/worldradio.nix> {};
  menstruation = pkgs.callPackage <menstruation-backend> {};
  pandoc-doc = pkgs.callPackage <niveum/packages/man/pandoc.nix> {};

-  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
+  nixpkgs-unstable = import <nixpkgs-unstable> {config.allowUnfree = true;};

  zoteroStyle = {
    name,
@@ -35,7 +35,7 @@
    })
  ];

-  astrolog = pkgs.astrolog.overrideAttrs (old:
+  astrolog = nixpkgs-unstable.astrolog.overrideAttrs (old:
    old
    // {
      installPhase = ''
@@ -73,8 +73,8 @@ in {
    whois
    dnsutils
    # FILE MANAGERS
-    lf
-    cinnamon.nemo
+    ranger
+    pcmanfm
    # MEDIA
    ffmpeg
    imagemagick
@@ -95,19 +95,17 @@ in {
    fd # better find
    file # determine file type
    dos2unix
-    genpass # generate passwords
-    gdu # ncurses disk usage (ncdu is broken)
-    rmlint # remove duplicate files
+    ncdu # ncurses disk usage
    python3Packages.jsonschema # json validation
    jq # json toolkit
    pup # html toolkit
    htmlq
    xsv # csv toolkit
-    fq # toolkit for yaml, xml and binaries
-    man-pages
-    man-pages-posix
+    xmlstarlet # xml toolkit
+    manpages
+    posix_man_pages
    tree
-    exfat # to mount windows drives
+    fuse_exfat # to mount windows drives
    parallel # for parallel, since moreutils shadows task spooler
    ripgrep # better grep
    rlwrap
@@ -119,32 +117,30 @@ in {
    arandr # xrandr for noobs
    libnotify # for notify-send
    xclip # clipboard CLI
-    xdragon # drag and drop
+    dragon-drop # drag and drop
    xorg.xkill # kill by clicking
    audacity
    calibre
    electrum
    inkscape
    astrolog
-    anki-bin # flashcards
+    anki # flashcards
    jbofihe # lojbanic software
-    zoom-us # video conferencing
-    alejandra # nix formatter
+    nixpkgs-unstable.zoom-us # video conferencing
+    nixpkgs-unstable.alejandra # nix formatter
    pdfgrep # search in pdf
    pdftk # pdf toolkit
    mupdf
    poppler_utils # pdf toolkit
-    okular # the word is nucular
+    foxitreader # for viewing pdf annotations
    xournalpp # for annotating pdfs
    pdfpc # presenter console for pdf slides
    hc # print files as qr codes
-    yt-dlp
+    youtubeDL
    espeak
    bc # calculator
    pari # gp -- better calculator
-    rink # unit converter
    scripts.auc
-    scripts.stackoverflow
    scripts.infschmv
    scripts.qrpaste
    scripts.ttspaste
@@ -154,7 +150,6 @@ in {
    scripts.showkeys-toggle
    scripts.kirciuoklis
    scripts.favicon
-    scripts.heuretes
    scripts.ipa # XSAMPA to IPA converter
    scripts.playlist
    scripts.mpv-tv
@@ -166,7 +161,7 @@ in {
    scripts.vimv
    scripts.swallow # window swallowing
    scripts.literature-quote
-    jless # less(1) for json
+    scripts.nav # json navigation
    scripts.notetags
    scripts.booksplit
    scripts.dmenurandr
@@ -180,12 +175,11 @@ in {
    scripts.fkill
    scripts.wttr
    scripts.unicodmenu
+    scripts.horoscope
    scripts.closest
    scripts.trans
    scripts.mpv-radio
    # kmein.slide
-    termdown
-    scripts.alarm
    scripts.tolino-screensaver
    scripts.rfc
    scripts.tag
@@ -237,15 +231,14 @@ in {
      py.pygments
      py.schema
    ]))
-    # python3Packages.poetry
+    python3Packages.poetry

-    html-tidy
+    htmlTidy
    nodePackages.csslint
    nodePackages.jsonlint
    nodePackages.prettier
    nodePackages.typescript
    nodePackages.yarn
-    deno # better node.js
    nodejs
    nodePackages.javascript-typescript-langserver
    texlive.combined.scheme-full
--- a/configs/printing.nix
+++ b/configs/printing.nix
@@ -1,18 +1,16 @@
 {pkgs, ...}: let
  inherit (import <niveum/lib>) localAddresses;
-  hp-driver = pkgs.hplip;
+  hp-driver = pkgs.hplipWithPlugin;
 in {
  services.printing = {
    enable = true;
    drivers = [hp-driver];
  };

-  environment.systemPackages = [
-    pkgs.system-config-printer
-  ];
-
-  # allow connecting to .local printers
-  services.avahi.nssmdns = true;
+  hardware.sane = {
+    enable = true;
+    extraBackends = [hp-driver];
+  };

  hardware.printers.ensurePrinters = [
    {
@@ -31,7 +29,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/retiolum.nix
+++ b/configs/retiolum.nix
@@ -4,13 +4,8 @@
  ...
 }: {
  imports = [
-    <retiolum/modules/retiolum>
+    <niveum/modules/retiolum.nix>
  ];

  networking.hosts = {"42:0:ca48:f98f:63d7:31ce:922b:245d" = ["go"];};
-
-  services.tinc.networks.retiolum = {
-    rsaPrivateKeyFile = toString <system-secrets/retiolum.key>;
-    ed25519PrivateKeyFile = toString <system-secrets/retiolum.ed25519>;
-  };
 }
--- a/configs/rofi.nix
+++ b/configs/rofi.nix
@@ -8,19 +8,6 @@ in {
  home-manager.users.me.programs.rofi = {
    enable = true;
    font = "Monospace 10";
-    theme = "${pkgs.rofi}/share/rofi/themes/Arc.rasi";
-    pass = {
-      enable = true;
-      extraConfig = ''
-        _pwgen() {
-          ${pkgs.genpass}/bin/genpass "$@"
-        }
-
-        USERNAME_field='login'
-        default_user2=kmein
-        help_color="#FF0000"
-      ''; # help_color set by https://github.com/mrossinek/dotfiles/commit/13fc5f24caa78c8f20547bf473266879507f13bf
-    };
-    plugins = [pkgs.rofi-calc];
+    theme = "${pkgs.rofi}/share/rofi/themes/Arc-Dark.rasi";
  };
 }
--- a/configs/save-space.nix
+++ b/configs/save-space.nix
@@ -7,10 +7,4 @@
  fonts.fontconfig.enable = false;
  nix.gc.automatic = true;
  nix.optimise.automatic = true;
-  services.journald.extraConfig = "SystemMaxUse=500M";
-  # https://webzine.snowflake.ovh/issue-001.html -- garbage collect when less then 1 GB is available, make 3 GB fee
-  nix.extraOptions = ''
-    min-free = 1073741824
-    max-free = 3221225472
-  '';
 }
--- a/configs/sound.nix
+++ b/configs/sound.nix
@@ -1,45 +0,0 @@
-{pkgs, ...}: {
-  sound.enable = true;
-
-  # realtime audio for pulseaudio
-  security.rtkit.enable = true;
-
-  services.pipewire = {
-    enable = false;
-    systemWide = false;
-    alsa = {
-      enable = true;
-      support32Bit = true;
-    };
-    pulse.enable = true;
-    jack.enable = true;
-  };
-
-  hardware.pulseaudio = {
-    enable = 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
-    pkgs.pamixer
-    pkgs.pulsemixer
-    pkgs.pulseaudio # for pactl
-  ];
-}
--- a/configs/ssh.nix
+++ b/configs/ssh.nix
@@ -5,18 +5,8 @@
  ...
 }: 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
-  '');
+  services.xserver.displayManager.sessionCommands = "${pkgs.openssh}/bin/ssh-add";

  programs.ssh.startAgent = true;

@@ -24,7 +14,7 @@ in {

  home-manager.users.me.programs.ssh = {
    enable = true;
-    matchBlocks = rec {
+    matchBlocks = {
      "github.com" = {
        hostname = "ssh.github.com";
        port = 443;
@@ -35,12 +25,7 @@ in {
        port = sshPort;
      };
      makanek = {
-        hostname = externalNetwork.makanek;
-        user = "root";
-        port = sshPort;
-      };
-      ful = {
-        hostname = externalNetwork.ful;
+        hostname = "makanek.r";
        user = "root";
        port = sshPort;
      };
@@ -49,16 +34,16 @@ in {
        user = "root";
        port = sshPort;
      };
-      tabula = {
-        hostname = "tabula.r";
-        user = "root";
-        port = sshPort;
-      };
      manakish = {
        hostname = "manakish.r";
        user = "kfm";
        port = sshPort;
      };
+      toum = {
+        hostname = "toum.r";
+        user = "root";
+        port = sshPort;
+      };
      kabsa = {
        hostname = "kabsa.r";
        user = "kfm";
@@ -72,16 +57,9 @@ in {
        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";
+      oracle = {
+        hostname = "130.61.171.199";
+        user = "ubuntu";
      };
    };
  };
--- a/configs/stardict.nix
+++ b/configs/stardict.nix
@@ -295,7 +295,7 @@ in {
    // dictionaries.englishGerman));

  environment.systemPackages = [
-    # pkgs.goldendict
+    pkgs.goldendict
    (makeStardict "lsj" dictionaries.classics)
    (makeStardict "sa" dictionaries.sanskrit)
    (makeStardict "oed" dictionaries.oed)
@@ -305,64 +305,64 @@ in {
  ];
 }
 /*
-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;
-};
-*/
+ 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;
+ };
+ */

--- a/configs/nsxiv.nix
+++ b/configs/nsxiv.nix
@@ -15,10 +15,10 @@
    cf	''${XDG_CONFIG_HOME:-$HOME/.config}
  '';
 in {
-  environment.systemPackages = [pkgs.nsxiv];
+  environment.systemPackages = [pkgs.sxiv];

  # TODO fix
-  home-manager.users.me.xdg.configFile."nsxiv/exec/key-handler".source = pkgs.writers.writeDash "key-handler" ''
+  home-manager.users.me.xdg.configFile."sxiv/exec/key-handler".source = pkgs.writers.writeDash "key-handler" ''
    PATH=$PATH:${
      lib.makeBinPath [
        pkgs.gnused
--- a/configs/telegram-bots/astrology.nix
+++ b/configs/telegram-bots/astrology.nix
@@ -1,11 +1,9 @@
 {
-  config,
  pkgs,
  lib,
  ...
 }: let
-  unstable = import <nixos-unstable> {inherit (config.nixpkgs) config;};
-
+  nixpkgs-unstable = import <nixpkgs-unstable> {};
  toSymbols = pkgs.writers.writeDash "to-symbols" ''
    ${pkgs.gnused}/bin/sed '
      s/\bTri\b/△/;
@@ -52,8 +50,8 @@ in {
      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"
+        ${nixpkgs-unstable.astrolog}/bin/astrolog -qd $date -zN Berlin -Yt -Yd -d -R Uranus Neptune Pluto "North Node"
+        ${nixpkgs-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
@@ -20,12 +20,4 @@ in {
    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
@@ -1,35 +0,0 @@
-{
-  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
@@ -4,12 +4,7 @@
  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> {};
+  telebots = pkgs.callPackage <telebots> {};
  reverseDirectory = "/run/telegram-reverse";
  proverbDirectory = "/run/telegram-proverb";
  inherit (import <niveum/lib>) tmpfilesConfig;
@@ -18,11 +13,8 @@ in {
    ./literature-quote.nix
    ./astrology.nix
    ./autorenkalender.nix
-    ./hesychius.nix
-    ./smyth.nix
    ./nachtischsatan.nix
    ./tlg-wotd.nix
-    ./celan.nix
    <niveum/modules/telegram-bot.nix>
  ];

@@ -34,24 +26,6 @@ in {
      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";
--- a/configs/telegram-bots/hesychius.nix
+++ b/configs/telegram-bots/hesychius.nix
@@ -1,25 +0,0 @@
-{
-  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
@@ -10,15 +10,8 @@ in {
    enable = true;
    time = "08/6:00";
    token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
-    chatIds = ["-1001760262519"];
+    chatIds = ["18980945" "757821027" "455964311"];
    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
@@ -34,12 +34,4 @@ in {
    });
    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
@@ -1,37 +0,0 @@
-{
-  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
@@ -12,17 +12,9 @@
      ${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)"
+        "*\(.word)* '\'''\(.definition | 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
@@ -1,82 +0,0 @@
-{
-  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
@@ -23,11 +23,6 @@ in {
      enable = true;
      platformTheme = "gtk";
    };
-    home.pointerCursor =
-      theme.cursor
-      // {
-        size = 16;
-        x11.enable = true;
-      };
+    xsession.pointerCursor = theme.cursor // {size = 16;};
  };
 }
--- a/configs/tor.nix
+++ b/configs/tor.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{
  services.tor.enable = true;
-  environment.systemPackages = [pkgs.tor];
+  services.tor.torsocks.enable = true;
 }
--- a/configs/zsh.nix
+++ b/configs/zsh.nix
@@ -7,15 +7,6 @@
    # nothing to see here
  '';

-  environment.systemPackages = [pkgs.atuin];
-  environment.variables.ATUIN_CONFIG_DIR = toString (pkgs.writeTextDir "/config.toml" ''
-    auto_sync = true
-    update_check = false
-    sync_address = "http://zaatar.r:8888"
-    sync_frequency = 0
-    style = "compact"
-  '');
-
  programs.zsh = let
    zsh-completions = pkgs.fetchFromGitHub {
      owner = "zsh-users";
@@ -23,6 +14,12 @@
      rev = "cf565254e26bb7ce03f51889e9a29953b955b1fb";
      sha256 = "1yf4rz99acdsiy0y1v3bm65xvs2m0sl92ysz0rnnrlbd5amn283l";
    };
+    zsh-history-substring-search = pkgs.fetchFromGitHub {
+      owner = "zsh-users";
+      repo = "zsh-history-substring-search";
+      rev = "aae3388491c2312c4efb2e86bcb999927bb2900e";
+      sha256 = "0lgmq1xcccnz5cf7vl0r0qj351hwclx9p80cl0qczxry4r2g5qaz";
+    };
  in {
    enable = true;
    enableCompletion = true;
@@ -57,6 +54,12 @@
      autoload -U zmv run-help

      fpath=(${zsh-completions}/src $fpath)
+      source ${zsh-history-substring-search}/zsh-history-substring-search.zsh
+
+      bindkey '^[[A' history-substring-search-up
+      bindkey '^[[B' history-substring-search-down
+      bindkey -M vicmd 'k' history-substring-search-up
+      bindkey -M vicmd 'j' history-substring-search-down
    '';
    promptInit = with config.niveum; ''
      autoload -Uz vcs_info
@@ -68,13 +71,6 @@
      zstyle ':vcs_info:*' formats "%c%u%F{cyan}%b%f"
      zstyle ':vcs_info:*' actionformats "(%a) %c%u%F{cyan}%b%f"

-      # atuin distributed shell history
-      export ATUIN_NOBIND="true" # disable all keybdinings of atuin
-      eval "$(atuin init zsh)"
-      bindkey '^r' _atuin_search_widget # bind ctrl+r to atuin
-      # use zsh only session history
-      fc -p
-
      precmd () {
        vcs_info
        RPROMPT="$vcs_info_msg_0_"
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
  "nodes": {
    "flake-utils": {
      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "lastModified": 1648297722,
+        "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
        "type": "github"
      },
      "original": {
@@ -18,21 +18,20 @@
    "home-manager": {
      "inputs": {
        "nixpkgs": [
-          "nixos-unstable"
-        ],
-        "utils": "utils"
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1675371293,
-        "narHash": "sha256-LrCjtrAXj/WJphhGEMnHgZs7oTsfOlvPfOjFTIvg39k=",
+        "lastModified": 1647175256,
+        "narHash": "sha256-7H+veXPM7IwdN1DoZqliwb9sghlN56koV5dnCu1kpsc=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "d1c7730bb707bf8124d997952f7babd2a281ae68",
+        "rev": "a8d00f5c038cf7ec54e7dac9c57b171c1217f008",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "master",
+        "ref": "release-21.11",
        "repo": "home-manager",
        "type": "github"
      }
@@ -43,19 +42,19 @@
          "flake-utils"
        ],
        "nixpkgs": [
-          "nixos-stable"
+          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1661273257,
-        "narHash": "sha256-cywpSH3D291AwdO/ecJxHeN2Vuuz0cIy/NEXMsFT+Og=",
-        "owner": "kmein",
+        "lastModified": 1644957911,
+        "narHash": "sha256-ggie/j7pdBqzDs4W7OiPmhqH9IGbXAbJxGqBdVxA8jA=",
+        "owner": "Mic92",
        "repo": "krops",
-        "rev": "542bc544ec8b0b807933a812d098e601683b0956",
+        "rev": "86fb3d2ee94fd8306231853b323ed8804edf26ec",
        "type": "github"
      },
      "original": {
-        "owner": "kmein",
+        "owner": "Mic92",
        "repo": "krops",
        "type": "github"
      }
@@ -63,11 +62,11 @@
    "menstruation-backend": {
      "flake": false,
      "locked": {
-        "lastModified": 1667816906,
-        "narHash": "sha256-VdckYVSQZfqThPb06Y5TGSI+kkibgM/G9pH5SQHIybI=",
+        "lastModified": 1634573652,
+        "narHash": "sha256-FIj8oCOJO+Wqxr2o5MMqIShvzMJud4iUq3o8y4NIRvw=",
        "owner": "kmein",
        "repo": "menstruation.rs",
-        "rev": "95c495d453c35f20a6a5641a88a862c668404acf",
+        "rev": "dd405fe2acf32441e8ac56e488e689bb1c4bea82",
        "type": "github"
      },
      "original": {
@@ -79,11 +78,11 @@
    "menstruation-telegram": {
      "flake": false,
      "locked": {
-        "lastModified": 1667816918,
-        "narHash": "sha256-yQSl0iKqHm7qFLELY8e7OzRRdnqSBbzJmQIYgkXlJpQ=",
+        "lastModified": 1634815642,
+        "narHash": "sha256-q1OTMx5ayNu9ppHJBDUie/ow+BcA5DXnHEm11EY+C4E=",
        "owner": "kmein",
        "repo": "menstruation-telegram",
-        "rev": "828872cf9c425442705a95019eceee397bc1c03f",
+        "rev": "a34555cf46f02157718b0565b5456348fff54181",
        "type": "github"
      },
      "original": {
@@ -95,11 +94,11 @@
    "nix-writers": {
      "flake": false,
      "locked": {
-        "lastModified": 1675197881,
-        "narHash": "sha256-gYtduNF59yqv4BgW4fC+tZHKE7cpOkZf+Y34psyFO5U=",
-        "ref": "refs/heads/master",
-        "rev": "d1424777b5f2e12cbd80efd1b55335dcba7c32bd",
-        "revCount": 38,
+        "lastModified": 1554228333,
+        "narHash": "sha256-hG/PlcCvCQhNcU55NpHfATkyH9k6cZmO7uvBoJjasXU=",
+        "ref": "master",
+        "rev": "c528cf970e292790b414b4c1c8c8e9d7e73b2a71",
+        "revCount": 32,
        "type": "git",
        "url": "https://cgit.krebsco.de/nix-writers"
      },
@@ -108,34 +107,34 @@
        "url": "https://cgit.krebsco.de/nix-writers"
      }
    },
-    "nixos-stable": {
+    "nixpkgs": {
      "locked": {
-        "lastModified": 1675237434,
-        "narHash": "sha256-YoFR0vyEa1HXufLNIFgOGhIFMRnY6aZ0IepZF5cYemo=",
+        "lastModified": 1647992509,
+        "narHash": "sha256-AG40Nt5OWz0LBs5p457emOuwLKOvTtcv/2fUdnEN3Ws=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "285b3ff0660640575186a4086e1f8dc0df2874b5",
+        "rev": "d2caa9377539e3b5ff1272ac3aa2d15f3081069f",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-22.11",
+        "ref": "nixos-21.11",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
-    "nixos-unstable": {
+    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1675273418,
-        "narHash": "sha256-tpYc4TEGvDzh9uRf44QemyQ4TpVuUbxb07b2P99XDbM=",
+        "lastModified": 1648337267,
+        "narHash": "sha256-8DRg8UDvs63iaIaHEbWG7/lnD9ImQlMNsTZMY3PvFLc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db",
+        "rev": "6de161729c81dc98e844793cc9c8fda29d5ef62a",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "master",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -143,11 +142,11 @@
    "recht": {
      "flake": false,
      "locked": {
-        "lastModified": 1669719044,
-        "narHash": "sha256-WsLWlTM2Hrurj9kVajybIOavV9QPYiJweMCOQR6h+YI=",
+        "lastModified": 1619583518,
+        "narHash": "sha256-3eFw6xWue9cvPxXq1ROq32ecvPOmqOedgQhyOr7N9iE=",
        "owner": "kmein",
        "repo": "recht",
-        "rev": "7c15b13328fb5cee01012c488ff235ee730cac70",
+        "rev": "d551afed23122bb3106e59eb2274394ec5555048",
        "type": "github"
      },
      "original": {
@@ -157,18 +156,19 @@
      }
    },
    "retiolum": {
+      "flake": false,
      "locked": {
-        "lastModified": 1675364416,
-        "narHash": "sha256-u7kbHg/cp+GdW55B6V52GG0D9+zWOhmVI2nh/NiMxfw=",
-        "ref": "refs/heads/master",
-        "rev": "ae5112af96361acc314e1d270d0c9281984fc517",
-        "revCount": 280,
-        "type": "git",
-        "url": "https://git.thalheim.io/Mic92/retiolum"
+        "lastModified": 1647444524,
+        "narHash": "sha256-N4T1UXLkYJMQqk65LkTDpW70ujXXeZ9xe5k+LOpznAI=",
+        "owner": "krebs",
+        "repo": "retiolum",
+        "rev": "de6d7dc9bd671e65f2ee3004b6807625e7553e84",
+        "type": "github"
      },
      "original": {
-        "type": "git",
-        "url": "https://git.thalheim.io/Mic92/retiolum"
+        "owner": "krebs",
+        "repo": "retiolum",
+        "type": "github"
      }
    },
    "root": {
@@ -179,8 +179,8 @@
        "menstruation-backend": "menstruation-backend",
        "menstruation-telegram": "menstruation-telegram",
        "nix-writers": "nix-writers",
-        "nixos-stable": "nixos-stable",
-        "nixos-unstable": "nixos-unstable",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable",
        "recht": "recht",
        "retiolum": "retiolum",
        "scripts": "scripts",
@@ -194,11 +194,11 @@
    "scripts": {
      "flake": false,
      "locked": {
-        "lastModified": 1675238486,
-        "narHash": "sha256-Hs9NKK0UFaNqrui2VauBnMnV/14U3eNWaI12EmVYXWY=",
+        "lastModified": 1648314795,
+        "narHash": "sha256-hGIXkAcGiJnVXnl8kigZpI3VFrLmAr2+yr85hi5JwP0=",
        "owner": "kmein",
        "repo": "scripts",
-        "rev": "5cefa5f112e7fe54e0302b7bc33bc06e1f762002",
+        "rev": "d1d525b92a34e55b1ad886807c284106e58716b2",
        "type": "github"
      },
      "original": {
@@ -210,17 +210,17 @@
    "stockholm": {
      "flake": false,
      "locked": {
-        "lastModified": 1675564669,
-        "narHash": "sha256-Fd4wBl9b5Aqt4ctH2vJu/oPvgTOHD+ME8MUEu3oR2tE=",
-        "ref": "refs/heads/master",
-        "rev": "e44fe862f0bedc658aabd1daafb16376f188857e",
-        "revCount": 11353,
+        "lastModified": 1648214990,
+        "narHash": "sha256-rptATGq+jcpL+P+Cr6d3OajV6zYkbHPWlt3aQNZI2TY=",
+        "ref": "master",
+        "rev": "ae9c0b12710b5361d0d45510eb401eebfc1b3fb0",
+        "revCount": 10497,
        "type": "git",
-        "url": "https://cgit.krebsco.de/stockholm"
+        "url": "https://cgit.lassul.us/stockholm"
      },
      "original": {
        "type": "git",
-        "url": "https://cgit.krebsco.de/stockholm"
+        "url": "https://cgit.lassul.us/stockholm"
      }
    },
    "telebots": {
@@ -242,11 +242,11 @@
    "tinc-graph": {
      "flake": false,
      "locked": {
-        "lastModified": 1666162569,
-        "narHash": "sha256-7ebWs/ryDebUMONkn6dPckNnUGrEuPQScoY+O/+vo+Q=",
+        "lastModified": 1639820904,
+        "narHash": "sha256-d4s2PulBGIIQXtX7blZz+Wnmij5dK/IrBcilNGjqZC4=",
        "owner": "kmein",
        "repo": "tinc-graph",
-        "rev": "72a4b305fcb49cfd6d456103cda45888a6b34bbe",
+        "rev": "1b9c69ffdbdab82d30a23e44f739feea63d94163",
        "type": "github"
      },
      "original": {
@@ -286,21 +286,6 @@
        "repo": "tuna",
        "type": "github"
      }
-    },
-    "utils": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@@ -2,20 +2,18 @@
  description = "niveum: packages, modules, systems";

  inputs = {
-    nixos-stable.url = "github:NixOS/nixpkgs/nixos-22.11";
-    nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
-
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11";
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
    flake-utils.url = "github:numtide/flake-utils";
    home-manager = {
-      url = "github:nix-community/home-manager/master";
-      inputs.nixpkgs.follows = "nixos-unstable";
+      url = "github:nix-community/home-manager/release-21.11";
+      inputs.nixpkgs.follows = "nixpkgs";
    };
    krops = {
-      url = "github:kmein/krops";
-      inputs.nixpkgs.follows = "nixos-stable";
+      url = "github:Mic92/krops";
+      inputs.nixpkgs.follows = "nixpkgs";
      inputs.flake-utils.follows = "flake-utils";
    };
-    retiolum.url = "git+https://git.thalheim.io/Mic92/retiolum";

    # legacy
    menstruation-backend = {
@@ -34,12 +32,16 @@
      url = "github:kmein/recht";
      flake = false;
    };
+    retiolum = {
+      url = "github:krebs/retiolum";
+      flake = false;
+    };
    scripts = {
      url = "github:kmein/scripts";
      flake = false;
    };
    stockholm = {
-      url = "git+https://cgit.krebsco.de/stockholm";
+      url = "git+https://cgit.lassul.us/stockholm";
      flake = false;
    };
    telebots = {
@@ -68,8 +70,8 @@
    menstruation-backend,
    menstruation-telegram,
    nix-writers,
-    nixos-unstable,
-    nixos-stable,
+    nixpkgs,
+    nixpkgs-unstable,
    recht,
    retiolum,
    scripts,
@@ -80,104 +82,44 @@
    tuna,
  } @ inputs: let
    system = "x86_64-linux";
-    pkgs = nixos-stable.legacyPackages.${system};
-    home =
-      if nixos-stable.lib.inPureEvalMode or false
-      then _: /nonexistent
-      else import lib/home.nix;
-    source = {
-      sources,
-      unstable,
-      name,
-    }:
+    pkgs = nixpkgs.legacyPackages.${system};
+    source = name:
      {
        niveum.file = toString ./.;
        nixos-config.symlink = "niveum/systems/${name}/configuration.nix";
        system-secrets.pass = {
-          dir = toString (home /.password-store);
+          dir = toString ~/.password-store;
          name = "systems/${name}";
        };
        secrets.pass = {
-          dir = toString (home /.password-store);
+          dir = toString ~/.password-store;
          name = "shared";
        };
-        nixpkgs.git = {
-          url = "https://github.com/NixOS/nixpkgs";
-          ref =
-            (
-              if unstable
-              then inputs.nixos-unstable
-              else inputs.nixos-stable
-            )
-            .rev;
-          shallow = true;
-        };
      }
-      // nixos-stable.lib.mapAttrs' (name: value: {
+      // nixpkgs.lib.mapAttrs' (name: value: {
        inherit name;
-        value.git = {
-          url = let
-            github = x: "https://github.com/${x}";
-          in
-            {
-              home-manager = github "nix-community/home-manager";
-              menstruation-backend = github "kmein/menstruation.rs";
-              menstruation-telegram = github "kmein/menstruation-telegram";
-              nixos-unstable = github "NixOS/nixpkgs";
-              nix-writers = "https://cgit.krebsco.de/nix-writers";
-              recht = github "kmein/recht";
-              retiolum = "https://git.thalheim.io/Mic92/retiolum";
-              stockholm = "https://cgit.krebsco.de/stockholm";
-              scripts = github "kmein/scripts";
-              telebots = github "kmein/telebots";
-              tinc-graph = github "kmein/tinc-graph";
-              traadfri = github "kmein/traadfri";
-            }
-            .${name};
-          ref = value.rev;
-          shallow = true;
-        };
-      }) (nixos-stable.lib.filterAttrs (name: _: builtins.elem name sources) inputs);
+        value.file = toString value;
+      }) (nixpkgs.lib.filterAttrs (name: _: !builtins.elem name ["flake-utils" "krops" "self"]) inputs);
    deployScriptFor = {
      name,
-      user ? "root",
      host,
-      unstable ? false,
-      sshPort ? (import ./lib/default.nix).sshPort,
-      sources,
-    }:
+    }: let
+      inherit (import ./lib/default.nix) sshPort;
+    in
      toString (krops.packages.${system}.writeDeploy "deploy-${name}" {
-        source = krops.lib.evalSource [(source {inherit sources unstable name;})];
-        target = "${user}@${host}:${toString sshPort}";
-        useNixOutputMonitor = true;
+        source = krops.lib.evalSource [(source name)];
+        target = "root@${host}:${toString sshPort}";
      });
  in {
    apps.${system} = let
      forSystems = f: builtins.listToAttrs (map f (builtins.attrNames (builtins.readDir ./systems)));
-      externalNetwork = import ./lib/external-network.nix;
      deployScripts = forSystems (name: {
        name = "deploy-${name}";
        value = {
          type = "app";
          program = deployScriptFor {
            inherit name;
-            host =
-              if externalNetwork ? name
-              then externalNetwork.${name}
-              else "${name}.r";
-            unstable = false; # name == "kabsa" || name == "manakish";
-            sources =
-              ["nix-writers" "nixpkgs" "retiolum" "stockholm"]
-              ++ {
-                zaatar = ["traadfri" "nixos-unstable"];
-                ful = [];
-                tahina = [];
-                tabula = [];
-                kabsa = ["traadfri" "nixos-unstable" "home-manager" "menstruation-backend" "recht"];
-                manakish = ["traadfri" "nixos-unstable" "home-manager" "menstruation-backend" "recht"];
-                makanek = ["nixos-unstable" "menstruation-telegram" "menstruation-backend" "scripts" "telebots" "tinc-graph"];
-              }
-              .${name};
+            host = "${name}.r";
          };
        };
      });
--- a/lib/colours/ayu-dark.nix
+++ b/lib/colours/ayu-dark.nix
@@ -1,37 +0,0 @@
-{
-  black = {
-    dark = "#000000";
-    bright = "#323232";
-  };
-  red = {
-    dark = "#ff3333";
-    bright = "#ff6565";
-  };
-  green = {
-    dark = "#b8cc52";
-    bright = "#e9fe83";
-  };
-  yellow = {
-    dark = "#e6c446";
-    bright = "#fff778";
-  };
-  blue = {
-    dark = "#36a3d9";
-    bright = "#68d4ff";
-  };
-  magenta = {
-    dark = "#f07078";
-    bright = "#ffa3aa";
-  };
-  cyan = {
-    dark = "#95e5cb";
-    bright = "#c7fffc";
-  };
-  white = {
-    dark = "#ffffff";
-    bright = "#ffffff";
-  };
-  background = "#0e1419";
-  foreground = "#e5e1cf";
-  cursor = "#f19618";
-}
--- a/lib/colours/ayu-light.nix
+++ b/lib/colours/ayu-light.nix
@@ -1,37 +0,0 @@
-{
-  black = {
-    dark = "#000000";
-    bright = "#323232";
-  };
-  red = {
-    dark = "#ff3333";
-    bright = "#ff6565";
-  };
-  green = {
-    dark = "#86b200";
-    bright = "#b8e532";
-  };
-  yellow = {
-    dark = "#f19618";
-    bright = "#ffc849";
-  };
-  blue = {
-    dark = "#41a6d9";
-    bright = "#73d7ff";
-  };
-  magenta = {
-    dark = "#f07078";
-    bright = "#ffa3aa";
-  };
-  cyan = {
-    dark = "#4cbe99";
-    bright = "#7ff0cb";
-  };
-  white = {
-    dark = "#ffffff";
-    bright = "#ffffff";
-  };
-  background = "#fafafa";
-  foreground = "#5b6673";
-  cursor = "#ff6900";
-}
--- a/lib/colours/owickstrom-dark.nix
+++ b/lib/colours/owickstrom-dark.nix
@@ -1,37 +1,37 @@
 rec {
  black = {
-    bright = "#282c34";
-    dark = "#282c34";
+    bright = "#4b4b4b";
+    dark = "#242424";
  };
  red = {
-    bright = "#e06c75";
-    dark = "#e06c75";
+    bright = "#fc1c18";
+    dark = "#d71c15";
  };
  green = {
-    bright = "#98c379";
-    dark = "#98c379";
+    bright = "#6bc219";
+    dark = "#5aa513";
  };
  yellow = {
-    bright = "#e5c07b";
-    dark = "#e5c07b";
+    bright = "#fec80e";
+    dark = "#fdb40c";
  };
  blue = {
-    bright = "#61afef";
-    dark = "#61afef";
+    bright = "#0955ff";
+    dark = "#063b8c";
  };
  magenta = {
-    bright = "#c678dd";
-    dark = "#c678dd";
+    bright = "#fb0050";
+    dark = "#e40038";
  };
  cyan = {
-    bright = "#56b6c2";
-    dark = "#56b6c2";
+    bright = "#3ea8fc";
+    dark = "#2595e1";
  };
  white = {
-    bright = "#dcdfe4";
-    dark = "#dcdfe4";
+    bright = "#8c00ec";
+    dark = "#efefef";
  };
-  background = black.dark;
-  foreground = white.bright;
-  cursor = "#a3b3cc";
+  background = "#181818";
+  foreground = white.dark;
+  cursor = "#bbbbbb";
 }
--- a/lib/colours/owickstrom-light.nix
+++ b/lib/colours/owickstrom-light.nix
@@ -1,37 +0,0 @@
-rec {
-  black = {
-    bright = "#4b4b4b";
-    dark = "#242424";
-  };
-  red = {
-    bright = "#fc1c18";
-    dark = "#d71c15";
-  };
-  green = {
-    bright = "#6bc219";
-    dark = "#5aa513";
-  };
-  yellow = {
-    bright = "#fec80e";
-    dark = "#fdb40c";
-  };
-  blue = {
-    bright = "#0955ff";
-    dark = "#063b8c";
-  };
-  magenta = {
-    bright = "#fb0050";
-    dark = "#e40038";
-  };
-  cyan = {
-    bright = "#3ea8fc";
-    dark = "#2595e1";
-  };
-  white = {
-    bright = "#8c00ec";
-    dark = "#efefef";
-  };
-  background = white.dark;
-  foreground = "#181818";
-  cursor = "#bbbbbb";
-}
--- a/lib/colours/owickstrom.nix
+++ b/lib/colours/owickstrom.nix
@@ -0,0 +1,37 @@
+rec {
+  black = {
+    bright = "#282c34";
+    dark = "#282c34";
+  };
+  red = {
+    bright = "#e06c75";
+    dark = "#e06c75";
+  };
+  green = {
+    bright = "#98c379";
+    dark = "#98c379";
+  };
+  yellow = {
+    bright = "#e5c07b";
+    dark = "#e5c07b";
+  };
+  blue = {
+    bright = "#61afef";
+    dark = "#61afef";
+  };
+  magenta = {
+    bright = "#c678dd";
+    dark = "#c678dd";
+  };
+  cyan = {
+    bright = "#56b6c2";
+    dark = "#56b6c2";
+  };
+  white = {
+    bright = "#dcdfe4";
+    dark = "#dcdfe4";
+  };
+  background = black.dark;
+  foreground = white.bright;
+  cursor = "#a3b3cc";
+}
--- a/lib/colours/papercolor-dark.nix
+++ b/lib/colours/papercolor-dark.nix
@@ -1,37 +0,0 @@
-rec {
-  black = {
-    dark = "#1c1c1c";
-    bright = "#585858";
-  };
-  red = {
-    dark = "#af005f";
-    bright = "#5faf5f";
-  };
-  green = {
-    bright = "#afd700";
-    dark = "#5faf00";
-  };
-  yellow = {
-    bright = "#af87d7";
-    dark = "#d7af5f";
-  };
-  blue = {
-    dark = "#5fafd7";
-    bright = "#ffaf00";
-  };
-  magenta = {
-    bright = "#ff5faf";
-    dark = "#808080";
-  };
-  cyan = {
-    dark = "#d7875f";
-    bright = "#00afaf";
-  };
-  white = {
-    dark = "#d0d0d0";
-    bright = "#5f8787";
-  };
-  background = black.dark;
-  foreground = white.dark;
-  cursor = blue.bright;
-}
--- a/lib/colours/papercolor-light.nix
+++ b/lib/colours/papercolor-light.nix
@@ -1,37 +0,0 @@
-rec {
-  black = {
-    dark = "#eeeeee";
-    bright = "#bcbcbc";
-  };
-  red = {
-    dark = "#af0000";
-    bright = "#d70000";
-  };
-  green = {
-    dark = "#008700";
-    bright = "#d70087";
-  };
-  yellow = {
-    dark = "#5f8700";
-    bright = "#8700af";
-  };
-  blue = {
-    dark = "#0087af";
-    bright = "#d75f00";
-  };
-  magenta = {
-    bright = "#878787";
-    dark = "#d75f00";
-  };
-  cyan = {
-    dark = "#005f87";
-    bright = "#005faf";
-  };
-  white = {
-    dark = "#444444";
-    bright = "#005f87";
-  };
-  background = black.dark;
-  foreground = white.dark;
-  cursor = blue.bright;
-}
--- a/lib/default-applications.nix
+++ b/lib/default-applications.nix
@@ -1,5 +1,5 @@
 pkgs: rec {
-  terminal = "alacritty";
-  browser = "${pkgs.firefox}/bin/firefox";
-  fileManager = "${pkgs.cinnamon.nemo}/bin/nemo";
+  terminal = "${pkgs.alacritty}/bin/alacritty";
+  browser = "${pkgs.brave}/bin/brave";
+  fileManager = "${terminal} -e ${pkgs.ranger}/bin/ranger";
 }
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -28,7 +28,7 @@ rec {
  serveHtml = file: pkgs: ''
    default_type "text/html";
    root ${
-      pkgs.linkFarm "www" [
+      pkgs.linkFarm "fahrplan" [
        {
          name = "index.html";
          path = file;
@@ -40,16 +40,16 @@ rec {

  sshPort = 22022;

-  colours = import ./colours/papercolor-dark.nix;
+  colours = import ./colours/ibm-3270.nix;

  theme = pkgs: {
    gtk = {
      name = "Adwaita-dark";
-      package = pkgs.gnome.gnome-themes-extra;
+      package = pkgs.gnome3.gnome-themes-extra;
    };
    icon = {
      name = "Adwaita";
-      package = pkgs.gnome.adwaita-icon-theme;
+      package = pkgs.gnome3.adwaita-icon-theme;
    };
    cursor = {
      name = "capitaine-cursors-white";
--- a/lib/email.nix
+++ b/lib/email.nix
@@ -1,145 +0,0 @@
-{
-  lib,
-  mainMailbox ? "posteo",
-  ...
-}: {
-  uni = {
-    user = "meinhark";
-    password = lib.strings.fileContents <secrets/eduroam/password>;
-    address = "kieran.felix.meinhardt@hu-berlin.de";
-    imap = "mailbox.cms.hu-berlin.de";
-    smtp = "mailhost.cms.hu-berlin.de";
-    smtpSettings = smtp: "smtp://${smtp}";
-    folders = {
-      drafts = "Drafts";
-      sent = "Sent";
-      trash = "Trash";
-    };
-  };
-
-  uni-old = {
-    user = "meinhark";
-    password = lib.strings.fileContents <secrets/eduroam/password>;
-    address = "meinhark@informatik.hu-berlin.de";
-    imap = "mailbox.informatik.hu-berlin.de";
-    smtp = "mailhost.informatik.hu-berlin.de";
-    smtpSettings = smtp: "smtp://${smtp}";
-    folders = {
-      drafts = "Drafts";
-      sent = "Sent";
-      trash = "Trash";
-    };
-  };
-
-  work-uni = {
-    user = "meinhaki";
-    password = lib.strings.fileContents <secrets/mail/meinhaki>;
-    address = "kieran.meinhardt@hu-berlin.de";
-    imap = "mailbox.cms.hu-berlin.de";
-    smtp = "mailhost.cms.hu-berlin.de";
-    smtpSettings = smtp: "smtp://${smtp}";
-    folders = {
-      drafts = "Drafts";
-      sent = "Sent";
-      trash = "Trash";
-    };
-  };
-
-  work-admin = {
-    user = "dslalewa";
-    password = lib.strings.fileContents <secrets/mail/dslalewa>;
-    address = "admin.alew.vglsprwi@hu-berlin.de";
-    imap = "mailbox.cms.hu-berlin.de";
-    smtp = "mailhost.cms.hu-berlin.de";
-    smtpSettings = smtp: "smtp://${smtp}";
-    folders = {
-      drafts = "Drafts";
-      sent = "Sent";
-      trash = "Trash";
-    };
-  };
-
-  uni-fsi = {
-    user = "fsklassp";
-    password = lib.strings.fileContents <secrets/mail/fsklassp>;
-    address = "fsklassp@hu-berlin.de";
-    imap = "mailbox.cms.hu-berlin.de";
-    smtp = "mailhost.cms.hu-berlin.de";
-    smtpSettings = smtp: "smtp://${smtp}";
-    folders = {
-      drafts = "Drafts";
-      sent = "Sent";
-      trash = "Trash";
-    };
-  };
-
-  work-fysi = rec {
-    user = "kieran@fysi.tech";
-    address = user;
-    password = lib.strings.fileContents <secrets/mail/fastmail>;
-    imap = "imap.fastmail.com";
-    smtp = "smtp.fastmail.com";
-    smtpSettings = smtp: "smtps://${smtp}:465";
-    folders = {
-      drafts = "Drafts";
-      sent = "Sent";
-      trash = "Trash";
-    };
-  };
-
-  cock = rec {
-    user = "2210@cock.li";
-    address = user;
-    password = lib.strings.fileContents <secrets/mail/cock>;
-    imap = "mail.cock.li";
-    smtp = imap;
-    smtpSettings = smtp: "smtp://${smtp}:587";
-    folders = {
-      drafts = "Drafts";
-      sent = "Sent";
-      trash = "Trash";
-    };
-  };
-
-  "${mainMailbox}" = rec {
-    user = "kieran.meinhardt@posteo.net";
-    address = user;
-    password = lib.strings.fileContents <secrets/mail/posteo>;
-    imap = "posteo.de";
-    smtp = imap;
-    smtpSettings = smtp: "smtp://${smtp}";
-    folders = {
-      drafts = "Drafts";
-      sent = "Sent";
-      trash = "Trash";
-    };
-  };
-
-  google-amro = rec {
-    user = "amroplay@gmail.com";
-    address = user;
-    password = lib.strings.fileContents <secrets/mail/gmail/amroplay>;
-    imap = "imap.gmail.com";
-    smtp = "smtp.gmail.com";
-    smtpSettings = smtp: "smtps://${smtp}:465";
-    folders = {
-      drafts = "[Gmail]/Drafts";
-      sent = "[Gmail]/Sent Mail";
-      trash = "[Gmail]/Bin";
-    };
-  };
-
-  google-kieran = rec {
-    user = "kieran.meinhardt@gmail.com";
-    address = user;
-    password = lib.strings.fileContents <secrets/mail/gmail/kieran.meinhardt>;
-    imap = "imap.gmail.com";
-    smtp = "smtp.gmail.com";
-    smtpSettings = smtp: "smtps://${smtp}:465";
-    folders = {
-      drafts = "[Gmail]/Entwürfe";
-      sent = "[Gmail]/Gesendet";
-      trash = "[Gmail]/Papierkorb";
-    };
-  };
-}
--- a/lib/external-network.nix
+++ b/lib/external-network.nix
@@ -1,4 +0,0 @@
-{
-  ful = "130.61.217.114";
-  makanek = "88.99.83.173";
-}
--- a/lib/home.nix
+++ b/lib/home.nix
@@ -1,2 +0,0 @@
-# https://github.com/hercules-ci/gitignore.nix/pull/58/files
-path: ~/. + path
--- a/lib/i3status-rust.nix
+++ b/lib/i3status-rust.nix
@@ -8,10 +8,19 @@

  setsid = script:
    pkgs.writers.writeDash "setsid-command" ''
-      ${pkgs.util-linux}/bin/setsid ${script}
+      ${pkgs.utillinux}/bin/setsid ${script}
    '';
-
-  accounts = import <niveum/lib/email.nix> {inherit lib;};
+  coronaBlock = {
+    block = "custom";
+    interval = 60 * 2; # every two minutes
+    command = pkgs.writers.writeDash "corona" ''
+      ${pkgs.curl}/bin/curl https://corona-stats.online/germany \
+        | ${pkgs.gnugrep}/bin/grep Germany \
+        | ${pkgs.gnused}/bin/sed 's/\s*//g' \
+        | ${pkgs.ansifilter}/bin/ansifilter \
+        | ${pkgs.gawk}/bin/awk -F'│' '{print "🤒 " $8 " 💀 " $5}'
+    '';
+  };
 in {
  theme = {
    name = "plain";
@@ -19,24 +28,62 @@ in {
      critical_fg = colours.red.bright;
      good_fg = colours.green.bright;
      idle_fg = colours.foreground;
-      info_fg = colours.cyan.bright;
+      info_fg = colours.foreground;
      warning_fg = colours.yellow.bright;
      warning_bg = colours.background;
      alternating_tint_bg = colours.background;
-      alternating_tint_fg = colours.foreground;
+      alternating_tint_fg = colours.background;
      critical_bg = colours.background;
      good_bg = colours.background;
      idle_bg = colours.background;
      info_bg = colours.background;
-      separator = "";
+      separator = "/ ";
      separator_bg = "auto";
      separator_fg = colours.black.bright;
    };
  };
-  icons.name = "awesome6";
-  icons.overrides.rss = "";
-  icons.overrides.vpn = "";
-  icons.overrides.irc = "";
+  icons = {
+    name = "none";
+    overrides = {
+      bat = "🔋";
+      bat_charging = "🔌";
+      bat_discharging = "🔋";
+      bat_empty = " ";
+      bat_full = " ";
+      bat_half = " ";
+      bat_quarter = " ";
+      bat_three_quarters = " ";
+      cogs = "🚦 ";
+      cpu = "🖥 ";
+      disk_drive = "💽";
+      mail = "📧 ";
+      memory_mem = "🧠 ";
+      music = "🎵";
+      music_next = "⏭";
+      music_pause = "";
+      music_play = "▶";
+      music_prev = "⏮";
+      net_down = "❎";
+      net_up = "🌐";
+      net_vpn = "🛡 ";
+      net_wired = "🌐";
+      net_wireless = "📶";
+      pomodoro = "🍅 ";
+      time = "📅 ";
+      toggle_off = "👎";
+      toggle_on = "👍";
+      volume_empty = "🔈 ";
+      volume_full = "🔊 ";
+      volume_half = "🔉 ";
+      volume_muted = "🔇";
+      weather_clouds = "🌥";
+      weather_default = "🌡";
+      weather_rain = "🌧";
+      weather_snow = "🌨";
+      weather_sun = "🌣";
+      weather_thunder = "🌩";
+    };
+  };
  block = [
    {
      block = "weather";
@@ -64,109 +111,35 @@ in {
          import astral.moon
          import astral.sun

+          moon_phases = {
+            0: "🌑",
+            3.5: "🌒",
+            7: "🌓",
+            10.5: "🌔",
+            14: "🌕",
+            17.5: "🌖",
+            21: "🌗",
+            24.5: "🌘",
+            28: "🌑",
+          }
          current_phase = astral.moon.phase()
+          closest_phase = min(moon_phases.keys(), key=lambda x: abs(current_phase - x))

          city = astral.LocationInfo("Berlin", "Germany", "${spacetime.time.timeZone}", ${toString spacetime.location.latitude}, ${toString spacetime.location.longitude})
          sun = astral.sun.sun(city.observer, date=astral.today(), tzinfo=city.timezone)

-          print("↑{} ↓{} {}{}".format(sun["sunrise"].strftime("%R"), sun["sunset"].strftime("%R"), "☽" if current_phase < 14 else "☾", round(current_phase, 1)))
+          print("🌅 {} 🌇 {} {} {}".format(sun["sunrise"].strftime("%R"), sun["sunset"].strftime("%R"), moon_phases[closest_phase], round(current_phase, 1)))
        '';
    }
-    {
-      block = "github";
-      info = ["total"];
-      warning = ["mention" "review_requested" "team_mention" "manual" "invitation" "assign" "subscribed"];
-    }
-    {
-      block = "custom";
-      interval = 10;
-      command = "newsboat-unread-count";
-      json = true;
-    }
-    {
-      block = "custom";
-      interval = 10;
-      command = pkgs.writers.writeDash "todo" ''
-        ${pkgs.todoman}/bin/todo --porcelain | ${pkgs.jq}/bin/jq -r '
-          map(select(.due != null))
-          | (map(select(.due < now)) | length) as $overdue
-          | (map(select(.due >= now and .due < now + (60 * 60 * 24))) | length) as $dueToday
-          | {
-            icon: "tasks",
-            text: (($overdue + $dueToday) as $sum | if $sum > 0 then $sum | tostring else "" end),
-            state: (
-              if $overdue > 0 then
-                "Critical"
-              elif $dueToday > 0 then
-                "Warning"
-              else
-                "Idle"
-              end
-            )
-          }
-        '
-      '';
-      json = true;
-      hide_when_empty = true;
-    }
-    {
-      block = "custom";
-      interval = 60 * 5;
-      command = let
-        query-account = name: account: "${pkgs.writers.writeDash "query-imap-${name}" ''
-          ${pkgs.coreutils}/bin/timeout 1 ${pkgs.curl}/bin/curl -sSL -u ${lib.escapeShellArg "${account.user}:${account.password}"} imaps://${account.imap} -X 'STATUS INBOX (UNSEEN)' \
-            | ${pkgs.gnugrep}/bin/grep -Eo '[0-9]+' \
-            | sed 's/^/{"${name}":/;s/$/}/'
-        ''} &";
-      in
-        pkgs.writers.writeDash "unread-mail" ''
-          {
-            ${lib.concatStringsSep "\n" (lib.mapAttrsToList query-account accounts)}
-            wait
-          } | jq -s 'if length == 0 then {text: "", icon: "mail", state: "Idle"} else
-            add
-            | (values | add) as $sum
-            | {
-              text: (if $sum > 0 then $sum | tostring else "" end),
-              icon: "mail",
-              state: (
-                if .uni > 0 or .["work-uni"] > 0 or .posteo > 0 then
-                  "Warning"
-                elif $sum > 0 then
-                  "Info"
-                else
-                  "Idle"
-                end
-              )
-            } end'
-        '';
-      json = true;
-      hide_when_empty = true;
-    }
-    {
-      block = "custom";
-      interval = 60;
-      command = pkgs.writers.writeDash "weechat" ''
-        ssh -o ConnectTimeout=1 makanek cat /var/lib/weechat/hotlist.txt | sed 's/,/\n/g' | wc -l | jq '{
-          text: (if . > 0 then . | tostring else "" end),
-          state: (if . > 0 then "Info" else "Idle" end),
-          icon: "irc"
-        }'
-      '';
-      json = true;
-      hide_when_empty = true;
-    }
    {
      block = "custom";
      interval = 5;
      command = pkgs.writers.writeDash "hu-berlin-vpn" ''
        PATH=${lib.makeBinPath [pkgs.systemd]}
-        (systemctl is-active --quiet openvpn-hu-berlin.service && echo '{"state": "Good", "text": "OpenVPN", "icon": "vpn"}') \
-          || (systemctl is-active --quiet hu-vpn.service && echo '{"state": "Good", "text": "PPP+SSL", "icon": "vpn"}') \
-          || echo '{"state": "Idle", "icon": "vpn", "text": ""}'
+        (systemctl is-active --quiet openvpn-hu-berlin.service && echo "🎓👍 (OpenVPN)") \
+          || (systemctl is-active --quiet hu-vpn.service && echo "🎓👍 (PPP+SSL)") \
+          || echo "🎓👎"
      '';
-      json = true;
-      hide_when_empty = true;
    }
    {
      block = "net";
@@ -193,35 +166,9 @@ in {
    }
    {block = "load";}
    {
-      block = "custom";
+      block = "time";
      interval = 1;
-      json = true;
-      command = pkgs.writers.writeDash "time" ''
-        ${pkgs.jq}/bin/jq -n \
-          --arg now "$(${pkgs.coreutils}/bin/date +'%Y-%m-%d (%W %a) %H:%M')" \
-          --argjson nextEvent "$(
-            ${pkgs.khal}/bin/khal list --format "{start}" --day-format "" $(${pkgs.coreutils}/bin/date +'%Y-%m-%d %H:%M') 2>/dev/null \
-            | ${pkgs.gnugrep}/bin/grep -E '[0-9]{2}:[0-9]{2}' \
-            | ${pkgs.coreutils}/bin/head -1 \
-            | ${pkgs.coreutils}/bin/date --date="$(cat)" +%s
-          )" \
-          '{
-            text: $now,
-            icon: "time",
-            state: (
-              ($nextEvent - now) as $deltaT
-              | if $deltaT < (5 * 60) then
-                "Critical"
-              elif $deltaT < (15 * 60) then
-                "Warning"
-              elif $deltaT < (60 * 60) then
-                "Info"
-              else
-                "Idle"
-              end
-            )
-          }'
-      '';
+      format = "%Y-%m-%d (%W %a) %H:%M";
    }
  ];
 }
--- a/lib/radio-news.html
+++ b/lib/radio-news.html
@@ -47,7 +47,7 @@
      }
    </style>
    <script>
-      const newsEndpoint = "http://radio-news.r";
+      const newsEndpoint = "http://prism.r:7999";

      function isoString(date) {
        return date.toISOString().slice(0, -5) + "Z";
@@ -75,19 +75,15 @@

              const startDate = document.createElement("time");
              startDate.className = "start";
-              startDate.title = isoString(start);
+              startDate.title = start.toString();
              startDate.setAttribute("datetime", isoString(start));
-              startDate.appendChild(
-                document.createTextNode(start.toLocaleString())
-              );
+              startDate.appendChild(document.createTextNode(isoString(start)));

              const endDate = document.createElement("time");
              endDate.className = "end";
-              endDate.title = isoString(end);
+              endDate.title = end.toString();
              endDate.setAttribute("datetime", isoString(end));
-              endDate.appendChild(
-                document.createTextNode(end.toLocaleString())
-              );
+              endDate.appendChild(document.createTextNode(isoString(end)));

              li.appendChild(document.createTextNode(newsItem.text));
              li.appendChild(startDate);
@@ -115,23 +111,7 @@
        location.reload();
      }

-      const pad2 = (int) => (int < 10 ? `0${int}` : int.toString());
-
-      const localIsoString = (date) =>
-        `${date.getFullYear()}-${pad2(date.getMonth() + 1)}-${pad2(
-          date.getDate()
-        )}T${pad2(date.getHours())}:${pad2(date.getMinutes())}`;
-
-      function setDate() {
-        let now = new Date();
-        document.getElementById("time-from").value = localIsoString(now);
-
-        now.setHours(now.getHours() + 1);
-        document.getElementById("time-to").value = localIsoString(now);
-      }
-
      window.onload = () => {
-        setDate();
        setNextNews();
        fetchNews();
      };
@@ -142,10 +122,10 @@
      <section>
        <h1>Submit news</h1>
        <form onsubmit="sendNews(event)">
-          <label>Start time</label>
-          <input type="datetime-local" id="time-from" name="from" required />
-          <label>End time</label>
-          <input type="datetime-local" id="time-to" name="to" required />
+          <label>Start date</label>
+          <input type="datetime-local" name="from" required />
+          <label>End date</label>
+          <input type="datetime-local" name="to" required />
          <label>News text</label>
          <textarea name="text" rows="10" required></textarea>
          <input type="submit" />
--- a/lib/retiolum-network.nix
+++ b/lib/retiolum-network.nix
@@ -4,11 +4,6 @@
    ipv6 = "42:0:3c46:861f:a118:8e9a:82c9:3d";
  };

-  ful = {
-    ipv4 = "10.243.2.107";
-    ipv6 = "42:0:3c46:2c8b:a564:1213:9fb4:1bc4";
-  };
-
  zaatar = {
    ipv4 = "10.243.2.34";
    ipv6 = "42:0:3c46:156e:10b6:3bd6:6e82:b2cd";
@@ -23,10 +18,7 @@
    ipv4 = "10.243.2.85";
    ipv6 = "42:0:3c46:ac99:ae36:cb8:c551:ba27";
  };
-  tabula = {
-    ipv4 = "10.243.2.78";
-    ipv6 = "";
-  };
+
  tahina = {
    ipv4 = "10.243.2.74";
    ipv6 = "42:0:3c46:2923:1c90:872:edd6:306";
--- a/lib/streams.nix
+++ b/lib/streams.nix
--- a/lib/vim/init.vim
+++ b/lib/vim/init.vim
@@ -7,7 +7,7 @@ nnoremap <C-p> :FZF<CR>
 nnoremap <C-l> :Rg<CR>
 let g:fzf_layout = { 'down': '~15%' }

-colorscheme dim
+colorscheme paramount
 " transparent background
 hi Normal guibg=NONE ctermbg=NONE

@@ -73,7 +73,6 @@ let g:netrw_altv=1 " open splits to the right
 let g:netrw_liststyle=3 " tree view
 let g:netrw_list_hide=netrw_gitignore#Hide()
 let g:netrw_list_hide.=',\(^\|\s\s\)\zs\.\S\+'
-let g:netrw_winsize = 25

 call matchadd('colorcolumn', '\%101v', 100)
 highlight colorcolumn ctermbg=red
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./constants.nix
+    ./dropbox.nix
+    ./retiolum.nix
+  ];
+}
--- a/modules/passport.nix
+++ b/modules/passport.nix
@@ -1,135 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  cfg = config.niveum.passport;
-  sortOn = a: lib.sort (as1: as2: lib.lessThan (lib.getAttr a as1) (lib.getAttr a as2));
-  css = ''
-    body {
-      margin: 0;
-      font-family: "Fira Sans Condensed", sans-serif;
-    }
-
-    main {
-      margin: 0 auto;
-      display: grid;
-      grid-template-columns: 1fr 3fr;
-      grid-gap: 2em;
-    }
-    @media only screen and (max-width: 768px) {
-      main {
-        grid-template-columns: 1fr;
-      }
-    }
-
-    footer, section {
-      padding: 1em;
-    }
-
-    footer {
-      text-align: center;
-    }
-
-    dl {
-      border: 3px double #ccc;
-      padding: 0.5em;
-    }
-    dt {
-      float: left;
-      clear: left;
-      width: 200px;
-      text-align: right;
-      font-weight: bold;
-      margin-right: 1em;
-      margin-bottom: 1em;
-    }
-    dd {
-      margin: 0 0 0 110px;
-      padding: 0 0 0.5em 0;
-      margin-bottom: 1em;
-    }
-  '';
-in
-  with lib; {
-    options.niveum.passport = {
-      enable = mkEnableOption "server passport";
-
-      introductionHTML = mkOption {type = types.str;};
-
-      virtualHost = mkOption {
-        type = types.str;
-      };
-
-      services = mkOption {
-        type = types.listOf (types.submodule {
-          options = {
-            title = mkOption {type = types.str;};
-            link = mkOption {
-              type = types.nullOr types.str;
-              default = null;
-            };
-            description = mkOption {
-              type = types.str;
-              default = "";
-            };
-          };
-        });
-        default = [];
-      };
-    };
-
-    config = mkIf cfg.enable {
-      services.nginx.enable = true;
-
-      services.nginx.virtualHosts."${cfg.virtualHost}".locations."/passport".extraConfig = ''
-        default_type "text/html";
-        root ${
-          pkgs.linkFarm "www" [
-            {
-              name = "passport/index.html";
-              path = pkgs.writeText "index.html" ''
-                <!doctype html>
-                <head>
-                  <meta charset="utf-8">
-                  <meta name="viewport" content="width=device-width, initial-scale=1">
-                  <title>${config.networking.hostName} passport</title>
-                  <style>${css}</style>
-                </head>
-                <body>
-                  <main>
-                    <section id="server">
-                    <h1>${config.networking.hostName}</h1>
-                    ${cfg.introductionHTML}
-                    </section>
-
-                    <section id="services">
-                    <h2>Services</h2>
-                    <dl>
-                    ${lib.strings.concatMapStringsSep "\n" (service: ''
-                  <dt>
-                  ${lib.optionalString (service.link != null) "<a href=\"${service.link}\">"}
-                  ${service.title}
-                  ${lib.optionalString (service.link != null) "</a>"}
-                  </dt>
-                  <dd>
-                  ${service.description}
-                  </dd>
-                '') (sortOn "title" cfg.services)}
-                    </dl>
-                    </section>
-                  </main>
-
-                  <footer>
-                    <tt>${config.networking.hostName}</tt> is part of the <i><a href="https://github.com/kmein/niveum/tree/master/systems/${config.networking.hostName}">niveum</a></i> network.
-                  </footer>
-                </body>
-              '';
-            }
-          ]
-        };
-        index index.html;
-      '';
-    };
-  }
--- a/modules/telegram-bot.nix
+++ b/modules/telegram-bot.nix
@@ -13,14 +13,14 @@ with lib; let
      startAt = bot.time;
      serviceConfig.Type = "oneshot";
      wants = ["network-online.target"];
-      script = strings.concatStringsSep "\n" (["QUOTE=$(${bot.command})" "if [ -n \"$QUOTE\" ]; then" "echo $QUOTE >&2"]
+      script = strings.concatStringsSep "\n" (["QUOTE=$(${bot.command})" "if [ -n \"$QUOTE\" ]; then"]
        ++ map (chatId: ''
-          ${pkgs.curl}/bin/curl -X POST "https://api.telegram.org/bot${bot.token}/sendMessage" \
+          ${pkgs.curl}/bin/curl -s -X POST "https://api.telegram.org/bot${bot.token}/sendMessage" \
            -d chat_id="${chatId}" \
            -d text="$QUOTE" ${
            lib.strings.optionalString (bot.parseMode != null)
            "-d parse_mode=${bot.parseMode}"
-          } | ${pkgs.jq}/bin/jq -e .ok
+          }
        '')
        bot.chatIds
        ++ ["fi"]);
--- a/packages/devanagari/devanagari.js
+++ b/packages/devanagari/devanagari.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 const { createInterface } = require("readline");
-const Sanscript = require("@indic-transliteration/sanscript");
+const Sanscript = require("@sanskrit-coders/sanscript");

 const rl = createInterface({
  input: process.stdin,
@@ -9,9 +9,5 @@ const rl = createInterface({
 });

 rl.on("line", (line) => {
-  console.log(
-    Sanscript.t(line, "hk", "devanagari")
-      .replace(/\.\./g, "॥")
-      .replace(/[,.]/g, "।")
-  );
+  console.log(Sanscript.t(line, "hk", "devanagari"));
 });
--- a/packages/devanagari/package.json
+++ b/packages/devanagari/package.json
@@ -5,6 +5,6 @@
  "bin": "devanagari.js",
  "author": "kmein",
  "devDependencies": {
-    "@indic-transliteration/sanscript": "^1.2.7"
+    "@sanskrit-coders/sanscript": "^1.1.5"
  }
 }
--- a/packages/devanagari/yarn.lock
+++ b/packages/devanagari/yarn.lock
@@ -2,20 +2,7 @@
 # yarn lockfile v1


-"@indic-transliteration/common_maps@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@indic-transliteration/common_maps/-/common_maps-1.0.0.tgz#c1f1c893ae49e01fe498ef1877bdd0153bc90b42"
-  integrity sha512-NUza2GKxc6/0YiWWew3qsFenEgksnFSZWvNGqyyKYnII9wZS/U+w1jY/yYN9aR+foA/rPymvckM2/hKv9Ow2dQ==
-
-"@indic-transliteration/sanscript@^1.2.7":
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/@indic-transliteration/sanscript/-/sanscript-1.2.7.tgz#c07aaa979f6d60fb0bbf35cdbd1d3bb1c487d931"
-  integrity sha512-Jm5z+wWxMUlw6dGHK7BHQUBjRnVHmfidmB7NiTbkdKPP89BDOB16zIKvXZY5XTsvkXmcyqF+DbJqiB9zzUhDKA==
-  dependencies:
-    "@indic-transliteration/common_maps" "^1.0.0"
-    toml "^2.3.6"
-
-toml@^2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/toml/-/toml-2.3.6.tgz#25b0866483a9722474895559088b436fd11f861b"
-  integrity sha512-gVweAectJU3ebq//Ferr2JUY4WKSDe5N+z0FvjDncLGyHmIDoxgY/2Ie4qfEIDm4IS7OA6Rmdm7pdEEdMcV/xQ==
+"@sanskrit-coders/sanscript@^1.1.5":
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/@sanskrit-coders/sanscript/-/sanscript-1.1.5.tgz#a22222cf7a5d55f7b19e210242c59f6f819fd643"
+  integrity sha512-YA7MchP2CD2JnAOkj+ORDUFrISiPqx3muvhKvRO3KFOx9UfvpIdEUORoKWJ88lr1uH9T32jDxjns/MSclmDczA==
--- a/packages/gfs-fonts.nix
+++ b/packages/gfs-fonts.nix
@@ -39,15 +39,5 @@ in
      GFS_Pyrsos = "0y0dv7y3n01bbhhnczflx1zcc7by56cffmr2xqixj2rd1nvchx0j";
      GFS_Solomos = "1mpx9mw566awvfjdfx5sbz3wz5gbnjjw56gz30mk1lw06vxf0dxz";
      GFS_Theokritos = "0haasx819x8c8yvna6pqywgi4060av2570jm34cddnz1fgnhv1b8";
-      # Heraklit
-      # Galatea
-      # Georgiou
-      # Ambrosia
-      # Fleischman
-      # Eustace
-      # Nicefore
-      # Jackson
-      # Garaldus
-      # Ignacio
    };
  }
--- a/packages/jsesh.nix
+++ b/packages/jsesh.nix
@@ -1,7 +0,0 @@
-{pkgs ? import <nixpkgs> {}}:
-pkgs.writers.writeDashBin "jsesh" ''
-  ${pkgs.jre}/bin/java -jar ${pkgs.fetchzip {
-    url = "https://github.com/rosmord/jsesh/releases/download/release-7.5.5/JSesh-7.5.5.zip";
-    sha256 = "1z7ln51cil9pypz855x9a8p9ip2aflvknh566wcaah1kmz3fp57r";
-  }}/lib/jseshAppli-7.5.5.jar
-''
--- a/packages/man/pandoc.nix
+++ b/packages/man/pandoc.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
  src = fetchgit {
    url = "https://github.com/jgm/pandoc";
    rev = pandoc.version;
-    sha256 = "sha256-8mkHbHoXrkgcXZ/rYlVh2fhL12WjcTt97a1W+oYVYOs=";
+    sha256 = "0s4mczbql35wh6bhyi542yln24f530rlsw6akcv7lmp083rrlpy4";
  };
  buildPhase = ''
    mkdir -p $out/man/man1
--- a/packages/opustags.nix
+++ b/packages/opustags.nix
@@ -2,7 +2,7 @@
  lib,
  stdenv,
  cmake,
-  pkg-config,
+  pkgconfig,
  libogg,
  fetchFromGitHub,
 }:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {

  buildInputs = [libogg];

-  nativeBuildInputs = [cmake pkg-config];
+  nativeBuildInputs = [cmake pkgconfig];

  meta = with lib; {
    homepage = "https://github.com/fmang/opustags";
--- a/packages/rusty-jeep.nix
+++ b/packages/rusty-jeep.nix
@@ -1,31 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
-  pkg-config,
-  alsa-lib,
-}:
-rustPlatform.buildRustPackage {
-  pname = "rusty-jeep";
-  version = "1.0.0";
-
-  src = let
-    repo = fetchFromGitHub {
-      owner = "kmein";
-      repo = "scripts";
-      rev = "c8e80b34c08e427f83b6af19a361e8c0711a4e6c";
-      sha256 = "18jlf9zkhni4jsvzrlkkllqvv5dkhjmilggcchbs32hr1km51q84";
-    };
-  in "${repo}/rusty-jeep";
-
-  nativeBuildInputs = [pkg-config];
-  buildInputs = [alsa-lib];
-
-  cargoHash = "sha256-8qbYTqRk+4InJNX6xK95VxISamDb5KID+wbmUDJYJ94=";
-
-  meta = with lib; {
-    description = "A beeping program inspired by K_belwagen";
-    license = licenses.wtfpl;
-    maintainers = [maintainers.kmein];
-  };
-}
--- a/packages/scripts/avesta.sed
+++ b/packages/scripts/avesta.sed
@@ -1,54 +0,0 @@
-#!/usr/bin/env -S sed -f
-s/ā̊/𐬃/g
-s/t̰/𐬝/g
-s/ṣ̌/𐬴/g
-s/š́/𐬳/g
-s/ą̄/𐬅/g
-s/ŋᵛ/𐬤/g
-s/ə̄/𐬇/g
-s/ŋ́/𐬣/g
-s/x́/𐬒/g
-s/xᵛ/𐬓/g
-s/a/𐬀/g
-s/ā/𐬁/g
-s/å/𐬂/g
-s/ą/𐬄/g
-s/ə/𐬆/g
-s/e/𐬈/g
-s/ē/𐬉/g
-s/o/𐬊/g
-s/ō/𐬋/g
-s/i/𐬌/g
-s/ī/𐬍/g
-s/u/𐬎/g
-s/ū/𐬏/g
-s/k/𐬐/g
-s/x/𐬑/g
-s/g/𐬔/g
-s/ġ/𐬕/g
-s/γ/𐬖/g
-s/c/𐬗/g
-s/j/𐬘/g
-s/t/𐬙/g
-s/θ/𐬚/g
-s/d/𐬛/g
-s/δ/𐬜/g
-s/p/𐬞/g
-s/f/𐬟/g
-s/b/𐬠/g
-s/β/𐬡/g
-s/ŋ/𐬢/g
-s/n/𐬥/g
-s/ń/𐬦/g
-s/ṇ/𐬧/g
-s/m/𐬨/g
-s/m̨/𐬩/g
-s/ẏ/𐬫/g
-s/y/𐬪/g
-s/v/𐬬/g
-s/r/𐬭/g
-s/s/𐬯/g
-s/z/𐬰/g
-s/š/𐬱/g
-s/ž/𐬲/g
-s/h/𐬵/g
--- a/packages/scripts/default.nix
+++ b/packages/scripts/default.nix
@@ -33,25 +33,6 @@ in
      name = "instaget";
    };

-    alarm = let
-      rusty-jeep = pkgs.callPackage ../rusty-jeep.nix {};
-    in
-      pkgs.writers.writeDashBin "alarm" ''
-        export PATH=${lib.makeBinPath [pkgs.coreutils pkgs.bc rusty-jeep]}
-        for i in `seq 8000 1000 10000`; do
-          echo $i 100
-        done | rusty-jeep
-        echo 'if you heard that sound, then goto sleep..^_^'
-
-        echo sleep "$@"
-        sleep "$@"
-
-        echo 'wake up!'
-        while :; do
-          echo $(echo "($(od -tu -An -N 2 /dev/urandom)%1000)+500"|bc) $(echo "($(od -tu -An -N 2 /dev/urandom)%500)+100"|bc)
-        done | rusty-jeep 1
-      '';
-
    infschmv = pkgs.writers.writeDashBin "InfSchMV" ''
      ${pkgs.curl}/bin/curl -sSL https://www.berlin.de/corona/massnahmen/verordnung/ \
        | ${pkgs.pup}/bin/pup .textile \
@@ -115,7 +96,7 @@ in
        rm "$file"
      }
      ${pkgs.qrencode}/bin/qrencode "$(${pkgs.xclip}/bin/xclip -selection clipboard -out)" -o "$file"
-      ${pkgs.nsxiv}/bin/nsxiv "$file"
+      ${pkgs.sxiv}/bin/sxiv "$file"
    '';

    ttspaste = pkgs.writers.writeDashBin "ttspaste" ''
@@ -136,13 +117,13 @@ in
      '';

    tag = wrapScript {
-      packages = [pkgs.vorbis-tools pkgs.python3Packages.eyeD3 opustags];
+      packages = [pkgs.vorbisTools pkgs.python3Packages.eyeD3 opustags];
      script = "${voidrice}/.local/bin/tag";
      name = "tag";
    };

    meteo = wrapScript {
-      packages = [pkgs.jq pkgs.curl pkgs.xdotool pkgs.nsxiv pkgs.gnused];
+      packages = [pkgs.jq pkgs.curl pkgs.xdotool pkgs.sxiv pkgs.gnused];
      script = ./meteo.sh;
      name = "meteo";
    };
@@ -297,6 +278,12 @@ in
      name = "nix-git";
    };

+    linkhandler = wrapScript {
+      packages = [pkgs.utillinux pkgs.mpv pkgs.curl pkgs.gnused pkgs.sxiv pkgs.ts];
+      script = "${voidrice}/.local/bin/linkhandler";
+      name = "linkhandler";
+    };
+
    mansplain = wrapScript {
      packages = [pkgs.man pkgs.zathura pkgs.dmenu pkgs.gnused];
      script = ./mansplain.sh;
@@ -320,14 +307,19 @@ in
      packages = [pkgs.xdo];
    };

-    ipa = wrapScript {
-      script = ./ipa.py;
-      name = "ipa";
-      packages = [pkgs.python3];
-    };
+    ipa =
+      pkgs.writers.writeHaskellBin "ipa" {
+        libraries = with pkgs; [haskellPackages.text haskellPackages.ipa];
+      } ''
+        import Data.Maybe (fromJust)
+        import Language.IPA
+        import qualified Data.Text as T
+        import qualified Data.Text.IO as T
+        main = T.interact (T.unwords . map (unIPA . fromJust . (xSampaToIpa =<<) . mkXSampa) . T.words)
+      '';

    default-gateway = pkgs.writers.writeDashBin "default-gateway" ''
-      ${pkgs.iproute2}/bin/ip -json route | ${pkgs.jq}/bin/jq --raw-output '.[0].gateway'
+      ${pkgs.iproute}/bin/ip -json route | ${pkgs.jq}/bin/jq --raw-output '.[0].gateway'
    '';

    betacode =
@@ -446,7 +438,7 @@ in
    scanned = pkgs.writers.writeDashBin "scanned" ''
      [ $# -eq 1 -a -f "$1" -a -r "$1" ] || exit 1

-      ${pkgs.imagemagick}/bin/convert -density 150 "$1" -rotate 0.5 -attenuate 0.25 +noise Multiplicative -colorspace Gray "scanned-$1"
+      ${pkgs.imagemagick}/bin/convert -density 150 "$1" -colorspace gray -linear-stretch 3.5%x10% -blur 0x0.5 -attenuate 0.25 +noise Gaussian "scanned-$1"
    '';

    nix-index-update = pkgs.writers.writeDashBin "nix-index-update" ''
@@ -458,22 +450,6 @@ in
      ln -f $filename files
    '';

-    heuretes = let
-      database = pkgs.fetchurl {
-        url = "http://c.krebsco.de/greek.csv";
-        hash = "sha256-SYL10kerNI0HzExG6JXh765+CBBCHLO95B6OKErQ/sU=";
-      };
-    in
-      pkgs.writers.writeDashBin "heuretes" ''
-        ${pkgs.xsv}/bin/xsv search -s simple "^$*$" ${database} | ${pkgs.xsv}/bin/xsv table
-      '';
-
-    # https://nitter.net/igor_chubin/status/1557793569104183298
-    stackoverflow = pkgs.writers.writeDashBin "so" ''
-      IFS=+
-      ${pkgs.curl}/bin/curl -sSL http://cht.sh/"$*"
-    '';
-
    rofi-hass = pkgs.writers.writeBashBin "rofi-hass" ''
      export PATH=${lib.makeBinPath [pkgs.home-assistant-cli pkgs.jq pkgs.util-linux pkgs.rofi pkgs.gnused pkgs.libnotify]}
      json=$(hass-cli -o json state list 2>/dev/null)
--- a/packages/scripts/horoscope/poetry.lock
+++ b/packages/scripts/horoscope/poetry.lock
@@ -1,17 +1,17 @@
 [[package]]
 name = "click"
-version = "8.1.3"
+version = "8.0.3"
 description = "Composable command line interface toolkit"
 category = "main"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.6"

 [package.dependencies]
 colorama = {version = "*", markers = "platform_system == \"Windows\""}

 [[package]]
 name = "colorama"
-version = "0.4.5"
+version = "0.4.4"
 description = "Cross-platform colored terminal text."
 category = "main"
 optional = false
@@ -30,11 +30,11 @@ pyswisseph = "2.08.00-1"

 [[package]]
 name = "numpy"
-version = "1.23.1"
+version = "1.21.1"
 description = "NumPy is the fundamental package for array computing with Python."
 category = "main"
 optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.7"

 [[package]]
 name = "pyswisseph"
@@ -72,10 +72,56 @@ python-versions = "^3.8"
 content-hash = "657742383232643f2fa13df5686de0cc79c624f9ae9bdb2f0fc96c7a94b5b8bf"

 [metadata.files]
-click = []
-colorama = []
-flatlib = []
-numpy = []
-pyswisseph = []
-pytz = []
-timezonefinder = []
+click = [
+    {file = "click-8.0.3-py3-none-any.whl", hash = "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3"},
+    {file = "click-8.0.3.tar.gz", hash = "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b"},
+]
+colorama = [
+    {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
+    {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
+]
+flatlib = [
+    {file = "flatlib-0.2.3-py3-none-any.whl", hash = "sha256:c846d83c965db7588581bb65ac9a6668b9a190afcad5027269f7e9c75f467bcd"},
+    {file = "flatlib-0.2.3.tar.gz", hash = "sha256:46cc956b936aa31a96082cff23448a5c27dd6e5e434a6293bc9265336c00dd5d"},
+]
+numpy = [
+    {file = "numpy-1.21.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:38e8648f9449a549a7dfe8d8755a5979b45b3538520d1e735637ef28e8c2dc50"},
+    {file = "numpy-1.21.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:fd7d7409fa643a91d0a05c7554dd68aa9c9bb16e186f6ccfe40d6e003156e33a"},
+    {file = "numpy-1.21.1-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a75b4498b1e93d8b700282dc8e655b8bd559c0904b3910b144646dbbbc03e062"},
+    {file = "numpy-1.21.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1412aa0aec3e00bc23fbb8664d76552b4efde98fb71f60737c83efbac24112f1"},
+    {file = "numpy-1.21.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e46ceaff65609b5399163de5893d8f2a82d3c77d5e56d976c8b5fb01faa6b671"},
+    {file = "numpy-1.21.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:c6a2324085dd52f96498419ba95b5777e40b6bcbc20088fddb9e8cbb58885e8e"},
+    {file = "numpy-1.21.1-cp37-cp37m-win32.whl", hash = "sha256:73101b2a1fef16602696d133db402a7e7586654682244344b8329cdcbbb82172"},
+    {file = "numpy-1.21.1-cp37-cp37m-win_amd64.whl", hash = "sha256:7a708a79c9a9d26904d1cca8d383bf869edf6f8e7650d85dbc77b041e8c5a0f8"},
+    {file = "numpy-1.21.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:95b995d0c413f5d0428b3f880e8fe1660ff9396dcd1f9eedbc311f37b5652e16"},
+    {file = "numpy-1.21.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:635e6bd31c9fb3d475c8f44a089569070d10a9ef18ed13738b03049280281267"},
+    {file = "numpy-1.21.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:4a3d5fb89bfe21be2ef47c0614b9c9c707b7362386c9a3ff1feae63e0267ccb6"},
+    {file = "numpy-1.21.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:8a326af80e86d0e9ce92bcc1e65c8ff88297de4fa14ee936cb2293d414c9ec63"},
+    {file = "numpy-1.21.1-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:791492091744b0fe390a6ce85cc1bf5149968ac7d5f0477288f78c89b385d9af"},
+    {file = "numpy-1.21.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0318c465786c1f63ac05d7c4dbcecd4d2d7e13f0959b01b534ea1e92202235c5"},
+    {file = "numpy-1.21.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:9a513bd9c1551894ee3d31369f9b07460ef223694098cf27d399513415855b68"},
+    {file = "numpy-1.21.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:91c6f5fc58df1e0a3cc0c3a717bb3308ff850abdaa6d2d802573ee2b11f674a8"},
+    {file = "numpy-1.21.1-cp38-cp38-win32.whl", hash = "sha256:978010b68e17150db8765355d1ccdd450f9fc916824e8c4e35ee620590e234cd"},
+    {file = "numpy-1.21.1-cp38-cp38-win_amd64.whl", hash = "sha256:9749a40a5b22333467f02fe11edc98f022133ee1bfa8ab99bda5e5437b831214"},
+    {file = "numpy-1.21.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:d7a4aeac3b94af92a9373d6e77b37691b86411f9745190d2c351f410ab3a791f"},
+    {file = "numpy-1.21.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d9e7912a56108aba9b31df688a4c4f5cb0d9d3787386b87d504762b6754fbb1b"},
+    {file = "numpy-1.21.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:25b40b98ebdd272bc3020935427a4530b7d60dfbe1ab9381a39147834e985eac"},
+    {file = "numpy-1.21.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:8a92c5aea763d14ba9d6475803fc7904bda7decc2a0a68153f587ad82941fec1"},
+    {file = "numpy-1.21.1-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:05a0f648eb28bae4bcb204e6fd14603de2908de982e761a2fc78efe0f19e96e1"},
+    {file = "numpy-1.21.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f01f28075a92eede918b965e86e8f0ba7b7797a95aa8d35e1cc8821f5fc3ad6a"},
+    {file = "numpy-1.21.1-cp39-cp39-win32.whl", hash = "sha256:88c0b89ad1cc24a5efbb99ff9ab5db0f9a86e9cc50240177a571fbe9c2860ac2"},
+    {file = "numpy-1.21.1-cp39-cp39-win_amd64.whl", hash = "sha256:01721eefe70544d548425a07c80be8377096a54118070b8a62476866d5208e33"},
+    {file = "numpy-1.21.1-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:2d4d1de6e6fb3d28781c73fbde702ac97f03d79e4ffd6598b880b2d95d62ead4"},
+    {file = "numpy-1.21.1.zip", hash = "sha256:dff4af63638afcc57a3dfb9e4b26d434a7a602d225b42d746ea7fe2edf1342fd"},
+]
+pyswisseph = [
+    {file = "pyswisseph-2.08.00-1.tar.gz", hash = "sha256:6b4818c0224d309c0b01f3c52df2432900dddcde345364408d99eafc9cdd1e71"},
+]
+pytz = [
+    {file = "pytz-2021.3-py2.py3-none-any.whl", hash = "sha256:3672058bc3453457b622aab7a1c3bfd5ab0bdae451512f6cf25f64ed37f5b87c"},
+    {file = "pytz-2021.3.tar.gz", hash = "sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326"},
+]
+timezonefinder = [
+    {file = "timezonefinder-5.2.0-py36.py37.py38-none-any.whl", hash = "sha256:4545533086eb25cd7ba10b97785059acbababf4577ab1b4d5c2ab56642eadfea"},
+    {file = "timezonefinder-5.2.0.tar.gz", hash = "sha256:a374570295a8dbd923630ce85f754e52578e288cb0a9cf575834415e84758352"},
+]
--- a/packages/scripts/meteo.sh
+++ b/packages/scripts/meteo.sh
@@ -69,8 +69,8 @@ curl -sSL \
    "http://wetterstationen.meteomedia.de/messnetz/vorhersagegrafik/$station.png" \
    -o "$cache"

-if window_id=$(xdotool search --name "^nsxiv - $cache$"); then
+if window_id=$(xdotool search --name "^sxiv - $cache$"); then
  xdotool key --window "$window_id" r
 else
-  nsxiv "$cache" &
+  sxiv "$cache" &
 fi
--- a/packages/scripts/mushakkil.sh
+++ b/packages/scripts/mushakkil.sh
@@ -1,6 +0,0 @@
-#!/bin/sh
-curl -sSL 'https://diac.alsharekh.org/Diac/DiacText' \
-  -H "Content-Type: application/json" \
-  --data-raw "$(jq --raw-input '{word: ., type: 1}')" \
-  --compressed \
-  | jq -r .diacWord
--- a/packages/scripts/pls.nix
+++ b/packages/scripts/pls.nix
@@ -39,12 +39,6 @@
    "make it stooop"
    "noooo"
  ];
-
-  messages.neutral = [
-    "meh"
-    "i have no opinion about this song"
-    "idk man"
-  ];
 in
  pkgs.writers.writeDashBin "pls" ''
    case "$1" in
@@ -56,9 +50,6 @@ in
        ${pkgs.curl}/bin/curl -sS -XPOST "${playlistAPI}/skip"
        echo ${lib.escapeShellArg (lib.concatStringsSep "\n" messages.bad)} | shuf -n1 | ${sendIRC}
      ;;
-      0|meh|neutral)
-        echo ${lib.escapeShellArg (lib.concatStringsSep "\n" messages.neutral)} | shuf -n1 | ${sendIRC}
-      ;;
      say|msg)
        shift
        echo "$@" | ${sendIRC}
--- a/Show More
+++ b/Show More