packages: install gnome disk utility

fonts: install coranica, egyptianText
kdeconnect: enable
2026-03-20 20:01:08 +01:00 · 2024-05-04 09:36:11 +02:00 · 2024-05-04 09:35:54 +02:00 · 2024-05-04 09:35:38 +02:00 · 2024-05-01 16:06:50 +02:00 · 2024-04-30 17:39:09 +02:00
92 changed files with 3179 additions and 957 deletions
--- a/.github/workflows/niveum.yml
+++ b/.github/workflows/niveum.yml
@@ -7,7 +7,7 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        system: [makanek,manakish,kabsa,zaatar,ful]
+        system: [makanek,manakish,kabsa,zaatar,ful,fatteh]
    steps:
    - uses: actions/checkout@v3
    - name: Install QEMU (ARM)
--- a/README.md
+++ b/README.md
@@ -7,4 +7,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/admin-essentials.nix
+++ b/configs/admin-essentials.nix
@@ -0,0 +1,102 @@
+{
+  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.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
+    ];
+
+  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,9 +2,10 @@
  pkgs,
  config,
  lib,
+  niveumPackages,
  ...
 }: let
-  inherit (import ../lib/email.nix) defaults;
+  inherit (import ../lib/email.nix) defaults thunderbirdProfile;
 in {
  age.secrets = {
    email-password-cock = {
@@ -22,6 +23,8 @@ in {
  };

  home-manager.users.me = {
+    accounts.email.maildirBasePath = "${config.users.users.me.home}/state/Maildir";
+
    services.mbsync = {
      enable = true;
      frequency = "daily";
@@ -87,14 +90,43 @@ 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;
+            backend = "imap";
+            sender = "smtp";
+          };
+          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;
@@ -153,6 +185,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>";
@@ -227,19 +260,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 --theme=ansi --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";
+          "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/backup.nix
+++ b/configs/backup.nix
@@ -14,21 +14,17 @@ 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/Zotero"
-      "/home/kfm/notes"
-      "/home/kfm/Maildir"
+      "/home/kfm/sync"
+      "/home/kfm/state"
      "/home/kfm/cloud"
+      "/home/kfm/mobile"
      "/home/kfm/.gnupg"
      "/home/kfm/.ssh"
-      "/mnt/sd-card/music"
-      "/mnt/sd-card/Books"
    ];
  };

--- 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,12 +1,9 @@
-{
-  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;
--- a/configs/chromium.nix
+++ b/configs/chromium.nix
@@ -2,27 +2,24 @@
  pkgs,
  config,
  ...
-}: {
-  programs.chromium = {
-    enable = true;
-    extensions = [
-      # "ihlenndgcmojhcghmfjfneahoeklbjjh" # cVim
-      # "fpnmgdkabkmnadcjpehmlllkndpkmiak" # Wayback Machine
-      "cjpalhdlnbpafiamejdnhcphjbkeiagm" # uBlock Origin
-      "pjjgklgkfeoeiebjogplpnibpfnffkng" # undistracted
-      "nhdogjmejiglipccpnnnanhbledajbpd" # vuejs devtools
-      "eimadpbcbfnmbkopoojfekhnkhdbieeh" # dark reader
-    ];
-  };
+}: let
+  inherit (import ../lib) tmpfilesConfig;
+in {
+  environment.systemPackages = [
+    (pkgs.writers.writeDashBin "cro" ''
+      ${pkgs.chromium}/bin/chromium \
+        --disable-sync \
+        --no-default-browser-check \
+        --no-first-run \
+        --user-data-dir="$(mktemp -d)" \
+        --incognito \
+        "$@"
+    '')
+  ];

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

-  environment.systemPackages = [pkgs.brave];
-
-  environment.variables.BROWSER = "brave";
+  environment.variables.BROWSER = "firefox";
 }
--- a/configs/cloud.nix
+++ b/configs/cloud.nix
@@ -6,29 +6,36 @@
 }: let
  inherit (import ../lib) tmpfilesConfig;
 in {
-  systemd.tmpfiles.rules = map tmpfilesConfig [
+  systemd.user.tmpfiles.users.me.rules = map tmpfilesConfig [
    {
+      type = "d";
+      mode = "0755";
+      age = "7d";
+      path = "${config.users.users.me.home}/sync/Downloads";
+    }
+    {
+      type = "d";
+      mode = "0755";
+      age = "7d";
+      path = "${config.users.users.me.home}/cloud/nextcloud/tmp";
+    }
+  ] ++ map (path: 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/nextcloud/Uni";
-      path = "${config.users.users.me.home}/uni";
-    }
-  ];
+      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 = true;
    services.nextcloud-client = {
      enable = true;
      startInBackground = true;
    };
-    systemd.user.services.nextcloud-client = {
-      Unit = {
-        Wants = ["gnome-keyring.service"];
-        After = ["gnome-keyring.service"];
-      };
-    };
  };

  systemd.user.services.nextcloud-syncer = {
@@ -95,7 +102,7 @@ in {
    mode = "400";
  };

-  services.syncthing = rec {
+  services.syncthing = {
    enable = true;
    user = "kfm";
    openDefaultPorts = true;
@@ -103,21 +110,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/zotero".devices = ["kabsa" "manakish"];
-      "${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/obsidian" = {
-        devices = ["kabsa" "manakish" "heym"];
-        id = "3r1hu-3barr";
-      };
-      "${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
@@ -7,7 +7,7 @@
  ...
 }: let
  inherit (lib.strings) makeBinPath;
-  inherit (import ../lib) localAddresses kieran;
+  inherit (import ../lib) localAddresses kieran remoteDir;
  defaultApplications = (import ../lib).defaultApplications {inherit pkgs;};
 in {
  imports = [
@@ -25,6 +25,8 @@ in {
          };
          permittedInsecurePackages = [
            "qtwebkit-5.212.0-alpha4"
+            "zotero-6.0.26"
+            "electron-25.9.0"
          ];
        };
      };
@@ -81,9 +83,10 @@ in {
      users.users.me = {
        name = "kfm";
        description = kieran.name;
-        passwordFile = config.age.secrets.kfm-password.path;
+        hashedPasswordFile = config.age.secrets.kfm-password.path;
        isNormalUser = true;
        uid = 1000;
+        extraGroups = ["pipewire" "audio"];
      };

      age.secrets = {
@@ -93,50 +96,18 @@ in {
      home-manager.users.me.xdg.enable = true;
    }
    {
-      environment.interactiveShellInit = "export PATH=$PATH:$HOME/projects/niveum";
+      environment.interactiveShellInit = "export PATH=$PATH";
      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 --theme=ansi --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";
+        ns = "nix-shell --run zsh";
        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
      };
@@ -237,6 +208,7 @@ in {
      };
    }
    ./android.nix
+    ./admin-essentials.nix
    ./stylix.nix
    ./alacritty.nix
    ./backup.nix
@@ -245,7 +217,7 @@ in {
    ./aerc.nix
    ./ccc.nix
    ./khal.nix
-    ./chromium.nix
+    ./browser.nix
    ./clipboard.nix
    ./cloud.nix
    ./direnv.nix
@@ -263,6 +235,7 @@ in {
    ./i3.nix
    ./i3status-rust.nix
    ./keyboard.nix
+    {home-manager.users.me.home.file.".XCompose".source = ../lib/keyboards/XCompose;}
    ./lb.nix
    ./mpv.nix
    ./mime.nix
@@ -274,7 +247,6 @@ in {
    ./picom.nix
    ./stardict.nix
    ./polkit.nix
-    ./power-action.nix
    ./printing.nix
    ./redshift.nix
    ./retiolum.nix
@@ -288,9 +260,49 @@ in {
    ./unclutter.nix
    ./vscode.nix
    ./watson.nix
+    ./wallpaper.nix
    ./zsh.nix
    ./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/Download";
+          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;
+        };
+      };
+    }
+    {
+      home-manager.users.me = {
+        services.kdeconnect.enable = true;
+        services.kdeconnect.indicator = true;
+      };
+    }
  ];
 }
--- a/configs/fonts.nix
+++ b/configs/fonts.nix
@@ -31,7 +31,7 @@
  };
  newGardiner = zip-font "NewGardiner" {
    url = "https://mjn.host.cs.st-andrews.ac.uk/egyptian/fonts/NewGardiner.zip";
-    hash = "sha256-i7ZBN28no/884fYMA7ZJ47WpkwZXzY//TK0bDz21pE0=";
+    hash = "sha256-nP0y4ILt+0mlkDRdCNSeO2Gequ8wyix/qQdmujTNw3Y=";
    stripRoot = false;
  };
  junicode2 = zip-font "JunicodeTwo" {
@@ -46,15 +46,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,6 +77,7 @@ in {
      charis-sil
      doulos-sil
      newAthenaUnicode
+      coranica
      corefonts
      crimson
      eb-garamond
@@ -72,16 +85,18 @@ in {
      jsesh
      egyptianHiero
      egyptianText
+      egyptianTextBeta
      font-awesome_6
      etBook
      newGardiner
      junicode2
+      koineGreek
      ezra-sil
      fira
      font-awesome
      galatia-sil
      gentium
-      niveumPackages.gfs-fonts
+      # niveumPackages.gfs-fonts
      gyre-fonts
      ibm-plex
      jetbrains-mono
@@ -109,7 +124,7 @@ in {
    fontconfig.defaultFonts = rec {
      monospace = ["Noto Sans Mono"] ++ emoji;
      serif = ["Noto Serif" "Noto Naskh Arabic" "Noto Serif Devanagari"];
-      sansSerif = ["Noto Sans Display" "Noto Naskh Arabic" "Noto Sans Devanagari" "Noto Sans CJK JP" "Noto Sans Coptic"];
+      sansSerif = ["Noto Sans Display" "Noto Naskh Arabic" "Noto Sans Hebrew" "Noto Sans Devanagari" "Noto Sans CJK JP" "Noto Sans Coptic"];
      emoji = ["Noto Color Emoji"];
    };
    # xelatex fails with woff files
--- a/configs/fu-berlin.nix
+++ b/configs/fu-berlin.nix
@@ -5,10 +5,15 @@
  ...
 }: let
  username = "meinhak99";
-  inherit (import ../lib/email.nix) defaults;
+  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";
@@ -33,21 +38,27 @@ in {
            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}

-  systemd.user.services.fu-blackboard-calendar = {
-    enable = true;
-    # startAt = "*:00/10";
-    after = ["vdirsyncer.service"];
-    wantedBy = ["default.target"];
-    script = ''
-      ${pkgs.curl}/bin/curl $(cat ${config.age.secrets.blackboard-calendar-ics.path}) | ${pkgs.khal}/bin/khal import -
-    '';
-    serviceConfig = {
-      Type = "oneshot";
-      Restart = "on-failure";
+                ---
+                Studentische Hilfskraft / ZODIAC
+                Freie Universität Berlin
+
+                Telefon: +49 30 838 58118
+                Arnimallee 10, Raum 106, 14195 Berlin
+              '';
+            };
+            himalaya = {
+              enable = true;
+              backend = "imap";
+              sender = "smtp";
+            };
+          });
    };
  };

@@ -58,14 +69,65 @@ in {
      group = config.users.users.me.group;
      mode = "400";
    };
-    blackboard-calendar-ics = {
-      file = ../secrets/blackboard-calendar-ics.age;
-      owner = config.users.users.me.name;
-      group = config.users.users.me.group;
+    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;
+  };
+
  systemd.services.fu-vpn = {
    enable = true;
    wants = ["network-online.target"];
--- 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 = {
--- 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)-01 last month" +%Y-%m-%d)" \
-        -e "$(date -d "$(date +%Y-%m)-01" +%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/hu-berlin.nix
+++ b/configs/hu-berlin.nix
@@ -4,7 +4,8 @@
  lib,
  ...
 }: let
-  inherit (import ../lib/email.nix) defaults;
+  inherit (import ../lib/email.nix) defaults pronouns;
+  inherit (import ../lib) remoteDir;
  hu-defaults = {
    imap.host = "mailbox.cms.hu-berlin.de";
    imap.port = 993;
@@ -24,13 +25,13 @@
    "x-systemd.idle-timeout=1min"
  ];
 in {
-  fileSystems."/media/hu-berlin/germpro2" = {
+  fileSystems."${remoteDir}/hu/germpro2" = {
    device = "//hugerm31c.user.hu-berlin.de/germpro2/ling";
    fsType = "cifs";
    options = hu-berlin-cifs-options;
  };

-  fileSystems."/media/hu-berlin/germhome" = {
+  fileSystems."${remoteDir}/hu/meinhaki/home" = {
    device = "//hugerm31c.user.hu-berlin.de/germhome/ling/meinhaki";
    fsType = "cifs";
    options = hu-berlin-cifs-options;
@@ -38,12 +39,6 @@ in {

  age.secrets = {
    cifs-credentials-hu-berlin.file = ../secrets/cifs-credentials-hu-berlin.age;
-    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;
@@ -56,22 +51,11 @@ in {
      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 = {
    programs.ssh = {
      matchBlocks = {
-        "gruenau6.informatik.hu-berlin.de" = {
-          hostname = "gruenau6.informatik.hu-berlin.de";
-          user = "meinhark";
-          setEnv.TERM = "xterm";
-        };
        "alew.hu-berlin.de" = {
          user = "centos";
          hostname = "141.20.187.219";
@@ -80,26 +64,6 @@ in {
    };

    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
@@ -109,10 +73,16 @@ in {
            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);
+            himalaya = {
+              enable = true;
+              backend = "imap";
+              sender = "smtp";
+            };
            signature = {
              showSignature = "append";
              text = ''
                ${defaults.realName}
+                ${pronouns}
                Studentische Hilfskraft / Administrator ALEW
                Humboldt-Universität zu Berlin

@@ -128,33 +98,16 @@ in {
          rec {
            userName = "dslalewa";
            address = "admin.alew.vglsprwi@hu-berlin.de";
+            himalaya = {
+              enable = true;
+              backend = "imap";
+              sender = "smtp";
+            };
            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
-              '';
-            };
-          });
    };
  };

@@ -181,20 +134,17 @@ in {
  systemd.services.hu-vpn = {
    enable = true;
    wants = ["network-online.target"];
-    serviceConfig.LoadCredential = "password:${config.age.secrets.email-password-meinhark.path}";
+    serviceConfig.LoadCredential = "password:${config.age.secrets.email-password-meinhaki.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.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
+          username = meinhaki
        ''
      }
-      fi
    '';
  };
 }
--- a/configs/i3.nix
+++ b/configs/i3.nix
@@ -5,6 +5,13 @@
  niveumPackages,
  ...
 }: let
+  dashboard = pkgs.writers.writeDashBin "dashboard" ''
+    ${pkgs.alacritty}/bin/alacritty --class wtf --command ${pkgs.writers.writeDash "dashboard-inner" ''
+      export WTF_OWM_API_KEY="$(cat ${config.age.secrets.openweathermap-api-key.path})"
+      export WTF_MINIFLUX_API_KEY="$(cat ${config.age.secrets.miniflux-api-token.path})"
+      exec ${niveumPackages.dashboard}/bin/dashboard
+    ''}
+  '';
  inherit (import ../lib) defaultApplications;
  klem = niveumPackages.klem.override {
    config.dmenu = "${pkgs.dmenu}/bin/dmenu -i -p klem";
@@ -50,18 +57,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 = pkgs.writers.writeDash "gpt" ''
-        ${niveumPackages.gpt}/bin/gpt
+      "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 = {
@@ -76,10 +79,18 @@ 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.xserver = {
    displayManager.defaultSession = "none+i3";
    windowManager.i3 = {
@@ -103,83 +114,84 @@ 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 {
-      inherit modifier;
-      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"
-            ];
-          }
-        ];
-      };
-      gaps.inner = 4;
-      floating = {
-        titlebar = false;
-        border = 1;
-      };
-      bars = [
-        (config.home-manager.users.me.lib.stylix.i3.bar
-          // rec {
-            workspaceButtons = false;
-            mode = "dock"; # "hide";
-            position = "bottom";
-            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})"
-              ${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;
-            };
-          })
+    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";
+          statusCommand = toString (pkgs.writers.writeDash "i3status-rust" ''
+            export I3RS_GITHUB_TOKEN="$(cat ${config.age.secrets.github-token-i3status-rust.path})"
+            export OPENWEATHERMAP_API_KEY="$(cat ${config.age.secrets.openweathermap-api-key.path})"
+            exec ${config.home-manager.users.me.programs.i3status-rust.package}/bin/i3status-rs ${config.home-manager.users.me.home.homeDirectory}/.config/i3status-rust/config-${position}.toml
+          '');
+          fonts = {
+            names = ["${config.stylix.fonts.sansSerif.name}" "FontAwesome 6 Free"];
+            size = config.stylix.fonts.sizes.desktop * 0.8;
+          };
+        })
+    ];
+    window = {
+      titlebar = false;
+      border = 2;
+      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"
+          ];
+        }
      ];
-      colors = let
-        background = config.lib.stylix.colors.withHashtag.base00;
-      in {
-        unfocused = {
-          border = lib.mkForce background;
-          childBorder = lib.mkForce background;
-        };
+    };
+    colors = let
+      background = config.lib.stylix.colors.withHashtag.base00;
+    in {
+      unfocused = {
+        border = lib.mkForce background;
+        childBorder = lib.mkForce background;
      };
-      modes.resize = {
-        "Escape" = ''mode "default"'';
-        "Return" = ''mode "default"'';
-        "h" = "resize shrink width 10 px or 5 ppt";
-        "j" = "resize grow height 10 px or 5 ppt";
-        "k" = "resize shrink height 10 px or 5 ppt";
-        "l" = "resize grow width 10 px or 5 ppt";
-      };
-      keybindings = {
+    };
+    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";
@@ -189,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";
@@ -203,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";
@@ -217,7 +228,6 @@ in {
        "${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 ${niveumPackages.notemenu}/bin/notemenu";
@@ -225,7 +235,6 @@ in {
        "${modifier}+Shift+p" = "exec rofi-pass --insert";
        "${modifier}+u" = "exec ${niveumPackages.unicodmenu}/bin/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
@@ -233,25 +242,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)
@@ -266,6 +268,74 @@ in {
        # XF86Back
        # XF86Launch1 (thinkvantage)
      };
+  in {
+    wayland.windowManager.sway = {
+      enable = true;
+      config = {
+        menu = "rofi -modi run,ssh,window -show run";
+        inherit modifier modes gaps bars floating window colors keybindings;
+        input = {
+          "*" = {
+            xkb_layout = "de";
+            xkb_variant = "T3";
+          };
+        };
+        terminal = (defaultApplications pkgs).terminal;
+        up = "k";
+        down = "j";
+        left = "h";
+        right = "l";
+        seat = {
+          "*" = {
+            hide_cursor = "when-typing enable";
+          };
+        };
+        startup = [
+          {command = "echo hello";}
+        ];
+      };
+    };
+
+    xsession.windowManager.i3 = {
+      enable = true;
+      extraConfig = ''
+        bindsym --release ${modifier}+Shift+w exec /run/wrappers/bin/slock
+
+        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="wtf"] ${infoWorkspace}
+        exec ${dashboard}/bin/dashboard
+      '';
+      config = lib.mkMerge [
+        {
+          inherit modifier gaps modes bars floating window colors keybindings;
+        }
+        {
+          keybindings = let
+            new-workspace = pkgs.writers.writeDash "new-workspace" ''
+              i3-msg workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
+            '';
+            move-to-new-workspace = pkgs.writers.writeDash "new-workspace" ''
+              i3-msg move container to workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
+            '';
+          in {
+            "${modifier}+ß" = "exec ${niveumPackages.menu-calc}/bin/=";
+            "${modifier}+F6" = "exec ${pkgs.xorg.xkill}/bin/xkill";
+            "${modifier}+F9" = "exec ${pkgs.redshift}/bin/redshift -O 4000 -b 0.85";
+            "${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
@@ -3,6 +3,15 @@
  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;
@@ -28,81 +37,9 @@
        };
        blocks = [
          {
-            block = "weather";
-            autolocate = true;
-            format = "$icon $location: $temp";
-            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 = 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;
-            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: "bell"
-              }'
-            '';
-            json = true;
-            hide_when_empty = true;
+            block = "music";
+            format = "{$icon $combo $play |}";
+            separator = " – ";
          }
          {
            block = "net";
@@ -116,11 +53,6 @@
            missing_format = "";
            device = "tun0";
          }
-          {
-            block = "net";
-            device = config.niveum.wirelessInterface;
-            format = "$icon $ssid $signal_strength";
-          }
          {
            block = "battery";
            device = config.niveum.batteryName;
@@ -138,35 +70,8 @@
          }
          {block = "load";}
          {
-            block = "custom";
-            interval = 10;
-            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
-                  )
-                }'
-            '';
+            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
@@ -9,10 +9,10 @@
    de = "T3";
    gr = "polytonic";
    ru = "phonetic";
-    ara = "buckwalter";
-    cop = "";
-    ave = "";
-    got = "";
+    arabic = "";
+    coptic = "";
+    avestan = "";
+    gothic = "";
    "in" = "san-kagapa";
    il = "phonetic";
  };
@@ -20,6 +20,7 @@
 in {
  # man 7 xkeyboard-config
  services.xserver = {
+    exportConfiguration = true; # link /usr/share/X11 properly
    layout = "de";
    # T3: https://upload.wikimedia.org/wikipedia/commons/a/a9/German-Keyboard-Layout-T3-Version1-large.png
    # buckwalter: http://www.qamus.org/transliteration.htm
@@ -32,31 +33,28 @@ in {
        "${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/arabic";
+            path = ../lib/keyboards/arabic;
          }
          {
-            name = "symbols/got";
-            path = pkgs.fetchurl {
-              url = "https://c.krebsco.de/got";
-              sha256 = "1i0jxghxi3rldlijw6gm2xawrv7f0pmm7a5cqbzzgjrg7ldk46gd";
-            };
+            name = "symbols/coptic";
+            path = ../lib/keyboards/coptic;
          }
          {
-            name = "symbols/ave";
-            path = pkgs.fetchurl {
-              url = "https://blog.simos.info/wp-content/uploads/2010/06/avestan.txt";
-              sha256 = "192zmmm3gxyhim39dsax7r87gsay2w5v2xkhwmvsfipjb60hwp5g";
-            };
+            name = "symbols/gothic";
+            path = ../lib/keyboards/gothic;
+          }
+          {
+            name = "symbols/avestan";
+            path = ../lib/keyboards/avestan;
          }
        ])
      ];
    };
  };

+  environment.etc."x11-locale".source = toString pkgs.xorg.libX11 + "share/X11/locale";
+
  console.keyMap = "de";

  environment.systemPackages =
--- a/configs/khal.nix
+++ b/configs/khal.nix
@@ -103,34 +103,9 @@ in {
      "khal/config".text = ''
        [calendars]

-        [[alew]]
-        path = ${davHome}/calendar/alew
-        color = "light gray"
-
-        [[personal]]
-        path = ${davHome}/calendar/personal
-        color = "light cyan"
-
-        [[krebs]]
-        path = ${davHome}/calendar/krebs
-        color = "light red"
-
-        [[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
@@ -162,19 +137,7 @@ in {
        [pair kalender]
        a = "kalender_local"
        b = "kalender_cloud"
-        collections = ["personal", "alew", "uni-1"]
-        conflict_resolution = "b wins"
-
-        [pair krebs]
-        a = "kalender_local"
-        b = "krebs_cloud"
-        collections = ["3edef929-d509-7944-2440-000a54f2d054"]
-        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]
@@ -198,18 +161,6 @@ in {
        url = "${kmeinCloud.davEndpoint}/calendars/${kmeinCloud.username}/"
        username = "${kmeinCloud.username}"
        password.fetch = ["command", "cat", "${kmeinCloud.passwordFile}"]
-
-        [storage krebs_cloud]
-        type = "caldav"
-        url = "http://calendar.r/krebs/"
-        username = "krebs"
-        password = "krebs"
-
-        [storage fysi_cloud]
-        type = "caldav"
-        url = "${fysiCloud.davEndpoint}/calendars/${fysiCloud.username}/"
-        username = "${fysiCloud.username}"
-        password.fetch = ["command", "cat", "${fysiCloud.passwordFile}"]
      '';
    };
  };
--- 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/packages.nix
+++ b/configs/packages.nix
@@ -30,7 +30,7 @@
    })
    (zoteroStyle {
      name = "apa";
-      sha256 = "sha256-yq4fW6hQknycLjaj5fPbXLrQlGBp5myXiOSHBU90jEc=";
+      sha256 = "sha256-sUf0Ov5c9aTUoLsYSRbQl3Qs9ELkb5/Tky35kH7pKuE=";
    })
  ];

@@ -65,56 +65,32 @@ in {
    aria2
    firefox
    tdesktop
-    w3m
-    wget
+    gomuks
    whois
    dnsutils
    # FILE MANAGERS
    lf
-    cinnamon.nemo
+    pcmanfm
    # MEDIA
    ffmpeg
    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
    gcc
    python3Packages.jsonschema # json validation
-    jq # json toolkit
    pup # html toolkit
    htmlq
    xsv # csv toolkit
-    fq # toolkit for yaml, xml and binaries
    man-pages
    man-pages-posix
-    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.gnome-disk-utility
    arandr # xrandr for noobs
    libnotify # for notify-send
    xclip # clipboard CLI
@@ -124,6 +100,8 @@ in {
    calibre
    electrum
    inkscape
+    krita
+    gthumb
    astrolog
    obsidian
    anki-bin # flashcards
@@ -140,12 +118,10 @@ in {
    niveumPackages.hc # print files as qr codes
    yt-dlp
    espeak
-    bc # calculator
-    pari # gp -- better calculator
    rink # unit converter
    niveumPackages.auc
    niveumPackages.cheat-sh
-    niveumPackages.infschmv
+    niveumPackages.polyglot
    niveumPackages.qrpaste
    niveumPackages.ttspaste
    niveumPackages.new-mac # get a new mac address
@@ -157,24 +133,23 @@ 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 {
@@ -196,7 +171,7 @@ in {
    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

@@ -222,9 +197,6 @@ in {

    #krebs
    niveumPackages.dic
-    niveumPackages.cyberlocker-tools
-    niveumPackages.untilport
-    niveumPackages.kpaste
    config.nur.repos.mic92.ircsink

    (haskellPackages.ghcWithHoogle (hs: [
@@ -256,6 +228,12 @@ in {
    lua-language-server
    nodePackages.vscode-langservers-extracted

+    dhall-lsp-server
+    dhall-nix
+    dhall-bash
+    dhall-json
+    dhall
+
    html-tidy
    nodePackages.csslint
    nodePackages.jsonlint
@@ -275,8 +253,8 @@ in {
    libreoffice
    # gnumeric
    dia
-    unstablePackages.pandoc
-    niveumPackages.man-pandoc
+    pandoc
+    # niveumPackages.man-pandoc
    typst
    # proselint
    asciidoctor
--- a/configs/sound.nix
+++ b/configs/sound.nix
@@ -1,12 +1,8 @@
 {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 +11,21 @@
    jack.enable = true;
  };

-  hardware.pulseaudio = {
+  systemd.user.services.pipewire-pulse.path = [pkgs.pulseaudio];
+
+  services.avahi = {
    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"
-        ]
-      }
-    '';
+    publish.enable = true;
+    publish.userServices = true;
  };

-  users.users.me.extraGroups = ["pipewire" "audio"];
+  environment.etc."pipewire/pipewire-pulse.conf.d/50-network-party.conf".text = ''
+    context.exec = [
+      { path = "pactl" args = "load-module module-native-protocol-tcp" }
+      { path = "pactl" args = "load-module module-zeroconf-discover" }
+      { path = "pactl" args = "load-module module-zeroconf-publish" }
+    ]
+  '';

  environment.systemPackages = [
    pkgs.pavucontrol
--- a/configs/ssh.nix
+++ b/configs/ssh.nix
@@ -2,35 +2,42 @@
  inherit (import ../lib) sshPort kieran;
  externalNetwork = import ../lib/external-network.nix;
 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;
@@ -74,6 +81,11 @@ in {
        user = "kfm";
        port = sshPort;
      };
+      fatteh = {
+        hostname = "fatteh.r";
+        user = "kfm";
+        port = sshPort;
+      };
    };
  };
 }
--- a/configs/sshd.nix
+++ b/configs/sshd.nix
@@ -17,5 +17,5 @@ in {
    };
  };

-  users.users.root.openssh.authorizedKeys.keys = kieran.sshKeys pkgs;
+  users.users.root.openssh.authorizedKeys.keys = kieran.sshKeys;
 }
--- a/configs/stardict.nix
+++ b/configs/stardict.nix
@@ -1,10 +1,10 @@
 {
-  config,
  pkgs,
  lib,
  inputs,
  ...
 }: let
+  locker = x: "https://c.krebsco.de/${x}";
  dictionaries = {
    lojban = {
      jbo-deu = pkgs.fetchzip {
@@ -30,7 +30,7 @@
        sha256 = "1kmbdjqinrcxkc6jdyyrq5rl2wzhnrychyynnh91yhrjwjxlh44k";
      };
      Woodhouse = pkgs.fetchzip {
-        url = "https://c.krebsco.de/Woodhouse.zip";
+        url = locker "Woodhouse.zip";
        sha256 = "1dvnc2679yb048q2f3hr2h34acvhan0n3iir6h9ajlrdzz48mlkq";
        stripRoot = false;
      };
@@ -69,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";
      };
    };
@@ -141,32 +141,38 @@
    };
    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;
+    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";
+        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";
+        url = locker "stardict-babylon-Babylon_English_Turkish-2.4.2.tar.bz2";
        sha256 = "0myx31xzb7nrn5m657h0bwdgm5xp93ccwp6lcpbxgjxdjm3q0hc5";
      };
    };
@@ -286,29 +292,28 @@
    " | 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)
--- a/configs/stw-berlin.nix
+++ b/configs/stw-berlin.nix
@@ -10,7 +10,8 @@
    wants = ["network-online.target"];
    startAt = "weekly";
    serviceConfig = {
-      user = "kfm";
+      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}"
--- a/configs/stylix.nix
+++ b/configs/stylix.nix
@@ -17,30 +17,28 @@ in {
  # stylix.image = inputs.wallpapers.outPath + "/meteora/rodrigo-soares-250630.jpg";
  stylix.image = generatedWallpaper;

-  environment.etc."stylix/wallpaper.png".source = generatedWallpaper;
+  # environment.etc."stylix/wallpaper.png".source = generatedWallpaper;

  # stylix.polarity = "either";
-  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/${
-    {
-      "0" = "synth-midnight-dark";
-      "1" = "apprentice"; # https://romainl.github.io/Apprentice/
-      "2" = "one-light";
-      "3" = "one-dark";
-      "4" = "material"; # https://github.com/ntpeters/base16-materialtheme-scheme
-      "5" = "material-palenight";
-      "6" = "material-lighter";
-      "7" = "tomorrow"; # https://github.com/chriskempson/tomorrow-theme
-      "8" = "tomorrow-night";
-      "9" = "gruvbox-light-medium"; # https://github.com/dawikur/base16-gruvbox-scheme
-      "a" = "gruvbox-dark-medium";
-      "b" = "selenized-light"; # https://github.com/jan-warchol/selenized
-      "c" = "selenized-dark";
-      "d" = "papercolor-light";
-      "e" = "papercolor-dark";
-      "f" = "dracula"; # https://draculatheme.com/
-    }
-    .${builtins.head (lib.stringToCharacters inputs.nixpkgs.rev)}
-  }.yaml";
+  # 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 = {
--- a/configs/telegram-bots/default.nix
+++ b/configs/telegram-bots/default.nix
@@ -51,6 +51,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 +67,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/battery.nix
+++ b/configs/battery.nix
--- a/configs/wallpaper.nix
+++ b/configs/wallpaper.nix
@@ -3,7 +3,8 @@
  lib,
  ...
 }: let
-  url = "http://wallpaper.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/zsh.nix
+++ b/configs/zsh.nix
@@ -52,9 +52,9 @@

      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)
    '';
@@ -99,6 +99,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
@@ -5,14 +5,14 @@
    agenix.url = "github:ryantm/agenix";
    coptic-dictionary.url = "github:kmein/coptic-dictionary";
    flake-utils.url = "github:numtide/flake-utils";
-    home-manager.url = "github:nix-community/home-manager/release-23.05";
+    home-manager.url = "github:nix-community/home-manager/release-23.11";
    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-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0";
    nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
    nur.url = "github:nix-community/NUR";
    recht.url = "github:kmein/recht";
    retiolum.url = "git+https://git.thalheim.io/Mic92/retiolum";
@@ -29,15 +29,14 @@
    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";
-    menstruation-backend.inputs.rust-overlay.follows = "rust-overlay";
+    # 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";
-    nixinate.inputs.nixpkgs.follows = "nixpkgs";
    recht.inputs.flake-utils.follows = "flake-utils";
    recht.inputs.nixpkgs.follows = "nixpkgs";
    rust-overlay.inputs.flake-utils.follows = "flake-utils";
@@ -61,41 +60,66 @@
    nixpkgs-unstable,
    nur,
    home-manager,
-    nixinate,
    agenix,
    retiolum,
+    nixinate,
    flake-utils,
    nix-on-droid,
    stylix,
    ...
  }:
    {
-      apps =
-        nixinate.nixinate.x86_64-linux self
-        // {
-          x86_64-linux = let
-            pkgs = nixpkgs.legacyPackages.x86_64-linux;
-          in {
+      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
              '');
            };
-            deploy = {
+          }
+          # 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";
+              kabsa = "root@kabsa";
+              fatteh = "root@fatteh";
+            };
+          in
+            lib.attrsets.nameValuePair "deploy-${hostname}" {
              type = "app";
-              program = toString (pkgs.writers.writeDash "deploy" ''
-                if [ $# -eq 0 ]
-                then
-                  systems='${toString (builtins.attrNames self.nixosConfigurations)}'
-                else
-                  systems=$*
-                fi
-                ${pkgs.parallel}/bin/parallel --line-buffer --tagstring '{}' 'nix run .\?submodules=1\#apps.nixinate.{}' ::: $systems
+              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} --build-host ${targets.${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;
@@ -128,6 +152,21 @@
        };
      };

+      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 {
@@ -147,6 +186,12 @@
          system = "aarch64-linux";
          specialArgs = niveumSpecialArgs system;
          modules = [
+            systems/ful/configuration.nix
+            agenix.nixosModules.default
+            inputs.self.nixosModules.passport
+            inputs.self.nixosModules.panoptikon
+            retiolum.nixosModules.retiolum
+            nur.nixosModules.nur
            {
              _module.args.nixinate = {
                host = "ful";
@@ -156,27 +201,12 @@
                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 = 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
@@ -188,15 +218,6 @@
          # for using inputs in other config files
          specialArgs = niveumSpecialArgs system;
          modules = [
-            {
-              _module.args.nixinate = {
-                host = "makanek";
-                sshUser = "root";
-                buildOn = "local";
-                substituteOnTarget = true;
-                hermetic = false;
-              };
-            }
            systems/makanek/configuration.nix
            inputs.self.nixosModules.telegram-bot
            inputs.self.nixosModules.htgen
@@ -226,15 +247,6 @@
          system = "x86_64-linux";
          specialArgs = niveumSpecialArgs system;
          modules = [
-            {
-              _module.args.nixinate = {
-                host = "manakish";
-                sshUser = "root";
-                buildOn = "local";
-                substituteOnTarget = true;
-                hermetic = false;
-              };
-            }
            systems/manakish/configuration.nix
            agenix.nixosModules.default
            retiolum.nixosModules.retiolum
@@ -247,15 +259,6 @@
          system = "x86_64-linux";
          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
@@ -264,15 +267,27 @@
            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.nixosModules.nur
+            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;
        overlays = [
          nur.overlay
          (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 "$@"'';
          })
        ];
@@ -290,11 +305,13 @@
      packages = rec {
        auc = pkgs.callPackage packages/auc.nix {};
        betacode = pkgs.callPackage packages/betacode.nix {};
+        brassica = pkgs.callPackage packages/brassica.nix {};
        cheat-sh = pkgs.callPackage packages/cheat-sh.nix {};
        closest = pkgs.callPackage packages/closest {};
        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 {};
@@ -307,8 +324,11 @@
        genius = pkgs.callPackage packages/genius.nix {};
        gfs-fonts = pkgs.callPackage packages/gfs-fonts.nix {};
        git-preview = pkgs.callPackage packages/git-preview.nix {};
-        gpt = pkgs.callPackage packages/gpt.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 {};
@@ -333,6 +353,7 @@
        mpv-radio = pkgs.callPackage packages/mpv-radio.nix {di-fm-key-file = "/dev/null";};
        mpv-tuner = pkgs.callPackage packages/mpv-tuner.nix {di-fm-key-file = "/dev/null";};
        mpv-tv = pkgs.callPackage packages/mpv-tv.nix {};
+        mpv-iptv = pkgs.callPackage packages/mpv-iptv.nix {};
        mpv-visualizer = unstablePackages.mpvScripts.visualizer;
        new-mac = pkgs.callPackage packages/new-mac.nix {};
        nix-git = pkgs.callPackage packages/nix-git.nix {};
@@ -340,6 +361,7 @@
        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 {};
        qrpaste = pkgs.callPackage packages/qrpaste.nix {};
        rfc = pkgs.callPackage packages/rfc.nix {};
        scanned = pkgs.callPackage packages/scanned.nix {};
@@ -350,6 +372,7 @@
        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};};
@@ -377,11 +400,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/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
@@ -15,6 +15,8 @@
    repository = "rest:http://${host}:${toString port}/";
  };

+  remoteDir = "/home/kfm/remote";
+
  firewall = lib: {
    accept = {
      source,
@@ -67,20 +69,18 @@
    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,5 +1,21 @@
-{
+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/keyboards/XCompose
+++ b/lib/keyboards/XCompose
@@ -0,0 +1,31 @@
+# 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> <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/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/retiolum-network.nix
+++ b/lib/retiolum-network.nix
@@ -19,6 +19,11 @@
    ipv6 = "42:0:3c46:f7a9:1f0a:1b2b:822a:6050";
  };

+  fatteh = {
+    ipv6 = "42:0:3c46:aa73:82b0:14d7:7bf8:bf2";
+    ipv4 = "10.243.2.77";
+  };
+
  manakish = {
    ipv4 = "10.243.2.85";
    ipv6 = "42:0:3c46:ac99:ae36:cb8:c551:ba27";
--- a/lib/streams.nix
+++ b/lib/streams.nix
@@ -148,6 +148,11 @@ in
      logo = "https://de.wikipedia.org/wiki/Wikipedia:Enzyklop%C3%A4die/Logo_von_Wikipedia#/media/Datei:Wikipedia-logo-v2.svg";
      tags = [tags.text];
    }
+    {
+      stream = "http://stream.freiesradio.org:8000/live.mp3";
+      station = "Freies Radio Kassel";
+      description = "Gesellschaft zur drahtlosen Belehrung und Erbauung";
+    }
    {
      stream = "http://162.244.80.20:6948";
      station = "Cool Jazz Florida";
@@ -1416,9 +1421,8 @@ in
      tags = [tags.arabic];
    }
    {
-      stream = "http://5.9.16.111:8210/arabic_live";
-      station = "Radio Arabica";
-      logo = "https://radioarabica.de/wp-content/uploads/2020/09/LOGO_klein-1.png";
+      stream = "https://arabica.streamabc.net/76-radioorient-mp3-256-1050481";
+      station = "Radio Orient";
      tags = [tags.berlin tags.arabic];
    }
    {
@@ -1907,9 +1911,14 @@ in
      stream = "https://divyavani.radioca.st/stream";
    }
    {
-      station = "XXX sanskrit radio";
+      station = "Sanskrit Bharati";
      tags = [tags.text tags.indian];
-      stream = "https://stream-23.zeno.fm/m08mkwsyw8quv?zs=0w7MJFPdRfavhR_zPt0M2g";
+      stream = "https://stream-23.zeno.fm/m08mkwsyw8quv";
+    }
+    {
+      stream = "http://epsilon.shoutca.st:8070/stream";
+      tags = [tags.text tags.indian tags.holy];
+      station = "Divyavani Sanskrit Radio";
    }
    {
      station = "Radio Mariam Arabic";
@@ -1966,6 +1975,15 @@ in
      station = "radioeins | RBB";
      tags = [tags.top40 tags.pop];
    }
+    {
+      stream = "https://liveradio.swr.de/sw282p3/swr4lu/";
+      station = "SWR3 Ludwigshafen";
+      tags = [tags.top40 tags.pop];
+    }
+    {
+      stream = "http://mp3.ffh.de/radioffh/hqlivestream.mp3";
+      station = "Hitradio FFH";
+    }
  ]
  ++ map (name: {
    stream = "https://${name}.stream.publicradio.org/${name}.aac";
--- a/lib/vim/init.lua
+++ b/lib/vim/init.lua
@@ -113,6 +113,7 @@ local language_servers = {
  html = {}, -- vscode-langservers-extracted
  jsonls = {}, -- vscode-langservers-extracted
  nil_ls = {}, -- github:oxalica/nil
+  dhall_lsp_server = {}, -- dhall-lsp-server
  -- rnix = {}, -- rnix-lsp
  jqls = {}, -- jq-lsp
  rust_analyzer = { ["rust-analyzer"] = {} },
--- a/lib/vim/init.vim
+++ b/lib/vim/init.vim
@@ -100,7 +100,8 @@ augroup filetypes
  autocmd bufnewfile,bufread *.typ packadd typst.vim | set filetype=typst
  autocmd bufnewfile,bufread *.ics packadd icalendar.vim | set filetype=icalendar
  autocmd bufnewfile,bufread *.ts packadd typescript-vim | set filetype=typescript
-  autocmd bufnewfile,bufread *.jq packadd jq.vim
+  autocmd bufnewfile,bufread *.dhall packadd dhall-vim | set filetype=dhall
+  autocmd bufnewfile,bufread *.jq packadd jq.vim | set filetype=jq
  autocmd bufnewfile,bufread *.journal packadd vim-ledger | set filetype=ledger shiftwidth=4
  autocmd bufnewfile,bufread urls,config set filetype=conf
  autocmd bufnewfile,bufread *.elm packadd elm-vim | set filetype=elm shiftwidth=4
@@ -108,6 +109,7 @@ augroup filetypes
  autocmd filetype haskell packadd haskell-vim | set keywordprg=hoogle\ -i
  autocmd filetype javascript packadd vim-javascript
  autocmd filetype make setlocal noexpandtab
+  autocmd filetype tsv setlocal noexpandtab
  autocmd filetype html packadd emmet-vim
  autocmd filetype gitcommit setlocal spell spelllang=en
  autocmd filetype mail setlocal spell spelllang=de textwidth=0
--- a/modules/panoptikon.nix
+++ b/modules/panoptikon.nix
@@ -28,6 +28,13 @@
            example = "*:0/3";
            default = "daily";
          };
+          loadCredential = lib.mkOption {
+            type = lib.types.listOf lib.types.string;
+            description = ''
+              This can be used to pass secrets to the systemd service without adding them to the nix store.
+            '';
+            default = [];
+          };
          reporters = lib.mkOption {
            type = lib.types.listOf lib.types.path;
            description = ''
@@ -82,6 +89,8 @@
              Group = "panoptikon";
              WorkingDirectory = "/var/lib/panoptikon";
              Restart = "on-failure";
+              StartLimitBurst = 5;
+              RestartSec = 30;
            };
            script = ''
              ${pkgs.git}/bin/git init --quiet
@@ -102,6 +111,7 @@
              WorkingDirectory = "/var/lib/panoptikon";
              RestartSec = "60";
              Restart = "on-failure";
+              LoadCredential = watcherOptions.loadCredential;
            };
            unitConfig = {
              StartLimitIntervalSec = "300";
--- a/packages/brassica.nix
+++ b/packages/brassica.nix
@@ -0,0 +1,5 @@
+{
+  haskell,
+  haskellPackages,
+}:
+haskell.lib.dontCheck (haskell.lib.unmarkBroken (haskell.lib.doJailbreak haskellPackages.brassica))
--- a/packages/dashboard/default.nix
+++ b/packages/dashboard/default.nix
@@ -0,0 +1,238 @@
+{
+  writers,
+  formats,
+  wtf,
+  himalaya,
+  lib,
+  jq,
+  gh,
+  curl,
+  khal,
+  todoman,
+  gnused,
+  coreutils,
+  astrolog,
+  weatherCityIds ? [2950159],
+}: let
+  rowCount = 10;
+  columnCount = 6;
+
+  yaml = formats.yaml {};
+  command = args:
+    {
+      enabled = true;
+      type = "cmdrunner";
+    }
+    // args;
+  configuration.wtf = rec {
+    grid = {
+      columns = lib.replicate columnCount 32;
+      rows = lib.replicate rowCount 5;
+    };
+    mods.vdir_khal = command {
+      title = "Calendar";
+      cmd = "${khal}/bin/khal";
+      args = ["--color" "list" "--exclude-calendar" "calendarium-tridentinum"];
+      refreshInterval = "1m";
+      position = rec {
+        top = 0;
+        left = columnCount - width + 1;
+        height = rowCount - mods.vdir_todo.position.height;
+        width = 1;
+      };
+    };
+    mods.vdir_todo = command {
+      title = "Agenda";
+      cmd = writers.writeDash "vdir_todo" "${todoman}/bin/todo --color=always -h | ${coreutils}/bin/tac";
+      refreshInterval = "1m";
+      position = {
+        top = 8;
+        left = 0;
+        height = 2;
+        width = columnCount + 1;
+      };
+    };
+    mods.weather = {
+      enabled = true;
+      cityids = weatherCityIds;
+      position = {
+        top = 6;
+        left = 2;
+        height = 2;
+        width = 1;
+      };
+      refreshInterval = "15m";
+      language = "DE";
+      tempUnit = "C";
+      useEmoji = true;
+      compact = true;
+    };
+    mods.btc = command {
+      title = "BTC";
+      cmd = writers.writeDash "btc" "${curl}/bin/curl -sSL https://rate.sx/BTC | ${gnused}/bin/sed -n '34,36p'";
+      refreshInterval = "1h";
+      position = {
+        top = 6;
+        left = 0;
+        height = 1;
+        width = 2;
+      };
+    };
+    mods.xmr = command {
+      title = "XMR";
+      cmd = writers.writeDash "xmr" "${curl}/bin/curl -sSL https://rate.sx/XMR | ${gnused}/bin/sed -n '34,36p'";
+      refreshInterval = "1h";
+      position = {
+        top = 7;
+        left = 0;
+        height = 1;
+        width = 2;
+      };
+    };
+    mods.top = command {
+      title = "uptime";
+      cmd = writers.writeDash "top" "top -b -n 1 -E g | ${gnused}/bin/sed -n '1,5p'";
+      refreshInterval = "30s";
+      position = {
+        top = 0;
+        left = 0;
+        height = 2;
+        width = 3;
+      };
+      enabled = false;
+    };
+    mods.resourceusage = {
+      enabled = true;
+      cpuCombined = false;
+      position = {
+        top = 0;
+        left = 0;
+        height = 2;
+        width = 1;
+      };
+      refreshInterval = "1s";
+      showCPU = true;
+      showMem = true;
+      showSwp = false;
+    };
+    mods.ipapi = {
+      enabled = true;
+      position = {
+        top = 0;
+        left = 1;
+        height = 2;
+        width = 2;
+      };
+      refreshInterval = "150s";
+    };
+    mods.disk-usage = command {
+      enabled = false;
+      cmd = "df";
+      args = ["-h"];
+      refreshInterval = "1m";
+      position = {
+        top = 2;
+        left = 1;
+        height = 2;
+        width = 2;
+      };
+    };
+    mods.email = command {
+      title = "Email";
+      cmd = writers.writeDash "email" ''
+        ${himalaya}/bin/himalaya accounts --output json \
+          | ${jq}/bin/jq -r 'map(.name) | join("\n")' \
+          | while read -r account
+            do
+              ${himalaya}/bin/himalaya list --account "$account" -o json \
+                | ${jq}/bin/jq -r '
+                  map(select(.flags == [])
+                  | "\u001b[33m\(.from.addr)\u001b[0m \(.subject)") | join("\n")
+                '
+            done
+      '';
+      refreshInterval = "5m";
+      position = {
+        top = 2;
+        left = 0;
+        height = 4;
+        width = 3;
+      };
+    };
+    mods.gh-status = command {
+      enabled = true;
+      title = "GitHub";
+      cmd = writers.writeDash "gh-status" ''
+        ${gh}/bin/gh api notifications \
+          | ${jq}/bin/jq -r 'map("\u001b[35m\(.repository.full_name)\u001b[0m \(.subject.title)") | join("\n")'
+      '';
+      refreshInterval = "5m";
+      position = {
+        top = 4;
+        left = 3;
+        height = 2;
+        width = 3;
+      };
+    };
+    mods.calendar = command {
+      title = "Calendar";
+      cmd = "cal";
+      args = ["-3" "-m" "-w"];
+      pty = true;
+      refreshInterval = "5m";
+      position = {
+        top = 6;
+        left = 3;
+        height = 2;
+        width = 3;
+      };
+    };
+    mods.astro-aspects = command {
+      title = "Aspects";
+      enabled = false;
+      cmd = writers.writeDash "astro-aspects" "${astrolog}/bin/astrolog -n -zN Berlin -d";
+      refreshInterval = "1h";
+      position = {
+        top = 7;
+        left = 3;
+        height = 1;
+        width = 2;
+      };
+    };
+    mods.feed = command {
+      title = "Feed";
+      cmd = writers.writeDash "feed" ''
+        ${curl}/bin/curl -u "$WTF_MINIFLUX_API_KEY" --basic -s 'https://feed.kmein.de/v1/entries?status=unread&direction=desc' \
+          | ${jq}/bin/jq -r '
+            .total as $total | (
+              .entries
+              | map(select(.feed | .hide_globally| not) | "\(.feed.category.title) \u001b[32m\(.author)\u001b[0m \(.title)")
+              | join("\n")
+            )'
+      '';
+      # position = { top = 0; left = 5; height = 5; width = 1; };
+      position = {
+        top = 0;
+        left = 3;
+        height = 4;
+        width = 3;
+      };
+      refreshInterval = "15m";
+    };
+    mods.astro-positions = command {
+      enabled = false;
+      title = "Positions";
+      cmd = writers.writeDash "astro-positions" "${astrolog}/bin/astrolog -q $(date +'%m %d %Y %H:%M') -zN Berlin | ${gnused}/bin/sed -n '4,16p' | ${coreutils}/bin/cut -c 1-33";
+      refreshInterval = "1h";
+      position = {
+        top = 5;
+        left = 5;
+        height = 3;
+        width = 1;
+      };
+    };
+  };
+in
+  writers.writeDashBin "dashboard" ''
+    exec ${wtf}/bin/wtfutil --config=${yaml.generate "config.yml" configuration}
+  ''
--- a/packages/dmenu-randr.nix
+++ b/packages/dmenu-randr.nix
@@ -0,0 +1,102 @@
+{
+  lib,
+  writers,
+  dmenu,
+  bc,
+  psmisc,
+  util-linux,
+  xorg,
+  gawk,
+  libnotify,
+  arandr,
+  gnugrep,
+  coreutils,
+}:
+writers.writeDashBin "dmenu-randr" ''
+  #!/bin/sh
+
+  export PATH=${lib.makeBinPath [dmenu bc psmisc util-linux xorg.xrandr gawk libnotify arandr gnugrep coreutils]}
+
+  # A UI for detecting and selecting all displays. Probes xrandr for connected
+  # displays and lets user select one to use. User may also select "manual
+  # selection" which opens arandr.
+
+  twoscreen() { # If multi-monitor is selected and there are two screens.
+
+      mirror=$(printf "no\\nyes" | dmenu -i -p "Mirror displays?")
+      # Mirror displays using native resolution of external display and a scaled
+      # version for the internal display
+      if [ "$mirror" = "yes" ]; then
+          external=$(echo "$screens" | dmenu -i -p "Optimize resolution for:")
+          internal=$(echo "$screens" | grep -v "$external")
+
+          res_external=$(xrandr --query | sed -n "/^$external/,/\+/p" | \
+              tail -n 1 | awk '{print $1}')
+          res_internal=$(xrandr --query | sed -n "/^$internal/,/\+/p" | \
+              tail -n 1 | awk '{print $1}')
+
+          res_ext_x=$(echo "$res_external" | sed 's/x.*//')
+          res_ext_y=$(echo "$res_external" | sed 's/.*x//')
+          res_int_x=$(echo "$res_internal" | sed 's/x.*//')
+          res_int_y=$(echo "$res_internal" | sed 's/.*x//')
+
+          scale_x=$(echo "$res_ext_x / $res_int_x" | bc -l)
+          scale_y=$(echo "$res_ext_y / $res_int_y" | bc -l)
+
+          xrandr --output "$external" --auto --scale 1.0x1.0 \
+              --output "$internal" --auto --same-as "$external" \
+              --scale "$scale_x"x"$scale_y"
+      else
+
+          primary=$(echo "$screens" | dmenu -i -p "Select primary display:")
+          secondary=$(echo "$screens" | grep -v "$primary")
+          direction=$(printf "left-of\\nright-of\\nabove\\nbelow" | dmenu -i -p "What side of $primary should $secondary be on?")
+          xrandr --output "$primary" --auto --scale 1.0x1.0 --output "$secondary" --"$direction" "$primary" --auto --scale 1.0x1.0
+      fi
+      }
+
+  morescreen() { # If multi-monitor is selected and there are more than two screens.
+  	primary=$(echo "$screens" | dmenu -i -p "Select primary display:")
+  	secondary=$(echo "$screens" | grep -v "$primary" | dmenu -i -p "Select secondary display:")
+  	direction=$(printf "left\\nright" | dmenu -i -p "What side of $primary should $secondary be on?")
+  	tertiary=$(echo "$screens" | grep -v "$primary" | grep -v "$secondary" | dmenu -i -p "Select third display:")
+  	xrandr --output "$primary" --auto --output "$secondary" --"$direction"-of "$primary" --auto --output "$tertiary" --"$(printf "left\\nright" | grep -v "$direction")"-of "$primary" --auto
+  	}
+
+  multimon() { # Multi-monitor handler.
+  	case "$(echo "$screens" | wc -l)" in
+  		2) twoscreen ;;
+  		*) morescreen ;;
+  	esac ;}
+
+  onescreen() { # If only one output available or chosen.
+  	xrandr --output "$1" --auto --scale 1.0x1.0 $(echo "$allposs" | grep -v "\b$1" | awk '{print "--output", $1, "--off"}' | paste -sd ' ' -)
+  	}
+
+  postrun() { # Stuff to run to clean up.
+  	{ killall dunst ; setsid -f dunst ;} >/dev/null 2>&1 # Restart dunst to ensure proper location on screen
+  	}
+
+  # Get all possible displays
+  allposs=$(xrandr -q | grep "connected")
+
+  # Get all connected screens.
+  screens=$(echo "$allposs" | awk '/ connected/ {print $1}')
+
+  # If there's only one screen
+  [ "$(echo "$screens" | wc -l)" -lt 2 ] &&
+  	{ onescreen "$screens"; postrun; notify-send "💻 Only one screen detected." "Using it in its optimal settings...";  exit ;}
+
+  # Get user choice including multi-monitor and manual selection:
+
+  # reenable if you sometimes want single display
+  chosen=$(printf "%s\\nmulti-monitor\\nmanual selection" "$screens" | dmenu -i -p "Select display arangement:") &&
+
+  case "$chosen" in
+  	"manual selection") arandr ; exit ;;
+  	"multi-monitor") multimon ;;
+  	*) onescreen "$chosen" ;;
+  esac
+
+  postrun
+''
--- a/packages/emailmenu.nix
+++ b/packages/emailmenu.nix
@@ -0,0 +1,18 @@
+{
+  writers,
+  lib,
+  coreutils,
+  dmenu,
+  gawk,
+  libnotify,
+  xclip,
+  khard,
+}:
+writers.writeDashBin "emailmenu" ''
+  history_file=$HOME/.cache/emailmenu
+  PATH=${lib.makeBinPath [coreutils dmenu gawk libnotify xclip]}
+  chosen=$(${khard}/bin/khard email --parsable | awk '!seen[$0]++' | dmenu -i -p 📧 -1 -l 10 | tee --append "$history_file" | cut -f1)
+  [ "$chosen" != "" ] || exit
+  echo "$chosen" | tr -d '\n' | xclip -selection clipboard
+  notify-send --app-name="$(basename "$0")" "'$chosen' copied to clipboard." &
+''
--- a/packages/hora.nix
+++ b/packages/hora.nix
@@ -0,0 +1,80 @@
+{ symlinkJoin
+, hledger
+, writers
+, lib
+, git
+, coreutils
+, gnugrep
+, timeLedger
+, ...
+}:
+let
+  date = "${coreutils}/bin/date +'%Y-%m-%d %H:%M:%S'";
+
+  hora = writers.writeDashBin "hora" "${hledger}/bin/hledger -f ${lib.escapeShellArg timeLedger} \"$@\"";
+  hora-edit = writers.writeDashBin "hora-edit" "$EDITOR ${lib.escapeShellArg timeLedger}";
+  hora-status = writers.writeDashBin "hora-status" "${coreutils}/bin/tac ${lib.escapeShellArg timeLedger} | ${gnugrep}/bin/grep -m 1 .";
+
+  hora-start = writers.writeDashBin "hora-start" ''
+    last_nonempty_line=$(${hora-status}/bin/hora-status)
+    (echo $last_nonempty_line | ${gnugrep}/bin/grep -q "^o") || {
+        echo "Last activity must be closed: $last_nonempty_line" >/dev/stderr
+        exit 1
+    }
+
+    account=$1
+    (${hora}/bin/hora accounts | ${gnugrep}/bin/grep -q "^$account\$") || {
+        echo "The account '$account' is not known. Please add manually."
+        exit 1
+    }
+
+    message=$2
+    date=$(${date})
+    echo "i $date $account  $message\n" >> "${timeLedger}"
+    echo "Started $account at $date" >/dev/stderr 
+  '';
+
+  hora-stop = writers.writeDashBin "hora-stop" ''
+    last_nonempty_line=$(${hora-status}/bin/hora-status)
+
+    (echo $last_nonempty_line | ${gnugrep}/bin/grep "^i") || {
+        echo "Last activity cannot be closed: $last_nonempty_line" >/dev/stderr
+        exit 1
+    }
+
+    last_activity=$(echo "$last_nonempty_line" | ${coreutils}/bin/cut -d' ' -f 4)
+    date=$(${date})
+
+    echo "o $date\n" >> ${timeLedger}
+    echo "Stopped $last_activity at $date" >/dev/stderr
+  '';
+
+  hora-year = writers.writeDashBin "hora-year" ''
+    ${hora}/bin/hora balance --tree --monthly --begin $(${coreutils}/bin/date +%Y) --depth 1
+  '';
+  hora-git = writers.writeDashBin "hora-git" ''
+    directory=$(${coreutils}/bin/dirname ${lib.escapeShellArg timeLedger})
+    if [ $# -gt 0 ]
+    then
+      ${git}/bin/git -C "$directory" --all --message=$(${date})
+    else
+      ${git}/bin/git -C "$directory" "$@"
+    fi
+  '';
+  hora-weekly = writers.writeDashBin "hora-weekly" ''
+    ${hora}/bin/hora register -p weekly --depth 1 --empty
+  '';
+in
+symlinkJoin {
+  name = "hora";
+  paths = [
+    hora
+    hora-edit
+    hora-start
+    hora-status
+    hora-stop
+    hora-year
+    hora-git
+    hora-weekly
+  ];
+}
--- a/packages/jq-lsp.nix
+++ b/packages/jq-lsp.nix
@@ -0,0 +1,16 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+}:
+buildGoModule {
+  name = "jq-lsp";
+  version = "unstable-2023-09-08";
+  src = fetchFromGitHub {
+    owner = "wader";
+    repo = "jq-lsp";
+    rev = "85edf1adbe5e6c91b37c67b6a4bf85eda1e49f2f";
+    hash = "sha256-ItLKRSbGZ8UqFEHCoh96KwhSpuKZ3l+2ZXnBkHEZL0M=";
+  };
+  vendorHash = "sha256-ppQ81uERHBgOr/bm/CoDSWcK+IqHwvcL6RFi0DgoLuw=";
+}
--- a/packages/man/pandoc.nix
+++ b/packages/man/pandoc.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
  src = fetchgit {
    url = "https://github.com/jgm/pandoc";
    rev = pandoc.version;
-    sha256 = "sha256-8mkHbHoXrkgcXZ/rYlVh2fhL12WjcTt97a1W+oYVYOs=";
+    hash = "sha256-4VDfRUr6TyF4oZsCve9t6FlEN0AqzYdlYXRny+SAcsY=";
  };
  buildPhase = ''
    mkdir -p $out/man/man1
--- a/packages/mpv-iptv.nix
+++ b/packages/mpv-iptv.nix
@@ -0,0 +1,16 @@
+{
+  mpv,
+  writers,
+}:
+writers.writeDashBin "iptv" ''
+  set -efu
+  ${mpv}/bin/mpv \
+    --audio-display=no --audio-channels=stereo \
+    --audio-samplerate=48000 --audio-format=s16 \
+    --ao-pcm-file=/run/snapserver/snapfifo --ao=pcm \
+    --audio-delay=-1 \
+    --playlist=https://iptv-org.github.io/iptv/index.nsfw.m3u \
+    --idle=yes \
+    --input-ipc-server=/tmp/mpv.ipc \
+    "$@"
+''
--- a/packages/mpv-tv.nix
+++ b/packages/mpv-tv.nix
@@ -2,15 +2,23 @@
  pkgs,
  lib,
 }: let
-  streams-tsv = pkgs.fetchurl {
+  m3u-to-tsv = ''
+    ${pkgs.gnused}/bin/sed '/#EXTM3U/d;/#EXTINF/s/.*,//g' $out | ${pkgs.coreutils}/bin/paste -d'\t' - - > $out.tmp
+    mv $out.tmp $out
+  '';
+
+  live-tv = pkgs.fetchurl {
+    url = "https://raw.githubusercontent.com/Free-TV/IPTV/master/playlist.m3u8";
+    sha256 = "sha256-yNeML586RXXX5+VUtinH1C9M50hvnJih7oLmsVspk0M=";
+    postFetch = m3u-to-tsv;
+  };
+
+  kodi-tv = pkgs.fetchurl {
    url = "https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/iptv/kodi/kodi_tv.m3u";
-    sha256 = "sha256-gbHV37Yo+D3TYfDXZyb9IX8aRsguZ3qG2SYlY8NsTL0=";
-    postFetch = ''
-      ${pkgs.gnused}/bin/sed '/#EXTM3U/d;/#EXTINF/s/.*,//g' $out | ${pkgs.coreutils}/bin/paste -d'\t' - - > $out.tmp
-      mv $out.tmp $out
-    '';
+    sha256 = "sha256-EZEshHWUejLTy6qsBhELfaYdDpQ/uqPsZa1JA0mb7h0=";
+    postFetch = m3u-to-tsv;
  };
 in
  pkgs.writers.writeDashBin "mpv-tv" ''
-    exec ${pkgs.mpv}/bin/mpv --force-window=yes "$(${pkgs.dmenu}/bin/dmenu -i -l 5 < ${streams-tsv} | ${pkgs.coreutils}/bin/cut -f2)"
+    cat ${kodi-tv} ${live-tv} | ${pkgs.mpv}/bin/mpv --force-window=yes "$(${pkgs.dmenu}/bin/dmenu -i -l 5 | ${pkgs.coreutils}/bin/cut -f2)"
  ''
--- a/packages/notemenu.nix
+++ b/packages/notemenu.nix
@@ -4,7 +4,7 @@
  rofi,
  findutils,
  coreutils,
-  noteDirectory ? "~/cloud/syncthing/obsidian",
+  noteDirectory ? "~/state/obsidian",
  currentDates ? false,
  niveumPackages,
 }:
--- a/packages/obsidian-vim.nix
+++ b/packages/obsidian-vim.nix
@@ -1,7 +1,7 @@
 {
  neovim,
  vimPlugins,
-  obsidiantVaultDirectory ? "~/cloud/syncthing/obsidian/",
+  obsidiantVaultDirectory ? "~/state/obsidian/",
  ...
 }:
 neovim.override {
@@ -15,6 +15,9 @@ neovim.override {
      let g:vimwiki_listsyms = ' X'
      let g:vimwiki_commentstring = '<!--%s-->'

+      let mapleader = ","
+      nmap <Leader>r :NERDTreeFocus<cr>R<c-w><c-p>
+
      let g:vimwiki_list = [{
        \ 'path': '${obsidiantVaultDirectory}',
        \ 'syntax': 'markdown',
--- a/packages/polyglot.nix
+++ b/packages/polyglot.nix
@@ -0,0 +1,107 @@
+{
+  writers,
+  mpv,
+}: let
+  arabicStories = "/home/kfm/cloud/syncthing/music/Arabic/Stories";
+  levantineTextbook = "/home/kfm/cloud/syncthing/music/Arabic/Damaszenisch";
+in
+  writers.writeDashBin "polyglot" ''
+    languages='persian
+    arabic
+    coptic
+    sanskrit
+    levantine
+    hebrew'
+
+    kurdish="https://www.youtube.com/channel/UCvutKJerMREoQtzXiQaDNBQ
+    https://www.youtube.com/channel/UCdqSEXLhnsltwN4IESMInDA"
+
+    persian="https://www.youtube.com/playlist?list=PL4aDVDOklYH5MnXNjCeRalFuRZ46I_p8Q
+    https://www.youtube.com/playlist?list=PL4aDVDOklYH404fg2zZoUQR6YcQp4UUrW
+    https://www.youtube.com/playlist?list=PL4aDVDOklYH4FhJZ4cX14HuUVsDJKUifr
+    https://www.youtube.com/playlist?list=PL4aDVDOklYH6i_Od0zD4ZFNqmZVBOTo4z
+    https://www.youtube.com/playlist?list=PL4aDVDOklYH5NuhQvc52KCPO0X64FU_bd
+    https://www.youtube.com/playlist?list=PL4aDVDOklYH6MFQfuQ5VIJmwuKfR1kgUR
+    https://www.youtube.com/playlist?list=PL4aDVDOklYH48_uuVl-AAPbkemzZFvnHH
+    https://www.youtube.com/playlist?list=PL4aDVDOklYH61WM-WmzjZyTFAE7AILb7j
+    https://www.youtube.com/channel/UCGY0LHNDQjt3GQrrc3r3Atw
+    https://www.youtube.com/channel/UC4jgHye1-kjDlY-2StrtVtA
+    https://www.youtube.com/channel/UCf67DKdLhpFW-7c7FZre2Ww
+    https://www.youtube.com/channel/UCLOGyLCPJL99gNriGAhwl7g
+    https://www.youtube.com/channel/UCxV5ZfGJjJhrzy_9am-S4QQ
+    https://www.youtube.com/channel/UCBSF89JJieetWjJTGZhGKJA
+    https://www.youtube.com/channel/UCFGB29XZkEGS1Vw7WplBqIg
+    https://www.youtube.com/channel/UChiyq4qjnAWMNhwPu2KL4yg
+    https://www.youtube.com/channel/UCULxPJn3NjsaXt4Nc-sIZrw
+    https://www.youtube.com/channel/UCYRyoX3ru_BfMiXVCGgRS6w
+    https://www.youtube.com/channel/UCbCvjr0v_-8LmZh9431N84w"
+
+    hebrew="https://www.youtube.com/playlist?list=PLXU4ackZsIPp2G8XjfpsYso2p3IHyl-bJ
+    https://www.youtube.com/playlist?list=PLXU4ackZsIPqLOWeWZc1frv3VCAohi90p
+    https://www.youtube.com/playlist?list=PLXU4ackZsIPpWWdWvtM3UtZHFKFhmI2mj
+    https://www.youtube.com/playlist?list=PLXU4ackZsIPoz05eaLCHsCv4Wrk4n1g34
+    https://www.youtube.com/channel/UCrMYJpbMhhQZhXi4ui3FKEw
+    https://www.youtube.com/playlist?list=PLXU4ackZsIPombqx98SIPanShjSUSlBW-
+    https://www.youtube.com/playlist?list=PLXU4ackZsIPrdSFUjNdw3eGK-qbtgqt-6
+    https://www.youtube.com/playlist?list=PLXU4ackZsIPrVHjB4P9QrYzJvBKD3MLuA
+    https://www.youtube.com/playlist?list=PLXU4ackZsIPp_7fb7TMyOaaX_ORI6vH29
+    https://www.youtube.com/channel/UCkKmeTinUEU27syZPKrzWQQ
+    https://www.youtube.com/channel/UC2gy2POCchS7JM_UCsZx5dw
+    https://www.youtube.com/channel/UCb2bkA-kSUz4Mj5YJv0zpJQ"
+
+    arabic="https://www.youtube.com/channel/UCbqqV0gO5QbV9iGITdxp-cw
+    https://www.youtube.com/channel/UCxNwNoGEhHg7lGOhthG4r6A
+    https://www.youtube.com/channel/UCmYYUdR85LRVB5yT1Y7DjFA
+    https://www.youtube.com/channel/UCIgFDroRoDYnxBlOGmwJ78A
+    https://www.youtube.com/channel/UCn5ASYdp7CzbFH2qtqjIJ9w
+    https://www.youtube.com/channel/UCD8N8HjsCkCmykfPnVleVRg
+    https://www.youtube.com/channel/UCEmWUZanVYXEzZXYDHzD-iA
+    https://www.youtube.com/channel/UC9rnrMdYzfqdjiuNXV7q8oQ
+    https://live-hls-audio-web-aja.getaj.net/VOICE-AJA/01.m3u8
+    http://asima.out.airtime.pro:8000/asima_a
+    http://edge.mixlr.com/channel/qtgru
+    http://ninarfm.grtvstream.com:8896/stream
+    http://andromeda.shoutca.st:8189/stream
+    http://www.dreamsiteradiocp4.com:8014/stream
+    http://n02.radiojar.com/sxfbks1vfy8uv.mp3
+    http://stream-025.zeno.fm/5y95pu36sm0uv
+    ${arabicStories}"
+
+    levantine_general="https://www.youtube.com/channel/UCe6YxTdT2zsbhG8ThAEssLw
+    https://www.youtube.com/channel/UC8IsrQ3Fvg1X2QboSRIMBHA
+    https://www.youtube.com/channel/UCo65IZihlwP204bleDDuAyA
+    https://www.youtube.com/channel/UCDXBymJu72YX2LzKVlZyZaA
+    https://www.youtube.com/channel/UCpovzufzZSP3kCYm16B5Hyw
+    https://www.youtube.com/channel/UCKkKlH7eJFBWhofiP5kQEFQ
+    https://www.youtube.com/channel/UC-YYp3mws0sa9vI3VUCWqhw
+    https://www.youtube.com/channel/UCpa9WD4btPSyn0h-DZSATGw
+    https://www.youtube.com/channel/UCb7oMrqwZnr3ZCayqnkkb8w
+    https://www.youtube.com/channel/UCuLNZirpkm2HYxq-tTiXnOA
+    https://www.youtube.com/channel/UCSGBoIBGUxUmpTYJfYZXs-A
+    https://www.youtube.com/channel/UCPINCItSdAc7SBXxi6AcWpw
+    https://www.youtube.com/channel/UCbZvzUBn04a_a95HFMX6eTA
+    https://www.youtube.com/channel/UChJs6Kqju9BmN5FMHhBfRSA
+    https://www.youtube.com/channel/UCyC7OV3gEQkguVwl9qDGuTQ
+    https://www.youtube.com/channel/UCwv1qu4iX6Bm6X-uSSB2eBQ
+    ${levantineTextbook}"
+
+    sanskrit="https://www.youtube.com/channel/UCTnCQNG_1WIlunxbp1SAOvw
+    https://stream-23.zeno.fm/m08mkwsyw8quv
+    https://www.youtube.com/channel/UCqFg6QnwgtVHo1iFgpxrx-A"
+
+    language="$(echo "$languages" | shuf -n1)"
+    case "$language" in
+      arabic)
+        ${mpv}/bin/mpv --shuffle $arabic;;
+      persian)
+        ${mpv}/bin/mpv --shuffle $persian;;
+      coptic)
+        ;;
+      sanskrit)
+        ${mpv}/bin/mpv --shuffle $sanskrit;;
+      levantine)
+        ${mpv}/bin/mpv --shuffle $levantine;;
+      hebrew)
+        ${mpv}/bin/mpv --shuffle $hebrew;;
+    esac
+  ''
--- a/packages/stardict-tools.nix
+++ b/packages/stardict-tools.nix
@@ -0,0 +1,48 @@
+{
+  stdenv,
+  autoreconfHook,
+  pkg-config,
+  which,
+  libtool,
+  glib,
+  zlib,
+  gtk3,
+  libmysqlclient,
+  pcre,
+  libxml2,
+  gnused,
+  fetchFromGitHub,
+}:
+stdenv.mkDerivation {
+  name = "stardict-tools";
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    which
+    libtool
+  ];
+  buildInputs = [glib zlib gtk3 libmysqlclient pcre libxml2];
+  buildPhase = "make";
+  configureFlags = ["--disable-dict"];
+  env.NIX_CFLAGS_COMPILE = toString [
+    "-Wno-error=format-security"
+  ];
+  patchPhase = ''
+    ${gnused}/bin/sed -i s/noinst_PROGRAMS/bin_PROGRAMS/ tools/src/Makefile.am
+  '';
+  installFlags = ["INSTALL_PREFIX=$(out)"];
+  autoreconfPhase = ''
+    patchShebangs ./autogen.sh
+    ./autogen.sh
+  '';
+  installPhase = ''
+    mkdir $out
+    make install
+  '';
+  src = fetchFromGitHub {
+    owner = "huzheng001";
+    repo = "stardict-3";
+    rev = "96b96d89eab5f0ad9246c2569a807d6d7982aa84";
+    hash = "sha256-zmqp2maKv2JZ5fwMVE7gIOg0BKdEKZ4UvTLC0suuBRw=";
+  };
+}
--- a/packages/trans.nix
+++ b/packages/trans.nix
@@ -5,7 +5,7 @@
 }: let
  script = fetchurl {
    url = "https://raw.githubusercontent.com/soimort/translate-shell/gh-pages/trans.awk";
-    sha256 = "178r8d27bry1mzd1g8x2svp4w469hwv7nnxnmnsinx974skjx0jb";
+    hash = "sha256-KT5iRRGtHpBTrPfs0L2e4JW6JrXVTVvgCXeFKFcr1P4=";
  };
 in
  writers.writeDashBin "trans" ''
