update menstruation-backend

go-webring: fix module
fix nixinate call
2026-03-16 18:21:07 +01:00 · 2025-10-02 23:16:57 +02:00 · 2025-10-02 19:33:46 +02:00 · 2025-10-02 19:33:46 +02:00 · 2025-10-02 18:34:23 +02:00 · 2025-10-02 18:34:10 +02:00
201 changed files with 8142 additions and 3494 deletions
--- a/.bin/fix-sd.sh
+++ b/.bin/fix-sd.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+set -xfu
+
+drive="$1"
+mountpoint="/media/sd-card-$(date +%s)"
+backup_directory="$(pwd)"
+
+trap clean EXIT
+clean() {
+  umount "$mountpoint"
+  rmdir "$mountpoint"
+  fsck.exfat "$drive"
+}
+
+filenames="$(fsck.exfat "$drive" 2>&1 | sed -nE "s/.* file '(.*?)' is not allocated.*/\1/p")"
+mkdir "$mountpoint"
+mount "$drive" "$mountpoint"
+
+echo "$filenames" | while read -r filename; do
+  find "$mountpoint" -type f -name "$filename" -exec mv {} "$backup_directory" \;
+done
--- a/.github/workflows/niveum.yml
+++ b/.github/workflows/niveum.yml
@@ -7,8 +7,33 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        system: [makanek,manakish,kabsa,zaatar,ful]
+        system: [makanek,manakish,kabsa,zaatar,ful,fatteh]
    steps:
-    - uses: actions/checkout@v2
-    - uses: cachix/install-nix-action@v16
-    - run: nix run .?submodules=1#apps.nixinate.${{matrix.system}}-dry-run
+    - uses: actions/checkout@v3
+    - name: Install QEMU (ARM)
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y qemu-user-static
+      if: ${{ matrix.system == 'ful' }}
+    - name: Install Nix (ARM)
+      uses: cachix/install-nix-action@v16
+      if: ${{ matrix.system == 'ful' }}
+      with:
+        extra_nix_config: |
+          system = aarch64-linux
+    - name: Install Nix (x86_64)
+      uses: cachix/install-nix-action@v16
+      if: ${{ matrix.system != 'ful' }}
+    - name: nixos-rebuild dry-build
+      run: |
+        # remove secrets: ref https://stackoverflow.com/questions/1260748/how-do-i-remove-a-submodule/36593218
+        git submodule deinit -f secrets
+        rm -rf .git/modules/secrets
+        git rm -f secrets
+
+        # recreate secrets
+        mkdir secrets
+        cat secrets.txt | while read -r path; do touch $path; done
+        git add secrets
+
+        nix run nixpkgs#nixos-rebuild -- dry-build  --flake $GITHUB_WORKSPACE#${{matrix.system}}
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # niveum

+> I must Create a System, or be enslav'd by another Man's. —William Blake
+
 > [nĭvĕus](https://logeion.uchicago.edu/niveus), a, um, adj. [nix], _of_ or _from snow, snowy, snow-_ (poet.)
 >
 > 1. Lit.: aggeribus niveis informis, Verg. G. 3, 354: aqua, _cooled with snow_, Mart. 12, 17, 6; cf. id. 14, 104 and 117: mons, _covered with snow_, Cat. 64, 240.—
@@ -7,4 +9,6 @@
 > 2. Transf., _snow-white, snowy_ (mostly poet.): a similitudine sic: Corpore niveum candorem, aspectu igneum ardorem assequebatur, Auct. Her. 4, 33, 44: lacerti, Verg. A. 8, 387: lac, id. E. 2, 20: hanc si capite niveae agnae exorari judicas, Sen. Q. N. 2, 36: Briseis niveo colore, Hor. C. 2, 4, 3: vestis, Ov. M. 10, 432: candidior nivei folio, Galatea, ligustri, id. ib. 13, 789: dens, id. H. 18, 18: quā notam duxit niveus videri, Hor. C. 4, 2, 59: panis, Juv. 5, 70: flumen, _clear, pellucid_, Sen. Hippol. 504: undae, Mart. 7, 32, 11: tribuni, _clothed in white togas_, Calp. Ecl. 7, 29; so, Quirites, Juv. 10, 45.

 ## Pressestimmen
-> das ist ja pure poesie —[xkey](https://github.com/riotbib)
+> das ist ja pure poesie —[riotbib](https://github.com/riotbib/)
+
+> Deine Configs sind wunderschön <3 —[flxai](https://github.com/flxai/)
--- a/configs/0ad.nix
+++ b/configs/0ad.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = [ pkgs.zeroad ];
+  networking.firewall = {
+    allowedTCPPorts = [ 20595 ];
+    allowedUDPPorts = [ 20595 ];
+  };
+}
--- a/configs/admin-essentials.nix
+++ b/configs/admin-essentials.nix
@@ -0,0 +1,119 @@
+{
+  pkgs,
+  niveumPackages,
+  lib,
+  ...
+}: let
+  darwin = lib.strings.hasSuffix "-darwin" pkgs.system;
+in {
+  environment.systemPackages =
+    [
+      pkgs.htop
+      pkgs.w3m
+      pkgs.wget
+      # ARCHIVE TOOLS
+      pkgs.unzip
+      pkgs.unrar
+      pkgs.p7zip
+      pkgs.sshuttle
+      pkgs.zip
+      # MONITORS
+      pkgs.iftop # interface bandwidth monitor
+      pkgs.lsof # list open files
+      # SHELL
+      pkgs.sqlite
+      pkgs.fd # better find
+      pkgs.tree
+      pkgs.parallel # for parallel, since moreutils shadows task spooler
+      pkgs.ripgrep # better grep
+      pkgs.rlwrap
+      pkgs.progress # display progress bars for pipes
+      pkgs.file # determine file type
+      pkgs.gdu # ncurses disk usage (ncdu is broken)
+      pkgs.rmlint # remove duplicate files
+      pkgs.jq # json toolkit
+      pkgs.jless # less(1) for json
+      pkgs.fq # toolkit for yaml, xml and binaries
+      pkgs.bc # calculator
+      pkgs.pari # gp -- better calculator
+      pkgs.ts
+      niveumPackages.vimv
+      niveumPackages.vg
+      niveumPackages.fkill
+      niveumPackages.cyberlocker-tools
+      niveumPackages.untilport
+      niveumPackages.kpaste
+      # HARDWARE
+      pkgs.pciutils # for lspci
+    ]
+    ++ lib.optionals (!darwin) [
+      pkgs.usbutils # for lsusb
+      pkgs.lshw # for lshw
+      pkgs.iotop # I/O load monitor
+      pkgs.psmisc # for killall, pstree
+    ];
+
+
+    security.wrappers = {
+      pmount = {
+        setuid = true;
+        owner = "root";
+        group = "root";
+        source = "${pkgs.pmount}/bin/pmount";
+      };
+      pumount = {
+        setuid = true;
+        owner = "root";
+        group = "root";
+        source = "${pkgs.pmount}/bin/pumount";
+      };
+    };
+
+  environment.shellAliases = let
+    take = pkgs.writers.writeDash "take" ''
+      mkdir "$1" && cd "$1"
+    '';
+    cdt = pkgs.writers.writeDash "cdt" ''
+      cd "$(mktemp -d)"
+      pwd
+    '';
+    wcd = pkgs.writers.writeDash "wcd" ''
+      cd "$(readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname)/.."
+    '';
+    where = pkgs.writers.writeDash "where" ''
+      readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname
+    '';
+  in
+    {
+      nixi = "nix repl '<nixpkgs>'";
+      take = "source ${take}";
+      wcd = "source ${wcd}";
+      where = "source ${where}";
+      # temporary files and directories
+      cdt = "source ${cdt}";
+      vit = "$EDITOR $(mktemp)";
+      # file safety
+      mv = "${pkgs.coreutils}/bin/mv --interactive";
+      rm = "${pkgs.coreutils}/bin/rm --interactive";
+      cp = "${pkgs.coreutils}/bin/cp --interactive";
+      # colours
+      cat = "${pkgs.bat}/bin/bat --theme=ansi --style=plain";
+      l = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso --almost-all";
+      ls = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso";
+      ll = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso -l";
+      la = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso --almost-all -l";
+    }
+    // (
+      if darwin
+      then {}
+      else {
+        "ß" = "${pkgs.util-linux}/bin/setsid";
+        ip = "${pkgs.iproute2}/bin/ip -c";
+        # systemd
+        s = "${pkgs.systemd}/bin/systemctl";
+        us = "${pkgs.systemd}/bin/systemctl --user";
+        j = "${pkgs.systemd}/bin/journalctl";
+        uj = "${pkgs.systemd}/bin/journalctl --user";
+      }
+    );
+}
--- a/configs/aerc.nix
+++ b/configs/aerc.nix
@@ -2,20 +2,10 @@
  pkgs,
  config,
  lib,
+  niveumPackages,
  ...
 }: let
-  defaults = {
-    aerc.enable = true;
-    realName = "Kierán Meinhardt";
-    folders.inbox = "INBOX";
-  };
-  hu-defaults = {
-    imap.host = "mailbox.cms.hu-berlin.de";
-    imap.port = 993;
-    smtp.host = "mailhost.cms.hu-berlin.de";
-    smtp.port = 25;
-    smtp.tls.useStartTls = true;
-  };
+  inherit (import ../lib/email.nix) defaults thunderbirdProfile;
 in {
  age.secrets = {
    email-password-cock = {
@@ -24,8 +14,8 @@ in {
      group = config.users.users.me.group;
      mode = "400";
    };
-    email-password-fysi = {
-      file = ../secrets/email-password-fysi.age;
+    email-password-letos = {
+      file = ../secrets/email-password-letos.age;
      owner = config.users.users.me.name;
      group = config.users.users.me.group;
      mode = "400";
@@ -36,33 +26,11 @@ in {
      group = config.users.users.me.group;
      mode = "400";
    };
-    email-password-meinhark = {
-      file = ../secrets/email-password-meinhark.age;
-      owner = config.users.users.me.name;
-      group = config.users.users.me.group;
-      mode = "400";
-    };
-    email-password-meinhaki = {
-      file = ../secrets/email-password-meinhaki.age;
-      owner = config.users.users.me.name;
-      group = config.users.users.me.group;
-      mode = "400";
-    };
-    email-password-dslalewa = {
-      file = ../secrets/email-password-dslalewa.age;
-      owner = config.users.users.me.name;
-      group = config.users.users.me.group;
-      mode = "400";
-    };
-    email-password-fsklassp = {
-      file = ../secrets/email-password-fsklassp.age;
-      owner = config.users.users.me.name;
-      group = config.users.users.me.group;
-      mode = "400";
-    };
  };

  home-manager.users.me = {
+    accounts.email.maildirBasePath = "${config.users.users.me.home}/state/Maildir";
+
    services.mbsync = {
      enable = true;
      frequency = "daily";
@@ -110,99 +78,31 @@ in {
        config.home-manager.users.me.accounts.email.accounts);
    };

-    accounts.email.accounts = rec {
-      hu-student =
-        lib.recursiveUpdate defaults
-        (lib.recursiveUpdate hu-defaults
-          rec {
-            userName = "meinhark";
-            address = "kieran.felix.meinhardt@hu-berlin.de";
-            aliases = ["${userName}@hu-berlin.de"];
-            passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-meinhark.path}";
-          });
-      hu-student-cs =
-        lib.recursiveUpdate defaults
-        (lib.recursiveUpdate hu-defaults
-          rec {
-            userName = "meinhark";
-            address = "kieran.felix.meinhardt@informatik.hu-berlin.de";
-            aliases = ["${userName}@informatik.hu-berlin.de"];
-            imap.host = "mailbox.informatik.hu-berlin.de";
-            smtp.host = "mailhost.informatik.hu-berlin.de";
-            passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-meinhark.path}";
-          });
-      hu-employee =
-        lib.recursiveUpdate defaults
-        (lib.recursiveUpdate hu-defaults
-          rec {
-            userName = "meinhaki";
-            address = "kieran.meinhardt@hu-berlin.de";
-            aliases = ["${userName}@hu-berlin.de"];
-            passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-meinhaki.path}";
-            aerc.extraAccounts.signature-file = toString (pkgs.writeText "signature" signature.text);
-            signature = {
-              showSignature = "append";
-              text = ''
-                ${defaults.realName}
-                Studentische Hilfskraft / Administrator ALEW
-                Humboldt-Universität zu Berlin
-
-                Telefon: +49 (0)30 2093 9634
-                Raum 3.212, Dorotheenstraße 24, 10117 Berlin-Mitte
-                https://alew.hu-berlin.de
-              '';
-            };
-          });
-      hu-admin =
-        lib.recursiveUpdate defaults
-        (lib.recursiveUpdate hu-defaults
-          rec {
-            userName = "dslalewa";
-            address = "admin.alew.vglsprwi@hu-berlin.de";
-            aliases = ["${userName}@hu-berlin.de"];
-            passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-dslalewa.path}";
-            inherit (hu-employee) signature;
-            aerc.extraAccounts.signature-file = toString (pkgs.writeText "signature" signature.text);
-          });
-      hu-fsi =
-        lib.recursiveUpdate defaults
-        (lib.recursiveUpdate hu-defaults
-          rec {
-            userName = "fsklassp";
-            passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-fsklassp.path}";
-            address = "${userName}@hu-berlin.de";
-            realName = "FSI Klassische Philologie";
-            aerc.extraAccounts.signature-file = toString (pkgs.writeText "signature" signature.text);
-            signature = {
-              showSignature = "append";
-              text = ''
-                Fachschafts-Initiative
-
-                Humboldt-Universität zu Berlin
-                Sprach- und literaturwissenschaftliche Fakultät
-                Institut für klassische Philologie
-                Unter den Linden 6
-                10099 Berlin
-              '';
-            };
-          });
-      fysi =
-        lib.recursiveUpdate defaults
-        rec {
-          address = "kieran@fysi.tech";
-          userName = address;
-          passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-fysi.path}";
-          flavor = "fastmail.com";
-        };
+    accounts.email.accounts = {
      cock =
        lib.recursiveUpdate defaults
        rec {
          address = "2210@cock.li";
          userName = address;
          passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-cock.path}";
-          realName = "";
+          realName = "2210";
          imap.host = "mail.cock.li";
+          imap.port = 993;
          smtp.host = imap.host;
+          smtp.port = 25;
+          smtp.tls.useStartTls = true;
+        };
+      letos =
+        lib.recursiveUpdate defaults
+        {
+          userName = "slfletos";
+          address = "letos.sprachlit@hu-berlin.de";
+          passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-letos.path}";
+          imap.host = "mailbox.cms.hu-berlin.de";
+          imap.port = 993;
+          smtp.host = "mailhost.cms.hu-berlin.de";
+          smtp.port = 25;
+          smtp.tls.useStartTls = true;
        };
      posteo =
        lib.recursiveUpdate defaults
@@ -211,14 +111,42 @@ in {
          aliases = ["kmein@posteo.de"];
          userName = address;
          imap.host = "posteo.de";
+          imap.port = 993;
+          imap.tls.enable = true;
          smtp.host = imap.host;
+          smtp.port = 465;
+          smtp.tls.enable = true;
          primary = true;
          passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-posteo.path}";
-          # himalaya = { enable = true; backend = "imap"; sender = "smtp"; };
+          himalaya = {
+            enable = true;
+            settings.backend = "imap";
+          };
+          aerc.extraAccounts.pgp-key-id = "9EDE82CC72A343A95266D0F444857074A3ACC8B7";
        };
    };