--- a/packages/unicodmenu.nix
+++ b/packages/unicodmenu.nix
@@ -11,7 +11,20 @@
  xclip,
  xdotool,
  gawk,
+  fetchFromGitHub,
 }: let
+  emoji-flags = builtins.fromJSON (builtins.readFile "${fetchFromGitHub {
+    owner = "matiassingers";
+    repo = "emoji-flags";
+    rev = "93ae74505d09bb55a3eb3a511f1dfc0dd60a5347";
+    sha256 = "10j73sx6jb250v37bz2p7w8big0v8da3r6kpqz9xcl667gl8svwx";
+  }}/data.json");
+  emoji-flags-file = writeText "emoji-flags.txt" (lib.strings.concatMapStringsSep "\n" ({
+    emoji,
+    title,
+    ...
+  }: "${emoji}    ${title}")
+  emoji-flags);
  unicode-file = runCommand "unicode.txt" {} ''
    ${
      writers.writePython3 "generate.py" {flakeIgnore = ["E501" "E722"];} ''
@@ -80,7 +93,7 @@ in

    all_characters() {
      tac "$history_file"
-      cat ${kaomoji-file} ${unicode-file}
+      cat ${kaomoji-file} ${unicode-file} ${emoji-flags-file}
    }

    chosen=$(all_characters | awk '!seen[$0]++' | dmenu -p unicode -i -l 10 | tee --append "$history_file" | sed "s/    .*//")
--- a/packages/vim.nix
+++ b/packages/vim.nix
@@ -55,6 +55,7 @@
      ];
      opt = [
        csv
+        dhall-vim
        elm-vim
        emmet-vim
        haskell-vim
--- a/packages/vimv.nix
+++ b/packages/vimv.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation {
    homepage = https://github.com/thameera/vimv;
    description = "Batch-rename files using Vim";
    license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
--- a/2
+++ b/2
--- a/secrets.txt
+++ b/secrets.txt
@@ -1,6 +1,6 @@
 secrets/alertmanager-token-reporters.age
-secrets/blackboard-calendar-ics.age
 secrets/cifs-credentials-hu-berlin.age
+secrets/cifs-credentials-zodiac.age
 secrets/di-fm-key.age
 secrets/email-password-cock.age
 secrets/email-password-dslalewa.age
@@ -8,32 +8,34 @@ secrets/email-password-fsklassp.age
 secrets/email-password-fysi.age
 secrets/email-password-meinhak99.age
 secrets/email-password-meinhaki.age
-secrets/email-password-meinhark.age
 secrets/email-password-posteo.age
+secrets/fatteh-retiolum-privateKey-ed25519.age
+secrets/fatteh-retiolum-privateKey-rsa.age
+secrets/fatteh-syncthing-cert.age
+secrets/fatteh-syncthing-key.age
 secrets/ful-retiolum-privateKey-ed25519.age
 secrets/ful-retiolum-privateKey-rsa.age
 secrets/ful-root.age
-secrets/ful-specus-privateKey.age
+secrets/fu-sftp-key.age
 secrets/github-token-i3status-rust.age
 secrets/grafana-password-admin.age
 secrets/hetzner-storagebox-credentials.age
 secrets/home-assistant-token.age
 secrets/kabsa-retiolum-privateKey-ed25519.age
 secrets/kabsa-retiolum-privateKey-rsa.age
-secrets/kabsa-specus-privateKey.age
 secrets/kabsa-syncthing-cert.age
 secrets/kabsa-syncthing-key.age
 secrets/kfm-password.age
 secrets/ledger-basicAuth.age
 secrets/makanek-retiolum-privateKey-ed25519.age
 secrets/makanek-retiolum-privateKey-rsa.age
-secrets/makanek-specus-privateKey.age
 secrets/manakish-retiolum-privateKey-ed25519.age
 secrets/manakish-retiolum-privateKey-rsa.age
 secrets/manakish-syncthing-cert.age
 secrets/manakish-syncthing-key.age
 secrets/maxmind-license-key.age
 secrets/mega-password.age
+secrets/miniflux-api-token.age
 secrets/miniflux-credentials.age
 secrets/nextcloud-password-admin.age
 secrets/nextcloud-password-database.age
@@ -56,11 +58,10 @@ secrets/telegram-token-menstruation.age
 secrets/telegram-token-nachtischsatan.age
 secrets/telegram-token-proverb.age
 secrets/telegram-token-reverse.age
+secrets/telegram-token-streaming-link.age
 secrets/weechat-sec.conf.age
 secrets/zaatar-moodle-dl-basicAuth.age
 secrets/zaatar-moodle-dl-tokens.json.age
 secrets/zaatar-retiolum-privateKey-ed25519.age
 secrets/zaatar-retiolum-privateKey-rsa.age
-secrets/zaatar-syncthing-cert.age
-secrets/zaatar-syncthing-key.age
 secrets/zaatar-ympd-basicAuth.age
--- a/systems/fatteh/configuration.nix
+++ b/systems/fatteh/configuration.nix
@@ -0,0 +1,47 @@
+{
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (import ../../lib) retiolumAddresses;
+in {
+  imports = [
+    ./hardware-configuration.nix
+    ../../configs/networkmanager.nix
+    ../../configs/default.nix
+    # ../../configs/gnome.nix
+  ];
+
+  niveum = {
+    batteryName = "BAT1";
+    wirelessInterface = "wlp3s0";
+    promptColours.success = "blue";
+  };
+
+  services.illum.enable = true;
+
+  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/selenized-light.yaml";
+
+  age.secrets = {
+    retiolum-rsa = {
+      file = ../../secrets/fatteh-retiolum-privateKey-rsa.age;
+      mode = "400";
+      owner = "tinc.retiolum";
+      group = "tinc.retiolum";
+    };
+    retiolum-ed25519 = {
+      file = ../../secrets/fatteh-retiolum-privateKey-ed25519.age;
+      mode = "400";
+      owner = "tinc.retiolum";
+      group = "tinc.retiolum";
+    };
+    restic.file = ../../secrets/restic.age;
+    syncthing-cert.file = ../../secrets/fatteh-syncthing-cert.age;
+    syncthing-key.file = ../../secrets/fatteh-syncthing-key.age;
+  };
+
+  networking.hostName = "fatteh";
+  networking.retiolum = retiolumAddresses.fatteh;
+
+  system.stateVersion = "23.11";
+}
--- a/systems/fatteh/hardware-configuration.nix
+++ b/systems/fatteh/hardware-configuration.nix
@@ -0,0 +1,51 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-intel"];
+  boot.extraModulePackages = [];
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  boot.initrd.luks.devices."luks-aa6beb1b-3e54-4a0e-ac9c-e0c007d73cd5".device = "/dev/disk/by-uuid/aa6beb1b-3e54-4a0e-ac9c-e0c007d73cd5";
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/42b747ff-a432-4c0e-bb0a-59f0a68c44a2";
+    fsType = "ext4";
+  };
+
+  boot.initrd.luks.devices."luks-67c1f7da-4318-49f7-bd98-cc731990b595".device = "/dev/disk/by-uuid/67c1f7da-4318-49f7-bd98-cc731990b595";
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/9051-0891";
+    fsType = "vfat";
+  };
+
+  swapDevices = [
+    {device = "/dev/disk/by-uuid/529a1893-773e-4d04-bf6c-16e67e1ed3c7";}
+  ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wwan0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
--- a/systems/ful/configuration.nix
+++ b/systems/ful/configuration.nix
@@ -1,5 +1,4 @@
 {
-  lib,
  config,
  pkgs,
  ...
@@ -11,7 +10,7 @@ in {
    ./matomo.nix
    ./radio.nix
    ./panoptikon.nix
-    ./ledger.nix
+    ./hledger.nix
    ../../configs/monitoring.nix
    ../../configs/tor.nix
    ../../configs/save-space.nix
@@ -19,6 +18,7 @@ in {
    ../../configs/retiolum.nix
    ../../configs/sshd.nix
    ../../configs/nix.nix
+    ../../configs/admin-essentials.nix
  ];

  niveum.passport = {
@@ -89,7 +89,7 @@ in {
    defaults.email = kieran.email;
  };

-  users.users.root.passwordFile = config.age.secrets.root.path;
+  users.users.root.hashedPasswordFile = config.age.secrets.root.path;

  environment.systemPackages = [pkgs.vim pkgs.git pkgs.tmux pkgs.python3];

--- a/systems/ful/hledger.nix
+++ b/systems/ful/hledger.nix
@@ -25,13 +25,13 @@
    script = ''
      ${pkgs.git}/bin/git config user.name "hledger-web"
      ${pkgs.git}/bin/git config user.email "hledger-web@${config.networking.hostName}"
-      ${pkgs.git}/bin/git commit -am $(date -Ih)
+      ${pkgs.git}/bin/git commit -am $(date -Ih) || :
      ${pkgs.git}/bin/git pull --rebase
      ${pkgs.git}/bin/git push
    '';
    serviceConfig = {
-      User = "hledger";
-      Group = "hledger";
+      User = "root";
+      Group = "root";
      WorkingDirectory = config.services.hledger-web.stateDir;
    };
  };
--- a/systems/ful/panoptikon.nix
+++ b/systems/ful/panoptikon.nix
@@ -13,6 +13,17 @@
    retiolumLink = true;
  };

+  telegram-kmein = let
+    chatId = "-1001796440545";
+  in
+    pkgs.writers.writeDash "telegram-fulltext" ''
+      export TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")"
+      ${pkgs.curl}/bin/curl -X POST "https://api.telegram.org/bot''${TOKEN}/sendMessage" \
+        -d chat_id=${chatId} \
+        -d text="$(cat)" \
+        | ${pkgs.jq}/bin/jq -e .ok
+    '';
+
  irc-kmein = panoptikon.kpaste-irc {
    messagePrefix = "$PANOPTIKON_WATCHER: ";
    target = "kmein";
@@ -20,6 +31,8 @@
    retiolumLink = false;
  };
 in {
+  age.secrets.telegram-token-kmein.file = ../../secrets/telegram-token-kmein.age;
+
  services.panoptikon = {
    enable = true;
    watchers = {
@@ -42,6 +55,10 @@ in {
        script = panoptikon.url "https://kratylos.reichert-online.org/current_issue/KRATYLOS";
        reporters = [irc-kmein];
      };
+      kobudo-tesshinkan = {
+        script = panoptikon.url "https://kobudo-tesshinkan.eu/index.php/de/termine-berichte/lehrgaenge/";
+        reporters = [irc-kmein telegram-kmein];
+      };
      zeno-free = {
        script = panoptikon.urlSelector ".zenoCOMain" "http://www.zeno.org/Lesesaal/M/E-Books";
        reporters = [irc-kmein];
@@ -50,6 +67,10 @@ in {
        script = panoptikon.urlSelector "#main" "https://carolinawelslau.de/";
        reporters = [irc-kmein];
      };
+      humboldt-preis = {
+        script = panoptikon.urlSelector "#content-core" "https://www.hu-berlin.de/de/ueberblick/menschen/ehrungen/humboldtpreis";
+        reporters = [irc-kmein];
+      };
      lisalittmann = {
        script = panoptikon.urlSelector "#site-content" "https://lisalittmann.de/";
        reporters = [irc-kmein];
@@ -94,6 +115,14 @@ in {
        script = panoptikon.urlSelector "[itemprop=articleBody]" "https://www.indogermanistik.org/tagungen/tagungen-der-ig.html";
        reporters = [irc-kmein];
      };
+      fu-distant = {
+        script = panoptikon.urlSelector "#current_events" "https://www.geschkult.fu-berlin.de/en/e/ma-distant/Termine/index.html";
+        reporters = [irc-kmein];
+      };
+      fu-aegyptologie = {
+        script = panoptikon.urlSelector "#current_events" "https://www.geschkult.fu-berlin.de/e/aegyptologie/termine/index.html";
+        reporters = [irc-kmein];
+      };
    };
  };
 }
--- a/systems/ful/radio.nix
+++ b/systems/ful/radio.nix
@@ -124,7 +124,15 @@ in {
    make_streams("wikipedia", random_url("${wikipedia-article}"), description="Zufällige Artikel von Wikipedia", genre="useless knowledge")
  '';

-  systemd.services.radio.environment.TMPDIR = liquidsoapDirectory;
+  systemd.services.radio = {
+    environment.TMPDIR = liquidsoapDirectory;
+    serviceConfig = {
+      RuntimeMaxSec = "${toString (5 * 60 * 60)}s";
+      Restart = "always";
+    };
+  };
+
+  environment.systemPackages = [refresh-qasaid];

  systemd.tmpfiles.rules = [
    (tmpfilesConfig {
--- a/systems/kabsa/configuration.nix
+++ b/systems/kabsa/configuration.nix
@@ -8,9 +8,10 @@
 in {
  imports = [
    ./hardware-configuration.nix
-    ../../configs/battery.nix
+    ../../configs/tlp.nix
    ../../configs/default.nix
-    ../../configs/networkmanager.nix # TODO how to get passwords into there?
+    ../../configs/networkmanager.nix
+    ../../configs/power-action.nix
  ];

  niveum = {
@@ -19,6 +20,8 @@ in {
    promptColours.success = "cyan";
  };

+  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/dracula.yaml";
+
  nix.settings = {
    cores = 1;
    max-jobs = 2;
--- a/systems/maakaron/home.nix
+++ b/systems/maakaron/home.nix
@@ -0,0 +1,103 @@
+{
+  config,
+  pkgs,
+  lib,
+  inputs,
+  niveumPackages,
+  ...
+}: let
+  system = "x86_64-darwin";
+
+  nextcloud = "${config.home.homeDirectory}/Nextcloud/ZODIAC";
+
+  hora = pkgs.callPackage ../../packages/hora.nix {
+    timeLedger = "${nextcloud}/hora.timeclock";
+  };
+
+  adminEssentials = import ../../configs/admin-essentials.nix {
+    inherit pkgs niveumPackages lib system;
+  };
+
+  stardict = import ../../configs/stardict.nix {
+    inherit pkgs lib inputs;
+  };
+
+  git = import ../../configs/git.nix {
+    inherit pkgs lib inputs system;
+  };
+in {
+  home.packages =
+    [
+      hora
+      niveumPackages.vim
+      pkgs.ghc
+      pkgs.python3
+    ]
+    ++ adminEssentials.environment.systemPackages
+    ++ git.environment.systemPackages;
+  #++ stardict.environment.systemPackages;
+
+  home.shellAliases =
+    adminEssentials.environment.shellAliases
+    // git.environment.shellAliases;
+
+  programs.git = git.home-manager.users.me.programs.git;
+
+  programs.zsh = let
+    promptColours = {
+      success = "green";
+      failure = "red";
+    };
+  in {
+    autocd = true;
+    defaultKeymap = "viins";
+    enableAutosuggestions = true;
+    enableCompletion = true;
+    enable = true;
+    historySubstringSearch.enable = true;
+    syntaxHighlighting.enable = true;
+    syntaxHighlighting.highlighters = ["main" "brackets" "pattern" "line"];
+    initExtra = ''
+      # ref https://gist.github.com/meeech/0b97a86f235d10bc4e2a1116eec38e7e
+      if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ];
+      then
+        . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'
+      fi
+
+      precmd () {
+        if [[ -n $IN_NIX_SHELL ]]; then
+          PROMPT='%B%~%b %(?.%F{${promptColours.success}}.%F{${promptColours.failure}})λ%f '
+        else
+          PROMPT='%B%~%b %(?.%F{${promptColours.success}}.%F{${promptColours.failure}})%#%f '
+        fi
+        print -Pn "\e]2;%n@%M:%~\a" # title bar prompt
+      }
+      zle-keymap-select zle-line-init () {
+        case $KEYMAP in
+          vicmd) print -n '\e]12;green\a';;
+          viins|main) print -n '\e]12;gray\a';;
+        esac
+      }
+      zle -N zle-line-init
+      zle -N zle-keymap-select
+    '';
+  };
+
+  home.sessionVariables.EDITOR = "${niveumPackages.vim}/bin/nvim";
+  home.file."Local Applications".source = pkgs.symlinkJoin {
+    name = "local-applications";
+    paths = [pkgs.anki-bin pkgs.dbeaver pkgs.vscode pkgs.stellarium];
+  };
+  home.stateVersion = "23.11";
+  home.username = "xm7234fu";
+  home.homeDirectory = "/Users/${config.home.username}";
+  nixpkgs.config.allowUnfree = true;
+  nix.package = pkgs.nixFlakes;
+  nix.extraOptions = "experimental-features = nix-command flakes";
+}
+
+/*
+hora register -p weekly --depth 1 --empty
+
+
+*/
--- a/systems/makanek/configuration.nix
+++ b/systems/makanek/configuration.nix
@@ -16,7 +16,7 @@ in {
    ./names.nix
    ./nextcloud.nix
    ./radio-news.nix
-    ./onlyoffice.nix
+    # ./onlyoffice.nix
    ./retiolum-map.nix
    ./tarot.nix
    ./tt-rss.nix
@@ -29,6 +29,7 @@ in {
    ../../configs/spacetime.nix
    ../../configs/sshd.nix
    ../../configs/telegram-bots
+    ../../configs/admin-essentials.nix
  ];

  services.restic.backups.niveum = {
--- a/systems/makanek/moinbot.nix
+++ b/systems/makanek/moinbot.nix
@@ -7,7 +7,8 @@
    startAt = "7:00";
    script = ''
      greeting=$(echo "moin
-      MOIN" | shuf -n1)
+      MOIN
+      moin: gib" | shuf -n1)
      echo "$greeting" | ${config.nur.repos.mic92.ircsink}/bin/ircsink \
        --nick "$greeting""bot" \
        --server irc.hackint.org \
--- a/systems/makanek/monitoring/default.nix
+++ b/systems/makanek/monitoring/default.nix
@@ -263,6 +263,9 @@ in {
    }
  ];

+  # otherwise bearer_token_file will fail
+  services.prometheus.checkConfig = "syntax-only";
+
  services.prometheus.scrapeConfigs = [
    {
      job_name = "makanek";
@@ -296,16 +299,19 @@ in {
      static_configs = [
        {
          targets = [
-            "alew.hu-berlin.de"
-            "pad.kmein.de"
-            "code.kmein.de"
-            "radio.kmein.de"
-            "tarot.kmein.de"
-            "cloud.kmein.de"
-            "grafana.kmein.r"
+            "https://alew.hu-berlin.de"
+            "https://beta.alew.hu-berlin.de"
+            "https://alew.hu-berlin.de/api/search?substring=die&domain=lemma&derivations=true&addition=true&diacritics=false&position=infix"
+            "https://beta.alew.hu-berlin.de/api/search?substring=die&domain=lemma&derivations=true&addition=true&diacritics=false&position=infix"
+            "https://pad.kmein.de"
+            "https://code.kmein.de"
+            "https://radio.kmein.de"
+            "https://tarot.kmein.de"
+            "https://cloud.kmein.de"
+            "http://grafana.kmein.r"
            # "names.kmein.r"
-            "rrm.r"
-            "graph.r"
+            "http://rrm.r"
+            "http://graph.r"
          ];
        }
      ];
--- a/systems/makanek/nextcloud.nix
+++ b/systems/makanek/nextcloud.nix
@@ -1,7 +1,6 @@
 {
  pkgs,
  config,
-  lib,
  ...
 }: let
  storageBoxMountPoint = "/mnt/storagebox";
@@ -48,10 +47,9 @@ in {

  services.nextcloud = {
    enable = true;
-    package = pkgs.nextcloud26;
+    package = pkgs.nextcloud27;

    https = true;
-    enableBrokenCiphersForSSE = false;

    autoUpdateApps = {
      enable = true;
@@ -104,9 +102,11 @@ in {
    ensureUsers = [
      {
        name = "nextcloud";
-        ensurePermissions."DATABASE ${config.services.nextcloud.config.dbname}" = "ALL PRIVILEGES";
+        ensureDBOwnership = true;
+        # ensurePermissions."DATABASE ${config.services.nextcloud.config.dbname}" = "ALL PRIVILEGES";
      }
    ];
+    package = pkgs.postgresql_14;
  };

  services.nginx.virtualHosts."cloud.kmein.de" = {
--- a/systems/makanek/onlyoffice.nix
+++ b/systems/makanek/onlyoffice.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
+{config, ...}: {
  services.onlyoffice = {
    enable = true;
    port = 8111;
--- a/systems/makanek/radio-news.nix
+++ b/systems/makanek/radio-news.nix
@@ -15,19 +15,4 @@ in {
      description = "supplies git history news to radio lassulus and lets you enter your own.";
    }
  ];
-
-  systemd.services.stockholm-history = {
-    startAt = "*:58:00";
-    script = ''
-      stockholm=$(mktemp -d)
-      trap clean EXIT
-      clean() {
-        rm -rf "$stockholm"
-      }
-      ${pkgs.git}/bin/git clone ${remote} "$stockholm"
-      ${pkgs.git}/bin/git --git-dir "$stockholm"/.git log --pretty='"%s" by %an, %ar.' --since "$(${pkgs.coreutils}/bin/date -d '1 hours ago')" \
-        | ${pkgs.jq}/bin/jq -R '{text: ., from: now | todateiso8601, to: (now + (60 * 60)) | todateiso8601}' \
-        | ${pkgs.curl}/bin/curl -Ssfd @- http://radio-news.r/
-    '';
-  };
 }
--- a/systems/makanek/weechat.nix
+++ b/systems/makanek/weechat.nix
@@ -61,7 +61,7 @@ in {
                addresses = "irc.hackint.org/6697";
                ipv6 = true;
                ssl = true;
-                autojoin = ["#eloop" "#krebs" "#hsmr" "#hsmr-moin" "#nixos" "#the_playlist" "#flipdot-berlin" "#hackint"];
+                autojoin = ["#eloop" "#krebs" "#the_playlist"];
                sasl_mechanism = "plain";
                sasl_username = nick;
                sasl_password = "\${sec.data.hackint_sasl}";
@@ -70,22 +70,11 @@ in {
                autoconnect = true;
                addresses = "irc.libera.chat/6697";
                ssl = true;
-                autojoin = ["#flipdot" "#haskell" "#nixos" "#fysi" "#binaergewitter" "#vim" "#newsboat"];
+                autojoin = ["#haskell" "#fysi" "#binaergewitter" "#vim"];
                sasl_mechanism = "plain";
                sasl_username = nick;
                sasl_password = "\${sec.data.libera_sasl}";
              };
-              oftc = {
-                autoconnect = true;
-                addresses = "irc.oftc.net/6697";
-                ssl = true;
-                ipv6 = true;
-                command = lib.concatStringsSep "\\;" [
-                  "/msg nickserv identify  \${sec.data.oftc_account}"
-                  "/msg nickserv set cloak on"
-                ];
-                autojoin = ["#home-manager"];
-              };
              retiolum = {
                autoconnect = true;
                addresses = "irc.r";
@@ -154,7 +143,7 @@ in {
            };
            bots = {
              buffer = "irc.retiolum.*";
-              tags = ["nick_gitlab"];
+              tags = ["nick_gitlab" "nick_prometheus"];
              regex = "*";
            };
            people = {
@@ -193,9 +182,9 @@ in {
  users.extraUsers.weechat = {
    useDefaultShell = true;
    openssh.authorizedKeys.keys =
-      kieran.sshKeys pkgs
+      kieran.sshKeys
      ++ [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC+KVDmYYH7mA8v81e9O3swXm3ZVYY9t4HP65ud61uXy weechat_android@heym"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC+KVDmYYH7mA8v81e9O3swXm3ZVYY9t4HP65ud61uXy weechat_android@kibbeh"
      ];
    createHome = true;
    group = "weechat";
--- a/systems/manakish/configuration.nix
+++ b/systems/manakish/configuration.nix
@@ -1,6 +1,7 @@
 {
  config,
  pkgs,
+  lib,
  ...
 }: let
  inherit (import ../../lib) retiolumAddresses;
@@ -10,8 +11,10 @@ in {
    ./hardware-configuration.nix
    ./hdmi.nix
    ../../configs/default.nix
-    ../../configs/battery.nix
+    ../../configs/tlp.nix
    ../../configs/wpa_supplicant.nix
+    ../../configs/admin-essentials.nix
+    ../../configs/power-action.nix
  ];

  age.secrets = {
@@ -31,6 +34,8 @@ in {
    syncthing-key.file = ../../secrets/manakish-syncthing-key.age;
  };

+  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml";
+
  niveum = {
    batteryName = "BAT0";
    wirelessInterface = "wlp3s0";
@@ -49,5 +54,7 @@ in {
    hostName = "manakish";
  };

+  systemd.services.systemd-networkd-wait-online.enable = lib.mkForce false;
+
  system.stateVersion = "20.09"; # Did you read the comment?
 }
--- a/systems/tabula/configuration.nix
+++ b/systems/tabula/configuration.nix
@@ -11,6 +11,7 @@ in {
    ../../configs/retiolum.nix
    ../../configs/sshd.nix
    ../../configs/nix.nix
+    ../../configs/admin-essentials.nix
  ];

  age.secrets = {
--- a/systems/tahina/configuration.nix
+++ b/systems/tahina/configuration.nix
@@ -11,6 +11,7 @@ in {
    ../../configs/sshd.nix
    ../../configs/retiolum.nix
    ../../configs/nix.nix
+    ../../configs/admin-essentials.nix
  ];

  age.secrets = {
--- a/systems/zaatar/backup.nix
+++ b/systems/zaatar/backup.nix
@@ -25,7 +25,7 @@ in {
  ];

  fileSystems."/backup" = {
-    device = "/dev/disk/by-id/ata-ST500LM021-1KJ152_W626LS9M";
+    device = "/dev/disk/by-id/ata-WDC_WD10JPVX-22JC3T0_WD-WXD1E5510MKW";
    fsType = "ext4";
  };

@@ -45,6 +45,10 @@ in {
        inherit dport protocol;
        source = retiolumAddresses.makanek.ipv4;
      })
+      (firewall.accept {
+        inherit dport protocol;
+        source = retiolumAddresses.fatteh.ipv4;
+      })
      (firewall.accept {
        inherit dport protocol;
        source = retiolumAddresses.ful.ipv4;
--- a/systems/zaatar/configuration.nix
+++ b/systems/zaatar/configuration.nix
@@ -10,15 +10,14 @@ in {
    ./atuin.nix
    ./backup.nix
    ./gaslight.nix
-    ./kiosk.nix
+    # ./kiosk.nix
    ./hardware-configuration.nix
-    ./moodle-dl-meinhark.nix
-    ./pulseaudio.nix
    ./home-assistant.nix
    ./mpd.nix
    ./grocy.nix
    ./spotifyd.nix
-    ../../configs/keyboard.nix
+    # ../../configs/keyboard.nix
+    ../../configs/sound.nix
    ../../configs/monitoring.nix
    ../../configs/retiolum.nix
    ../../configs/printing.nix
@@ -27,8 +26,11 @@ in {
    ../../configs/tmux.nix
    ../../configs/wpa_supplicant.nix
    ../../configs/nix.nix
+    ../../configs/admin-essentials.nix
  ];

+  services.pipewire.systemWide = true;
+
  age.secrets = {
    retiolum-rsa = {
      file = ../../secrets/zaatar-retiolum-privateKey-rsa.age;
@@ -42,7 +44,12 @@ in {
      owner = "tinc.retiolum";
      group = "tinc.retiolum";
    };
-    restic.file = ../../secrets/restic.age;
+    restic = {
+      file = ../../secrets/restic.age;
+      mode = "400";
+      owner = "restic";
+      group = "restic";
+    };
  };

  services.restic.backups.niveum = {
--- a/systems/zaatar/home-assistant.nix
+++ b/systems/zaatar/home-assistant.nix
@@ -12,13 +12,6 @@ in {
    };
  };

-  services.influxdb = {
-    enable = true;
-    extraConfig = {
-      http.bind-address = ":${toString influxPort}";
-    };
-  };
-
  services.restic.backups.niveum = {
    initialize = true;
    inherit (restic) repository;
--- a/systems/zaatar/kiosk.nix
+++ b/systems/zaatar/kiosk.nix
@@ -7,7 +7,7 @@
  users.extraUsers.kiosk = {
    isNormalUser = true;
    password = "";
-    extraGroups = ["audio"];
+    extraGroups = ["audio" "pipewire"];
  };
  # TODO https://github.com/cage-kiosk/cage/issues/138
  services.cage = {
@@ -15,7 +15,7 @@
    user = config.users.extraUsers.kiosk.name;
    extraArguments = ["-s"]; # allow vt switching
    program = let
-      startUrls = ["https://youtube.com" "http://radio.kmein.r"];
+      startUrls = [];
    in
      pkgs.writers.writeDash "kiosk-browser" ''
        while true; do
--- a/systems/zaatar/mpd.nix
+++ b/systems/zaatar/mpd.nix
@@ -8,31 +8,13 @@
  inherit (import ../../lib) tmpfilesConfig;

  mukkeMountPoint = "/mnt/mukke";
+  fritzboxMountPoint = "/mnt/fritz";

  streams = import ../../lib/streams.nix {
    di-fm-key = "%DI_FM_KEY%"; # TODO lib.strings.fileContents <secrets/di.fm/key>;
  };
-  multi-room-audio-port = 8000;
 in {
-  services.syncthing = let
-    mpd-directory = config.services.mpd.dataDir;
-  in {
-    enable = true;
-    user = config.services.mpd.user; # config.users.extraUsers.moodle.name;
-    openDefaultPorts = true;
-    configDir = "${mpd-directory}/.config/syncthing";
-    dataDir = "${mpd-directory}/.config/syncthing";
-    cert = config.age.secrets.syncthing-cert.path;
-    key = config.age.secrets.syncthing-key.path;
-    devices = {
-      inherit ((import ../../lib).syncthing.devices) kabsa manakish heym;
-    };
-    folders."${config.services.mpd.musicDirectory}/sync" = {
-      devices = ["heym" "kabsa" "manakish"];
-      id = "music";
-      type = "receiveonly";
-    };
-  };
+  users.users.${config.services.mpd.user}.extraGroups = ["pipewire" "audio"];

  services.mpd = {
    enable = true;
@@ -42,7 +24,7 @@ in {
      auto_update "yes"

      audio_output {
-        type "pulse"
+        type "pipewire"
        name "zaatar single room audio system"
      }
    '';
@@ -61,6 +43,19 @@ in {
    ];
  };

+  fileSystems."${fritzboxMountPoint}" = {
+    device = "//192.168.178.1/FRITZ.NAS/Backup";
+    fsType = "cifs";
+    options = [
+      "username=ftpuser"
+      "password=ftppassword"
+      "noauto"
+      "nounix"
+      "ro"
+      "noserverino" # ref https://askubuntu.com/a/1265165
+    ];
+  };
+
  systemd.tmpfiles.rules = [
    (tmpfilesConfig {
      type = "L+";
@@ -70,6 +65,14 @@ in {
      path = "${config.services.mpd.musicDirectory}/mukke";
      argument = mukkeMountPoint;
    })
+    (tmpfilesConfig {
+      type = "L+";
+      mode = "0644";
+      user = "mpd";
+      group = "mpd";
+      path = "${config.services.mpd.musicDirectory}/fritz";
+      argument = "${fritzboxMountPoint}";
+    })
  ];

  environment.systemPackages = [pkgs.mpc_cli];
@@ -144,8 +147,6 @@ in {
      group = "nginx";
      mode = "400";
    };
-    syncthing-cert.file = ../../secrets/zaatar-syncthing-cert.age;
-    syncthing-key.file = ../../secrets/zaatar-syncthing-key.age;
    di-fm-key.file = ../../secrets/di-fm-key.age;
  };

--- a/systems/zaatar/pulseaudio.nix
+++ b/systems/zaatar/pulseaudio.nix
@@ -1,17 +0,0 @@
-{pkgs, ...}: {
-  sound.enable = true;
-
-  environment.systemPackages = [pkgs.ncpamixer];
-
-  hardware.pulseaudio = {
-    package = pkgs.pulseaudioFull;
-    enable = true;
-    systemWide = true;
-    tcp = {
-      enable = true;
-      anonymousClients.allowedIpRanges = ["127.0.0.1" "10.243.2.0/24" "192.168.0.0/16"];
-    };
-    zeroconf.publish.enable = true;
-  };
-  networking.firewall.allowedTCPPorts = [4713];
-}
--- a/systems/zaatar/spotifyd.nix
+++ b/systems/zaatar/spotifyd.nix
@@ -3,7 +3,10 @@
    # mpris is a dbus service for controlling all music players with e.g. playerctl
    # I do not need this, because I only interact with the service via Spotify Connect
    # otherẃise it will pull in DBus which fails without X11
-    spotifyd = pkgs.spotifyd.overrideAttrs {withMPris = false;};
+    spotifyd = pkgs.spotifyd.overrideAttrs {
+      withMpris = false;
+      withKeyring = false;
+    };
  };

  services.spotifyd = {
@@ -12,8 +15,8 @@
      global = {
        username_cmd = "cat $CREDENTIALS_DIRECTORY/username";
        password_cmd = "cat $CREDENTIALS_DIRECTORY/password";
-        backend = "pulseaudio";
        bitrate = 320;
+        use_mpris = false;
        device_type = "s_t_b"; # set-top box
        device_name = config.networking.hostName;
      };
@@ -25,8 +28,12 @@
      "username:${config.age.secrets.spotify-username.path}"
      "password:${config.age.secrets.spotify-password.path}"
    ];
+    serviceConfig.RuntimeMaxSec = "${toString (5 * 60 * 60)}s";
+    serviceConfig.SupplementaryGroups = ["pipewire"];
  };

+  networking.firewall.allowedTCPPorts = [4713];
+
  age.secrets = {
    spotify-username.file = ../../secrets/spotify-username.age;
    spotify-password.file = ../../secrets/spotify-password.age;