-    # programs.himalaya.enable = true;
+    programs.himalaya.enable = true;
+
+    programs.thunderbird = {
+      enable = true;
+      settings = {
+      };
+      profiles.${thunderbirdProfile} = {
+        isDefault = true;
+        settings = {
+          "mail.default_send_format" = 1;
+          "msgcompose.default_colors" = false;
+          "msgcompose.text_color" = config.lib.stylix.colors.withHashtag.base00;
+          "msgcompose.background_color" = config.lib.stylix.colors.withHashtag.base05;
+        };
+        userChrome = ''
+        '';
+        userContent = ''
+        '';
+        withExternalGnupg = false;
+      };
+    };

    programs.aerc = {
      enable = true;
@@ -277,6 +205,7 @@ in {
          "*" = ":filter -x Flagged<Enter>";
        };
        view = {
+          tr = ":pipe ${niveumPackages.trans}/bin/trans -show-original n -b -no-autocorrect<Enter>"; # https://man.sr.ht/~rjarry/aerc/integrations/translator.md
          "/" = ":toggle-key-passthrough <Enter> /";
          q = ":close<Enter>";
          O = ":open<Enter>";
@@ -351,19 +280,19 @@ in {
        general.pgp-provider = "gpg";
        viewer = {pager = "${pkgs.less}/bin/less -R";};
        compose = {
-          address-book-cmd = "khard email --remove-first-line --parsable '%s'";
-          no-attachment-warning = "(attach|attached|attachments?|anbei|Anhang|angehängt)";
+          # address-book-cmd = "khard email --remove-first-line --parsable '%s'";
+          no-attachment-warning = "(attach|attached|attachments?|anbei|Anhang|angehängt|beigefügt)";
        };
        filters = {
-          "text/plain" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
-          "text/calendar" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/calendar";
-          "text/html" = "${pkgs.aerc}/share/aerc/filters/html"; # Requires w3m, dante
+          "text/plain" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
+          "text/calendar" = "${pkgs.aerc}/libexec/aerc/filters/calendar";
+          "text/html" = "${pkgs.aerc}/libexec/aerc/filters/html"; # Requires w3m, dante
          # "text/html" =
          #   "${pkgs.aerc}/share/aerc/filters/html | ${pkgs.aerc}/share/aerc/filters/colorize";
          # "text/*" =
-          #   ''${pkgs.bat}/bin/bat -fP --file-name="$AERC_FILENAME "'';
-          "message/delivery-status" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
-          "message/rfc822" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
+          #   ''${pkgs.bat}/bin/bat -fP --theme=ansi --file-name="$AERC_FILENAME "'';
+          "message/delivery-status" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
+          "message/rfc822" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
          "application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
        };
        openers = let
--- a/configs/alacritty.nix
+++ b/configs/alacritty.nix
@@ -1,68 +1,33 @@
 {
  pkgs,
  lib,
-  config,
  ...
 }: let
-  alacritty-cfg = theme:
-    (pkgs.formats.yaml {}).generate "alacritty.yml" {
-      window.opacity = 0.99;
-      bell = {
-        animation = "EaseOut";
-        duration = 100;
-        color = "#ffffff";
-      };
-      font = {
-        normal.family = "Monospace";
-        size = 6;
-      };
-      live_config_reload = true;
-      key_bindings = [
-        {
-          key = "Plus";
-          mods = "Control";
-          action = "IncreaseFontSize";
-        }
-        {
-          key = "Minus";
-          mods = "Control";
-          action = "DecreaseFontSize";
-        }
-        {
-          key = "Key0";
-          mods = "Control";
-          action = "ResetFontSize";
-        }
-      ];
-      colors = let
-        colourNames = ["black" "red" "green" "yellow" "blue" "magenta" "cyan" "white"];
-        colourPairs = lib.getAttrs colourNames theme;
-      in {
-        primary = {inherit (theme) background foreground;};
-        cursor = {inherit (theme) cursor;};
-        normal = lib.mapAttrs (_: colour: colour.dark) colourPairs;
-        bright = lib.mapAttrs (_: colour: colour.bright) colourPairs;
-      };
-    };
-  alacritty-pkg = pkgs.symlinkJoin {
-    name = "alacritty";
-    paths = [
-      (pkgs.writers.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 ../lib/colours/owickstrom-dark.nix);
-    "themes/light/alacritty.yml".source = alacritty-cfg (import ../lib/colours/owickstrom-light.nix);
+  home-manager.users.me = {
+    programs.alacritty = {
+      enable = true;
+      settings = {
+        keyboard.bindings = [
+          {
+            key = "Plus";
+            mods = "Control";
+            action = "IncreaseFontSize";
+          }
+          {
+            key = "Minus";
+            mods = "Control";
+            action = "DecreaseFontSize";
+          }
+          {
+            key = "Key0";
+            mods = "Control";
+            action = "ResetFontSize";
+          }
+        ];
+      };
+    };
  };
 }
--- a/configs/android.nix
+++ b/configs/android.nix
@@ -0,0 +1,5 @@
+{
+  programs.adb.enable = true;
+
+  users.users.me.extraGroups = ["adbusers"];
+}
--- a/configs/backup.nix
+++ b/configs/backup.nix
@@ -14,19 +14,18 @@ in {
    };
    passwordFile = config.age.secrets.restic.path;
    extraBackupArgs = [
-      "--exclude=/home/kfm/projects/nixpkgs/.git"
+      "--exclude=/home/kfm/sync/src/nixpkgs/.git"
      "--exclude=node_modules"
+      "--exclude=.parcel-cache"
    ];
    paths = [
-      "/home/kfm/work"
-      "/home/kfm/projects"
-      "/home/kfm/notes"
-      "/home/kfm/Maildir"
+      "/home/kfm/sync"
+      "/home/kfm/state"
      "/home/kfm/cloud"
+      "/home/kfm/mobile"
      "/home/kfm/.gnupg"
+      "/home/kfm/.electrum"
      "/home/kfm/.ssh"
-      "/mnt/sd-card/music"
-      "/mnt/sd-card/Books"
    ];
  };

--- a/configs/bash.nix
+++ b/configs/bash.nix
@@ -1,7 +1,7 @@
-{
+{pkgs, ...}: {
  programs.bash = {
    promptInit = ''
-      PS1="$(tput bold)\w \$([[ \$? == 0 ]] && echo \"\[\033[1;32m\]\" || echo \"\[\033[1;31m\]\")\$$(tput sgr0) "'';
+      PS1="$(${pkgs.ncurses}/bin/tput bold)\w \$([[ \$? == 0 ]] && echo \"\[\033[1;32m\]\" || echo \"\[\033[1;31m\]\")\$$(${pkgs.ncurses}/bin/tput sgr0) "'';
    interactiveShellInit = ''
      set -o vi
    '';
--- a/configs/beets.nix
+++ b/configs/beets.nix
@@ -1,14 +0,0 @@
-{
-  lib,
-  pkgs,
-  ...
-}: {
-  environment.systemPackages = [pkgs.beets];
-  home-manager.users.me.xdg.configFile = {
-    "beets/config.yaml".source = (pkgs.formats.yaml {}).generate "config.yaml" {
-      directory = "~/cloud/syncthing/music";
-      library = "~/cloud/syncthing/common/music.db";
-      plugins = toString ["fetchart" "lastgenre"];
-    };
-  };
-}
--- a/configs/bluetooth.nix
+++ b/configs/bluetooth.nix
@@ -1,17 +1,10 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
+{pkgs, ...}: {
  hardware.bluetooth = {
    enable = true;
-    settings.General.Enable =
-      lib.concatStringsSep "," ["Source" "Sink" "Media" "Socket"];
+    settings.general = {
+      enable = "Source,Sink,Media,Socket";
+    };
  };

-  services.blueman.enable = true;
-
-  # environment.systemPackages = [pkgs.blueman];
-
-  home-manager.users.me = {services.blueman-applet.enable = true;};
+  environment.systemPackages = [ pkgs.bluetuith ];
 }
--- a/configs/telegram-bots/autorenkalender.nix
+++ b/configs/telegram-bots/autorenkalender.nix
@@ -13,17 +13,18 @@
  autorenkalender =
    pkgs.python3Packages.callPackage autorenkalender-package {};
 in {
-  niveum.telegramBots.autorenkalender = {
+  niveum.bots.autorenkalender = {
    enable = true;
    time = "07:00";
-    tokenFile = config.age.secrets.telegram-token-kmein.path;
-    chatIds = ["@autorenkalender"];
-    parseMode = "Markdown";
+    telegram = {
+      enable = true;
+      tokenFile = config.age.secrets.telegram-token-kmein.path;
+      chatIds = ["@autorenkalender"];
+      parseMode = "Markdown";
+    };
    command = "${autorenkalender}/bin/autorenkalender";
  };

-  age.secrets.telegram-token-kmein.file = ../../secrets/telegram-token-kmein.age;
-
  niveum.passport.services = [
    {
      title = "Autorenkalender";
--- a/configs/bots/celan.nix
+++ b/configs/bots/celan.nix
@@ -0,0 +1,79 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
+  niveum.bots.celan = {
+    enable = true;
+    time = "08:00";
+    telegram = {
+      enable = true;
+      tokenFile = config.age.secrets.telegram-token-kmein.path;
+      chatIds = ["@PaulCelan"];
+    };
+    mastodon = {
+      enable = true;
+      tokenFile = config.age.secrets.mastodon-token-celan.path;
+      language = "de";
+    };
+    command = toString (pkgs.writers.writePython3 "random-celan.py" { libraries = [pkgs.python3Packages.lxml]; } ''
+      from lxml import etree
+      import random
+
+
+      def xml_text(elements):
+          return "".join("".join(t.itertext()) for t in elements).strip()
+
+
+      tree = etree.parse('${pkgs.fetchurl {
+        url = "http://c.krebsco.de/celan.tei.xml";
+        hash = "sha256-HgNmJYfhuwyfm+FcNtnnYWpJpIIU1ElHLeLiIFjF9mE=";
+      }}')
+      root = tree.getroot()
+
+      tei = {"tei": "http://www.tei-c.org/ns/1.0"}
+
+      poems = root.xpath(".//tei:lg[@type='poem']", namespaces=tei)
+
+      poem = random.choice(poems)
+
+      for stanza in poem.xpath("./tei:lg[@type='stanza']", namespaces=tei):
+          for line in stanza.xpath('./tei:l', namespaces=tei):
+              if line.text:
+                  print(line.text.strip())
+          print()
+
+      current_element = poem
+      while current_element is not None:
+          if current_element.tag == "{http://www.tei-c.org/ns/1.0}text":
+              text_element = current_element
+
+              title = xml_text(text_element.xpath("./tei:front/tei:docTitle",
+                               namespaces=tei))
+              print(f"Aus: #{title.replace(" ", "_")}", end=" ")
+
+              if date := xml_text(text_element.xpath("./tei:front/tei:docDate",
+                                  namespaces=tei)):
+                  print(f"({date})")
+              break
+          current_element = current_element.getparent()
+
+      print("\n\n#PaulCelan #Celan #Lyrik #poetry")
+    '');
+  };
+
+  age.secrets = {
+    mastodon-token-celan.file = ../../secrets/mastodon-token-celan.age;
+  };
+
+  systemd.timers.bot-celan.timerConfig.RandomizedDelaySec = "10h";
+
+  niveum.passport.services = [
+    {
+      title = "Paul Celan Bot";
+      description = "sends a random poem by Paul Celan to Telegram.";
+      link = "https://t.me/PaulCelan";
+    }
+  ];
+}
--- a/configs/telegram-bots/default.nix
+++ b/configs/telegram-bots/default.nix
@@ -11,14 +11,15 @@
  inherit (import ../../lib) tmpfilesConfig;
 in {
  imports = [
-    ./literature-quote.nix
-    ./astrology.nix
+    ./logotheca.nix
+    ./transits.nix
    ./autorenkalender.nix
    ./hesychius.nix
    ./smyth.nix
    ./nachtischsatan.nix
    ./tlg-wotd.nix
    ./celan.nix
+    ./nietzsche.nix
  ];

  systemd.tmpfiles.rules = map (path:
@@ -51,6 +52,7 @@ in {
    telegram-token-reverse.file = ../../secrets/telegram-token-reverse.age;
    telegram-token-betacode.file = ../../secrets/telegram-token-betacode.age;
    telegram-token-proverb.file = ../../secrets/telegram-token-proverb.age;
+    telegram-token-streaming-link.file = ../../secrets/telegram-token-streaming-link.age;
  };

  systemd.services.telegram-reverse = {
@@ -66,6 +68,17 @@ in {
    serviceConfig.LoadCredential = "token:${config.age.secrets.telegram-token-reverse.path}";
  };

+  systemd.services.telegram-streaming-link = {
+    wantedBy = ["multi-user.target"];
+    description = "Telegram bot converting YouTube Music <-> Spotify";
+    enable = true;
+    script = ''
+      TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${telebots}/bin/telegram-streaming-link
+    '';
+    serviceConfig.Restart = "always";
+    serviceConfig.LoadCredential = "token:${config.age.secrets.telegram-token-streaming-link.path}";
+  };
+
  systemd.services.telegram-betacode = {
    wantedBy = ["multi-user.target"];
    description = "Telegram beta code bot";
--- a/configs/bots/hesychius.nix
+++ b/configs/bots/hesychius.nix
@@ -0,0 +1,39 @@
+{
+  pkgs,
+  config,
+  inputs,
+  lib,
+  ...
+}: let
+  hesychius = inputs.scripts.outPath + "/hesychius/hesychius.txt";
+in {
+  niveum.bots.hesychius = {
+    enable = true;
+    time = "08:00";
+    mastodon = {
+      enable = true;
+      language = "el";
+      tokenFile = config.age.secrets.mastodon-token-hesychius.path;
+    };
+    telegram = {
+      enable = true;
+      tokenFile = config.age.secrets.telegram-token-kmein.path;
+      chatIds = ["@HesychiosAlexandreus"];
+    };
+    command = "${pkgs.coreutils}/bin/shuf -n1 ${hesychius}";
+  };
+
+  systemd.timers.bot-hesychius.timerConfig.RandomizedDelaySec = "10h";
+
+  age.secrets = {
+    mastodon-token-hesychius.file = ../../secrets/mastodon-token-hesychius.age;
+  };
+
+  niveum.passport.services = [
+    {
+      title = "Hesychius of Alexandria Bot";
+      description = "sends a random word from Hesychius of Alexandria's lexicon to Telegram.";
+      link = "https://t.me/HesychiosAlexandreus";
+    }
+  ];
+}
--- a/configs/bots/logotheca.nix
+++ b/configs/bots/logotheca.nix
@@ -0,0 +1,38 @@
+{
+  pkgs,
+  config,
+  lib,
+  niveumPackages,
+  ...
+}: {
+  niveum.bots.logotheca = {
+    enable = true;
+    time = "08/6:00";
+    telegram = {
+      enable = true;
+      tokenFile = config.age.secrets.telegram-token-kmein.path;
+      chatIds = ["-1001760262519"];
+      parseMode = "Markdown";
+    };
+    matrix = {
+      enable = true;
+      homeserver = "matrix.4d2.org";
+      tokenFile = config.age.secrets.matrix-token-lakai.path;
+      chatIds = [
+        "!zlwCuPiCNMSxDviFzA:4d2.org"
+      ];
+    };
+    command = "${niveumPackages.literature-quote}/bin/literature-quote";
+  };
+
+  age.secrets = {
+    matrix-token-lakai.file = ../../secrets/matrix-token-lakai.age;
+  };
+
+  niveum.passport.services = [
+    {
+      title = "Literature quote bot";
+      description = "sends me and my friends three <a href=\"https://logotheca.xn--kiern-0qa.de/\">logotheca</a> quotes a day.";
+    }
+  ];
+}
--- a/configs/telegram-bots/nachtischsatan.nix
+++ b/configs/telegram-bots/nachtischsatan.nix
@@ -8,23 +8,22 @@
    pkgs.writers.writePython3 "nachtischsatan-bot" {
      libraries = [pkgs.python3Packages.python-telegram-bot];
    } ''
-      from telegram.ext import Updater, MessageHandler
-      from telegram.ext.filters import Filters
+      from telegram.ext import Application, ContextTypes, MessageHandler, filters
+      from telegram import Update
      import random
      import time


-      def flubber(update, context):
+      async def flubber(update: Update, context: ContextTypes.DEFAULT_TYPE):
          time.sleep(random.randrange(4000) / 1000)
-          update.message.reply_text("*flubberflubber*")
+          await update.message.reply_text("*flubberflubber*")


      with open('${tokenFile}', 'r') as tokenFile:
-          updater = Updater(tokenFile.read().strip())
-
-          updater.dispatcher.add_handler(MessageHandler(Filters.all, flubber))
-          updater.start_polling()
-          updater.idle()
+          token = tokenFile.read().strip()
+          application = Application.builder().token(token).build()
+          application.add_handler(MessageHandler(filters.ALL, flubber))
+          application.run_polling()
    '';
 in {
  systemd.services.telegram-nachtischsatan = {
--- a/configs/bots/nietzsche.nix
+++ b/configs/bots/nietzsche.nix
@@ -0,0 +1,31 @@
+{
+  config,
+  pkgs,
+  niveumPackages,
+  ...
+}: {
+  niveum.bots.nietzsche = {
+    enable = true;
+    time = "08:00";
+    mastodon = {
+      enable = true;
+      tokenFile = config.age.secrets.mastodon-token-nietzsche.path;
+      language = "de";
+    };
+    command = toString (pkgs.writers.writeBash "random-nietzsche" ''
+      set -efu
+      random_number=$(( ($RANDOM % 10) + 1 ))
+      if [ "$random_number" -eq 1 ]; then
+        ${niveumPackages.random-zeno}/bin/random-zeno "/Literatur/M/Nietzsche,+Friedrich"
+      else
+        ${niveumPackages.random-zeno}/bin/random-zeno "/Philosophie/M/Nietzsche,+Friedrich"
+      fi
+    '');
+  };
+
+  systemd.timers.bot-nietzsche.timerConfig.RandomizedDelaySec = "10h";
+
+  age.secrets = {
+    mastodon-token-nietzsche.file = ../../secrets/mastodon-token-nietzsche.age;
+  };
+}
--- a/configs/telegram-bots/smyth.nix
+++ b/configs/telegram-bots/smyth.nix
@@ -4,11 +4,19 @@
  lib,
  ...
 }: {
-  niveum.telegramBots.smyth = {
+  niveum.bots.smyth = {
    enable = true;
    time = "08:00";
-    tokenFile = config.age.secrets.telegram-token-kmein.path;
-    chatIds = ["@HerbertWeirSmyth"];
+    mastodon = {
+      enable = true;
+      tokenFile = config.age.secrets.mastodon-token-smyth.path;
+      language = "en";
+    };
+    telegram = {
+      enable = true;
+      tokenFile = config.age.secrets.telegram-token-kmein.path;
+      chatIds = ["@HerbertWeirSmyth"];
+    };
    command = toString (pkgs.writers.writeDash "random-smyth" ''
      set -efu

@@ -19,14 +27,21 @@
          | ${pkgs.gnused}/bin/sed 's/^ref="//;s/"$//'
      )

-      ${pkgs.curl}/bin/curl -sSL http://www.perseus.tufts.edu/hopper/text?doc=$RANDOM_SECTION\
+      url="http://www.perseus.tufts.edu/hopper/text?doc=$RANDOM_SECTION"
+      ${pkgs.curl}/bin/curl -sSL "$url"\
        | ${pkgs.htmlq}/bin/htmlq '#text_main' \
        | ${pkgs.gnused}/bin/sed 's/<\/\?hr>//g' \
        | ${pkgs.pandoc}/bin/pandoc -f html -t plain --wrap=none
+
+      printf '\n%s\n\n#AncientGreek' "$url"
    '');
  };

-  systemd.timers.telegram-bot-smyth.timerConfig.RandomizedDelaySec = "10h";
+  systemd.timers.bot-smyth.timerConfig.RandomizedDelaySec = "10h";
+
+  age.secrets = {
+    mastodon-token-smyth.file = ../../secrets/mastodon-token-smyth.age;
+  };

  niveum.passport.services = [
    {
--- a/configs/bots/tlg-wotd.nix
+++ b/configs/bots/tlg-wotd.nix
@@ -0,0 +1,163 @@
+{
+  pkgs,
+  lib,
+  config,
+  niveumPackages,
+  ...
+}: let
+  mastodonEndpoint = "https://social.krebsco.de";
+in {
+  systemd.services.bot-tlg-wotd = {
+    enable = true;
+    wants = ["network-online.target"];
+    startAt = "9:30";
+    path = [ pkgs.jq pkgs.curl pkgs.recode pkgs.deno pkgs.imagemagick pkgs.gawk pkgs.gnugrep pkgs.coreutils ];
+    environment = {
+      NPM_CONFIG_CACHE = "/tmp";
+      CLTK_DATA = "/tmp";
+    };
+    script = ''
+      set -efux
+
+      chat_id=@tlgwotd
+
+      export TELEGRAM_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/telegram-token")"
+      export MASTODON_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/mastodon-token")"
+
+      json_data=$(curl -sSL http://stephanus.tlg.uci.edu/Iris/Wotd | recode html..utf8)
+
+      word=$(echo "$json_data" | jq -r '.word')
+      compact_word=$(echo "$word" | sed 's/,.*$//')
+      definition=$(echo "$json_data" | jq -r '.definition | sub("<.*>"; "") | rtrimstr(" ")')
+      first_occurrence=$(echo "$json_data" | jq -r '.firstOccurrence')
+      total_occurrences=$(echo "$json_data" | jq -r '.totalOccurrences')
+      telegram_caption="*$word* ‘$definition’
+
+    First occurrence (century): $first_occurrence
+    Number of occurrences (in all Ancient Greek texts): $total_occurrences"
+      mastodon_caption="$word ‘$definition’
+
+    First occurrence (century): $first_occurrence
+    Number of occurrences (in all Ancient Greek texts): $total_occurrences"
+
+      #ancientgreek #classics #wotd #wordoftheday
+
+      transliteration=$(${pkgs.writers.makePythonWriter pkgs.python311 pkgs.python311Packages pkgs.python3Packages "translit.py" {
+        # revert to pkgs.writers.writePython3 once https://github.com/NixOS/nixpkgs/pull/353367 is merged
+        libraries = [ pkgs.python3Packages.cltk ];
+      } ''
+        import sys
+        from cltk.phonology.grc.transcription import Transcriber
+
+        probert = Transcriber("Attic", "Probert")
+        text = " ".join(sys.argv[1:])
+        ipa = probert.transcribe(text)
+
+        print(ipa)
+      ''} "$compact_word")
+
+
+      photo_path=/tmp/output.png
+
+      hex_to_rgb() {
+          hex="$1"
+          r=$(printf "%d" "0x$(echo "$hex" | cut -c2-3)")
+          g=$(printf "%d" "0x$(echo "$hex" | cut -c4-5)")
+          b=$(printf "%d" "0x$(echo "$hex" | cut -c6-7)")
+          echo "$r $g $b"
+      }
+
+      calculate_luminance() {
+          r="$1"
+          g="$2"
+          b="$3"
+
+          r_l=$(echo "$r" | awk '{print ($1 / 255 <= 0.03928) ? $1 / 255 / 12.92 : (($1 / 255 + 0.055) / 1.055)^2.4}')
+          g_l=$(echo "$g" | awk '{print ($1 / 255 <= 0.03928) ? $1 / 255 / 12.92 : (($1 / 255 + 0.055) / 1.055)^2.4}')
+          b_l=$(echo "$b" | awk '{print ($1 / 255 <= 0.03928) ? $1 / 255 / 12.92 : (($1 / 255 + 0.055) / 1.055)^2.4}')
+
+          echo "$r_l $g_l $b_l" | awk '{print 0.2126*$1 + 0.7152*$2 + 0.0722*$3}'
+      }
+
+
+      hex_color="#$(echo "$compact_word" | md5sum | cut -c 1-6)"
+      if echo "$hex_color" | grep -qE '^#[0-9A-Fa-f]{6}$'; then
+          set -- $(hex_to_rgb "$hex_color")
+          r="$1"
+          g="$2"
+          b="$3"
+      fi
+
+      luminance=$(calculate_luminance "$r" "$g" "$b")
+
+      threshold="0.1"
+      echo "$r $g $b"
+      if [ "$(echo "$luminance" | awk -v threshold="$threshold" '{print ($1 > threshold)}')" -eq 1 ]; then
+          color1="black"
+          color2="#333"
+      else
+          color1="white"
+          color2=lightgrey
+      fi
+
+      magick -size 1400x846 \
+          xc:"$hex_color" \
+          -font "${pkgs.gentium}/share/fonts/truetype/GentiumBookPlus-Bold.ttf" \
+          -fill "$color1" \
+          -pointsize 150 -gravity west \
+          -annotate +100-160 "$compact_word" \
+          -font "${pkgs.gentium}/share/fonts/truetype/GentiumBookPlus-Regular.ttf" \
+          -fill "$color2" \
+          -pointsize 60 -gravity west \
+          -annotate +100+00 "$transliteration" \
+          -fill "$color1" \
+          -annotate +100+120 "‘$definition’" \
+          -fill "$color2" \
+          -pointsize 40 -gravity southwest \
+          -annotate +100+60 "attested $total_occurrences times" \
+          -pointsize 40 -gravity southeast \
+          -annotate +100+60 "$(date -I)" \
+          "$photo_path"
+
+      curl -X POST "https://api.telegram.org/bot$TELEGRAM_TOKEN/sendPhoto" \
+           -F "chat_id=\"$chat_id\"" \
+           -F "photo=@$photo_path" \
+           -F parse_mode=Markdown \
+           -F caption="$telegram_caption"
+
+      mastodon_upload_response=$(curl -X POST "${mastodonEndpoint}/api/v2/media" \
+          -H "Authorization: Bearer $MASTODON_TOKEN" \
+          -F "file=@$photo_path" \
+          -F "description=$word ‘$definition’")
+      mastodon_image_id=$(echo $mastodon_upload_response | jq -r .id)
+      curl -X POST "${mastodonEndpoint}/api/v1/statuses" \
+          -H "Authorization: Bearer $MASTODON_TOKEN" \
+          -d "status=$mastodon_caption" \
+          -d "visibility=public" \
+          -d "media_ids[]=$mastodon_image_id"
+    '';
+    serviceConfig = {
+      Type = "oneshot";
+      DynamicUser = true;
+      StateDirectory = "tlgwotd";
+      PrivateTmp = true;
+      LoadCredential = [
+        "telegram-token:${config.age.secrets.telegram-token-kmein.path}"
+        "mastodon-token:${config.age.secrets.mastodon-token-tlgwotd.path}"
+      ];
+    };
+  };
+
+  age.secrets = {
+    telegram-token-kmein.file = ../../secrets/telegram-token-kmein.age;
+    mastodon-token-tlgwotd.file = ../../secrets/mastodon-token-tlgwotd.age;
+  };
+
+  niveum.passport.services = [
+    {
+      title = "Thesaurus Linguae Graecae Word of the Day";
+      description = "sends <a href=\"https://stephanus.tlg.uci.edu/\">TLG</a>'s word of the day to Telegram.";
+      link = "https://t.me/tlgwotd";
+    }
+  ];
+}
--- a/configs/telegram-bots/astrology.nix
+++ b/configs/telegram-bots/astrology.nix
@@ -41,18 +41,32 @@
    '
  '';
 in {
-  niveum.telegramBots.transits = {
+  niveum.bots.transits = {
    enable = true;
    time = "*:0/1";
-    tokenFile = config.age.secrets.telegram-token-kmein.path;
-    chatIds = ["-1001796440545"];
+    mastodon = {
+      enable = true;
+      tokenFile = config.age.secrets.mastodon-token-transits.path;
+    };
+    telegram = {
+      enable = true;
+      tokenFile = config.age.secrets.telegram-token-kmein.path;
+      chatIds = ["-1001796440545"];
+    };
    command = toString (pkgs.writers.writeDash "common-transits" ''
+      set -efu
+
      now=$(${pkgs.coreutils}/bin/date +%_H:%M | ${pkgs.gnused}/bin/sed 's/^\s*//')
      date=$(${pkgs.coreutils}/bin/date +'%m %d %Y')
-      {
-        ${pkgs.astrolog}/bin/astrolog -qd $date -zN Berlin -Yt -Yd -d -R Uranus Neptune Pluto "North Node" -A 2
-        ${pkgs.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" || :
+      (
+        cd ${pkgs.astrolog}/bin
+        # ./astrolog -Yt -Yd -q 10 22 1999 6:32 -zN Kassel -td $date -R Uranus Neptune Pluto "North Node"
+        ./astrolog -qd $date -zN Berlin -Yt -Yd -d -R Uranus Neptune Pluto "North Node" -A 2
+      ) | ${toSymbols} | ${pkgs.coreutils}/bin/sort -n | ${pkgs.gnugrep}/bin/grep "^$now" || :
    '');
  };
+
+  age.secrets = {
+    mastodon-token-transits.file = ../../secrets/mastodon-token-transits.age;
+  };
 }
--- a/configs/chromium.nix
+++ b/configs/chromium.nix
@@ -1,28 +1,19 @@
 {
-  pkgs,
  config,
+  pkgs,
+  niveumPackages,
  ...
 }: {
-  programs.chromium = {
-    enable = true;
-    extensions = [
-      # "ihlenndgcmojhcghmfjfneahoeklbjjh" # cVim
-      # "fpnmgdkabkmnadcjpehmlllkndpkmiak" # Wayback Machine
-      "cjpalhdlnbpafiamejdnhcphjbkeiagm" # uBlock Origin
-      "pjjgklgkfeoeiebjogplpnibpfnffkng" # undistracted
-      "nhdogjmejiglipccpnnnanhbledajbpd" # vuejs devtools
-      "eimadpbcbfnmbkopoojfekhnkhdbieeh" # dark reader
-    ];
-  };
+  environment.systemPackages = [
+    niveumPackages.cro
+    pkgs.tor-browser-bundle-bin
+    pkgs.firefox
+    pkgs.brave
+  ];

  home-manager.users.me = {
    programs.firefox = {
      enable = true;
-      package = pkgs.firefox.override {
-        cfg = {
-          enableTridactylNative = true;
-        };
-      };
      profiles = let
        defaultSettings = {
          "beacon.enabled" = false;
@@ -91,7 +82,9 @@
    };
  };

-  environment.systemPackages = [pkgs.brave];
+  home-manager.users.me = {
+    stylix.targets.firefox.profileNames = ["default"];
+  };

-  environment.variables.BROWSER = "brave";
+  environment.variables.BROWSER = "firefox";
 }
--- a/configs/cloud.nix
+++ b/configs/cloud.nix
@@ -6,41 +6,50 @@
 }: let
  inherit (import ../lib) tmpfilesConfig;
 in {
-  systemd.tmpfiles.rules = map tmpfilesConfig [
+  systemd.user.services.systemd-tmpfiles-clean = {
+    enable = true;
+    wantedBy = [ "default.target" ];
+    startAt = "daily";
+    script = "systemd-tmpfiles --user --clean";
+    serviceConfig = {
+      Type = "oneshot";
+    };
+  };
+
+  systemd.user.tmpfiles.users.me.rules = map tmpfilesConfig [
    {
-      type = "L+";
-      user = config.users.users.me.name;
-      group = "users";
+      type = "d";
      mode = "0755";
-      argument = "${config.users.users.me.home}/cloud/Seafile/Uni";
-      path = "${config.users.users.me.home}/uni";
+      age = "7d";
+      path = "${config.users.users.me.home}/sync/Downloads";
    }
    {
+      type = "d";
+      mode = "0755";
+      age = "7d";
+      path = "${config.users.users.me.home}/cloud/nextcloud/tmp";
+    }
+  ] ++ map (path: tmpfilesConfig {
      type = "L+";
      user = config.users.users.me.name;
-      group = "users";
+      group = config.users.users.me.group;
      mode = "0755";
-      argument = "${config.users.users.me.home}/cloud/syncthing/common/mahlzeit";
-      path = "${config.users.users.me.home}/mahlzeit";
-    }
-  ];
+      argument = "${config.users.users.me.home}/sync/${path}";
+      path = "${config.users.users.me.home}/${path}";
+  }) [".ssh" ".gnupg" ".pki" ".local/share/aerc"];
+
+  services.gnome.gnome-keyring.enable = true;
+  security.pam.services.lightdm.enableGnomeKeyring = true;

  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;
+    enable = false;
    wants = ["network-online.target"];
    wantedBy = ["default.target"];
    startAt = "*:00/10";
@@ -48,7 +57,7 @@ in {
      kieran = {
        user = "kieran";
        passwordFile = config.age.secrets.nextcloud-password-kieran.path;
-        endpoint = "https://cloud.xn--kiern-0qa.de";
+        endpoint = "https://cloud.kmein.de";
        target = "${config.users.users.me.home}/notes";
      };
    in ''
@@ -66,7 +75,7 @@ in {
      set -efu
      book="$({
        ${pkgs.findutils}/bin/find ${config.users.users.me.home}/cloud/syncthing/library -type f
-        ${pkgs.findutils}/bin/find ${config.users.users.me.home}/cloud/Seafile/Books -type f
+        ${pkgs.findutils}/bin/find ${config.users.users.me.home}/cloud/nextcloud/Books -type f
      } | ${pkgs.fzf}/bin/fzf)"
      exec ${pkgs.zathura}/bin/zathura "$book"
    '')
@@ -103,17 +112,7 @@ in {
    mode = "400";
  };

-  fileSystems."/media/moodle" = {
-    device = "zaatar.r:/moodle";
-    fsType = "nfs";
-    options = [
-      "x-systemd.idle-timeout=600"
-      "noauto"
-      "x-systemd.automount"
-    ];
-  };
-
-  services.syncthing = rec {
+  services.syncthing = {
    enable = true;
    user = "kfm";
    openDefaultPorts = true;
@@ -121,16 +120,22 @@ in {
    dataDir = "/home/kfm/.config/syncthing";
    cert = config.age.secrets.syncthing-cert.path;
    key = config.age.secrets.syncthing-key.path;
-    inherit ((import ../lib).syncthing) devices;
-    folders = let
-      cloud-dir = "${config.users.users.me.home}/cloud";
-    in {
-      "${cloud-dir}/syncthing/common".devices = ["kabsa" "manakish"];
-      "${cloud-dir}/syncthing/library".devices = ["kabsa" "manakish" "heym"];
-      "${cloud-dir}/syncthing/mundoiu".devices = ["kabsa" "manakish" "heym"];
-      "${cloud-dir}/syncthing/music" = {
-        devices = ["kabsa" "manakish" "heym" "zaatar"];
-        id = "music";
+    settings = {
+      inherit ((import ../lib).syncthing) devices;
+      folders = {
+        "${config.users.users.me.home}/sync" = {
+          devices = ["kabsa" "manakish" "fatteh"];
+          label = "sync";
+          versioning.type = "trashcan";
+          versioning.params.cleanoutDays = 100;
+        };
+        "${config.users.users.me.home}/mobile" = {
+          devices = ["kabsa" "manakish" "fatteh" "kibbeh"];
+          id = "mobile";
+          label = "mobile";
+          versioning.type = "trashcan";
+          versioning.params.cleanoutDays = 100;
+        };
      };
    };
  };
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -3,19 +3,21 @@
  lib,
  config,
  niveumPackages,
+  unstablePackages,
  inputs,
  ...
-}: let
+}:
+let
  inherit (lib.strings) makeBinPath;
-  inherit (import ../lib) localAddresses kieran;
-  defaultApplications = (import ../lib).defaultApplications {inherit pkgs;};
-in {
+  inherit (import ../lib) localAddresses kieran remoteDir;
+  defaultApplications = (import ../lib).defaultApplications { inherit pkgs; };
+in
+{
  imports = [
    inputs.self.nixosModules.system-dependent
-    inputs.self.nixosModules.traadfri
    inputs.self.nixosModules.power-action
    {
-      boot.supportedFilesystems = ["ntfs"];
+      boot.supportedFilesystems = [ "ntfs" ];
    }
    {
      nixpkgs = {
@@ -26,12 +28,14 @@ in {
          };
          permittedInsecurePackages = [
            "qtwebkit-5.212.0-alpha4"
+            "zotero-6.0.26"
+            "electron-25.9.0"
          ];
        };
      };
    }
    {
-      boot.cleanTmpDir = true;
+      boot.tmp.cleanOnBoot = true;
      boot.loader.timeout = 1;
    }
    {
@@ -56,7 +60,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
          };
        };
@@ -70,116 +73,92 @@ in {
      users.users.me = {
        name = "kfm";
        description = kieran.name;
-        hashedPassword = "$6$w9hXyGFl/.IZBXk$5OiWzS1G.5hImhh1YQmZiCXYNAJhi3X6Y3uSLupJNYYXPLMsQpx2fwF4Xr2uYzGMV8Foqh8TgUavx1APD9rcb/";
+        hashedPasswordFile = config.age.secrets.kfm-password.path;
        isNormalUser = true;
        uid = 1000;
+        extraGroups = [
+          "pipewire"
+          "audio"
+        ];
+      };
+
+      nix.settings.trusted-users = [ config.users.users.me.name ];
+
+      age.secrets = {
+        kfm-password.file = ../secrets/kfm-password.age;
      };

      home-manager.users.me.xdg.enable = true;
    }
    {
-      environment.interactiveShellInit = "export PATH=$PATH:$HOME/projects/niveum";
-      environment.shellAliases = let
-        wcd = pkgs.writers.writeDash "wcd" ''
-          cd "$(readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname)/.."
-        '';
-        where = pkgs.writers.writeDash "where" ''
-          readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname
-        '';
-        take = pkgs.writers.writeDash "take" ''
-          mkdir "$1" && cd "$1"
-        '';
-        cdt = pkgs.writers.writeDash "cdt" ''
-          cd "$(mktemp -d)"
-          pwd
-        '';
-        swallow = command: "${niveumPackages.swallow}/bin/swallow ${command}";
-      in {
-        "ß" = "${pkgs.util-linux}/bin/setsid";
-        cat = "${pkgs.bat}/bin/bat --style=plain";
-        chromium-incognito = "chromium --user-data-dir=$(mktemp -d /tmp/chr.XXXXXX) --no-first-run --incognito";
-        cp = "cp --interactive";
-        ip = "${pkgs.iproute2}/bin/ip -c";
-        l = "ls --color=auto --time-style=long-iso --almost-all";
-        ls = "ls --color=auto --time-style=long-iso";
-        ll = "ls --color=auto --time-style=long-iso -l";
-        la = "ls --color=auto --time-style=long-iso --almost-all -l";
-        mv = "mv --interactive";
-        nixi = "nix repl '<nixpkgs>'";
-        ns = "nix-shell --run zsh";
-        o = "${pkgs.xdg-utils}/bin/xdg-open";
-        pbcopy = "${pkgs.xclip}/bin/xclip -selection clipboard -in";
-        pbpaste = "${pkgs.xclip}/bin/xclip -selection clipboard -out";
-        rm = "rm --interactive";
-        s = "${pkgs.systemd}/bin/systemctl";
-        take = "source ${take}";
-        cdt = "source ${cdt}";
-        vit = "$EDITOR $(mktemp)";
-        tmux = "${pkgs.tmux}/bin/tmux -2";
-        sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv";
-        zathura = swallow "${pkgs.zathura}/bin/zathura";
-        us = "${pkgs.systemd}/bin/systemctl --user";
-        wcd = "source ${wcd}";
-        im = "${pkgs.openssh}/bin/ssh weechat@makanek -t tmux attach-session -t IM";
-        where = "source ${where}";
-        yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
-        yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -xic"; # Download with audio
-      };
+      environment.interactiveShellInit = "export PATH=$PATH";
+      environment.shellAliases =
+        let
+          swallow = command: "${niveumPackages.swallow}/bin/swallow ${command}";
+        in
+        {
+          o = "${pkgs.xdg-utils}/bin/xdg-open";
+          ns = "nix-shell --run zsh";
+          pbcopy = "${pkgs.xclip}/bin/xclip -selection clipboard -in";
+          pbpaste = "${pkgs.xclip}/bin/xclip -selection clipboard -out";
+          tmux = "${pkgs.tmux}/bin/tmux -2";
+          sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv";
+          zathura = swallow "${pkgs.zathura}/bin/zathura";
+          im = "${pkgs.openssh}/bin/ssh weechat@makanek -t tmux attach-session -t IM";
+          yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
+          yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata --audio-format opus --audio-quality 0 -xic"; # Download with audio
+        };
    }
    {
      i18n = {
        defaultLocale = "en_DK.UTF-8";
-        supportedLocales = ["all"];
+        supportedLocales = [ "all" ];
      };
    }
    {
+      services.displayManager = {
+        autoLogin = {
+          enable = true;
+          user = config.users.users.me.name;
+        };
+      };
      services.xserver = {
        enable = true;
-        displayManager = {
-          autoLogin = {
-            enable = true;
-            user = config.users.users.me.name;
-          };
-          lightdm = {
-            enable = true;
-            greeters.gtk = {
-              enable = true;
-              indicators = ["~spacer" "~host" "~spacer" "~session" "~power"];
-            };
-          };
-        };
-      };
-    }
-    {
-      security.wrappers = {
-        pmount = {
-          setuid = true;
-          owner = "root";
-          group = "root";
-          source = "${pkgs.pmount}/bin/pmount";
-        };
-        pumount = {
-          setuid = true;
-          owner = "root";
-          group = "root";
-          source = "${pkgs.pmount}/bin/pumount";
-        };
-      };
-    }
-    {programs.command-not-found.enable = true;}
-    {
-      home-manager.users.me = {
-        services.gpg-agent = rec {
+        displayManager.lightdm = {
          enable = true;
-          enableZshIntegration = true;
-          defaultCacheTtl = 2 * 60 * 60;
-          maxCacheTtl = 4 * defaultCacheTtl;
+          greeters.gtk = {
+            enable = true;
+            indicators = [
+              "~spacer"
+              "~host"
+              "~spacer"
+              "~session"
+              "~power"
+            ];
+          };
+        };
+      };
+    }
+    { programs.command-not-found.enable = true; }
+    {
+      programs.gnupg = {
+        agent = {
+          enable = true;
+          pinentryPackage = pkgs.pinentry-qt;
+          settings = rec {
+            default-cache-ttl = 2 * 60 * 60;
+            max-cache-ttl = 4 * default-cache-ttl;
+          };
        };
      };

      environment.systemPackages = [
        pkgs.gnupg
-        (pkgs.pass.withExtensions (e: [e.pass-otp e.pass-import e.pass-genphrase]))
+        (pkgs.pass.withExtensions (e: [
+          e.pass-otp
+          e.pass-import
+          e.pass-genphrase
+        ]))
      ];
    }
    {
@@ -192,21 +171,20 @@ in {
      };
    }
    {
-      networking.hosts =
-        lib.mapAttrs' (name: address: {
-          name = address;
-          value = ["${name}.local"];
-        })
-        localAddresses;
+      networking.hosts = lib.mapAttrs' (name: address: {
+        name = address;
+        value = [ "${name}.local" ];
+      }) localAddresses;
    }
    {
      home-manager.users.me.home.stateVersion = "22.05";
+      home-manager.backupFileExtension = "bak";
    }
    {
      systemd.user.services.udiskie = {
-        after = ["udisks2.service"];
-        wants = ["udisks2.service"];
-        wantedBy = ["graphical-session.target"];
+        after = [ "udisks2.service" ];
+        wants = [ "udisks2.service" ];
+        wantedBy = [ "graphical-session.target" ];
        serviceConfig = {
          ExecStart = "${pkgs.udiskie}/bin/udiskie --verbose --no-config --notify";
        };
@@ -221,15 +199,17 @@ in {
        };
      };
    }
+    ./android.nix
+    ./admin-essentials.nix
+    ./stylix.nix
    ./alacritty.nix
    ./backup.nix
    ./bash.nix
-    ./beets.nix
    ./bluetooth.nix
    ./aerc.nix
    ./ccc.nix
    ./khal.nix
-    ./chromium.nix
+    ./browser.nix
    ./clipboard.nix
    ./cloud.nix
    ./direnv.nix
@@ -241,9 +221,14 @@ in {
    ./git.nix
    ./hledger.nix
    ./htop.nix
-    ./hu-berlin.nix
+    ./fu-berlin.nix
    ./i3.nix
+    ./i3status-rust.nix
    ./keyboard.nix
+    ./mycelium.nix
+    ./kdeconnect.nix
+    { home-manager.users.me.home.file.".XCompose".source = ../lib/keyboards/XCompose; }
+    { services.upower.enable = true; }
    ./lb.nix
    ./mpv.nix
    ./mime.nix
@@ -251,31 +236,66 @@ in {
    ./nix.nix
    ./newsboat.nix
    ./flameshot.nix
+    ./fritzbox.nix
    ./packages.nix
    ./picom.nix
    ./stardict.nix
    ./polkit.nix
-    ./power-action.nix
    ./printing.nix
-    # ./openweathermap.nix
-    ./wallpaper.nix
    ./redshift.nix
    ./retiolum.nix
    ./rofi.nix
    ./spacetime.nix
-    ./seafile.nix
    ./ssh.nix
    ./sshd.nix
    ./sound.nix
    ./sudo.nix
-    ./themes.nix
    ./tmux.nix
-    ./traadfri.nix
    ./unclutter.nix
    ./vscode.nix
    ./watson.nix
+    ./wallpaper.nix
    ./zsh.nix
+    {
+      home-manager.users.me.home.file.".zshrc".text = ''
+        # nothing to see here
+      '';
+    }
    ./tor.nix
+    ./stw-berlin.nix
    ./mastodon-bot.nix
+    {
+      fileSystems."${remoteDir}/fritz" = {
+        device = "//192.168.178.1/FRITZ.NAS/Backup";
+        fsType = "cifs";
+        options = [
+          "username=ftpuser"
+          "password=ftppassword"
+          "noauto"
+          "nounix"
+          "rw"
+          # "noserverino" # ref https://askubuntu.com/a/1265165
+          "uid=${toString config.users.users.me.uid}"
+          "gid=${toString config.users.groups.users.gid}"
+          "x-systemd.automount"
+          "x-systemd.device-timeout=1"
+          "x-systemd.idle-timeout=1min"
+        ];
+      };
+    }
+    {
+      home-manager.users.me = {
+        xdg.userDirs = rec {
+          enable = true;
+          documents = "${config.users.users.me.home}/cloud/nextcloud/Documents";
+          desktop = "/tmp";
+          download = "${config.users.users.me.home}/sync/Downloads";
+          music = "${config.users.users.me.home}/mobile/audio";
+          pictures = "${config.users.users.me.home}/cloud/nextcloud/Bilder";
+          publicShare = "${config.users.users.me.home}/cloud/nextcloud/tmp";
+          videos = pictures;
+        };
+      };
+    }
  ];
 }
--- a/configs/dunst.nix
+++ b/configs/dunst.nix
@@ -3,24 +3,32 @@
  pkgs,
  ...
 }: let
-  inherit (import ../lib) defaultApplications colours theme;
+  inherit (import ../lib) defaultApplications theme;
+  sgr = code: string: ''\u001b[${code}m${string}\u001b[0m'';
 in {
+  environment.systemPackages = [
+    (pkgs.writers.writeDashBin "notifications" ''
+      ${pkgs.dunst}/bin/dunstctl history \
+        | ${pkgs.jq}/bin/jq -r '
+          .data[]
+          | map("${sgr "90" ''\(.appname.data)''} ${sgr "1" ''\(.summary.data)''} ${sgr "31" ''\(.body.data | gsub("\n"; " | "))''}")
+          | join("\n")'
+    '')
+  ];
+
  home-manager.users.me.services.dunst = {
    enable = true;
    iconTheme = (theme pkgs).icon;
    settings = {
      global = {
        transparency = 10;
-        font = "Monospace 8";
        geometry = "200x5-30+20";
-        frame_color = colours.foreground;
        follow = "mouse";
        indicate_hidden = true;
        notification_height = 0;
        separator_height = 2;
        padding = 8;
        horizontal_padding = 8;
-        separator_color = "auto";
        sort = true;
        markup = "full";
        format = "%a\\n<b>%s</b>\\n%b";
@@ -43,22 +51,13 @@ in {
        mouse_right_click = "close_current";
        mouse_middle_click = "close_all";
      };
-      urgency_low = rec {
-        frame_color = background;
-        background = colours.foreground;
-        foreground = colours.background;
+      urgency_low = {
        timeout = 5;
      };
-      urgency_normal = rec {
-        frame_color = background;
-        background = colours.foreground;
-        foreground = colours.background;
+      urgency_normal = {
        timeout = 10;
      };
-      urgency_critical = rec {
-        frame_color = background;
-        background = colours.red.dark;
-        foreground = colours.background;
+      urgency_critical = {
        timeout = 0;
      };
    };
--- a/configs/flameshot.nix
+++ b/configs/flameshot.nix
@@ -10,7 +10,6 @@
        autoCloseIdleDaemon = true;
        drawColor = "#ff0000";
        drawThickness = 2;
-        checkForUpdates = false;
        showDesktopNotification = true;
        disabledTrayIcon = true;
        showHelp = false;
--- a/configs/fonts.nix
+++ b/configs/fonts.nix
@@ -22,7 +22,7 @@

  egyptianHiero = zip-font "EgyptianHiero" {
    url = "https://github.com/MKilani/Djehuty/archive/master.zip";
-    sha256 = "sha256-KbY4vedm757NWfDlgmNhslbZd+2Vs+o5PjtMMGDt61Y=";
+    sha256 = "sha256-S3vZxdeBj57KJsF+zaZw7sQw8T+z1aVC2CnpnZ0/x2c=";
  };
  antinoou = zip-font "Antinoou" {
    url = "https://www.evertype.com/fonts/coptic/AntinoouFont.zip";
@@ -31,13 +31,9 @@
  };
  newGardiner = zip-font "NewGardiner" {
    url = "https://mjn.host.cs.st-andrews.ac.uk/egyptian/fonts/NewGardiner.zip";
-    sha256 = "1jd0qa6shh9pqqyig2w43m9l9rv1i50l73jzkhb6g6mqxbhb1mip";
+    hash = "sha256-nP0y4ILt+0mlkDRdCNSeO2Gequ8wyix/qQdmujTNw3Y=";
    stripRoot = false;
  };
-  junicode2 = zip-font "JunicodeTwo" {
-    url = "https://github.com/psb1558/Junicode-font/archive/48bf476db278c844c67542b04d1e0e4c71f139d2.zip";
-    sha256 = "1ryicc155vkvgv3315ddliigwa01afwyb4c4f6pnqcns03af001i";
-  };
  newAthenaUnicode = zip-font "NewAthenaUnicode" {
    url = "https://classicalstudies.org/sites/default/files/userfiles/files/NAU5_005.zip";
    sha256 = "1g7qk9gl4nq2dz41bvck1nzilhin44j8691cxax3dlp77bbn9bxr";
@@ -46,15 +42,27 @@
    url = "http://files.qenherkhopeshef.org/jsesh/JSeshFont.ttf";
    sha256 = "1203jrk2xzvgckcc5hx88kja1i3h8gm1wiyla5j6gspc0hbv56ry";
  };
-  egyptianText = simple-ttf "EgyptianText-1.0beta" {
+  egyptianTextBeta = simple-ttf "EgyptianText-1.0beta" {
    url = "http://c.krebsco.de/EgyptianText-v1.0-beta.ttf";
    sha256 = "0cfjbk7xxnxhlp6v922psm5j1xzrv6wfk226ji2wz2yfrnkbcbsv";
  };
+  coranica = simple-ttf "Coranica" {
+    url = "https://corpuscoranicum.de/fonts/coranica_1164.ttf";
+    sha256 = "0igi8q8b2p38x9jq8c98afsl7bf8rj32zj2052yyjgj9r88y4yi5";
+  };
+  koineGreek = simple-ttf "KoineGreek.ttf" {
+    url = "https://github.com/Center-for-New-Testament-Restoration/font/raw/af83eed50105344edaa5e5eddaf87696e271468c/KoineGreek.ttf";
+    hash = "sha256-YtC+nj7+Jl8k00rqAAqySYc8iTAOL7PixXc+LfSmnS0=";
+  };
+  egyptianText = simple-ttf "EgyptianText" {
+    url = "https://github.com/microsoft/font-tools/raw/1092cb23520967830001a0807eb21d6a44dda522/EgyptianOpenType/font/eot.ttf";
+    sha256 = "1n294vhcx90270pnsw1dbk6izd61fjvbnjrh4hcf98ff3s540x0c";
+  };
 in {
  fonts = {
-    enableDefaultFonts = true;
+    enableDefaultPackages = true;
    fontDir.enable = true;
-    fonts = with pkgs; [
+    packages = with pkgs; [
      alegreya
      alegreya-sans
      amiri
@@ -65,22 +73,27 @@ in {
      charis-sil
      doulos-sil
      newAthenaUnicode
+      coranica
      corefonts
      crimson
      eb-garamond
+      ipaexfont
      jsesh
      egyptianHiero
      egyptianText
+      egyptianTextBeta
      font-awesome_6
      etBook
      newGardiner
-      junicode2
+      junicode
+      koineGreek
+      # brill
      ezra-sil
      fira
      font-awesome
      galatia-sil
      gentium
-      niveumPackages.gfs-fonts
+      # niveumPackages.gfs-fonts
      gyre-fonts
      ibm-plex
      jetbrains-mono
@@ -92,7 +105,7 @@ in {
      roboto
      roboto-mono
      noto-fonts
-      noto-fonts-cjk
+      noto-fonts-cjk-sans
      noto-fonts-emoji
      roboto-slab
      scheherazade-new
@@ -108,7 +121,7 @@ in {
    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"];
+      sansSerif = ["Noto Sans Display" "Noto Naskh Arabic" "Noto Sans Hebrew" "Noto Sans Devanagari" "Noto Sans CJK JP" "Noto Sans Coptic" "Noto Sans Syriac Western"];
      emoji = ["Noto Color Emoji"];
    };
    # xelatex fails with woff files
--- a/configs/fritzbox.nix
+++ b/configs/fritzbox.nix
@@ -0,0 +1,19 @@
+{ config, ... }:
+{
+  networking.firewall.allowedUDPPorts = [ 51820 ];
+  networking.wg-quick.interfaces.aether = {
+    autostart = false;
+    dns = ["192.168.178.1" "fritz.box"];
+    listenPort = 51820;
+    privateKeyFile = config.age.secrets.wireguard-aether-key.path;
+    peers = [
+      {
+        allowedIPs = ["192.168.178.0/24" "0.0.0.0/0"];
+        endpoint = "lng5gx2rmssv8ge1.myfritz.net:58997";
+        persistentKeepalive = 25;
+        presharedKeyFile = config.age.secrets.wireguard-aether-psk.path;
+        publicKey = "8Rr7BueC0CGmycBQFS7YM7VF7Adkdc1ZcLFy8YXyOQk=";
+      }
+    ];
+  };
+}
--- a/configs/fu-berlin.nix
+++ b/configs/fu-berlin.nix
@@ -0,0 +1,153 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  username = "meinhak99";
+  inherit (import ../lib/email.nix) defaults pronouns;
+  inherit (import ../lib) remoteDir;
+  fu-defaults = rec {
+    imap.host = "mail.zedat.fu-berlin.de";
+    imap.port = 993;
+    imap.tls.enable = true;
+    smtp.host = imap.host;
+    smtp.port = 465;
+    smtp.tls.enable = true;
+    folders.drafts = "Entwürfe";
+    folders.sent = "Gesendet";
+    folders.trash = "Papierkorb";
+  };
+in {
+  home-manager.users.me = {
+    programs.ssh = {
+      matchBlocks = {
+        fu-berlin = {
+          user = username;
+          hostname = "login.zedat.fu-berlin.de";
+          setEnv.TERM = "xterm";
+        };
+      };
+    };
+    accounts.email.accounts = {
+      fu-student =
+        lib.recursiveUpdate defaults
+        (lib.recursiveUpdate fu-defaults
+          rec {
+            userName = "meinhak99";
+            address = "kieran.meinhardt@fu-berlin.de";
+            aliases = ["${userName}@fu-berlin.de"];
+            passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-meinhak99.path}";
+            aerc.extraAccounts.signature-file = toString (pkgs.writeText "signature" signature.text);
+            signature = {
+              showSignature = "append";
+              text = ''
+                ${defaults.realName}
+                ${pronouns}
+
+                ---
+                Studentische Hilfskraft / ZODIAC
+                Freie Universität Berlin
+
+                Telefon: +49 30 838 58118
+                Arnimallee 10, Raum 106, 14195 Berlin
+              '';
+            };
+            himalaya = {
+              enable = true;
+              settings.backend = "imap";
+            };
+          });
+    };
+  };
+
+  age.secrets = {
+    email-password-meinhak99 = {
+      file = ../secrets/email-password-meinhak99.age;
+      owner = config.users.users.me.name;
+      group = config.users.users.me.group;
+      mode = "400";
+    };
+    fu-sftp-key = {
+      file = ../secrets/fu-sftp-key.age;
+      owner = "root";
+      group = "root";
+      mode = "400";
+    };
+  };
+
+  # if it fails with "connection reset by peer" run `sudo sshfs ... ... -o ...` manually
+  # it needs to say 'yes' to the server's fingerprint
+  system.fsPackages = [ pkgs.sshfs ];
+
+  # https://www.zedat.fu-berlin.de/tip4u_157.pdf
+  fileSystems = let
+    fu-berlin-cifs-options = [
+      "uid=${toString config.users.users.me.uid}"
+      "gid=${toString config.users.groups.users.gid}"
+      "rw"
+      "nounix"
+      "domain=fu-berlin"
+      "noauto"
+      "x-systemd.automount"
+      "x-systemd.device-timeout=1"
+      "x-systemd.idle-timeout=1min"
+    ];
+
+    firstCharacter = lib.strings.substring 0 1;
+
+    home-directory-mount = user: {
+      "${remoteDir}/fu/${user}/home" = {
+        device = "${user}@login.zedat.fu-berlin.de:/home/${firstCharacter user}/${user}";
+        fsType = "sshfs";
+        options = [
+          "allow_other"
+          "_netdev"
+          "x-systemd.automount"
+          "reconnect"
+          "ServerAliveInterval=15"
+          "IdentityFile=${config.age.secrets.fu-sftp-key.path}"
+        ];
+      };
+    };
+  in {
+    "${remoteDir}/fu/zodiac" = {
+      device = "//trove.storage.fu-berlin.de/GESCHKULT";
+      fsType = "cifs";
+      options =
+        fu-berlin-cifs-options
+        ++ [
+          "credentials=${config.age.secrets.cifs-credentials-zodiac.path}"
+        ];
+    };
+  } // home-directory-mount "meinhak99"
+    // home-directory-mount "xm7234fu";
+
+  age.secrets = {
+    cifs-credentials-zodiac.file = ../secrets/cifs-credentials-zodiac.age;
+  };
+
+  environment.systemPackages = [
+    (pkgs.writers.writeDashBin "fu-vpn" ''
+      if ${pkgs.wirelesstools}/bin/iwgetid | ${pkgs.gnugrep}/bin/grep --invert-match eduroam
+      then
+        # root firefox will not open login window unless root owns Xauthority
+        sudo cp $XAUTHORITY /root/.Xauthority
+        sudo chown root: /root/.Xauthority
+        XAUTHORITY=/root/.Xauthority sudo ${pkgs.openconnect}/bin/openconnect vpn.fu-berlin.de --useragent=AnyConnect
+      fi
+    '')
+  ];
+
+  systemd.services.fu-vpn = {
+    enable = false;
+    wants = ["network-online.target"];
+    serviceConfig.LoadCredential = "password:${config.age.secrets.email-password-meinhak99.path}";
+    script = ''
+      if ${pkgs.wirelesstools}/bin/iwgetid | ${pkgs.gnugrep}/bin/grep --invert-match eduroam
+      then
+        cat "$CREDENTIALS_DIRECTORY/password" | ${pkgs.openconnect}/bin/openconnect vpn.fu-berlin.de --user ${username} --passwd-on-stdin
+      fi
+    '';
+  };
+}
--- a/configs/fysi.nix
+++ b/configs/fysi.nix
@@ -0,0 +1,55 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (import ../lib/email.nix) defaults;
+  sshIdentity = name: "${config.users.users.me.home}/.ssh/${name}";
+in {
+  age.secrets = {
+    email-password-fysi = {
+      file = ../secrets/email-password-fysi.age;
+      owner = config.users.users.me.name;
+      group = config.users.users.me.group;
+      mode = "400";
+    };
+  };
+
+  home-manager.users.me = {
+    accounts.email.accounts = {
+      fysi =
+        lib.recursiveUpdate defaults
+        rec {
+          address = "kieran@fysi.tech";
+          userName = address;
+          passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-fysi.path}";
+          flavor = "fastmail.com";
+        };
+    };
+
+    programs.ssh.matchBlocks = rec {
+      "nextcloud.fysi.dev" = {
+        hostname = "116.203.82.203";
+        user = "root";
+      };
+      "lingua.miaengiadina.ch" = {
+        hostname = "135.181.85.233";
+        user = "root";
+      };
+      "cms-dev.woc2023.app".identityFile = sshIdentity "fysiweb";
+      "cms-master.woc2023.app".identityFile = sshIdentity "fysiweb";
+      "fysi-dev1" = {
+        hostname = "94.130.229.139";
+        user = "root";
+        identityFile = sshIdentity "fysiweb";
+      };
+      ${fysi-dev1.hostname} = fysi-dev1;
+      "fysi-shared0" = {
+        hostname = "49.12.205.235";
+        user = "root";
+        identityFile = sshIdentity "fysiweb";
+      };
+    };
+  };
+}
--- a/configs/fzf.nix
+++ b/configs/fzf.nix
@@ -1,37 +1,22 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  environment = {
-    systemPackages = [pkgs.fzf];
-    variables = rec {
-      FZF_DEFAULT_COMMAND = "${pkgs.fd}/bin/fd --type f --strip-cwd-prefix --follow --no-ignore-vcs --exclude .git";
-      FZF_DEFAULT_OPTS =
-        lib.escapeShellArgs ["--height=40%"];
-      FZF_ALT_C_COMMAND = "${pkgs.fd}/bin/fd --type d";
-      FZF_ALT_C_OPTS = lib.escapeShellArgs [
-        "--preview='${pkgs.tree}/bin/tree -L 1 \"{}\"'"
+{pkgs, ...}: {
+  programs.fzf = {
+    fuzzyCompletion = true;
+    keybindings = true;
+  };
+
+  home-manager.users.me = {
+    programs.fzf = rec {
+      enable = true;
+      defaultCommand = "${pkgs.fd}/bin/fd --type f --strip-cwd-prefix --follow --no-ignore-vcs --exclude .git";
+      defaultOptions = ["--height=40%"];
+      changeDirWidgetCommand = "${pkgs.fd}/bin/fd --type d";
+      changeDirWidgetOptions = [
+        "--preview='${pkgs.tree}/bin/tree -L 1 {}'"
        "--bind=space:toggle-preview"
        "--preview-window=hidden"
      ];
-      FZF_CTRL_T_COMMAND = FZF_DEFAULT_COMMAND;
-      FZF_CTRL_T_OPTS =
-        lib.escapeShellArgs ["--preview='head -$LINES {}'"];
+      fileWidgetCommand = defaultCommand;
+      fileWidgetOptions = ["--preview='head -$LINES {}'"];
    };
  };
-
-  programs.zsh.interactiveShellInit = ''
-    if [[ $options[zle] = on ]]; then
-      . ${pkgs.fzf}/share/fzf/completion.zsh
-      . ${pkgs.fzf}/share/fzf/key-bindings.zsh
-    fi
-  '';
-
-  programs.bash.interactiveShellInit = ''
-    if [[ :$SHELLOPTS: =~ :(vi|emacs): ]]; then
-      . ${pkgs.fzf}/share/fzf/completion.bash
-      . ${pkgs.fzf}/share/fzf/key-bindings.bash
-    fi
-  '';
 }
--- a/configs/git.nix
+++ b/configs/git.nix
@@ -1,7 +1,5 @@
 {
  pkgs,
-  config,
-  lib,
  inputs,
  ...
 }: let
@@ -9,17 +7,17 @@
 in {
  environment.systemPackages = [
    pkgs.mr
-    pkgs.git
+    pkgs.gitFull
    pkgs.git-crypt
-    pkgs.gitAndTools.gitflow
-    pkgs.gitAndTools.gh
-    pkgs.gitAndTools.git-extras
-    pkgs.gitAndTools.git-trim
-    pkgs.gitAndTools.git-absorb
+    pkgs.gitflow
+    pkgs.gh
+    pkgs.git-extras
+    # pkgs.git-trim
+    pkgs.git-absorb
    pkgs.gitstats
    pkgs.patch
    pkgs.patchutils
-    inputs.self.packages.x86_64-linux.git-preview
+    inputs.self.packages.${pkgs.system}.git-preview
  ];

  environment.shellAliases = {
@@ -30,7 +28,7 @@ in {
  home-manager.users.me = {
    programs.git = {
      enable = true;
-      package = pkgs.gitAndTools.gitFull;
+      package = pkgs.gitFull;
      userName = kieran.name;
      userEmail = kieran.email;
      aliases = {
@@ -51,6 +49,7 @@ in {
        pull.ff = "only";
        rebase.autoStash = true;
        merge.autoStash = true;
+        push.autoSetupRemote = true;

        # # ref https://github.com/dandavison/delta
        # core.pager = "${pkgs.delta}/bin/delta";
--- a/configs/gnome.nix
+++ b/configs/gnome.nix
@@ -0,0 +1,5 @@
+{
+  services.xserver.enable = true;
+  services.xserver.displayManager.lightdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
+}
--- a/configs/hledger.nix
+++ b/configs/hledger.nix
@@ -1,28 +1,15 @@
 {
-  config,
  pkgs,
  ...
-}: {
+}: let
+  ledgerDirectory = "/home/kfm/sync/src/ledger";
+  hora = pkgs.callPackage ../packages/hora.nix { timeLedger = "${ledgerDirectory}/time.timeclock"; };
+in {
  environment.systemPackages = let
-    ledgerDirectory = "$HOME/projects/ledger";
-    timeLedger = "${ledgerDirectory}/time.timeclock";
    git = "${pkgs.git}/bin/git -C ${ledgerDirectory}";
  in [
+    hora
    pkgs.hledger
-    (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
-    '')
-
    (pkgs.writers.writeDashBin "hledger-git" ''
      if [ "$1" = entry ]; then
        ${pkgs.hledger}/bin/hledger balance -V > "${ledgerDirectory}/balance.txt"
--- a/configs/htop.nix
+++ b/configs/htop.nix
@@ -20,7 +20,7 @@
        show_thread_names = false;
        sort_descending = true;
        sort_key = "PERCENT_CPU";
-        tree_view = true;
+        tree_view = false;
        update_process_names = false;
        right_meters = ["Uptime" "Tasks" "LoadAverage" "Battery"];
        left_meters = ["LeftCPUs2" "RightCPUs2" "Memory" "Swap"];
--- a/configs/hu-berlin.nix
+++ b/configs/hu-berlin.nix
@@ -1,86 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
-  inherit (lib.strings) fileContents;
-  inherit (import ../lib) sshPort;
-  eduroam = {
-    identity = fileContents <secrets/eduroam/identity>;
-    password = fileContents <secrets/eduroam/password>;
-  };
-  hu-berlin-cifs-options = [
-    "uid=${toString config.users.users.me.uid}"
-    "gid=${toString config.users.groups.users.gid}"
-    "sec=ntlmv2"
-    "workgroup=german"
-    "credentials=${config.age.secrets.cifs-credentials-hu-berlin.path}"
-    "noauto"
-    # "x-systemd.requires=hu-vpn.service"
-    "x-systemd.automount"
-    "x-systemd.device-timeout=1"
-    "x-systemd.idle-timeout=1min"
-  ];
-in {
-  fileSystems."/media/hu-berlin/germpro2" = {
-    device = "//hugerm31c.user.hu-berlin.de/germpro2/ling";
-    fsType = "cifs";
-    options = hu-berlin-cifs-options;
-  };
-
-  fileSystems."/media/hu-berlin/germhome" = {
-    device = "//hugerm31c.user.hu-berlin.de/germhome/ling/meinhaki";
-    fsType = "cifs";
-    options = hu-berlin-cifs-options;
-  };
-
-  age.secrets.cifs-credentials-hu-berlin.file = ../secrets/cifs-credentials-hu-berlin.age;
-
-  home-manager.users.me.programs.ssh = {
-    matchBlocks = {
-      "alew.hu-berlin.de" = {
-        user = "centos";
-        hostname = "141.20.187.219";
-      };
-    };
-  };
-
-  environment.systemPackages = [
-    (pkgs.writers.writeDashBin "hu-ip" ''
-      ${pkgs.w3m}/bin/w3m -dump meineip.hu-berlin.de | head --lines=-4 | tail --lines=+3
-    '')
-    (
-      pkgs.writers.writePython3Bin "hu-eduroam-install"
-      {
-        libraries = with pkgs.python3Packages; [distro pyopenssl dbus-python];
-        flakeIgnore = ["E501" "E123" "W504" "E722" "F821" "E226" "E126" "E265" "W291"];
-      }
-      (builtins.readFile (builtins.fetchurl {
-        url = "https://www.cms.hu-berlin.de/de/dl/netze/wlan/config/eduroam/linux-installer/eduroam-linux-hub.py";
-        sha256 = "19x2kvwxx13265b2hj5fjf53g0liw6dw7xf9j9cav67cswmz60kf";
-      }))
-    )
-  ];
-
-  systemd.services.hu-vpn = {
-    enable = true;
-    wants = ["network-online.target"];
-    serviceConfig.LoadCredential = "password:${config.age.secrets.email-password-meinhark.path}";
-    script = ''
-      if ${pkgs.wirelesstools}/bin/iwgetid | ${pkgs.gnugrep}/bin/grep --invert-match eduroam
-      then
-        ${pkgs.openfortivpn}/bin/openfortivpn \
-          --password="$(cat "$CREDENTIALS_DIRECTORY/password")" \
-          --config=${
-        pkgs.writeText "hu-berlin.config" ''
-          host = forti-ssl.vpn.hu-berlin.de
-          port = 443
-          username = meinhark
-          trusted-cert = 9e5dea8e077970d245900839f437ef7fb9551559501c7defd70af70ea568573d
-        ''
-      }
-      fi
-    '';
-  };
-}
--- a/configs/i3.nix
+++ b/configs/i3.nix
@@ -5,31 +5,37 @@
  niveumPackages,
  ...
 }: let
-  inherit (import ../lib) defaultApplications colours;
+  dashboard = pkgs.writers.writeDashBin "dashboard" ''
+    ${pkgs.alacritty}/bin/alacritty --option font.size=4 --class dashboard --command ${pkgs.writers.writeDash "dashboard-inner" ''
+      exec ${pkgs.procps}/bin/watch -c -n 10 ${niveumPackages.q}/bin/q
+    ''}
+  '';
+  inherit (import ../lib) defaultApplications;
  klem = niveumPackages.klem.override {
    config.dmenu = "${pkgs.dmenu}/bin/dmenu -i -p klem";
    config.scripts = {
-      "p.r" = pkgs.writers.writeDash "p.r" ''
+      "p.r paste" = pkgs.writers.writeDash "p.r" ''
        ${pkgs.curl}/bin/curl -fSs http://p.r --data-binary @- \
          | ${pkgs.coreutils}/bin/tail --lines=1 \
          | ${pkgs.gnused}/bin/sed 's/\\<r\\>/krebsco.de/'
      '';
-      # "envs.sh 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 paste" = pkgs.writers.writeDash "envs-host" ''
+        ${pkgs.curl}/bin/curl -F "file=@-" https://envs.sh
      '';
+      # this segfaults
+      # "envs.sh mirror" = pkgs.writers.writeDash "envs-mirror" ''
+      #   ${pkgs.curl}/bin/curl -F "url=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
+      # '';
      "envs.sh 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
-      '';
-      "go.r" = pkgs.writers.writeDash "go.r" ''
+      "go.r shorten" = pkgs.writers.writeDash "go.r" ''
        ${pkgs.curl}/bin/curl -fSs http://go.r -F "uri=$(${pkgs.coreutils}/bin/cat)"
      '';
-      "0x0.st" = pkgs.writers.writeDash "0x0.st" ''
+      "4d2.org paste" = pkgs.writers.writeDash "4d2-paste" ''
+        ${pkgs.curl}/bin/curl -F "file=@-" https://depot.4d2.org/
+      '';
+      "0x0.st shorten" = pkgs.writers.writeDash "0x0.st" ''
        ${pkgs.curl}/bin/curl -fSs https://0x0.st -F "shorten=$(${pkgs.coreutils}/bin/cat)"
      '';
      "rot13" = pkgs.writers.writeDash "rot13" ''
@@ -50,15 +56,14 @@
      emojai = pkgs.writers.writeDash "emojai" ''
        ${pkgs.curl}/bin/curl https://www.emojai.app/api/generate -X POST -H 'Content-Type: application/json' --data-raw "$(${pkgs.jq}/bin/jq -sR '{emoji:.}')" | ${pkgs.jq}/bin/jq -r .result
      '';
+      "gpt-3.5" = pkgs.writers.writeDash "gpt" ''
+        ${niveumPackages.gpt35}/bin/gpt
+      '';
+      gpt-4 = pkgs.writers.writeDash "gpt" ''
+        ${niveumPackages.gpt4}/bin/gpt
+      '';
    };
  };
-
-  new-workspace = pkgs.writers.writeDash "new-workspace" ''
-    i3-msg workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
-  '';
-  move-to-new-workspace = pkgs.writers.writeDash "new-workspace" ''
-    i3-msg move container to workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
-  '';
 in {
  age.secrets = {
    github-token-i3status-rust = {
@@ -73,14 +78,23 @@ in {
      group = config.users.users.me.group;
      mode = "400";
    };
+    miniflux-api-token = {
+      file = ../secrets/miniflux-api-token.age;
+      owner = config.users.users.me.name;
+      group = config.users.users.me.group;
+      mode = "400";
+    };
  };

  programs.slock.enable = true;

+  environment.systemPackages = [dashboard];
+
+  services.displayManager.defaultSession = "none+i3";
  services.xserver = {
-    displayManager.defaultSession = "none+i3";
    windowManager.i3 = {
      enable = true;
+      package = pkgs.i3-gaps;
    };
  };

@@ -99,129 +113,85 @@ in {
    '';
  };

-  home-manager.users.me.xsession.windowManager.i3 = let
+
+  home-manager.users.me = let
    modifier = "Mod4";
-  in {
-    enable = true;
-    extraConfig = ''
-      bindsym --release ${modifier}+Shift+w exec /run/wrappers/bin/slock
-    '';
-    config = rec {
-      fonts = {
-        names = ["Sans"];
-        size = 10.0;
-      };
-      inherit modifier;
-      window = {
-        titlebar = false;
-        border = 1;
-        hideEdgeBorders = "smart";
-        commands = [
-          {
-            criteria = {class = "floating";};
-            command = "floating enable";
-          }
-          {
-            criteria = {class = "fzfmenu";};
-            command = "floating enable";
-          }
-          {
-            criteria = {class = ".*";};
-            command = "border pixel 2";
-          }
-          {
-            criteria = {class = "mpv";};
-            command = lib.strings.concatStringsSep ", " [
-              "floating enable"
-              "sticky enable"
-              "fullscreen disable"
-              "resize set 640 480"
-              "move position mouse"
-            ];
-          }
-        ];
-      };
-      floating = {
-        titlebar = false;
-        border = 1;
-      };
-      colors = let
-        scheme = {
-          background = colours.background;
-          text = colours.foreground;
-        };
-      in rec {
-        focused =
-          scheme
-          // {
-            border = colours.blue.bright;
-            indicator = colours.blue.bright;
-            childBorder = colours.blue.bright;
-          };
-        unfocused =
-          scheme
-          // {
-            border = colours.background;
-            indicator = colours.background;
-            childBorder = colours.background;
-          };
-        focusedInactive = unfocused;
-        urgent =
-          scheme
-          // {
-            border = colours.red.bright;
-            indicator = colours.red.bright;
-            childBorder = colours.red.bright;
-          };
-        placeholder =
-          scheme
-          // {
-            border = colours.green.bright;
-            indicator = colours.green.bright;
-            childBorder = colours.green.bright;
-          };
-      };
-      bars = [
-        {
-          workspaceButtons = false;
-          fonts = {
-            names = ["Monospace" "Font Awesome 6 Free"];
-            size = 8.0;
-          };
-          mode = "dock"; # "hide";
+    infoWorkspace = "ℹ";
+    messageWorkspace = "✉";
+    modes.resize = {
+      "Escape" = ''mode "default"'';
+      "Return" = ''mode "default"'';
+      "h" = "resize shrink width 10 px or 5 ppt";
+      "j" = "resize grow height 10 px or 5 ppt";
+      "k" = "resize shrink height 10 px or 5 ppt";
+      "l" = "resize grow width 10 px or 5 ppt";
+    };
+    gaps.inner = 4;
+    floating = {
+      titlebar = false;
+      border = 1;
+    };
+    bars = [
+      (config.home-manager.users.me.lib.stylix.i3.bar
+        // rec {
+          workspaceButtons = true;
+          mode = "hide"; # "dock";
          position = "bottom";
-          colors = rec {
-            background = colours.background;
-            separator = background;
-            statusline = colours.foreground;
-            bindingMode = {
-              background = colours.red.bright;
-              border = colours.background;
-              text = colours.foreground;
-            };
-          };
          statusCommand = toString (pkgs.writers.writeDash "i3status-rust" ''
            export I3RS_GITHUB_TOKEN="$(cat ${config.age.secrets.github-token-i3status-rust.path})"
            export OPENWEATHERMAP_API_KEY="$(cat ${config.age.secrets.openweathermap-api-key.path})"
-            ${pkgs.i3status-rust}/bin/i3status-rs ${
-              (pkgs.formats.toml {}).generate "i3status-rust.toml" (import ../lib/i3status-rust.nix {
-                inherit (config.niveum) batteryName wirelessInterface;
-                inherit (config.home-manager.users.me.accounts.email) accounts;
-                inherit colours;
-                inherit pkgs;
-              })
-            }'');
+            exec ${config.home-manager.users.me.programs.i3status-rust.package}/bin/i3status-rs ${config.home-manager.users.me.home.homeDirectory}/.config/i3status-rust/config-${position}.toml
+          '');
+          fonts = {
+            names = ["${config.stylix.fonts.sansSerif.name}" "FontAwesome 6 Free"];
+            size = config.stylix.fonts.sizes.desktop * 0.8;
+          };
+        })
+    ];
+    window = {
+      titlebar = false;
+      border = 2;
+      hideEdgeBorders = "smart";
+      commands = [
+        {
+          criteria = {class = "floating";};
+          command = "floating enable";
+        }
+        {
+          criteria = {class = "fzfmenu";};
+          command = "floating enable";
+        }
+        {
+          criteria = {class = ".*";};
+          command = "border pixel 2";
+        }
+        {
+          criteria = {class = "mpv";};
+          command = lib.strings.concatStringsSep ", " [
+            "floating enable"
+            "sticky enable"
+            "fullscreen disable"
+            "resize set 640 480"
+            "move position mouse"
+          ];
        }
      ];
-      modes.resize = {
-        "Escape" = ''mode "default"'';
-        "Return" = ''mode "default"'';
-        "h" = "resize shrink width 10 px or 5 ppt";
-        "j" = "resize grow height 10 px or 5 ppt";
-        "k" = "resize shrink height 10 px or 5 ppt";
-        "l" = "resize grow width 10 px or 5 ppt";
+    };
+    colors = let
+      background = config.lib.stylix.colors.withHashtag.base00;
+    in {
+      unfocused = {
+        border = lib.mkForce background;
+        childBorder = lib.mkForce background;
      };
-      keybindings = {
+    };
+    keybindings =
+      lib.listToAttrs (map (x: lib.nameValuePair "${modifier}+Shift+${toString x}" "move container to workspace ${toString x}") (lib.range 1 9))
+      // lib.listToAttrs (map (x: lib.nameValuePair "${modifier}+${toString x}" "workspace ${toString x}") (lib.range 1 9))
+      // {
+        "${modifier}+i" = "workspace ${infoWorkspace}";
+        "${modifier}+m" = "workspace ${messageWorkspace}";
+
        "${modifier}+Shift+h" = "move left 25 px";
        "${modifier}+Shift+j" = "move down 25 px";
        "${modifier}+Shift+k" = "move up 25 px";
@@ -231,12 +201,10 @@ in {
        "${modifier}+k" = "focus up";
        "${modifier}+l" = "focus right";

-        "${modifier}+Shift+b" = "move window to workspace prev";
-        "${modifier}+Shift+n" = "move window to workspace next";
-        "${modifier}+Shift+x" = "exec ${move-to-new-workspace}";
-        "${modifier}+b" = "workspace prev";
-        "${modifier}+n" = "workspace next";
-        "${modifier}+x" = "exec ${new-workspace}";
+        # "${modifier}+Shift+b" = "move container to workspace prev";
+        # "${modifier}+Shift+n" = "move container to workspace next";
+        # "${modifier}+b" = "workspace prev";
+        # "${modifier}+n" = "workspace next";

        "${modifier}+Shift+c" = "reload";
        "${modifier}+Shift+q" = "kill";
@@ -245,8 +213,9 @@ in {
        "${modifier}+z" = "sticky toggle";
        "${modifier}+Shift+z" = "floating toggle";

-        "${modifier}+s" = "scratchpad show";
        "${modifier}+Shift+s" = "move scratchpad";
+        "${modifier}+s" = ''[class="^(?i)(?!obsidian).*"] scratchpad show'';
+        "${modifier}+o" = ''[class="obsidian"] scratchpad show'';

        "${modifier}+c" = "split h";
        "${modifier}+e" = "layout toggle split";
@@ -254,43 +223,19 @@ 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}+q" = "exec ${config.services.clipmenu.package}/bin/clipmenu";

-        # "${modifier}+Shift+y" = "exec ${pkgs.qutebrowser}/bin/qutebrowser";
        "${modifier}+Return" = "exec ${(defaultApplications pkgs).terminal}";
        "${modifier}+t" = "exec ${(defaultApplications pkgs).fileManager}";
        "${modifier}+y" = "exec ${(defaultApplications pkgs).browser}";
-        "${modifier}+0" = "exec ${niveumPackages.menu-calc}/bin/=";

        "${modifier}+d" = "exec ${pkgs.writers.writeDash "run" ''exec rofi -modi run,ssh,window -show run''}";
-        "${modifier}+Shift+d" = "exec ${
-          pkgs.writers.writeDash "notemenu" ''
-            set -efu
-            PATH=$PATH:${
-              lib.makeBinPath [pkgs.rofi pkgs.findutils pkgs.coreutils]
-            }
-
-            cd ~/notes
-            note_file=$({
-              echo diary/$(date -I).md
-              echo diary/$(date -I -d yesterday).md
-              find . ! -name '.*' -type f -printf "%T@ %p\n" | sort --reverse --numeric-sort | cut --delimiter=" " --fields=2-
-            } | rofi -dmenu -i -p 'notes')
-            if test "$note_file"
-            then
-              alacritty --working-directory ~/notes -e "$EDITOR" "$note_file"
-            fi
-          ''
-        }";
+        "${modifier}+Shift+d" = "exec ${niveumPackages.notemenu}/bin/notemenu";
        "${modifier}+p" = "exec rofi-pass";
        "${modifier}+Shift+p" = "exec rofi-pass --insert";
        "${modifier}+u" = "exec ${niveumPackages.unicodmenu}/bin/unicodmenu";
+        "${modifier}+Shift+u" = "exec ${pkgs.writers.writeDash "last-unicode" ''${pkgs.xdotool}/bin/xdotool type --delay 1000 "$(${pkgs.gawk}/bin/awk 'END{print $1}' ~/.cache/unicodmenu)"''}";

-        "${modifier}+F6" = "exec ${pkgs.xorg.xkill}/bin/xkill";
        "${modifier}+F7" = "exec ${pkgs.writers.writeDash "showkeys-toggle" ''
          if ${pkgs.procps}/bin/pgrep screenkey; then
            exec ${pkgs.procps}/bin/pkill screenkey
@@ -298,25 +243,18 @@ in {
            exec ${pkgs.screenkey}/bin/screenkey
          fi
        ''}";
-        "${modifier}+F8" = "exec switch-theme toggle";
-        "${modifier}+F9" = "exec ${pkgs.redshift}/bin/redshift -O 4000 -b 0.85";
-        "${modifier}+F10" = "exec ${pkgs.redshift}/bin/redshift -x";
-        "${modifier}+F11" = "exec ${pkgs.xcalib}/bin/xcalib -invert -alter";
        "${modifier}+F12" = "exec ${klem}/bin/klem";
-        "Print" = "exec flameshot gui";
        "XF86AudioLowerVolume" = "exec ${pkgs.pamixer}/bin/pamixer -d 5";
        "XF86AudioMute" = "exec ${pkgs.pamixer}/bin/pamixer -t";
        "XF86AudioRaiseVolume" = "exec ${pkgs.pamixer}/bin/pamixer -i 5";
        "XF86Calculator" = "exec ${pkgs.st}/bin/st -c floating -e ${pkgs.bc}/bin/bc";
-        "XF86AudioPause" = "exec ${pkgs.playerctl}/bin/playerctl pause";
+        "XF86AudioPause" = "exec ${pkgs.playerctl}/bin/playerctl play-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 ${niveumPackages.k-lock}/bin/k-lock";

-        "XF86Display" = "exec ${niveumPackages.dmenu-randr}/bin/dmenu-randr";
-
        # key names detected with xorg.xev:
        # XF86WakeUp (fn twice)
        # XF86Battery (fn f3)
@@ -331,6 +269,38 @@ in {
        # XF86Back
        # XF86Launch1 (thinkvantage)
      };
+  in {
+    stylix.targets.i3.enable = true;
+
+    xsession.windowManager.i3 = {
+      enable = true;
+      extraConfig = ''
+        bindsym --release ${modifier}+Shift+w exec /run/wrappers/bin/slock
+
+        exec "${pkgs.obsidian}/bin/obsidian"
+        for_window [class="obsidian"] , move scratchpad
+
+        assign [class="message"] ${messageWorkspace}
+        exec "${pkgs.writers.writeDash "irc" "exec ${pkgs.alacritty}/bin/alacritty --class message -e ssh weechat@makanek -t tmux attach-session -t IM"}"
+        exec "${pkgs.writers.writeDash "email" "exec ${pkgs.alacritty}/bin/alacritty --class message -e aerc"}"
+
+        assign [class="dashboard"] ${infoWorkspace}
+        exec ${dashboard}/bin/dashboard
+      '';
+      config = {
+          inherit modifier gaps modes bars floating window colors;
+          keybindings = keybindings // {
+            "${modifier}+ß" = "exec ${niveumPackages.menu-calc}/bin/=";
+            "${modifier}+F6" = "exec ${pkgs.xorg.xkill}/bin/xkill";
+            "${modifier}+F9" = "exec ${pkgs.redshift}/bin/redshift -O 4000 -b 0.85";
+            "${modifier}+F10" = "exec ${pkgs.redshift}/bin/redshift -x";
+            "${modifier}+F11" = "exec ${pkgs.xcalib}/bin/xcalib -invert -alter";
+            "Print" = "exec flameshot gui";
+            # "${modifier}+Shift+x" = "exec ${move-to-new-workspace}";
+            # "${modifier}+x" = "exec ${new-workspace}";
+            "XF86Display" = "exec ${niveumPackages.dmenu-randr}/bin/dmenu-randr";
+          };
+      };
    };
  };
 }
--- a/configs/i3status-rust.nix
+++ b/configs/i3status-rust.nix
@@ -0,0 +1,82 @@
+{
+  pkgs,
+  config,
+  ...
+}: {
+  age.secrets = {
+    miniflux-api-token = {
+      file = ../secrets/miniflux-api-token.age;
+      owner = config.users.users.me.name;
+      group = config.users.users.me.group;
+      mode = "400";
+    };
+  };
+
+  home-manager.users.me = {
+    programs.i3status-rust = {
+      enable = true;
+      bars.bottom = {
+        icons = "awesome6";
+        settings = {
+          theme.overrides = let
+            colours = config.lib.stylix.colors.withHashtag;
+          in {
+            idle_bg = colours.base00;
+            idle_fg = colours.base05;
+            good_bg = colours.base00;
+            good_fg = colours.base0B;
+            warning_bg = colours.base00;
+            warning_fg = colours.base0A;
+            critical_bg = colours.base00;
+            critical_fg = colours.base09;
+            info_bg = colours.base00;
+            info_fg = colours.base04;
+            separator_bg = colours.base00;
+            separator = " ";
+          };
+        };
+        blocks = [
+          {
+            block = "music";
+            format = "{$icon $combo $play |}";
+            separator = " – ";
+          }
+          {
+            block = "net";
+            format = " $icon HU";
+            missing_format = "";
+            device = "ppp0";
+          }
+          {
+            block = "net";
+            format = " $icon FU";
+            missing_format = "";
+            device = "tun0";
+          }
+          {
+            block = "battery";
+            format = "$icon $percentage $time";
+            device = "DisplayDevice";
+            driver = "upower";
+          }
+          {
+            block = "sound";
+          }
+          {
+            block = "disk_space";
+            format = "$icon $available";
+          }
+          {
+            block = "memory";
+            format = "$icon $mem_used.eng(prefix:G)";
+          }
+          {block = "load";}
+          {
+            block = "time";
+            format = "$icon $timestamp.datetime(f:'%Y-%m-%d (%W %a) %H:%M', l:de_DE)";
+          }
+        ];
+      };
+    };
+  };
+}
--- a/configs/keyboard.nix
+++ b/configs/keyboard.nix
@@ -2,68 +2,129 @@
  pkgs,
  lib,
  ...
-}: let
+}:
+let
+
  commaSep = builtins.concatStringsSep ",";
-  xkbOptions = ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
+  xkbOptions = [
+    "compose:caps"
+    "terminate:ctrl_alt_bksp"
+    "grp:ctrls_toggle"
+  ];
  languages = {
-    de = "T3";
-    gr = "polytonic";
-    ru = "phonetic";
-    ara = "buckwalter";
-    cop = "";
-    ave = "";
-    "in" = "san-kagapa";
-    il = "phonetic";
+    deutsch = {
+      code = "de";
+      variant = "T3";
+    };
+    greek = {
+      code = "gr";
+      variant = "polytonic";
+    };
+    russian = {
+      code = "ru";
+      variant = "phonetic";
+    };
+    arabic = {
+      code = "ara";
+      variant = "buckwalter";
+    }; # ../lib/keyboards/arabic;
+    coptic = ../lib/keyboards/coptic;
+    avestan = ../lib/keyboards/avestan;
+    gothic = ../lib/keyboards/gothic;
+    farsi = {
+      code = "ir";
+      variant = "qwerty";
+    };
+    syriac = {
+      code = "sy";
+      variant = "syc_phonetic";
+    };
+    sanskrit = {
+      code = "in";
+      variant = "san-kagapa";
+    };
+    gujarati = {
+      code = "in";
+      variant = "guj-kagapa";
+    };
+    urdu = {
+      code = "in";
+      variant = "urd-phonetic";
+    };
+    hebrew = {
+      code = "il";
+      variant = "phonetic";
+    };
  };
-  defaultLanguage = "de";
-in {
+  defaultLanguage = languages.deutsch;
+in
+{
+  services.libinput.enable = true;
+
  # man 7 xkeyboard-config
  services.xserver = {
-    layout = "de";
+    exportConfiguration = true; # link /usr/share/X11 properly
+    xkb.layout = defaultLanguage.code;
    # T3: https://upload.wikimedia.org/wikipedia/commons/a/a9/German-Keyboard-Layout-T3-Version1-large.png
    # buckwalter: http://www.qamus.org/transliteration.htm
-    xkbVariant = "T3";
-    xkbOptions = commaSep xkbOptions;
-    libinput.enable = true;
-    xkbDir = pkgs.symlinkJoin {
+    xkb.variant = defaultLanguage.variant;
+    xkb.options = commaSep xkbOptions;
+    xkb.dir = 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";
-            };
-          }
-        ])
+        (pkgs.linkFarm "custom-x-keyboards" (
+          lib.mapAttrsToList (name: value: {
+            name = "symbols/${name}";
+            path = value;
+          }) (lib.filterAttrs (_: value: !(value ? "code")) languages)
+          ++ [
+            {
+              name = "symbols/ir";
+              path = ../lib/keyboards/farsi;
+            }
+          ]
+        ))
      ];
    };
  };

+  environment.etc."x11-locale".source = toString pkgs.xorg.libX11 + "share/X11/locale";
+
+  home-manager.users.me = {
+    home.file =
+      lib.mapAttrs' (name: path: lib.nameValuePair ".xkb/symbols/${name}" { source = path; })
+        (lib.filterAttrs (_: value: !(value ? "code")) languages) // {
+          ".xkb/symbols/ir".source = ../lib/keyboards/farsi;
+        };
+  };
+
  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;
+  environment.systemPackages = lib.mapAttrsToList (
+    language: settings:
+    let
+      code = if settings ? "code" then settings.code else language;
+      variant = if settings ? "variant" then settings.variant else "";
+    in
+    pkgs.writers.writeDashBin "kb-${language}" ''
+      if [ -z $SWAYSOCK ]; then
+        ${pkgs.xorg.setxkbmap}/bin/setxkbmap ${defaultLanguage.code},${code} ${defaultLanguage.variant},${variant} ${
+          toString (map (option: "-option ${option}") xkbOptions)
+        }
+      else
+        swaymsg -s $SWAYSOCK 'input * xkb_layout "${defaultLanguage.code},${code}"'
+        swaymsg -s $SWAYSOCK 'input * xkb_variant "${defaultLanguage.variant},${variant}"'
+        swaymsg -s $SWAYSOCK 'input * xkb_options "${lib.concatStringsSep "," xkbOptions}"'
+      fi
+    ''
+  ) languages;

  # improve held key rate
  services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xset}/bin/xset r rate 300 50";

  systemd.user.services.gxkb = {
-    wantedBy = ["graphical-session.target"];
+    wantedBy = [ "graphical-session.target" ];
    serviceConfig = {
      SyslogIdentifier = "gxkb";
      ExecStart = "${pkgs.gxkb}/bin/gxkb";
--- a/configs/khal.nix
+++ b/configs/khal.nix
@@ -6,7 +6,7 @@
 }: let
  davHome = "~/.local/share/dav";
  kmeinCloud = {
-    davEndpoint = "https://cloud.xn--kiern-0qa.de/remote.php/dav";
+    davEndpoint = "https://cloud.kmein.de/remote.php/dav";
    username = "kieran";
    passwordFile = config.age.secrets.nextcloud-password-kieran.path;
  };
@@ -54,8 +54,7 @@ in {
    wantedBy = ["default.target"];
    startAt = "*:00/10";
    script = ''
-      ${pkgs.vdirsyncer}/bin/vdirsyncer sync
-      ${pkgs.khal}/bin/khal printcalendars # https://lostpackets.de/khal/configure.html#syncing
+      ${pkgs.vdirsyncer}/bin/vdirsyncer sync && ${pkgs.khal}/bin/khal printcalendars # https://lostpackets.de/khal/configure.html#syncing
    '';
    serviceConfig = {
      Type = "oneshot";
@@ -104,30 +103,9 @@ in {
      "khal/config".text = ''
        [calendars]

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

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

        [storage kontakte_local]
@@ -189,12 +161,6 @@ in {
        url = "${kmeinCloud.davEndpoint}/calendars/${kmeinCloud.username}/"
        username = "${kmeinCloud.username}"
        password.fetch = ["command", "cat", "${kmeinCloud.passwordFile}"]
-
-        [storage fysi_cloud]
-        type = "caldav"
-        url = "${fysiCloud.davEndpoint}/calendars/${fysiCloud.username}/"
-        username = "${fysiCloud.username}"
-        password.fetch = ["command", "cat", "${fysiCloud.passwordFile}"]
      '';
    };
  };
--- a/configs/lb.nix
+++ b/configs/lb.nix
@@ -9,7 +9,7 @@
    startAt = "weekly";
    serviceConfig = {
      user = "kfm";
-      WorkingDirectory = "/home/kfm/cloud/Seafile/Books/Germanistik/LB";
+      WorkingDirectory = "/home/kfm/cloud/nextcloud/Books/Germanistik/LB";
    };
    script = ''
      first_year=2019
--- a/configs/mime.nix
+++ b/configs/mime.nix
@@ -2,6 +2,13 @@
  home-manager.users.me = {
    xdg.mimeApps = {
      enable = true;
+      associations = {
+        added = {
+          "x-scheme-handler/tg" = "org.telegram.desktop.desktop";
+        };
+        removed = {
+        };
+      };
      defaultApplications = {
        "application/epub+zip" = "org.pwmt.zathura.desktop";
        "application/pdf" = "org.pwmt.zathura.desktop";
@@ -19,7 +26,7 @@
        "x-scheme-handler/mailto" = "firefox.desktop";
        "x-scheme-handler/unknown" = "firefox.desktop";
        "x-scheme-handler/webcal" = "firefox.desktop";
-        "inode/directory" = "pcmanfm.desktop";
+        "x-scheme-handler/tg" = "org.telegram.desktop.desktop";
      };
    };
  };
--- a/configs/mpv.nix
+++ b/configs/mpv.nix
@@ -36,7 +36,7 @@ in {
        "Alt+j" = "add video-pan-y -0.05";
      };
      scripts = [
-        pkgs.mpvScripts.youtube-quality
+        pkgs.mpvScripts.quality-menu
        niveumPackages.mpv-visualizer
      ];
    };
--- a/configs/mycelium.nix
+++ b/configs/mycelium.nix
@@ -0,0 +1,15 @@
+{ lib, ... }:
+let
+  myceliumAddresses = import ../lib/mycelium-network.nix;
+in
+{
+  services.mycelium = {
+    enable = true;
+    openFirewall = true;
+  };
+
+  networking.hosts = lib.mapAttrs' (name: address: {
+    name = address;
+    value = [ "${name}.m" ];
+  }) myceliumAddresses;
+}
--- a/configs/neovim.nix
+++ b/configs/neovim.nix
@@ -1,6 +1,7 @@
 {
  pkgs,
  niveumPackages,
+  config,
  ...
 }: {
  environment.variables.EDITOR = pkgs.lib.mkForce "nvim";
@@ -8,66 +9,51 @@
  environment.shellAliases.vim = "nvim";
  environment.shellAliases.view = "nvim -R";

-  environment.systemPackages = [
-    (pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
-    (pkgs.neovim.override {
-      configure = {
-        customRC = ''
-          source ${../lib/vim/init.vim}
-
-          luafile ${../lib/vim/init.lua}
-        '';
-        packages.nvim = with pkgs.vimPlugins; {
-          start = [
-            ale
-            fzf-vim
-            fzfWrapper
-            supertab
-            undotree
-            tabular
-            # vimwiki
-            niveumPackages.vimPlugins-vim-colors-paramount
-            nvim-lspconfig
-            vim-commentary
-            vim-css-color
-            vim-eunuch
-            niveumPackages.vimPlugins-vim-fetch
-            vim-fugitive
-            vim-gitgutter
-            vim-repeat
-            vim-sensible
-            vim-surround
-            (pkgs.vimUtils.buildVimPlugin rec {
-              pname = "vim-dim";
-              version = "1.1.0";
-              name = "${pname}-${version}";
-              src = pkgs.fetchFromGitHub {
-                owner = "jeffkreeftmeijer";
-                repo = pname;
-                rev = version;
-                sha256 = "sha256-lyTZUgqUEEJRrzGo1FD8/t8KBioPrtB3MmGvPeEVI/g=";
-              };
-            })
-          ];
-          opt = [
-            csv
-            elm-vim
-            emmet-vim
-            haskell-vim
-            niveumPackages.vimPlugins-icalendar-vim
-            niveumPackages.vimPlugins-jq-vim
-            rust-vim
-            typescript-vim
-            vim-javascript
-            vim-ledger
-            vim-nix
-            vimtex
-            vim-pandoc
-            vim-pandoc-syntax
-            niveumPackages.vimPlugins-vim-256noir
-          ];
+  home-manager.users.me = {
+    editorconfig = {
+      enable = true;
+      settings = {
+        "*" = {
+          charset = "utf-8";
+          end_of_line = "lf";
+          trim_trailing_whitespace = true;
+          insert_final_newline = true;
+          indent_style = "space";
+          indent_size = 2;
+        };
+        "*.py" = {
+          indent_size = 4;
+        };
+        Makefile = {
+          indent_style = "tab";
+        };
+        "*.md" = {
+          trim_trailing_whitespace = false;
        };
      };
+    };
+  };
+
+  environment.systemPackages = [
+    (pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
+    (niveumPackages.vim.override {
+      # stylixColors = config.lib.stylix.colors;
+      colorscheme = "base16-gruvbox-light-medium";
    })
+
+    # language servers
+    pkgs.pyright
+    pkgs.haskellPackages.haskell-language-server
+    pkgs.texlab
+    pkgs.nil
+    pkgs.gopls
+    pkgs.nixfmt-rfc-style
+    pkgs.rust-analyzer
+    pkgs.nodePackages.typescript-language-server
+    pkgs.lua-language-server
+    pkgs.nodePackages.vscode-langservers-extracted
+    pkgs.lemminx
+    niveumPackages.jq-lsp
+    pkgs.dhall-lsp-server
  ];
 }
--- a/configs/neovim.sync-conflict-20250130-092404-AJVBWR2.nix
+++ b/configs/neovim.sync-conflict-20250130-092404-AJVBWR2.nix
@@ -0,0 +1,46 @@
+{ pkgs, niveumPackages, config, ... }: {
+  environment.variables.EDITOR = pkgs.lib.mkForce "nvim";
+  environment.shellAliases.vi = "nvim";
+  environment.shellAliases.vim = "nvim";
+  environment.shellAliases.view = "nvim -R";
+
+  home-manager.users.me = {
+    editorconfig = {
+      enable = true;
+      settings = {
+        "*" = {
+          charset = "utf-8";
+          end_of_line = "lf";
+          trim_trailing_whitespace = true;
+          insert_final_newline = true;
+          indent_style = "space";
+          indent_size = 2;
+        };
+        "*.py" = { indent_size = 4; };
+        Makefile = { indent_style = "tab"; };
+        "*.md" = { trim_trailing_whitespace = false; };
+      };
+    };
+  };
+
+  environment.systemPackages = [
+    (pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
+    (niveumPackages.vim.override {
+      stylixColors = config.lib.stylix.colors;
+      # colorscheme = "base16-gruvbox-dark-medium";
+    })
+
+    # language servers
+    pkgs.pyright
+    pkgs.haskellPackages.haskell-language-server
+    pkgs.texlab
+    pkgs.nil
+    pkgs.rust-analyzer
+    pkgs.nodePackages.typescript-language-server
+    pkgs.lua-language-server
+    pkgs.nodePackages.vscode-langservers-extracted
+    pkgs.lemminx
+    niveumPackages.jq-lsp
+    pkgs.dhall-lsp-server
+  ];
+}
--- a/configs/networkmanager.nix
+++ b/configs/networkmanager.nix
@@ -1,47 +1,7 @@
 {
-  lib,
  pkgs,
  ...
-}: let
-  profile = name: custom:
-    lib.recursiveUpdate {
-      connection.id = name;
-      connection.type = "wifi";
-      connection.interface-name = "wlp3s0";
-      connection.permissions = "";
-      wifi.mac-address-blacklist = "";
-      wifi.ssid = name;
-      wifi.mode = "infrastructure";
-      ipv4.dns-search = "";
-      ipv4.method = "auto";
-      ipv6.addr-gen-mode = "stable-privacy";
-      ipv6.dns-search = "";
-      ipv6.method = "auto";
-      proxy = {};
-    }
-    custom;
-  eduroamProfile = {
-    connection.uuid = "eae9fee6-a7d2-4120-a609-440b457d6fcf";
-    wifi-security = {
-      group = "ccmp;tkip;";
-      key-mgmt = "wpa-eap";
-      pairwise = "ccmp;";
-      proto = "rsn;";
-    };
-    "802-1x" = {
-      altsubject-matches = "DNS:srv1-radius.cms.hu-berlin.de;DNS:srv2-radius.cms.hu-berlin.de;";
-      anonymous-identity = "anonymous@wlan.hu-berlin.de";
-      ca-cert = pkgs.fetchurl {
-        url = "https://www.cms.hu-berlin.de/de/dl/netze/wlan/config/eduroam/t-telesec_globalroot_class_2.pem";
-        sha256 = "0if8aqd06sid7a0vw009zpa087wxcgdd2x6z2zs4pis5kvyqj2dk";
-      };
-      eap = "ttls;";
-      identity = lib.strings.fileContents <secrets/eduroam/identity>;
-      password = lib.strings.fileContents <secrets/eduroam/password>;
-      phase2-auth = "pap";
-    };
-  };
-in {
+}: {
  programs.nm-applet.enable = true;

  networking.networkmanager = {
--- a/configs/newsboat.nix
+++ b/configs/newsboat.nix
@@ -1,118 +1,17 @@
 {
  pkgs,
  config,
-  lib,
  ...
-}: let
-  ytdl-format = "'bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best'";
-
-  youtube-download = "${pkgs.ts}/bin/ts ${pkgs.yt-dlp}/bin/yt-dlp -f ${ytdl-format} --add-metadata";
-
-  newsboat-home = "${config.users.users.me.home}/cloud/Seafile/Documents/newsboat";
-  linkhandler = pkgs.writers.writeDash "linkhandler" ''
-    # Feed script a url or file location.
-    # If an image, it will view in sxiv,
-    # if a video or gif, it will view in mpv
-    # if a music file or pdf, it will download,
-    # otherwise it opens link in browser.
-
-    # If no url given. Opens browser. For using script as $BROWSER.
-    [ -z "$1" ] && { "$BROWSER"; exit; }
-
-    case "$1" in
-        *mkv|*webm|*mp4|*youtube.com/watch*|*youtube.com/playlist*|*youtu.be*|*bitchute.com*|*videos.lukesmith.xyz*|*odysee.com*)
-            setsid -f ${pkgs.mpv}/bin/mpv -quiet "$1" >/dev/null 2>&1 ;;
-        *png|*jpg|*jpe|*jpeg|*gif)
-            curl -sL "$1" > "/tmp/$(echo "$1" | sed "s/.*\///")" && sxiv -a "/tmp/$(echo "$1" | sed "s/.*\///")"  >/dev/null 2>&1 & ;;
-        *mp3|*flac|*opus|*mp3?source*)
-            setsid -f tsp curl -LO "$1" >/dev/null 2>&1 ;;
-        *)
-            if [ -f "$1" ]; then "$TERMINAL" -e "$EDITOR" "$1"
-        else setsid -f "$BROWSER" "$1" >/dev/null 2>&1; fi ;;
-    esac
-  '';
-
-  newsboat-config = pkgs.writeText "config" ''
-    auto-reload no
-    reload-threads 8
-    prepopulate-query-feeds yes
-
-    # dont keep a search history
-    history-limit 0
-
-    datetime-format %F
-
-    text-width 85
-
-    external-url-viewer "${pkgs.urlscan}/bin/urlscan -dc -r '${linkhandler} {}'"
-    browser ${linkhandler}
-    macro , open-in-browser
-    macro c set browser "${pkgs.xsel}/bin/xsel -b <<<" ; open-in-browser ; set browser ${linkhandler}
-    macro v set browser "${pkgs.util-linux}/bin/setsid -f ${pkgs.mpv}/bin/mpv" ; open-in-browser ; set browser ${linkhandler}
-    macro y set browser "${youtube-download}" ; open-in-browser ; set browser ${linkhandler}
-
-    bind-key j down
-    bind-key k up
-    bind-key j next articlelist
-    bind-key k prev articlelist
-    bind-key J next-feed articlelist
-    bind-key K prev-feed articlelist
-    bind-key G end
-    bind-key g home
-    bind-key d pagedown
-    bind-key u pageup
-    bind-key l open
-    bind-key h quit
-    bind-key a toggle-article-read
-    bind-key n next-unread
-    bind-key N prev-unread
-    bind-key D pb-download
-    bind-key U show-urls
-    bind-key x pb-delete
-
-    save-path ${newsboat-home}/saved/
-
-    highlight all "---.*---" yellow default
-    # highlight feedlist ".*(0/0))" default default
-    highlight article "^Title:.*" yellow default bold
-    highlight article "^Author:.*" yellow default
-    highlight article "^Flags:.*" red default
-    highlight article "\\[[0-9][0-9]*\\]" color66 default bold
-    highlight article "\\[image [0-9][0-9]*\\]" color109 default bold
-    highlight article "\\[embedded flash: [0-9][0-9]*\\]" color66 default bold
-
-    color listfocus blue default
-    color listfocus_unread blue default bold
-    color info red default bold
-
-    urls-source "miniflux"
-    miniflux-url "https://feed.kmein.de"
-    miniflux-login "kfm"
-    miniflux-password "${lib.strings.fileContents <secrets/miniflux/password>}"
-  '';
-
-  newsboat-sql = "${pkgs.sqlite}/bin/sqlite3 ${newsboat-home}/cache.db";
-in {
+}: {
  environment.systemPackages = [
-    pkgs.newsboat
-    (pkgs.writers.writeDashBin "newsboat-unread-count" ''
-      if [ -f ${newsboat-home}/cache.db.lock ]; then
-        ${pkgs.jq}/bin/jq -n '{state: "Info", text: "↻", icon: "rss"}'
-      else
-
-        ${pkgs.jq}/bin/jq -n \
-          --argjson unread "$(${newsboat-sql} "SELECT COUNT(DISTINCT id) FROM rss_item WHERE unread=1")" \
-          --argjson watchLater "$(${newsboat-sql} "SELECT COUNT(DISTINCT id) FROM rss_item WHERE flags='e' AND deleted=0")" \
-          '{
-            state: (if $unread > 0 then "Good" else "Idle" end),
-            text: (if $unread > 0 then "\($unread)" else "[\($watchLater)]" end),
-            icon: "rss"
-          }'
-      fi
-    '')
-    (pkgs.writers.writeDashBin "mpv-watch-later" ''
-      ${newsboat-sql} "SELECT url FROM rss_item WHERE flags='e' AND deleted=0 ORDER BY pubDate DESC" \
-        | ${pkgs.findutils}/bin/xargs ${pkgs.mpv}/bin/mpv
+    (pkgs.writers.writeDashBin "miniflux-watch-later" ''
+      miniflux_api_token=$(cat ${config.age.secrets.miniflux-api-token.path})
+      random_feed_item=$(
+        ${pkgs.curl}/bin/curl -u "$miniflux_api_token" --basic -s 'https://feed.kmein.de/v1/entries?starred=true&limit=0' \
+        | ${pkgs.jq}/bin/jq -r '.entries[].id' \
+        | ${pkgs.coreutils}/bin/shuf -n1
+      )
+      ${pkgs.xdg-utils}/bin/xdg-open "https://feed.kmein.de/starred/entry/$random_feed_item"
    '')
  ];
 }
--- a/configs/nix.nix
+++ b/configs/nix.nix
@@ -1,9 +1,14 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  inputs,
+  ...
+}: {
  nixpkgs = {
    config.allowUnfree = true;
  };
  nix = {
-    package = pkgs.nixFlakes;
+    package = pkgs.nixVersions.stable;
    extraOptions = "experimental-features = nix-command flakes";
+    nixPath = ["nixpkgs=${inputs.nixpkgs}"];
  };
 }
--- a/configs/packages.nix
+++ b/configs/packages.nix
@@ -4,10 +4,13 @@
  lib,
  inputs,
  niveumPackages,
+  unstablePackages,
  ...
 }: let
  worldradio = pkgs.callPackage ../packages/worldradio.nix {};

+  externalNetwork = import ../lib/external-network.nix;
+
  zoteroStyle = {
    name,
    sha256,
@@ -29,7 +32,7 @@
    })
    (zoteroStyle {
      name = "apa";
-      sha256 = "sha256-yq4fW6hQknycLjaj5fPbXLrQlGBp5myXiOSHBU90jEc=";
+      sha256 = "sha256-sUf0Ov5c9aTUoLsYSRbQl3Qs9ELkb5/Tky35kH7pKuE=";
    })
  ];

@@ -60,89 +63,79 @@ in {
  };

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

-    inputs.menstruation-backend.defaultPackage.x86_64-linux
+    # inputs.menstruation-backend.defaultPackage.x86_64-linux
    inputs.agenix.packages.x86_64-linux.default
    inputs.recht.defaultPackage.x86_64-linux

@@ -202,9 +201,6 @@ in {
      ${pkgs.openssh}/bin/ssh makanek "cd /var/lib/weechat/logs && grep --ignore-case --color=always --recursive $@" | ${pkgs.less}/bin/less --raw-control-chars
    '')

-    (pkgs.writers.writeDashBin "ncmpcpp-zaatar" ''MPD_HOST=${(import ../lib/local-network.nix).zaatar} exec ${pkgs.ncmpcpp}/bin/ncmpcpp "$@"'')
-    (pkgs.writers.writeDashBin "mpc-zaatar" ''MPD_HOST=${(import ../lib/local-network.nix).zaatar} exec ${pkgs.mpc_cli}/bin/mpc "$@"'')
-
    inputs.scripts.packages.x86_64-linux.alarm

    spotify
@@ -216,10 +212,13 @@ in {

    #krebs
    niveumPackages.dic
-    niveumPackages.cyberlocker-tools
-    niveumPackages.untilport
-    niveumPackages.kpaste
-    config.nur.repos.mic92.ircsink
+    pkgs.nur.repos.mic92.ircsink
+
+    (haskellPackages.ghcWithHoogle (hs: [
+      hs.text
+      hs.lens
+      hs.bytestring
+    ]))

    (python3.withPackages (py: [
      py.black
@@ -233,22 +232,16 @@ in {
    ]))
    # python3Packages.poetry

-    # language servers
-    pyright
-    haskell-language-server
-    texlab
-    nil
-    rust-analyzer
+    dhall-nix
+    dhall-bash
+    dhall-json
+    dhall

    html-tidy
    nodePackages.csslint
    nodePackages.jsonlint
-    nodePackages.prettier
-    nodePackages.typescript
-    nodePackages.yarn
    deno # better node.js
-    nodejs
-    nodePackages.javascript-typescript-langserver
+    go
    texlive.combined.scheme-full
    latexrun
    (aspellWithDicts (dict: [dict.de dict.en dict.en-computers]))
@@ -260,7 +253,9 @@ in {
    # gnumeric
    dia
    pandoc
-    niveumPackages.man-pandoc
+    librsvg # pandoc depends on this to include SVG in documents
+    # niveumPackages.man-pandoc
+    typst
    # proselint
    asciidoctor
    wordnet
@@ -270,9 +265,18 @@ in {
    # nightly.rust
    shellcheck

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

  age.secrets.home-assistant-token = {
--- a/configs/picom.nix
+++ b/configs/picom.nix
@@ -1,13 +1,13 @@
 {
  services.picom = {
    enable = true;
-    activeOpacity = 1;
+    # activeOpacity = 1;
    fade = true;
    fadeDelta = 1;
-    inactiveOpacity = 0.9;
-    shadow = true;
-    menuOpacity = 0.9;
-    shadowOpacity = 0.3;
+    # inactiveOpacity = 0.9;
+    # shadow = true;
+    # menuOpacity = 0.9;
+    # shadowOpacity = 0.3;
    fadeExclude = [
      "class_g = 'slock'" # don't want a transparent lock screen!
      "name *?= 'slock'"
--- a/configs/printing.nix
+++ b/configs/printing.nix
@@ -12,7 +12,7 @@ in {
  ];

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

  hardware.printers.ensurePrinters = [
    {
--- a/configs/rofi.nix
+++ b/configs/rofi.nix
@@ -1,14 +1,6 @@
-{
-  config,
-  pkgs,
-  ...
-}: let
-  inherit (import <niveum/lib>) colours;
-in {
+{pkgs, ...}: {
  home-manager.users.me.programs.rofi = {
    enable = true;
-    font = "Monospace 10";
-    theme = "${pkgs.rofi}/share/rofi/themes/Arc.rasi";
    pass = {
      enable = true;
      extraConfig = ''
--- a/configs/seafile.nix
+++ b/configs/seafile.nix
@@ -1,23 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
-  services.xserver.displayManager.sessionCommands = "${pkgs.seafile-client}/bin/seafile-applet &";
-
-  home-manager.users.me.xdg.configFile = {
-    "Seafile/Seafile Client.conf".source = (pkgs.formats.ini {}).generate "Seafile Client.conf" {
-      Behavior = {
-        hideDockIcon = false;
-        hideMainWindowWhenStarted = true;
-      };
-      Settings = {
-        computerName = config.networking.hostName;
-        lastShiburl = "https://box.hu-berlin.de";
-      };
-      UsedServerAddresses.main = "https://box.hu-berlin.de";
-    };
-  };
-
-  environment.systemPackages = [pkgs.seafile-client];
-}
--- a/configs/sound.nix
+++ b/configs/sound.nix
@@ -1,12 +1,6 @@
 {pkgs, ...}: {
-  sound.enable = true;
-
-  # realtime audio for pulseaudio
-  security.rtkit.enable = true;
-
  services.pipewire = {
-    enable = false;
-    systemWide = false;
+    enable = true;
    alsa = {
      enable = true;
      support32Bit = true;
@@ -15,25 +9,13 @@
    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"
-        ]
-      }
-    '';
-  };
+  systemd.user.services.pipewire-pulse.path = [pkgs.pulseaudio];

-  users.users.me.extraGroups = ["pipewire" "audio"];
+  services.avahi = {
+    enable = true;
+    publish.enable = true;
+    publish.userServices = true;
+  };

  environment.systemPackages = [
    pkgs.pavucontrol
--- a/configs/spacetime.nix
+++ b/configs/spacetime.nix
@@ -3,5 +3,6 @@
  location = {
    latitude = 52.517;
    longitude = 13.3872;
+    provider = "geoclue2";
  };
 }
--- a/configs/ssh.nix
+++ b/configs/ssh.nix
@@ -1,46 +1,46 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
+{pkgs, ...}: let
  inherit (import ../lib) sshPort kieran;
  externalNetwork = import ../lib/external-network.nix;
-  sshIdentity = name: "${config.users.users.me.home}/.ssh/${name}";
 in {
-  users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys pkgs;
+  users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys;
+  programs.ssh.startAgent = true;

  home-manager.users.me = {
-    services.gpg-agent = rec {
-      enable = true;
-      enableSshSupport = true;
-      defaultCacheTtlSsh = 2 * 60 * 60;
-      maxCacheTtlSsh = 4 * defaultCacheTtlSsh;
-      sshKeys = [
-        "568047C91DE03A23883E340F15A9C24D313E847C"
-        "BB3EE102DB8CD45540A78A6B18B511B67061F6B4" # kfm@manakish ed25519
-        "3F8986755818B5762A096BE212777EAAC441DD9D" # fysiweb rsa
-        "0E4ABD229432486CC432639BB0986B2CDE365105" # agenix ed25519
-        "A1E8D32CBFCDBD2DE798E2298D795CCFD785AE06" # kfm@kabsa ed25519
-      ];
-    };
+    # https://discourse.nixos.org/t/gnome-keyring-and-ssh-agent-without-gnome/11663
+    xsession.profileExtra = ''
+      eval $(${pkgs.gnome3.gnome-keyring}/bin/gnome-keyring-daemon --daemonize --components=ssh,secrets)
+      export SSH_AUTH_SOCK
+    '';
+    # services.gpg-agent = rec {
+    #   enable = false;
+    #   enableSshSupport = true;
+    #   defaultCacheTtlSsh = 2 * 60 * 60;
+    #   maxCacheTtlSsh = 4 * defaultCacheTtlSsh;
+    #   sshKeys = [
+    #     "568047C91DE03A23883E340F15A9C24D313E847C"
+    #     "BB3EE102DB8CD45540A78A6B18B511B67061F6B4" # kfm@manakish ed25519
+    #     "3F8986755818B5762A096BE212777EAAC441DD9D" # fysiweb rsa
+    #     "0E4ABD229432486CC432639BB0986B2CDE365105" # agenix ed25519
+    #     "A1E8D32CBFCDBD2DE798E2298D795CCFD785AE06" # kfm@kabsa ed25519
+    #   ];
+    # };
  };

-  environment.extraInit = ''
-    if [[ -z "$SSH_AUTH_SOCK" ]]; then
-      export SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)"
-    fi
-  '';
+  # environment.extraInit = ''
+  # if [[ -z "$SSH_AUTH_SOCK" ]]; then
+  #   export SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)"
+  # fi
+  # '';

-  environment.interactiveShellInit = ''
-    GPG_TTY="$(tty)"
-    export GPG_TTY
-    ${pkgs.gnupg}/bin/gpg-connect-agent updatestartuptty /bye > /dev/null
-  '';
+  # environment.interactiveShellInit = ''
+  # GPG_TTY="$(tty)"
+  # export GPG_TTY
+  # ${pkgs.gnupg}/bin/gpg-connect-agent updatestartuptty /bye > /dev/null
+  # '';

  home-manager.users.me.programs.ssh = {
    enable = true;
-    matchBlocks = rec {
+    matchBlocks = {
      "github.com" = {
        hostname = "ssh.github.com";
        port = 443;
@@ -80,26 +80,10 @@ in {
        user = "kfm";
        port = sshPort;
      };
-      "nextcloud.fysi.dev" = {
-        hostname = "116.203.82.203";
-        user = "root";
-      };
-      "lingua.miaengiadina.ch" = {
-        hostname = "135.181.85.233";
-        user = "root";
-      };
-      "cms-dev.woc2023.app".identityFile = sshIdentity "fysiweb";
-      "cms-master.woc2023.app".identityFile = sshIdentity "fysiweb";
-      "fysi-dev1" = {
-        hostname = "94.130.229.139";
-        user = "root";
-        identityFile = sshIdentity "fysiweb";
-      };
-      ${fysi-dev1.hostname} = fysi-dev1;
-      "fysi-shared0" = {
-        hostname = "49.12.205.235";
-        user = "root";
-        identityFile = sshIdentity "fysiweb";
+      fatteh = {
+        hostname = "fatteh.r";
+        user = "kfm";
+        port = sshPort;
      };
    };
  };
--- a/configs/sshd.nix
+++ b/configs/sshd.nix
@@ -11,9 +11,13 @@ in {
  services.openssh = {
    enable = true;
    ports = [sshPort];
-    passwordAuthentication = false;
-    forwardX11 = true;
+    settings = {
+      PasswordAuthentication = false;
+      X11Forwarding = true;
+    };
  };

-  users.users.root.openssh.authorizedKeys.keys = kieran.sshKeys pkgs;
+  users.users.root.openssh.authorizedKeys.keys = kieran.sshKeys ++ [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPoiRIn1dBUtpApcUyGbZKN+m5KBSgKIDQjdnQ8vU0xU kfm@kibbeh" # travel laptop
+  ];
 }
--- a/configs/stardict.nix
+++ b/configs/stardict.nix
@@ -1,9 +1,10 @@
 {
-  config,
  pkgs,
  lib,
+  inputs,
  ...
 }: let
+  locker = x: "https://c.krebsco.de/${x}";
  dictionaries = {
    lojban = {
      jbo-deu = pkgs.fetchzip {
@@ -29,7 +30,7 @@
        sha256 = "1kmbdjqinrcxkc6jdyyrq5rl2wzhnrychyynnh91yhrjwjxlh44k";
      };
      Woodhouse = pkgs.fetchzip {
-        url = "https://c.krebsco.de/Woodhouse.zip";
+        url = locker "Woodhouse.zip";
        sha256 = "1dvnc2679yb048q2f3hr2h34acvhan0n3iir6h9ajlrdzz48mlkq";
        stripRoot = false;
      };
@@ -68,39 +69,39 @@
        sha256 = "1bjja3n3layfd08xa1r0a6375dxh5zi6hlv7chkhgnx800cx7hxn";
      };
      Roget = pkgs.fetchzip {
-        url = "http://download.huzheng.org/bigdict/stardict-Roget_s_II_The_New_Thesaurus_3th_Ed-2.4.2.tar.bz2";
-        sha256 = "1szyny9497bpyyccf9l5kr3bnw0wvl4cnsd0n1zscxpyzlsrqqbz";
+        url = locker "stardict-Roget_s_II_The_New_Thesaurus_3th_Ed-2.4.2.tar.bz2";
+        hash = "sha256-f2GcNf3+dqZ/sKBpywjdHHC7Rp6FJseY93edRJK3/us=";
      };
      JargonFile = pkgs.fetchzip {
-        url = "http://download.huzheng.org/dict.org/stardict-dictd-jargon-2.4.2.tar.bz2";
-        sha256 = "096phar9qpmm0fnaqv5nz8x9lpxwnfj78g4vjfcfyd7kqp7iqla4";
+        url = locker "stardict-dictd-jargon-2.4.2.tar.bz2";
+        hash = "sha256-RFEcz8XzNO+Yk5s8dKSzvF+aOvq2bKysA7VenLKC1yQ=";
      };
      Oxford-Collocations = pkgs.fetchzip {
-        url = "http://download.huzheng.org/bigdict/stardict-Oxford_Collocations_Dictionary_2nd_Ed-2.4.2.tar.bz2";
+        url = locker "stardict-Oxford_Collocations_Dictionary_2nd_Ed-2.4.2.tar.bz2";
        sha256 = "1zkfs0zxkcn21z2lhcabrs77v4ma9hpv7qm119hpyi1d8ajcw07q";
      };
      Langenscheidt-Deu-En = pkgs.fetchzip {
-        url = "http://download.huzheng.org/babylon/german/stardict-Handw_rterbuch_Deutsch_Englisc-2.4.2.tar.bz2";
+        url = locker "stardict-Handw_rterbuch_Deutsch_Englisc-2.4.2.tar.bz2";
        sha256 = "12q9i5azq7ylyrpb6jqbaf1rxalc3kzcwjvbinvb0yabdxb80y30";
      };
      Langenscheidt-En-Deu = pkgs.fetchzip {
-        url = "http://download.huzheng.org/babylon/german/stardict-Handw_rterbuch_Englisch_Deutsc-2.4.2.tar.bz2";
+        url = locker "stardict-Handw_rterbuch_Englisch_Deutsc-2.4.2.tar.bz2";
        sha256 = "087b05h155j5ldshfgx91pz81h6ijq2zaqjirg7ma8ig3l96zb59";
      };
      Duden_Das_Fremdworterbuch = pkgs.fetchzip {
-        url = "http://download.huzheng.org/babylon/german/stardict-Duden_Das_Fremdworterbuch-2.4.2.tar.bz2";
+        url = locker "stardict-Duden_Das_Fremdworterbuch-2.4.2.tar.bz2";
        sha256 = "1zrcay54ccl031s6dvjwsah5slhanmjab87d81rxlcy8fx0xd8wq";
      };
      Duden_De_De = pkgs.fetchzip {
-        url = "http://download.huzheng.org/babylon/german/stardict-Duden_De_De-2.4.2.tar.bz2";
+        url = locker "stardict-Duden_De_De-2.4.2.tar.bz2";
        sha256 = "1fhay04w5aaj83axfmla2ql34nb60gb05dgv0k94ig7p8x4yxxlf";
      };
      ConciseOED = pkgs.fetchzip {
-        url = "http://download.huzheng.org/bigdict/stardict-Concise_Oxford_English_Dictionary-2.4.2.tar.bz2";
+        url = locker "stardict-Concise_Oxford_English_Dictionary-2.4.2.tar.bz2";
        sha256 = "19kpcxbhqzpmhi94mp48nalgmsh6s7rsx1gb4kwkhirp2pbjcyl7";
      };
      Duden_Synonym = pkgs.fetchzip {
-        url = "http://download.huzheng.org/babylon/german/stardict-Duden_Synonym-2.4.2.tar.bz2";
+        url = locker "stardict-Duden_Synonym-2.4.2.tar.bz2";
        sha256 = "0cx086zvb86bmz7i8vnsch4cj4fb0cp165g4hig4982zakj6f2jd";
      };
    };
@@ -140,32 +141,39 @@
    };
    oed = {
      OED1 = pkgs.fetchzip {
-        url = "http://download.huzheng.org/bigdict/stardict-Oxford_English_Dictionary_2nd_Ed._P1-2.4.2.tar.bz2";
+        url = locker "stardict-Oxford_English_Dictionary_2nd_Ed._P1-2.4.2.tar.bz2";
        sha256 = "0i5vv1rv44yfwyf9bfbdrb9brzhhpvz2jnh39fv8hh107nkv2vcf";
      };
      OED2 = pkgs.fetchzip {
-        url = "http://download.huzheng.org/bigdict/stardict-Oxford_English_Dictionary_2nd_Ed._P2-2.4.2.tar.bz2";
+        url = locker "stardict-Oxford_English_Dictionary_2nd_Ed._P2-2.4.2.tar.bz2";
        sha256 = "1pk234pbq4pk55d8sjk0pp9j5sajm82f8804kf2xm2x5p387q1rg";
      };
    };
+    coptic = {
+      dictionary = inputs.coptic-dictionary.packages.x86_64-linux.coptic-stardict;
+      Crum = pkgs.fetchzip {
+        url = locker "stardict-Coptic-English_all_dialects-2.4.2.tar.bz2";
+        sha256 = "1fi281mb9yzv40wjsdapi8fzpa7x2yscz582lv2qnss9g8zzzzr9";
+      };
+    };
    russian = {
      LingvoGermanRussian = pkgs.fetchzip {
-        url = "http://download.huzheng.org/lingvo/stardict-GR-LingvoUniversal-2.4.2.tar.bz2";
+        url = locker "stardict-GR-LingvoUniversal-2.4.2.tar.bz2";
        sha256 = "0p353gs2z4vj70hqsdhffjaaw3a4zlmcs46flipmf35lm5wmaj0g";
      };
      LingvoRussianGerman = pkgs.fetchzip {
-        url = "http://download.huzheng.org/lingvo/stardict-RG-LingvoUniversal-2.4.2.tar.bz2";
+        url = locker "stardict-RG-LingvoUniversal-2.4.2.tar.bz2";
        sha256 = "03f9wdmkgpjifpms7dyh10ma29wf3ka1j3zlp1av0cybhdldk2a8";
      };
    };
    turkish = {
      BabylonTurkishEnglish = pkgs.fetchzip {
-        url = "http://download.huzheng.org/babylon/bidirectional/stardict-babylon-Babylon_Turkish_English-2.4.2.tar.bz2";
-        sha256 = "17rv46r95nkikg7aszqmfrbgdhz9ny52w423m8n01g3p93shdb4i";
+        url = locker "stardict-babylon-Babylon_Turkish_English-2.4.2.tar.bz2";
+        sha256 = "1zpzgk3w0536gww31bj58cmn3imnkndyjwbcr7bay8ibq2kzv44z";
      };
      BabylonEnglishTurkish = pkgs.fetchzip {
-        url = "http://download.huzheng.org/babylon/bidirectional/stardict-babylon-Babylon_English_Turkish-2.4.2.tar.bz2";
-        sha256 = "063dl02s8ii8snsxgma8wi49xwr6afk6ysq0v986fygx5511353f";
+        url = locker "stardict-babylon-Babylon_English_Turkish-2.4.2.tar.bz2";
+        sha256 = "0myx31xzb7nrn5m657h0bwdgm5xp93ccwp6lcpbxgjxdjm3q0hc5";
      };
    };
  };
@@ -284,35 +292,35 @@
    " | less -FR
  '';
 in {
-  environment.etc.stardict.source = toString (makeStardictDataDir ({
-      Crum = pkgs.fetchzip {
-        url = "http://download.huzheng.org/misc/stardict-Coptic-English_all_dialects-2.4.2.tar.bz2";
-        sha256 = "1fi281mb9yzv40wjsdapi8fzpa7x2yscz582lv2qnss9g8zzzzr9";
-      };
-      SmithBiographyMythology = pkgs.fetchzip {
-        url = "https://github.com/latin-dict/Smith1873/releases/download/v1.0/Smith1873-stardict.zip";
-        sha256 = "01h5fxacp2m60xir8kzslkfy772vs3vmz07zhdwfhcwdaxif2af2";
-      };
-      SmithAntiquities = pkgs.fetchzip {
-        url = "https://github.com/latin-dict/Smith1890/releases/download/v1.0/Smith1890-stardict.zip";
-        sha256 = "0vpsv62p2lrzmgys4d1swpnc6lqhdi7rxwkj2ngy3lz5dk3fysyb";
-      };
-    }
-    // dictionaries.classics
-    // dictionaries.sanskrit
-    // dictionaries.oed
-    // dictionaries.russian
-    // dictionaries.englishGerman
-    // dictionaries.turkish));
+  # environment.etc.stardict.source = toString (makeStardictDataDir ({
+  #     Crum = pkgs.fetchzip {
+  #       url = "http://download.huzheng.org/misc/stardict-Coptic-English_all_dialects-2.4.2.tar.bz2";
+  #       sha256 = "1fi281mb9yzv40wjsdapi8fzpa7x2yscz582lv2qnss9g8zzzzr9";
+  #     };
+  #     SmithBiographyMythology = pkgs.fetchzip {
+  #       url = "https://github.com/latin-dict/Smith1873/releases/download/v1.0/Smith1873-stardict.zip";
+  #       sha256 = "01h5fxacp2m60xir8kzslkfy772vs3vmz07zhdwfhcwdaxif2af2";
+  #     };
+  #     SmithAntiquities = pkgs.fetchzip {
+  #       url = "https://github.com/latin-dict/Smith1890/releases/download/v1.0/Smith1890-stardict.zip";
+  #       sha256 = "0vpsv62p2lrzmgys4d1swpnc6lqhdi7rxwkj2ngy3lz5dk3fysyb";
+  #     };
+  #   }
+  #   // dictionaries.classics
+  #   // dictionaries.sanskrit
+  #   // dictionaries.oed
+  #   // dictionaries.russian
+  #   // dictionaries.englishGerman
+  #   // dictionaries.turkish));

  environment.systemPackages = [
-    # pkgs.goldendict
    (makeStardict "lsj" dictionaries.classics)
    (makeStardict "sa" dictionaries.sanskrit)
    (makeStardict "oed" dictionaries.oed)
    (makeStardict "sd-russian" dictionaries.russian)
    (makeStardict "sd" dictionaries.englishGerman)
    (makeStardict "jbo" dictionaries.lojban)
+    (makeStardict "cop" dictionaries.coptic)
    (makeStardict "sd-turkish" dictionaries.turkish)
  ];
 }
--- a/configs/stw-berlin.nix
+++ b/configs/stw-berlin.nix
@@ -0,0 +1,52 @@
+{
+  pkgs,
+  config,
+  ...
+}: {
+  age.secrets.stw-berlin-card-code.file = ../secrets/stw-berlin-card-code.age;
+
+  systemd.services.stw-berlin = {
+    enable = true;
+    wants = ["network-online.target"];
+    startAt = "weekly";
+    serviceConfig = {
+      User = config.users.users.me.name;
+      Group = config.users.users.me.group;
+      WorkingDirectory = "/home/kfm/cloud/nextcloud/Uni/Meta/Mensa";
+      LoadCredential = [
+        "password:${config.age.secrets.stw-berlin-card-code.path}"
+      ];
+    };
+    script = ''
+      KARTEN_ID=8071859
+      PASSWORT=$(cat "$CREDENTIALS_DIRECTORY"/password)
+
+      endpoint=https://ks.stw.berlin:4433/TL1/TLM/KASVC
+      authorization_header='Authorization: Basic S0FTVkM6ekt2NXlFMUxaVW12VzI5SQ=='
+
+      get_auth_token() {
+        ${pkgs.curl}/bin/curl -sSL "$endpoint/LOGIN?karteNr=$KARTEN_ID&format=JSON&datenformat=JSON" \
+          -X POST \
+          -H "$authorization_header" \
+          --data-raw '{"BenutzerID":"'$KARTEN_ID'","Passwort":"'$PASSWORT'"}' \
+          | ${pkgs.jq}/bin/jq -r '.[0].authToken|@uri'
+      }
+
+
+      get_transactions() {
+        ${pkgs.curl}/bin/curl -sSL "$endpoint/TRANS?format=JSON&authToken=$(get_auth_token)&karteNr=$KARTEN_ID&datumVon=12.02.2018&datumBis=$(date -d tomorrow +%d.%m.%Y)" \
+          -H "$authorization_header" \
+          | ${pkgs.jq}/bin/jq
+      }
+
+      get_items() {
+        ${pkgs.curl}/bin/curl -sSL "$endpoint/TRANSPOS?format=JSON&authToken=$(get_auth_token)&karteNr=$KARTEN_ID&datumVon=12.02.2018&datumBis=$(date -d tomorrow +%d.%m.%Y)" \
+          -H "$authorization_header" \
+          | ${pkgs.jq}/bin/jq
+      }
+
+      get_transactions > transactions-$(date -I).json
+      get_items > items-$(date -I).json
+    '';
+  };
+}
--- a/configs/stylix.nix
+++ b/configs/stylix.nix
@@ -0,0 +1,82 @@
+{
+  pkgs,
+  config,
+  lib,
+  inputs,
+  ...
+}: let
+  generatedWallpaper = pkgs.runCommand "wallpaper.png" {} ''
+    ${inputs.wallpaper-generator.packages.x86_64-linux.wp-gen}/bin/wallpaper-generator lines \
+      --output $out \
+      ${lib.concatMapStringsSep " "
+      (n: "--base0${lib.toHexString n}=${config.lib.stylix.colors.withHashtag."base0${lib.toHexString n}"}")
+      (lib.range 0 15)}
+  '';
+in {
+  # https://danth.github.io/stylix/tricks.html
+  # stylix.image = inputs.wallpapers.outPath + "/meteora/rodrigo-soares-250630.jpg";
+  stylix.enable = true;
+  stylix.image = generatedWallpaper;
+
+  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml";
+
+  stylix.cursor = {
+    name = "capitaine-cursors-white";
+    package = pkgs.capitaine-cursors;
+    size = 12;
+  };
+
+  home-manager.users.me = {
+    stylix.autoEnable = true;
+  };
+
+  # environment.etc."stylix/wallpaper.png".source = generatedWallpaper;
+
+  # stylix.polarity = "either";
+  # stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/${
+  # onedark
+  # synth-midnight-dark
+  # apprentice # https://romainl.github.io/Apprentice/
+  # one-light
+  # onedark
+  # material # https://github.com/ntpeters/base16-materialtheme-scheme
+  # material-palenight
+  # material-lighter
+  # tomorrow # https://github.com/chriskempson/tomorrow-theme
+  # tomorrow-night
+  # gruvbox-light-medium # https://github.com/dawikur/base16-gruvbox-scheme
+  # gruvbox-dark-medium
+  # selenized-light # https://github.com/jan-warchol/selenized
+  # selenized-dark
+  # papercolor-light
+  # papercolor-dark
+  # dracula # https://draculatheme.com/
+  # }.yaml";
+
+  stylix.fonts = {
+    serif = {
+      package = pkgs.noto-fonts;
+      name = "Noto Serif";
+    };
+
+    sansSerif = {
+      package = pkgs.noto-fonts;
+      name = "Noto Sans";
+    };
+
+    monospace = {
+      package = pkgs.noto-fonts;
+      name = "Noto Sans Mono";
+    };
+
+    emoji = {
+      package = pkgs.noto-fonts-emoji;
+      name = "Noto Color Emoji";
+    };
+
+    sizes = {
+      terminal = 6;
+      applications = 10;
+    };
+  };
+}
--- a/configs/telegram-bots/celan.nix
+++ b/configs/telegram-bots/celan.nix
@@ -1,36 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}: 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";
-    tokenFile = config.age.secrets.telegram-token-kmein.path;
-    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/hesychius.nix
+++ b/configs/telegram-bots/hesychius.nix
@@ -1,27 +0,0 @@
-{
-  pkgs,
-  config,
-  inputs,
-  lib,
-  ...
-}: let
-  hesychius = inputs.scripts.outPath + "/hesychius/hesychius.txt";
-in {
-  niveum.telegramBots.hesychius = {
-    enable = true;
-    time = "08:00";
-    tokenFile = config.age.secrets.telegram-token-kmein.path;
-    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
@@ -1,23 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  niveumPackages,
-  ...
-}: {
-  niveum.telegramBots.quotebot = {
-    enable = true;
-    time = "08/6:00";
-    tokenFile = config.age.secrets.telegram-token-kmein.path;
-    chatIds = ["-1001760262519"];
-    command = "${niveumPackages.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/tlg-wotd.nix
+++ b/configs/telegram-bots/tlg-wotd.nix
@@ -1,29 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}: {
-  niveum.telegramBots.tlg-wotd = {
-    enable = true;
-    time = "9:30";
-    chatIds = ["@tlgwotd"];
-    tokenFile = config.age.secrets.telegram-token-kmein.path;
-    command = toString (pkgs.writers.writeDash "tlg-wotd" ''
-      ${pkgs.curl}/bin/curl -sSL http://stephanus.tlg.uci.edu/Iris/Wotd \
-      | ${pkgs.recode}/bin/recode html..utf8 \
-      | ${pkgs.jq}/bin/jq -r '
-        "*\(.word)* '\'''\(.definition | sub("<.*>"; "") | rtrimstr(" "))'\'''\n\nFirst occurrence: \(.firstOccurrence)\nNumber of occurrences: \(.totalOccurrences)"
-      '
-    '');
-    parseMode = "Markdown";
-  };
-
-  niveum.passport.services = [
-    {
-      title = "Thesaurus Linguae Graecae Word of the Day";
-      description = "sends <a href=\"https://stephanus.tlg.uci.edu/\">TLG</a>'s word of the day to Telegram.";
-      link = "https://t.me/tlgwotd";
-    }
-  ];
-}
--- a/configs/themes.nix
+++ b/configs/themes.nix
@@ -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
@@ -1,33 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: let
-  theme = (import <niveum/lib>).theme pkgs;
-in {
-  environment.systemPackages = [theme.gtk.package theme.icon.package theme.cursor.package];
-
-  services.xserver.displayManager.lightdm.greeters.gtk = {
-    theme = {inherit (theme.gtk) name package;};
-    iconTheme = {inherit (theme.icon) name package;};
-  };
-
-  home-manager.users.me = {
-    gtk = {
-      enable = true;
-      iconTheme = theme.icon;
-      theme = theme.gtk;
-    };
-    qt = {
-      enable = true;
-      platformTheme = "gtk";
-    };
-    home.pointerCursor =
-      theme.cursor
-      // {
-        size = 16;
-        x11.enable = true;
-      };
-  };
-}
--- a/configs/battery.nix
+++ b/configs/battery.nix
--- a/configs/tmux.nix
+++ b/configs/tmux.nix
@@ -13,7 +13,7 @@
    aggressiveResize = true;
    escapeTime = 50;
    historyLimit = 7000;
-    shortcut = "a";
+    shortcut = "b";
    extraConfig = ''
      set -g mouse on

@@ -37,15 +37,6 @@
      set -g status-left-length 32
      set -g status-right-length 150

-      set -g status-bg colour242
-
-      setw -g window-status-format "#[fg=colour12,bg=colour233] #I #[fg=white,bg=colour237] #W "
-      setw -g window-status-current-format "#[fg=colour12,bg=colour233] * #[fg=white,bg=colour237,bold] #W "
-
-      set -g status-left ""
-      set -g status-right "#[fg=colour255,bg=colour237,bold] #(hostname -I) #[default]#[fg=colour12,bg=colour233] %FT%R "
-      set -g status-justify left
-
      set -g status-position bottom
    '';
  };
--- a/configs/traadfri.nix
+++ b/configs/traadfri.nix
@@ -1,43 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
-  inherit (import ../lib) localAddresses;
-  living-room-id = 131090;
-in {
-  environment.systemPackages = [
-    (pkgs.writers.writeDashBin "traadfri-party" ''
-      while true; do
-        for color in $(traadfri colours | shuf); do
-          echo "$color"
-          traadfri group "''${2:-${toString living-room-id}}" --on --colour="$color"
-          sleep "''${1:-2}"
-        done
-      done
-    '')
-  ];
-
-  age.secrets.traadfri-key = {
-    file = ../secrets/traadfri-key.age;
-    owner = config.users.users.me.name;
-    group = config.users.users.me.group;
-    mode = "400";
-  };
-
-  niveum.traadfri = {
-    enable = true;
-    user = "kmein";
-    host = localAddresses.tradfri;
-    keyFile = config.age.secrets.traadfri-key.path;
-    rooms = {
-      corridor = 131080;
-      kitchen = 131081;
-      bedroom = 131082;
-      living-room = living-room-id;
-      bedside = 131087;
-      chain = 131089;
-    };
-  };
-}
--- a/configs/wallpaper.nix
+++ b/configs/wallpaper.nix
@@ -3,7 +3,8 @@
  lib,
  ...
 }: let
-  url = "http://prism.r/realwallpaper-krebs-stars-berlin.png";
+  # url = "http://wallpaper.r/realwallpaper-krebs-stars-berlin.png";
+  url = "http://wallpaper.r/realwallpaper-krebs.png";
  stateDir = "~/.cache/wallpaper";
 in {
  systemd.user.services.wallpaper = {
--- a/configs/wpa_supplicant.nix
+++ b/configs/wpa_supplicant.nix
@@ -1,6 +1,9 @@
+{ config, ... }:
 {
  networking.wireless = {
    enable = true;
-    networks.Aether.pskRaw = "e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a";
+    secretsFile = config.age.secrets.wifi.path;
+    # networks.Aether.pskRaw = "e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a";
+    networks.Schilfpalast.pskRaw = "ext:schilfpalast";
  };
 }
--- a/configs/zsh.nix
+++ b/configs/zsh.nix
@@ -2,11 +2,10 @@
  config,
  pkgs,
  ...
-}: {
-  home-manager.users.me.home.file.".zshrc".text = ''
-    # nothing to see here
-  '';
-
+}: let
+  promptColours.success = "cyan";
+  promptColours.failure = "red";
+in {
  environment.systemPackages = [pkgs.atuin];
  environment.variables.ATUIN_CONFIG_DIR = toString (pkgs.writeTextDir "/config.toml" ''
    auto_sync = true
@@ -52,13 +51,13 @@

      export KEYTIMEOUT=1

-      hash -d nixos=/etc/nixos niveum=${config.users.users.me.home}/projects/niveum
+      hash -d nixos=/etc/nixos niveum=${config.users.users.me.home}/sync/src/niveum

-      autoload -U zmv run-help
+      autoload -U zmv run-help edit-command-line

      fpath=(${zsh-completions}/src $fpath)
    '';
-    promptInit = with config.niveum; ''
+    promptInit = ''
      autoload -Uz vcs_info
      zstyle ':vcs_info:*' enable git
      zstyle ':vcs_info:*' check-for-changes true
@@ -99,6 +98,8 @@

      zle -N zle-line-init
      zle -N zle-keymap-select
+      zle -N edit-command-line
+      bindkey -M vicmd v edit-command-line
    '';
  };
 }
--- a/flake.lock
+++ b/flake.lock
--- a/flake.nix
+++ b/flake.nix
@@ -3,44 +3,139 @@

  inputs = {
    agenix.url = "github:ryantm/agenix";
+    # alew-web.url = "git+ssh://gitea@code.kmein.de:22022/kfm/alew-web.git?ref=refs/heads/master";
+    coptic-dictionary.url = "github:kmein/coptic-dictionary";
    flake-utils.url = "github:numtide/flake-utils";
-    home-manager.url = "github:nix-community/home-manager/release-22.11";
+    home-manager.url = "github:nix-community/home-manager/release-25.05";
    menstruation-backend.url = "github:kmein/menstruation.rs";
    menstruation-telegram.url = "github:kmein/menstruation-telegram";
+    nix-on-droid.url = "github:t184256/nix-on-droid/release-23.05";
    nixinate.url = "github:matthewcroughan/nixinate";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
+    nixpkgs-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0";
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
    nur.url = "github:nix-community/NUR";
    recht.url = "github:kmein/recht";
+    retiolum.url = "github:krebs/retiolum";
+    rust-overlay.url = "github:oxalica/rust-overlay";
    scripts.url = "github:kmein/scripts";
-    retiolum.url = "git+https://git.thalheim.io/Mic92/retiolum";
+    stockholm.url = "github:krebs/stockholm";
+    stylix.url = "github:danth/stylix/release-25.05";
    telebots.url = "github:kmein/telebots";
    tinc-graph.url = "github:kmein/tinc-graph";
-    traadfri.url = "github:kmein/traadfri";
    voidrice.url = "github:Lukesmithxyz/voidrice";
+    wallpaper-generator.url = "github:pinpox/wallpaper-generator/v1.1";
+    wallpapers.url = "github:kmein/wallpapers";

+    agenix.inputs.home-manager.follows = "home-manager";
    agenix.inputs.nixpkgs.follows = "nixpkgs";
+    coptic-dictionary.inputs.nixpkgs.follows = "nixpkgs";
    home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    menstruation-backend.inputs.flake-utils.follows = "flake-utils";
-    menstruation-backend.inputs.nixpkgs.follows = "nixpkgs";
-    nixinate.inputs.nixpkgs.follows = "nixpkgs";
+    # menstruation-backend.inputs.flake-utils.follows = "flake-utils";
+    # menstruation-backend.inputs.nixpkgs.follows = "nixpkgs";
+    # menstruation-backend.inputs.rust-overlay.follows = "rust-overlay";
+    menstruation-telegram.inputs.flake-utils.follows = "flake-utils";
+    menstruation-telegram.inputs.menstruation-backend.follows = "menstruation-backend";
+    menstruation-telegram.inputs.nixpkgs.follows = "nixpkgs-old";
+    nix-on-droid.inputs.home-manager.follows = "home-manager";
+    nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
+    recht.inputs.flake-utils.follows = "flake-utils";
+    recht.inputs.nixpkgs.follows = "nixpkgs";
+    rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
+    scripts.inputs.flake-utils.follows = "flake-utils";
+    scripts.inputs.nixpkgs.follows = "nixpkgs";
+    scripts.inputs.rust-overlay.follows = "rust-overlay";
+    stylix.inputs.home-manager.follows = "home-manager";
+    stylix.inputs.nixpkgs.follows = "nixpkgs";
    tinc-graph.inputs.flake-utils.follows = "flake-utils";
    tinc-graph.inputs.nixpkgs.follows = "nixpkgs";
+    tinc-graph.inputs.rust-overlay.follows = "rust-overlay";
    voidrice.flake = false;
+    wallpaper-generator.inputs.flake-utils.follows = "flake-utils";
+    wallpapers.flake = false;
+  };
+
+  nixConfig = {
+    extra-substituters = [ "https://kmein.cachix.org" ];
+    extra-trusted-public-keys = [ "kmein.cachix.org-1:rsJ2b6++VQHJ1W6rGuDUYsK/qUkFA3bNpO6PyEyJ9Ls=" ];
  };

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

      nixosModules = {
        htgen = import modules/htgen.nix;
@@ -51,22 +146,74 @@
        power-action = import modules/power-action.nix;
        system-dependent = import modules/system-dependent.nix;
        telegram-bot = import modules/telegram-bot.nix;
-        traadfri = import modules/traadfri.nix;
+        go-webring = import modules/go-webring.nix;
      };

      lib = {
        panoptikon = import lib/panoptikon.nix;
      };

-      nixosConfigurations = {
-        ful = nixpkgs.lib.nixosSystem rec {
-          system = "aarch64-linux";
-          specialArgs = {
-            niveumPackages = inputs.self.packages.${system};
+      nixOnDroidConfigurations = {
+        moto = nix-on-droid.lib.nixOnDroidConfiguration {
+          modules = [systems/moto/configuration.nix];
+          pkgs = import nixpkgs {
+            system = "aarch64-linux";
+            overlays = [nix-on-droid.overlays.default];
+          };
+          extraSpecialArgs = {
+            niveumPackages = inputs.self.packages.aarch64-linux;
            niveumLib = inputs.self.lib;
            inherit inputs;
          };
+          home-manager-path = home-manager.outPath;
+        };
+      };
+
+      homeConfigurations = {
+        maakaron = let
+          system = "x86_64-darwin";
+          pkgs = nixpkgs.legacyPackages.${system};
+        in
+          home-manager.lib.homeManagerConfiguration {
+            inherit pkgs;
+            modules = [./systems/maakaron/home.nix];
+            extraSpecialArgs = {
+              inherit inputs;
+              niveumPackages = inputs.self.packages.${system};
+            };
+          };
+      };
+
+      nixosConfigurations = let
+        niveumSpecialArgs = system: {
+          unstablePackages = import nixpkgs-unstable {
+            inherit system;
+            config.allowUnfreePredicate = pkg:
+              builtins.elem (nixpkgs-unstable.lib.getName pkg) [
+                "obsidian"
+                "zoom"
+              ];
+          };
+
+          niveumPackages = inputs.self.packages.${system};
+          niveumLib = inputs.self.lib;
+          inherit inputs;
+        };
+      in {
+        ful = nixpkgs.lib.nixosSystem rec {
+          system = "aarch64-linux";
+          specialArgs = niveumSpecialArgs system;
          modules = [
+            systems/ful/configuration.nix
+            agenix.nixosModules.default
+            inputs.self.nixosModules.passport
+            inputs.self.nixosModules.panoptikon
+            inputs.self.nixosModules.go-webring
+            inputs.self.nixosModules.htgen
+            inputs.stockholm.nixosModules.reaktor2
+            retiolum.nixosModules.retiolum
+            nur.modules.nixos.default
+            { nixpkgs.overlays = [ inputs.stockholm.overlays.default ]; }
            {
              _module.args.nixinate = {
                host = "ful";
@@ -76,72 +223,53 @@
                hermetic = false;
              };
            }
-            systems/ful/configuration.nix
-            agenix.nixosModules.default
-            inputs.self.nixosModules.passport
-            inputs.self.nixosModules.panoptikon
-            retiolum.nixosModules.retiolum
-            nur.nixosModules.nur
          ];
        };
        zaatar = nixpkgs.lib.nixosSystem rec {
          system = "x86_64-linux";
-          specialArgs = {
-            niveumPackages = inputs.self.packages.${system};
-            inherit inputs;
-          };
+          specialArgs = niveumSpecialArgs system;
          modules = [
-            {
-              _module.args.nixinate = {
-                host = "zaatar";
-                sshUser = "root";
-                buildOn = "remote";
-                substituteOnTarget = true;
-                hermetic = false;
-              };
-            }
            systems/zaatar/configuration.nix
-            inputs.self.nixosModules.moodle-dl
            agenix.nixosModules.default
            retiolum.nixosModules.retiolum
          ];
        };
+        kibbeh = nixpkgs.lib.nixosSystem rec {
+          system = "x86_64-linux";
+          specialArgs = niveumSpecialArgs system;
+          modules = [
+            systems/kibbeh/configuration.nix
+            agenix.nixosModules.default
+            retiolum.nixosModules.retiolum
+            home-manager.nixosModules.home-manager
+          ];
+        };
        makanek = nixpkgs.lib.nixosSystem rec {
          system = "x86_64-linux";
          # for using inputs in other config files
-          specialArgs = {
-            niveumPackages = inputs.self.packages.${system};
-            inherit inputs;
-          };
+          specialArgs = niveumSpecialArgs system;
          modules = [
-            {
-              _module.args.nixinate = {
-                host = "makanek";
-                sshUser = "root";
-                buildOn = "remote";
-                substituteOnTarget = true;
-                hermetic = false;
-              };
-            }
            systems/makanek/configuration.nix
            inputs.self.nixosModules.telegram-bot
            inputs.self.nixosModules.htgen
            inputs.self.nixosModules.passport
            agenix.nixosModules.default
            retiolum.nixosModules.retiolum
-            nur.nixosModules.nur
+            nur.modules.nixos.default
          ];
        };
-        tahina = nixpkgs.lib.nixosSystem {
+        tahina = nixpkgs.lib.nixosSystem rec {
          system = "x86_64-linux";
+          specialArgs = niveumSpecialArgs system;
          modules = [
            systems/tahina/configuration.nix
            agenix.nixosModules.default
            retiolum.nixosModules.retiolum
          ];
        };
-        tabula = nixpkgs.lib.nixosSystem {
+        tabula = nixpkgs.lib.nixosSystem rec {
          system = "x86_64-linux";
+          specialArgs = niveumSpecialArgs system;
          modules = [
            systems/tabula/configuration.nix
            agenix.nixosModules.default
@@ -150,63 +278,57 @@
        };
        manakish = nixpkgs.lib.nixosSystem rec {
          system = "x86_64-linux";
-          specialArgs = {
-            niveumPackages = inputs.self.packages.${system};
-            inherit inputs;
-          };
+          specialArgs = niveumSpecialArgs system;
          modules = [
-            {
-              _module.args.nixinate = {
-                host = "manakish";
-                sshUser = "root";
-                buildOn = "remote";
-                substituteOnTarget = true;
-                hermetic = false;
-              };
-            }
            systems/manakish/configuration.nix
            agenix.nixosModules.default
            retiolum.nixosModules.retiolum
            home-manager.nixosModules.home-manager
-            nur.nixosModules.nur
+            nur.modules.nixos.default
+            stylix.nixosModules.stylix
          ];
        };
        kabsa = nixpkgs.lib.nixosSystem rec {
          system = "x86_64-linux";
-          specialArgs = {
-            niveumPackages = inputs.self.packages.${system};
-            inherit inputs;
-          };
+          specialArgs = niveumSpecialArgs system;
          modules = [
-            {
-              _module.args.nixinate = {
-                host = "kabsa";
-                sshUser = "root";
-                buildOn = "remote";
-                substituteOnTarget = true;
-                hermetic = false;
-              };
-            }
            systems/kabsa/configuration.nix
            agenix.nixosModules.default
            retiolum.nixosModules.retiolum
            home-manager.nixosModules.home-manager
-            nur.nixosModules.nur
+            nur.modules.nixos.default
+            stylix.nixosModules.stylix
+          ];
+        };
+        fatteh = nixpkgs.lib.nixosSystem rec {
+          system = "x86_64-linux";
+          specialArgs = niveumSpecialArgs system;
+          modules = [
+            systems/fatteh/configuration.nix
+            agenix.nixosModules.default
+            retiolum.nixosModules.retiolum
+            home-manager.nixosModules.home-manager
+            nur.modules.nixos.default
+            stylix.nixosModules.stylix
          ];
        };
      };
    }
-    // flake-utils.lib.eachSystem [flake-utils.lib.system.x86_64-linux flake-utils.lib.system.aarch64-linux] (system: let
+    // flake-utils.lib.eachSystem [flake-utils.lib.system.x86_64-linux flake-utils.lib.system.x86_64-darwin flake-utils.lib.system.aarch64-linux] (system: let
      pkgs = import nixpkgs {
        inherit system;
+        config.allowUnfree = true;
        overlays = [
-          nur.overlay
+          nur.overlays.default
          (self: super: {
-            mpv = super.mpv.override {scripts = [inputs.self.packages.${system}.mpv-visualizer];};
+            mpv = super.mpv.override {scripts = [inputs.self.packages.${system}.mpv-visualizer super.mpvScripts.mpris];};
            dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
          })
        ];
      };
+      unstablePackages = import nixpkgs-unstable {
+        inherit system;
+      };
      wrapScript = {
        packages ? [],
        name,
@@ -217,11 +339,15 @@
      packages = rec {
        auc = pkgs.callPackage packages/auc.nix {};
        betacode = pkgs.callPackage packages/betacode.nix {};
+        brainmelter = pkgs.callPackage packages/brainmelter.nix {};
+        brassica = pkgs.callPackage packages/brassica.nix {};
        cheat-sh = pkgs.callPackage packages/cheat-sh.nix {};
        closest = pkgs.callPackage packages/closest {};
+        cro = pkgs.callPackage packages/cro.nix {};
        cyberlocker-tools = pkgs.callPackage packages/cyberlocker-tools.nix {};
        default-gateway = pkgs.callPackage packages/default-gateway.nix {};
        depp = pkgs.callPackage packages/depp.nix {};
+        dashboard = pkgs.callPackage packages/dashboard {};
        devanagari = pkgs.callPackage packages/devanagari {};
        devour = pkgs.callPackage packages/devour.nix {};
        dic = pkgs.callPackage packages/dic.nix {};
@@ -234,7 +360,11 @@
        genius = pkgs.callPackage packages/genius.nix {};
        gfs-fonts = pkgs.callPackage packages/gfs-fonts.nix {};
        git-preview = pkgs.callPackage packages/git-preview.nix {};
+        gpt35 = pkgs.callPackage packages/gpt.nix {model = "gpt-3.5-turbo";};
+        gpt4 = pkgs.callPackage packages/gpt.nix {model = "gpt-4";};
        hc = pkgs.callPackage packages/hc.nix {};
+        jq-lsp = pkgs.callPackage packages/jq-lsp.nix {};
+        stardict-tools = pkgs.callPackage packages/stardict-tools.nix {};
        heuretes = pkgs.callPackage packages/heuretes.nix {};
        htgen = pkgs.callPackage packages/htgen.nix {};
        image-convert-favicon = pkgs.callPackage packages/image-convert-favicon.nix {};
@@ -256,16 +386,25 @@
        manual-sort = pkgs.callPackage packages/manual-sort.nix {};
        menu-calc = pkgs.callPackage packages/menu-calc.nix {};
        meteo = pkgs.callPackage packages/meteo.nix {};
+        noise-waves = pkgs.callPackage packages/noise-waves.nix {};
        mpv-radio = pkgs.callPackage packages/mpv-radio.nix {di-fm-key-file = "/dev/null";};
+        mpv-tuner = pkgs.callPackage packages/mpv-tuner.nix {di-fm-key-file = "/dev/null";};
        mpv-tv = pkgs.callPackage packages/mpv-tv.nix {};
-        mpv-visualizer = pkgs.callPackage packages/mpv-visualizer.nix {};
+        mpv-iptv = pkgs.callPackage packages/mpv-iptv.nix {};
+        mpv-visualizer = unstablePackages.mpvScripts.visualizer;
        new-mac = pkgs.callPackage packages/new-mac.nix {};
        nix-git = pkgs.callPackage packages/nix-git.nix {};
        nix-index-update = pkgs.callPackage packages/nix-index-update.nix {inherit system;};
+        notemenu = pkgs.callPackage packages/notemenu.nix {niveumPackages = self.packages.${system};};
        opustags = pkgs.callPackage packages/opustags.nix {};
        pls = pkgs.callPackage packages/pls.nix {};
+        polyglot = pkgs.callPackage packages/polyglot.nix {};
+        q = pkgs.callPackage packages/q.nix {};
        qrpaste = pkgs.callPackage packages/qrpaste.nix {};
+        random-zeno = pkgs.callPackage packages/random-zeno.nix {};
+        go-webring = pkgs.callPackage packages/go-webring.nix {};
        rfc = pkgs.callPackage packages/rfc.nix {};
+        gimp = pkgs.callPackage packages/gimp.nix {};
        scanned = pkgs.callPackage packages/scanned.nix {};
        swallow = pkgs.callPackage packages/swallow.nix {};
        text2pdf = pkgs.callPackage packages/text2pdf.nix {};
@@ -274,11 +413,18 @@
        trans = pkgs.callPackage packages/trans.nix {};
        ttspaste = pkgs.callPackage packages/ttspaste.nix {};
        unicodmenu = pkgs.callPackage packages/unicodmenu.nix {};
+        emailmenu = pkgs.callPackage packages/emailmenu.nix {};
        untilport = pkgs.callPackage packages/untilport.nix {};
        vg = pkgs.callPackage packages/vg.nix {};
+        vim = pkgs.callPackage packages/vim.nix {niveumPackages = self.packages.${system};};
+        obsidian-vim = pkgs.callPackage packages/obsidian-vim.nix {};
+        radio-news = pkgs.callPackage packages/radio-news.nix {};
        vimPlugins-cheat-sh-vim = pkgs.callPackage packages/vimPlugins/cheat-sh.nix {};
        vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix {};
        vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix {};
+        vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix {};
+        vimPlugins-mdwa-nvim = pkgs.callPackage packages/vimPlugins/mdwa-nvim.nix {};
+        vimPlugins-vim-ernest = pkgs.callPackage packages/vimPlugins/vim-ernest.nix {};
        vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix {};
        vimPlugins-vim-colors-paramount = pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix {};
        vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix {};
@@ -298,11 +444,7 @@
          name = "booksplit";
          packages = [pkgs.ffmpeg pkgs.glibc.bin];
        };
-        dmenu-randr = wrapScript {
-          script = inputs.voidrice.outPath + "/.local/bin/displayselect";
-          name = "dmenu-randr";
-          packages = [pkgs.dmenu pkgs.bc pkgs.psmisc pkgs.util-linux pkgs.xorg.xrandr pkgs.gawk pkgs.libnotify pkgs.arandr (pkgs.writers.writeDashBin "setbg" "")];
-        };
+        dmenu-randr = pkgs.callPackage packages/dmenu-randr.nix {};
        tag = wrapScript {
          script = inputs.voidrice.outPath + "/.local/bin/tag";
          name = "tag";
--- a/lib/colours/antares.nix
+++ b/lib/colours/antares.nix
@@ -1,37 +0,0 @@
-rec {
-  black = {
-    bright = "#151515";
-    dark = "#000000";
-  };
-  red = {
-    bright = "#de575c";
-    dark = "#de575c";
-  };
-  yellow = {
-    bright = "#ebe971";
-    dark = "#ebe971";
-  };
-  green = {
-    bright = "#00b853";
-    dark = "#00b853";
-  };
-  blue = {
-    bright = "#90d0f0";
-    dark = "#7fc6f0";
-  };
-  magenta = {
-    bright = "#cf9ffa";
-    dark = "#cf9ffa";
-  };
-  cyan = {
-    bright = "#4ae5e8";
-    dark = "#4ae5e8";
-  };
-  white = {
-    bright = "#ffffff";
-    dark = "#bbbbbb";
-  };
-  background = black.dark;
-  foreground = white.dark;
-  cursor = green.bright;
-}
--- a/lib/colours/apprentice.nix
+++ b/lib/colours/apprentice.nix
@@ -1,37 +0,0 @@
-{
-  black = {
-    bright = "#444444";
-    dark = "#1c1c1c";
-  };
-  red = {
-    bright = "#ff8700";
-    dark = "#af5f5f";
-  };
-  green = {
-    bright = "#87af87";
-    dark = "#5f875f";
-  };
-  yellow = {
-    bright = "#ffffaf";
-    dark = "#87875f";
-  };
-  blue = {
-    bright = "#8fafd7";
-    dark = "#5f87af";
-  };
-  magenta = {
-    bright = "#8787af";
-    dark = "#5f5f87";
-  };
-  cyan = {
-    bright = "#5fafaf";
-    dark = "#5f8787";
-  };
-  white = {
-    bright = "#999999";
-    dark = "#6c6c6c";
-  };
-  background = "#262626";
-  foreground = "#bcbcbc";
-  cursor = "#bcbcbc";
-}
--- 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/connermcd.nix
+++ b/lib/colours/connermcd.nix
@@ -1,37 +0,0 @@
-rec {
-  black = {
-    bright = "#454545";
-    dark = "#222222";
-  };
-  red = {
-    bright = "#FA8072";
-    dark = "#B22222";
-  };
-  green = {
-    bright = "#779A3E";
-    dark = "#556B2F";
-  };
-  yellow = {
-    bright = "#DAA520";
-    dark = "#B8860B";
-  };
-  blue = {
-    bright = "#6495ED";
-    dark = "#4682B4";
-  };
-  magenta = {
-    bright = "#DA70D6";
-    dark = "#9932CC";
-  };
-  cyan = {
-    bright = "#B0E0E6";
-    dark = "#87CEEB";
-  };
-  white = {
-    bright = "#FFFFFF";
-    dark = "#C0C0C0";
-  };
-  background = "#000000";
-  foreground = "#AAAAAA";
-  cursor = green.bright;
-}
--- a/lib/colours/ibm-3270.nix
+++ b/lib/colours/ibm-3270.nix
@@ -1,37 +0,0 @@
-rec {
-  black = {
-    bright = "#888888";
-    dark = "#222222";
-  };
-  red = {
-    bright = "#ef8383";
-    dark = "#f01818";
-  };
-  yellow = {
-    bright = "#efe28b";
-    dark = "#f8d824";
-  };
-  green = {
-    bright = "#23d830";
-    dark = "#7ed684";
-  };
-  blue = {
-    bright = "#b3bfef";
-    dark = "#7890f0";
-  };
-  magenta = {
-    bright = "#efb3e3";
-    dark = "#f078d8";
-  };
-  cyan = {
-    bright = "#9ce2e2";
-    dark = "#54e4e4";
-  };
-  white = {
-    bright = "#ffffff";
-    dark = "#a5a5a5";
-  };
-  background = "#000000";
-  foreground = "#bbbbbb";
-  cursor = green.bright;
-}
--- a/lib/colours/mac-os.nix
+++ b/lib/colours/mac-os.nix
@@ -1,37 +0,0 @@
-rec {
-  black = {
-    bright = "#818383";
-    dark = "#000000";
-  };
-  red = {
-    bright = "#fc391f";
-    dark = "#c23621";
-  };
-  yellow = {
-    bright = "#eaec23";
-    dark = "#adad27";
-  };
-  green = {
-    bright = "#31e722";
-    dark = "#25bc24";
-  };
-  blue = {
-    bright = "#5833ff";
-    dark = "#492ee1";
-  };
-  magenta = {
-    bright = "#f935f8";
-    dark = "#d338d3";
-  };
-  cyan = {
-    bright = "#14f0f0";
-    dark = "#33bbc8";
-  };
-  white = {
-    bright = "#e9ebeb";
-    dark = "#cbcccd";
-  };
-  background = black.dark;
-  foreground = white.dark;
-  cursor = green.bright;
-}
--- a/lib/colours/owickstrom-dark.nix
+++ b/lib/colours/owickstrom-dark.nix
@@ -1,37 +0,0 @@
-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/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/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/colours/solarized-dark.nix
+++ b/lib/colours/solarized-dark.nix
@@ -1,37 +0,0 @@
-rec {
-  black = {
-    dark = "#073642";
-    bright = "#002b36";
-  };
-  red = {
-    dark = "#dc322f";
-    bright = "#cb4b16";
-  };
-  yellow = {
-    dark = "#b58900";
-    bright = "#657b83";
-  };
-  green = {
-    dark = "#859900";
-    bright = "#586e75";
-  };
-  blue = {
-    dark = "#268bd2";
-    bright = "#839496";
-  };
-  magenta = {
-    dark = "#d33682";
-    bright = "#6c71c4";
-  };
-  cyan = {
-    dark = "#2aa198";
-    bright = "#93a1a1";
-  };
-  white = {
-    dark = "#eee8d5";
-    bright = "#fdf6e3";
-  };
-  background = black.bright;
-  foreground = blue.bright;
-  cursor = cyan.bright;
-}
--- a/lib/colours/solarized-light.nix
+++ b/lib/colours/solarized-light.nix
@@ -1,37 +0,0 @@
-rec {
-  black = {
-    dark = "#073642";
-    bright = "#002b36";
-  };
-  red = {
-    dark = "#dc322f";
-    bright = "#cb4b16";
-  };
-  yellow = {
-    dark = "#b58900";
-    bright = "#657b83";
-  };
-  green = {
-    dark = "#859900";
-    bright = "#586e75";
-  };
-  blue = {
-    dark = "#268bd2";
-    bright = "#839496";
-  };
-  magenta = {
-    dark = "#d33682";
-    bright = "#6c71c4";
-  };
-  cyan = {
-    dark = "#2aa198";
-    bright = "#93a1a1";
-  };
-  white = {
-    dark = "#eee8d5";
-    bright = "#fdf6e3";
-  };
-  background = white.bright;
-  foreground = yellow.bright;
-  cursor = green.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";
+  fileManager = "${pkgs.pcmanfm}/bin/pcmanfm";
 }
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,4 +1,4 @@
-rec {
+{
  tmpfilesConfig = {
    type,
    path,
@@ -15,6 +15,8 @@ rec {
    repository = "rest:http://${host}:${toString port}/";
  };

+  remoteDir = "/home/kfm/remote";
+
  firewall = lib: {
    accept = {
      source,
@@ -40,16 +42,14 @@ rec {

  sshPort = 22022;

-  colours = import ./colours/owickstrom-dark.nix;
-
  theme = pkgs: {
    gtk = {
      name = "Adwaita-dark";
-      package = pkgs.gnome.gnome-themes-extra;
+      package = pkgs.gnome-themes-extra;
    };
    icon = {
      name = "Adwaita";
-      package = pkgs.gnome.adwaita-icon-theme;
+      package = pkgs.adwaita-icon-theme;
    };
    cursor = {
      name = "capitaine-cursors-white";
@@ -69,20 +69,18 @@ rec {
    github = "kmein";
    email = "kmein@posteo.de";
    name = "Kierán Meinhardt";
-    sshKeys = pkgs:
-      pkgs.lib.strings.splitString "\n" (pkgs.lib.strings.fileContents (pkgs.fetchurl {
-        url = "https://github.com/kmein.keys";
-        hash = "sha256-TvvPwplrH9cw7NE4GKqbE5ga+oBHM+TkjxYQ3b1fpLI=";
-      }));
+    sshKeys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyTnGhFq0Q+vghNhrqNrAyY+CsN7nNz8bPfiwIwNpjk" # kabsa
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOiQEc8rTr7C7xVLYV7tQ99BDDBLrJsy5hslxtCEatkB" # manakish
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIByreBjBEMJKjgpKLd5XZHIUUwIhNafVqN6OUOQpJa3y" # fatteh
+    ];
  };

  syncthing.devices = {
    kabsa.id = "R6DEBD7-G5RYDKN-VFA3HPO-WX4DNVI-373F7OQ-AW5MZTT-3L4BDVW-Y6ROEAF";
-    heym.id = "HLQSG3D-WSKLA6S-MEYQ3EU-GDBGABE-PY53RQ6-SWQAP2I-Z5MVBVX-MYPJXAM";
+    kibbeh.id = "HLQSG3D-WSKLA6S-MEYQ3EU-GDBGABE-PY53RQ6-SWQAP2I-Z5MVBVX-MYPJXAM";
    manakish.id = "AJVBWR2-VFFAGZF-7ZF5JAX-T63GMOG-NZ446WK-MC5E6WK-6X6Q2HE-QQA2JQ3";
-    toum.id = "CBJQXFF-FMFGWFU-2J6FMPR-SRDTSGX-7NHOYOH-CQCABKF-KQJMRJC-SDE24Q4";
-    zaatar.id = "CGHO6LK-ZJBAXBD-UWI7AH3-BXYARE6-EUIM7PE-O2FUCOM-VCCRNCM-IG34WQ7";
-    tahina.id = "UKJ2CBO-EQPKQL4-3QLRUSG-SSYR6AB-CCCUTKU-CLPYR7N-RUI5A6Y-JTL5NA4";
+    fatteh.id = "GSOGYT3-2GBHZXT-MNCTDIY-3BJIR4V-OHVOOMJ-ICVLKXR-U4C7RFB-HJOK3AC";
  };

  ignorePaths = [
--- a/lib/email.nix
+++ b/lib/email.nix
@@ -1,14 +1,23 @@
-{lib, ...}: {
-  cock = rec {
-    user = "2210@cock.li";
-    address = user;
-    imap = "mail.cock.li";
-    smtp = imap;
-    smtpSettings = smtp: "smtp://${smtp}:587";
-    folders = {
-      drafts = "Drafts";
-      sent = "Sent";
-      trash = "Trash";
+rec {
+  thunderbirdProfile = "donnervogel";
+  pronouns = builtins.concatStringsSep "/" [
+    "er"
+    "he"
+    "is"
+    "οὗτος"
+    "هو"
+    "ⲛ̄ⲧⲟϥ"
+    "он"
+    "han"
+    "सः"
+  ];
+  defaults = {
+    thunderbird = {
+      enable = true;
+      profiles = [thunderbirdProfile];
    };
+    aerc.enable = true;
+    realName = "Kierán Meinhardt";
+    folders.inbox = "INBOX";
  };
 }
--- a/lib/i3status-rust.nix
+++ b/lib/i3status-rust.nix
@@ -1,224 +0,0 @@
-{
-  pkgs,
-  wirelessInterface,
-  colours,
-  batteryName,
-  accounts,
-}: let
-  inherit (pkgs) lib;
-
-  setsid = script:
-    pkgs.writers.writeDash "setsid-command" ''
-      ${pkgs.util-linux}/bin/setsid ${script}
-    '';
-in {
-  theme = {
-    name = "plain";
-    overrides = {
-      critical_fg = colours.red.bright;
-      good_fg = colours.green.bright;
-      idle_fg = colours.foreground;
-      info_fg = colours.cyan.bright;
-      warning_fg = colours.yellow.bright;
-      warning_bg = colours.background;
-      critical_bg = colours.background;
-      good_bg = colours.background;
-      idle_bg = colours.background;
-      info_bg = colours.background;
-      separator = "";
-      separator_bg = "auto";
-      separator_fg = colours.black.bright;
-    };
-  };
-  icons.name = "awesome6";
-  icons.overrides.rss = "";
-  icons.overrides.vpn = "";
-  icons.overrides.irc = "";
-  block = [
-    {
-      block = "weather";
-      autolocate = true;
-      format = "{location}: {temp}C";
-      service = {
-        name = "openweathermap";
-        city_id = "2950159";
-        units = "metric";
-      };
-    }
-    {
-      block = "custom";
-      interval = 60 * 5;
-      command = let
-        spacetime = import ../configs/spacetime.nix;
-      in
-        pkgs.writers.writePython3 "sun.py" {
-          libraries = [pkgs.python3Packages.astral];
-          flakeIgnore = ["E121" "E501"];
-        }
-        ''
-          import astral
-          import astral.moon
-          import astral.sun
-
-          current_phase = astral.moon.phase()
-
-          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)))
-        '';
-    }
-    {
-      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}" ''
-          password=$(${toString account.passwordCommand})
-          ${pkgs.coreutils}/bin/timeout 1 ${pkgs.curl}/bin/curl -sSL -u ${lib.escapeShellArg account.userName}:"$password" imaps://${account.imap.host} -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 .["hu-student"] > 0 or .["hu-employee"] > 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": ""}'
-      '';
-      json = true;
-      hide_when_empty = true;
-    }
-    {
-      block = "net";
-      device = wirelessInterface;
-      format = "{ssid} {signal_strength}";
-    }
-    {
-      block = "battery";
-      device = batteryName;
-    }
-    {
-      block = "sound";
-      on_click = "pavucontrol";
-    }
-    {
-      block = "disk_space";
-      format = "{icon} {available}";
-    }
-    {
-      block = "memory";
-      display_type = "memory";
-      format_mem = "{mem_used;G}";
-      clickable = false;
-    }
-    {block = "load";}
-    {
-      block = "custom";
-      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
-            )
-          }'
-      '';
-    }
-  ];
-}
--- a/lib/keyboards/XCompose
+++ b/lib/keyboards/XCompose
@@ -0,0 +1,34 @@
+# Import default rules from the system Compose file
+include "%L"
+
+# Custom definitions
+<Multi_key> <U0634> <U0634> : "ژ" U0698 # ز + ز = ژ
+<Multi_key> <U063A> <U063A> : "گ" U06AF # غ + غ = گ
+<Multi_key> <U0641> <U0641> : "ڤ" U06A4 # ف + ف = ڤ
+<Multi_key> <U062C> <U062C> : "چ" U0686 # ج + ج = چ
+<Multi_key> <U0628> <U0628> : "پ" U067E # ب + ب = پ
+<Multi_key> <U0643> <U0643> : "ک" U06A9 # ك + ك = ک
+<Multi_key> <U064A> <U064A> : "ی" U06CC # ي + ي = ی
+<Multi_key> <U0647> <U064A> : "ۀ" U06C0 # ه + ي = ۀ
+<Multi_key> <E> <E> : "ɛ" U025B
+<Multi_key> <O> <O> : "ɔ" U0254
+<Multi_key> <s> <h> : "ʃ" U0283
+<Multi_key> <g> <h> : "ɣ" U0283
+<Multi_key> <b> <h> : "β" U0283
+<Multi_key> <p> <h> : "ɸ" U0283
+<Multi_key> <z> <h> : "ʒ" U0292
+<Multi_key> <e> <i> : "ɪ" U026A
+<Multi_key> <e> <u> : "ʊ" U028A
+<Multi_key> <colon> <colon> : "ː" U02D0
+<Multi_key> <question> <period> : "ʔ" U0294
+<Multi_key> <period> <question> : "ʕ" U0295
+<Multi_key> <apostrophe> <period> : "ˈ" U02C8
+<Multi_key> <period> <apostrophe> : "ˌ" U02CC
+<dead_belowring> <nobreakspace> : "̥" U0325 # COMBINING RING BELOW
+<dead_belowbreve> <nobreakspace> : "̮" U032E # COMBINING BREVE BELOW
+<dead_invertedbreve> <nobreakspace> : "̑" U0311 # COMBINING INVERTED BREVE
+<dead_belowmacron> <nobreakspace> : "̱" U0331 # COMBINING MACRON BELOW
+<dead_belowcircumflex> <nobreakspace> : "̯" U032F # COMBINING INVERTED BREVE BELOW
+<dead_circumflex> <Multi_key> <underscore> <e> : "ᵊ" U1D4A
+
+# TODO zwnj
--- a/lib/keyboards/arabic
+++ b/lib/keyboards/arabic
@@ -0,0 +1,23 @@
+// Arabic keyboard using Buckwalter transliteration
+// http://www.qamus.org/transliteration.htm
+// Martin Vidner
+// stolen from https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/blob/2505a3ec2605ea7303bc6de68acf96578f0fd424/symbols/ara#L179
+
+// TODO 06CC ARABIC LETTER FARSI YEH
+
+default partial alphanumeric_keys
+xkb_symbols "buckwalter" {
+  include "ara(buckwalter)"
+  name[Group1] = "Arabic (Buckwalter + Persian)";
+
+  key <AE09> {[ 0x1000669, parenleft ] };
+  key <AE10> {[ 0x1000660, parenright ] };
+  key <AD10> {[ Arabic_tehmarbuta, 0x100067E ] }; // پ
+  key <AD11> {[ 0x100200C, 0x1000671 ] }; // alif wasla, ZWNJ
+  key <AD12> {[ 0x10006C0, Arabic_hamzaonyeh ] }; // ۀ
+  key <AC05> {[ Arabic_ghain, 0x10006AF ] }; // گ
+  key <AC07> {[ Arabic_jeem, 0x1000686 ] }; // چ
+  key <AB03> {[ 0x10006A9, 0x1000698 ] }; // ک ژ
+  key <AB04> {[ Arabic_theh, 0x10006A4 ] }; // ڤ
+  key <AB09> {[ period, Arabic_hamzaonalef ] };
+};
--- a/lib/keyboards/avestan
+++ b/lib/keyboards/avestan
@@ -0,0 +1,60 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+// Generated keyboard layout file with the Keyboard Layout Editor.
+// For more about the software, see http://code.google.com/p/keyboardlayouteditor
+//
+// Version 0.2, changed AD09.
+
+partial default alphanumeric_keys
+xkb_symbols "avestan"
+{
+	name[Group1] = "Iran - Avestan";
+
+	key <AB01> { [ U10B30,         U10B32 ] }; // ð¬° ð¬²
+	key <AB02> { [ U10B11,         U10B12 ] }; // ð¬‘ ð¬’
+	key <AB03> { [ U10B17,          UE102 ] }; // ð¬— î„‚
+	key <AB04> { [ U10B2C,         U10B13 ] }; // ð¬¬ ð¬“
+	key <AB05> { [ U10B20,         U10B21 ] }; // ð¬  ð¬¡
+	key <AB06> { [ U10B25,         U10B27 ] }; // ð¬¥ ð¬§
+	key <AB07> { [ U10B28,         U10B29 ] }; // ð¬¨ ð¬©
+	key <AB08> { [ U10B3C,         U10B39 ] }; // ð¬¼ ð¬¹
+	key <AB09> { [ U10B3E,         U10B3D ] }; // ð¬¾ ð¬½
+	key <AB10> { [ U10B3F, periodcentered ] }; // ð¬¿ Â·
+
+	key <AC01> { [ U10B00,         U10B01 ] }; // ð¬€ ð¬
+	key <AC02> { [ U10B2F,         U10B31 ] }; // ð¬¯ ð¬±
+	key <AC03> { [ U10B1B,         U10B1C ] }; // ð¬› ð¬œ
+	key <AC04> { [ U10B1F,         U10B16 ] }; // ð¬Ÿ ð¬–
+	key <AC05> { [ U10B14,         U10B15 ] }; // ð¬” ð¬•
+	key <AC06> { [ U10B35,          UE100 ] }; // ð¬µ î„€
+	key <AC07> { [ U10B18,         U10B24 ] }; // ð¬˜ ð¬¤
+	key <AC08> { [ U10B10,          UE101 ] }; // ð¬ î„
+	key <AC09> { [ U10B2E,          UE103 ] }; // ð¬® î„ƒ
+	key <AC10> { [ U10B3B,         U10B3A ] }; // ð¬» ð¬º
+	key <AC11> { [ U10B1D                 ] }; // ð¬
+
+	key <AD01> { [ U10B22,         U10B23 ] }; // ð¬¢ ð¬£
+	key <AD02> { [ U10B33,         U10B34 ] }; // ð¬³ ð¬´
+	key <AD03> { [ U10B08,         U10B09 ] }; // ð¬ˆ ð¬‰
+	key <AD04> { [ U10B2D,         U10B26 ] }; // ð¬ ð¬¦
+	key <AD05> { [ U10B19,         U10B1A ] }; // ð¬™ ð¬š
+	key <AD06> { [ U10B2B,         U10B2A ] }; // ð¬« ð¬ª
+	key <AD07> { [ U10B0E,         U10B0F ] }; // ð¬Ž ð¬
+	key <AD08> { [ U10B0C,         U10B0D ] }; // ð¬Œ ð¬
+	key <AD09> { [ U10B0A,         U10B0B ] }; // ð¬Š ð¬‹
+	key <AD10> { [ U10B1E                 ] }; // ð¬ž
+	key <AD11> { [ U10B06,         U10B07 ] }; // ð¬† ð¬‡
+	key <AD12> { [ U10B02,         U10B03 ] }; // ð¬‚ ð¬ƒ
+
+	key <AE01> { [ U10B78                 ] }; // ð¸
+	key <AE02> { [ U10B79                 ] }; // ð¹
+	key <AE03> { [ U10B7A                 ] }; // ðº
+	key <AE04> { [ U10B7B                 ] }; // ð»
+	key <AE05> { [ U10B7C                 ] }; // ð¼
+	key <AE06> { [ U10B7D                 ] }; // ð½
+	key <AE07> { [ U10B7E                 ] }; // ð¾
+	key <AE08> { [ U10B7F                 ] }; // ð¿
+
+	key <BKSL> { [ U10B04,         U10B05 ] }; // ð¬„ ð¬…
+	key <LSGT> { [ U10B04,         U10B05 ] }; // ð¬„ ð¬…
+};
--- a/lib/keyboards/coptic
+++ b/lib/keyboards/coptic
@@ -0,0 +1,79 @@
+// Coptic keyboard symbols for XKB and PC keyboard
+// based on the mapping of logos
+// (C) 2006 Moheb Mekhaiel <mohebm@gmx.de>
+//
+// Permission is granted to anyone to use, distribute and modify
+// this file in any way, provided that the above copyright notice
+// is left intact and the author of the modification summarizes
+// the changes in this header.
+//
+// This file is distributed without any expressed or implied warranty.
+
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+    name[Group1]= "Coptic";
+
+    key <TLDE>  { [ U0308,      U0311,      U0361,      U2CE5 ] };
+
+    key <AE01>  { type[Group1] = "FOUR_LEVEL",
+                  [ 1,          U0304,      VoidSymbol, U2CE6 ] };
+    key <AE02>  { [ 2,          U0306,      U2CFD,      U2CE7 ] };
+    key <AE03>  { [ 3,          U0374,      U2056,      U2CE8 ] };
+    key <AE04>  { [ 4,          U0375,      U2058,      U2CE9 ] };
+    key <AE05>  { [ 5,          U0307,      U2059,      U2CEA ] };
+    key <AE06>  { [ 6,          U0323,      U2C8B,      U2C8A ] };
+    key <AE07>  { [ 7,          U2CE4 ] };
+    key <AE08>  { [ 8,          U002A,      U2026 ] };
+    key <AE09>  { [ 9,          parenleft,  U201C,      plusminus ] };
+    key <AE10>  { [ 0,          parenright, U201D,      degree ] };
+    key <AE11>  { [ U00B7,      underscore, U2013,      U2014 ] };
+    key <AE12>  { [ U2E17,      U0305,      U033F ] };
+    key <BKSL>  { [ U0300,      U007C,      backslash,  U007C ] };
+
+    key <AD01>  { [ U2C91,      U2C90 ] };
+    key <AD02>  { [ U2CB1,      U2CB0 ] };
+    key <AD03>  { [ U2C89,      U2C88 ] };
+    key <AD04>  { [ U2CA3,      U2CA2 ] };
+    key <AD05>  { [ U2CA7,      U2CA6,      U03EF,      U03EE ] };
+    key <AD06>  { [ U2CAF,      U2CAE ] };
+    key <AD07>  { [ U2CA9,      U2CA8 ] };
+    key <AD08>  { [ U2C93,      U2C92 ] };
+    key <AD09>  { [ U2C9F,      U2C9E ] };
+    key <AD10>  { [ U2CA1,      U2CA0 ] };
+    key <AD11>  { [ bracketleft,braceleft,  U2018 ] };
+    key <AD12>  { [ bracketright,braceright,U2019 ] };
+
+    key <AC01>  { [ U2C81,      U2C80 ] };
+    key <AC02>  { [ U2CA5,      U2CA4,      U03E3,      U03E2 ] };
+    key <AC03>  { [ U2C87,      U2C86,      U03EF,      U03EE ] };
+    key <AC04>  { [ U2CAB,      U2CAA,      U03E5,      U03E4 ] };
+    key <AC05>  { [ U2C85,      U2C84,      U03EB,      U03EA ] };
+    key <AC06>  { [ U2C8F,      U2C8E,      U03E9,      U03E8 ] };
+    key <AC07>  { [ U03EB,      U03EA,      U03EB,      U03EA ] };
+    key <AC08>  { [ U2C95,      U2C94,      U03E7,      U03E6 ] };
+    key <AC09>  { [ U2C97,      U2C96 ] };
+    key <AC10>  { [ semicolon,  colon,      U2053,      dead_doubleacute ] };
+    key <AC11>  { [ apostrophe, U2CFF,      U0022 ] };
+
+    key <AB01>  { [ U2C8D,      U2C8C ] };
+    key <AB02>  { [ U2C9D,      U2C9C ] };
+    key <AB03>  { [ U2CAD,      U2CAC,       U03ED,      U03EC ] };
+    key <AB04>  { [ U03E3,      U03E2,       U03E3,      U03E2 ] };
+    key <AB05>  { [ U2C83,      U2C82 ] };
+    key <AB06>  { [ U2C9B,      U2C9A ] };
+    key <AB07>  { [ U2C99,      U2C98 ] };
+    key <AB08>  { [ comma,      less,        U00AB,      U2039 ] };
+    key <AB09>  { [ period,     greater,     U00BB,      U203A ] };
+    key <AB10>  { [ U0301,      U2CFE,       slash,      question ] };
+
+    key <RALT>  { type[Group1]="TWO_LEVEL",
+                  [ ISO_Level3_Shift, Multi_key ]   };
+
+    modifier_map Mod5   { <RALT> };
+
+    //include "level3(ralt_switch_multikey)"
+
+  // End alphanumeric section
+};
+
--- a/lib/keyboards/farsi
+++ b/lib/keyboards/farsi
@@ -0,0 +1,114 @@
+// https://github.com/gpuminingir/Farsi-Phonetic-Keyboard-Linux
+// by @gpuminingir
+
+partial alphanumeric_keys
+xkb_symbols "qwerty" {
+  // Classic Finnish keyboard layout without dead keys and {[]} on asdf + AltG
+  name[Group1]="Persian (QWERTY)";
+  include "ir(pesq_part_basic)"
+  include "ir(pesq_part_ext)"
+  include "ir(pesq_part_keypad)"
+  include "nbsp(zwnj2nb3nnb4)"
+  include "level3(ralt_switch)"  
+};
+
+hidden partial alphanumeric_keys
+xkb_symbols "pesq_part_basic" {
+  // Persian digits
+  key <AE01> { [ Arabic_1, exclam, exclam ] }; // ١ ! !
+  key <AE02> { [ Arabic_2, at, at ] }; // ٢ @ @
+  key <AE03> { [ Arabic_3, numbersign, numbersign ] }; // ٣ # #
+  key <AE04> { [ Farsi_4, dollar, dollar ] }; // ۴ $ $
+  key <AE05> { [ Farsi_5, percent, percent ] }; // ۵ % %
+  key <AE06> { [ Farsi_6, asciicircum, asciicircum ] }; // ۶ ^ ^
+  key <AE07> { [ Arabic_7, ampersand, ampersand ] }; // ٧ & &
+  key <AE08> { [ Arabic_8, KP_Multiply, KP_Multiply ] }; // ٨ * *
+  key <AE09> { [ Arabic_9, Armenian_parenright, Armenian_parenright, Armenian_parenleft ] }; // ٩ ) ) (
+  key <AE10> { [ Farsi_0, Armenian_parenleft, Armenian_parenleft ] }; // ۰ ( (
+  key <AE11> { [ underbar, KP_Subtract, KP_Subtract ] }; // _ – –
+  key <AE12> { [ KP_Equal, KP_Add, KP_Add ] }; // = + +
+
+  // Persian letters and symbols
+  key <AD01> { [ Arabic_qaf, Arabic_ghain ] }; // ق غ
+  key <AD02> { [ Arabic_sheen ] }; // ش
+  key <AD03> { [ Arabic_ain ] }; // ع
+  key <AD04> { [ Arabic_ra ] }; // ر
+  key <AD05> { [ Arabic_teh, Arabic_tah ] }; // ت ط
+  key <AD06> { [ Farsi_yeh ] }; // ى
+  key <AD07> { [ Arabic_waw ] }; // و
+  key <AD08> { [ Farsi_yeh ] }; // ى
+  key <AD09> { [ Arabic_waw ] }; // و
+  key <AD10> { [ Arabic_peh ] }; // پ
+  key <AD11> { [ bracketright, braceleft ] }; // ] } {
+  key <AD12> { [ bracketleft, braceright ] }; // [ { }
+
+  key <AC01> { [ Arabic_alef, Arabic_maddaonalef, Arabic_maddaonalef ] }; // ا آ آ
+  key <AC02> { [ Arabic_seen, Arabic_sad, Arabic_sheen, Arabic_sheen ] }; // س ص  ش 
+  key <AC03> { [ Arabic_dal, Arabic_thal ] }; // د ذ ذ
+  key <AC04> { [ Arabic_feh ] }; // ف
+  key <AC05> { [ Arabic_gaf, Arabic_ghain ] }; // گ
+  key <AC06> { [ Arabic_heh, Arabic_hah ] }; // ە ح ه
+  key <AC07> { [ Arabic_jeem, Arabic_jeh ] }; // ج ژ ژ
+  key <AC08> { [ Arabic_keheh ] }; // ک
+  key <AC09> { [ Arabic_lam ] }; // ل
+  key <AC10> { [ Arabic_semicolon, colon ] }; // ؛ : ։
+  key <AC11> { [ Arabic_comma, quotedbl, quotedbl ] }; // ، ” ”
+
+  key <AB01> { [ Arabic_zain, Arabic_dad, Arabic_zah, Arabic_zah ] }; //  ض ض ز خ
+  key <AB02> { [ Arabic_khah, Arabic_zah ] }; // ظ خ
+  key <AB03> { [ Arabic_theh, Arabic_tcheh ] }; // چ ث
+  key <AB04> { [ Arabic_hamza, Arabic_waw ] }; // و
+  key <AB05> { [ Arabic_beh ] }; // ب
+  key <AB06> { [ Arabic_noon ] }; // ن
+  key <AB07> { [ Arabic_meem ] }; // م
+  key <AB08> { [ Arabic_comma, rightcaret, leftcaret ] }; // , > <
+  key <AB09> { [ period, leftcaret, rightcaret ] }; // . < >
+  key <AB10> { [ slash,		Arabic_question_mark,	question ] }; // / ?
+
+  key <AE11> { [ minus, underscore ] };
+  key <AE12> { [ equal, plus, 0x1002212 ] };
+  key <BKSL> { [ backslash, bar, 0x1002010 ] };
+  key <TLDE> { [ U02DC, UFDFC, UFDF2 ] }; // ˜ ﷼ ﷲ
+};
+
+hidden partial alphanumeric_keys
+xkb_symbols "pesq_part_ext" {
+  // Persian and ASCII digits
+  key <AE01> { [ Farsi_1, exclam, grave, 1 ] };
+  key <AE02> { [ Farsi_2, 0x100066c, at, 2 ] };
+  key <AE03> { [ Farsi_3, 0x100066b, numbersign, 3 ] };
+  key <AE04> { [ Farsi_4, 0x100fdfc, dollar, 4 ] };
+  key <AE05> { [ Farsi_5, 0x100066a, percent, 5 ] };
+  key <AE06> { [ Farsi_6, multiply, asciicircum, 6 ] };
+  key <AE07> { [ Farsi_7, Arabic_comma, ampersand, 7 ] };
+  key <AE08> { [ Farsi_8, asterisk, enfilledcircbullet, 8 ] };
+  key <AE09> { [ Farsi_9, parenright, 0x100200e, 9 ] };
+  key <AE10> { [ Farsi_0, parenleft, 0x100200f, 0 ] };
+};
+
+hidden partial alphanumeric_keys
+xkb_symbols "pesq_part_keypad" {
+  // Persian digits and Mathematical operators
+  key <KPDV> { [ division, XF86_Ungrab ] };
+  key <KPMU> { [ multiply, XF86_ClearGrab ] };
+  key <KPSU> { [ 0x1002212, XF86_Prev_VMode ] };
+  key <KPAD> { [ plus, XF86_Next_VMode ] };
+
+  key <KPEN> { [ KP_Enter ] };
+  key <KPEQ> { [ equal ] };
+
+  key <KP7> { [ KP_Home, Farsi_7 ] };
+  key <KP8> { [ KP_Up, Farsi_8 ] };
+  key <KP9> { [ KP_Prior, Farsi_9 ] };
+
+  key <KP4> { [ KP_Left, Farsi_4 ] };
+  key <KP5> { [ KP_Begin, Farsi_5 ] };
+  key <KP6> { [ KP_Right, Farsi_6 ] };
+
+  key <KP1> { [ KP_End, Farsi_1 ] };
+  key <KP2> { [ KP_Down, Farsi_2 ] };
+  key <KP3> { [ KP_Next, Farsi_3 ] };
+
+  key <KP0> { [ KP_Insert, Farsi_0 ] };
+  key <KPDL> { [ KP_Delete, 0x100066b ] };
+};
--- a/lib/keyboards/gothic
+++ b/lib/keyboards/gothic
@@ -0,0 +1,69 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+// Generated keyboard layout file with the Keyboard Layout Editor.
+// For more about the software, see http://code.google.com/p/keyboardlayouteditor
+//
+// Version 0.2, changed AD09.
+
+partial default alphanumeric_keys
+xkb_symbols "Gothic"
+{
+	name[Group1] = "Gothic";
+
+	key <AB01> { [ U10336,         U10336 ] }; // Z: 𐌶
+	key <AB02> { [ U10347,         U10347 ] }; // X: 𐍇
+	key <AB03> { [ U10343,         U10343 ] }; // C: 𐍃
+	key <AB04> { [ U10338,         U10338 ] }; // V: 𐌸
+	key <AB05> { [ U10331,         U10331 ] }; // B: 𐌱
+	key <AB06> { [ U1033D,         U10341 ] }; // n: 𐌽           N: 𐍁
+	key <AB07> { [ U1033C,         U1033C ] }; // M: 𐌼
+	key <AB08> { [ U10B3C,         U10B39 ] };
+	key <AB09> { [ U10349,         U10349 ] };
+	key <AB10> { [ U10B3F, periodcentered ] };
+
+	key <AC01> { [ U10330,         U10330 ] }; // A: 𐌰
+	key <AC02> { [ U10343,         U10343 ] }; // S: 𐍃
+	key <AC03> { [ U10333,         U10338 ] }; // d: 𐌳             D: 𐌸
+	key <AC04> { [ U10346,         U10346 ] }; // F: 𐍆
+	key <AC05> { [ U10332,         U10332 ] }; // G: 𐌲
+	key <AC06> { [ U10337,         U10337 ] }; // H: 𐌷
+	key <AC07> { [ U1033E,         U1033E ] }; // J: 𐌾
+	key <AC08> { [ U1033A,         U1033A ] }; // K: 𐌺
+	key <AC09> { [ U1033B,         U1033B ] }; // L: 𐌻
+        key <AC10> { [ semicolon,	colon ]	};
+        key <AC11> { [ apostrophe,	quotedbl ] };
+
+	key <AD01> { [ U10335,         U10335 ] }; // Q: 𐌵
+	key <AD02> { [ U10345,         U10345 ] }; // W: 𐍅
+	key <AD03> { [ U10334,         U10334 ] }; // E: 𐌴
+	key <AD04> { [ U10342,         U10342 ] }; // R: 𐍂
+	key <AD05> { [ U10344,         U10338 ] }; // t: 𐍄                T: 𐌸
+	key <AD06> { [ U10348,         U1034A ] }; // y: 𐍈                 Y: 𐍊
+	key <AD07> { [ U1033F,         U1033F ] }; // U: 𐌿
+	key <AD08> { [ U10339,         U10339 ] }; // I: 𐌹
+	key <AD09> { [ U10349,         U10349 ] }; // O: 𐍉
+	key <AD10> { [ U10340,	       U10340 ] }; // P: 𐍀
+	key <AD11> { [ bracketleft,         braceleft ] };
+	key <AD12> { [ bracketright,         braceright ] };
+
+    key <TLDE> {	[     grave,	asciitilde	]	};
+    key <AE01> {	[	  1,	exclam 		]	};
+    key <AE02> {	[	  2,	at		]	};
+    key <AE03> {	[	  3,	numbersign	]	};
+    key <AE04> {	[	  4,	dollar		]	};
+    key <AE05> {	[	  5,	percent		]	};
+    key <AE06> {	[	  6,	asciicircum	]	};
+    key <AE07> {	[	  7,	ampersand	]	};
+    key <AE08> {	[	  8,	asterisk	]	};
+    key <AE09> {	[	  9,	parenleft	]	};
+    key <AE10> {	[	  0,	parenright	]	};
+    key <AE11> {	[     minus,	underscore	]	};
+    key <AE12> {	[     equal,	plus		]	};
+
+    key <AB08> {	[     comma,	less		]	};
+    key <AB09> {	[    period,	greater		]	};
+    key <AB10> {	[     slash,	question	]	};
+
+	key <BKSL> { [ U10B04,         U10B05 ] };
+	key <LSGT> { [ U10B04,         U10B05 ] };
+};
--- a/lib/local-network.nix
+++ b/lib/local-network.nix
@@ -1,11 +1,4 @@
 {
-  toum = "192.168.178.24";
-  zaatar = "192.168.178.21";
-  kabsa = "192.168.178.32";
-  android = "192.168.178.35";
-  manakish = "192.168.178.29";
-
-  tradfri = "192.168.178.28";
-  officejet = "192.168.178.27";
-  fritzbox = "192.168.178.1";
+  officejet = "192.168.0.251";
+  router = "192.168.0.1";
 }
--- a/Show More
+++ b/Show More