feat: add grimm dwb scroller

Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/0160a0cef076294127f8cc0750019410ab94370d' (2022-08-22)
  → 'github:nix-community/home-manager/d89bdff445eadff03fe414e9c30486bc8166b72b' (2022-08-27)
• Updated input 'nixos-stable':
    'github:NixOS/nixpkgs/52527082ea267fe486f0648582d57c85486b2031' (2022-08-22)
  → 'github:NixOS/nixpkgs/f11e12ac6af528c1ba12426ce83cee26f21ceafd' (2022-08-26)
• Updated input 'nixos-unstable':
    'github:NixOS/nixpkgs/c4a0efdd5a728e20791b8d8d2f26f90ac228ee8d' (2022-08-12)
  → 'github:NixOS/nixpkgs/f3d0897be466aa09a37f6bf59e62c360c3f9a6cc' (2022-08-25)

.bin/anki-poem.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+file="${1?please supply a poetry file}"
+[ -f "$file" ] || {
+  echo "'$file' is no file"
+  exit 1
+}
+
+poem="$(mktemp)"
+clean () {
+  rm "$poem"
+}
+trap clean EXIT
+sed '/^$/d' "$file" > "$poem"
+
+htmlize() {
+  awk 'ORS="<br/>"' \
+    | head -c -5          # remove final <br/> characters
+}
+
+for line_number in $(seq 1 "$(wc -l "$poem" | cut -d' ' -f1)"); do
+  if [ "$line_number" -gt 3 ] && [ "$line_number" -gt 1 ]; then
+    sed -n "$((line_number - 3)),$((line_number - 1))p" "$poem"
+  else
+    sed -n "1,$((line_number - 1))p" "$poem"
+  fi | htmlize
+  printf '\t'
+  sed -n "${line_number},+1p" "$poem" | htmlize
+  printf '\n'
+done

.bin/watson2fdf.sh

@@ -0,0 +1,26 @@
+project=Filli
+year=2022
+
+for month in Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec; do
+  from="$(date +%F -d "$month 1, $year")"
+  to="$(date +%F -d "$month 1, $year + 1 month")"
+  watson report --json --from "$from" --to "$to" --project "$project"
+done | jq --slurp '
+  def in_array($arr):
+      . as $value | any($arr[]; . == $value);
+
+  map(
+    ["engadin-app","fysiweb","val-muestair","mia-engiadina","ol"] as $official_projects
+    | (.timespan.from | .[0:7]) as $timespan
+    | .projects | .[0]
+    | .time as $total_time
+    | .tags
+    | select(. != null)
+    | map(select(.name | in_array($official_projects)))
+    | (map(.time)|add) as $official_time
+    | map({key:.name, value:.time}) | from_entries
+    | .other |= ($total_time - $official_time)
+    | map_values(. / (60*60) | ceil)
+    | .month |= $timespan
+  )
+'

.github/workflows/niveum.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        system: [makanek,manakish,kabsa,zaatar]
+        system: [makanek,manakish,kabsa,zaatar,ful]
     steps:
     - uses: actions/checkout@v2
     - uses: cachix/install-nix-action@v16

ci.nix

@@ -1,32 +1,50 @@
-{ inputs, system, name }:
+{
-let
+  inputs,
-  inherit (inputs) nixpkgs;
+  system,
+  name,
+}: let
+  nixpkgs = inputs.nixos-stable;
   pkgs = nixpkgs.legacyPackages.${system};
-  ensureFiles = paths: pkgs.runCommand "directory" {} ''
+  ensureFiles = paths:
+    pkgs.runCommand "directory" {} ''
       set -efu
       mkdir $out
       cd $out
-    ${nixpkgs.lib.concatMapStringsSep "\n" (path: ''
+      ${
+        nixpkgs.lib.concatMapStringsSep "\n" (path: ''
           mkdir -p "$(dirname ${nixpkgs.lib.escapeShellArg path})"
           echo foo > ${nixpkgs.lib.escapeShellArg path}
-    '') paths}
+        '')
+        paths
+      }
     '';
   nixPath = nixpkgs.lib.concatStringsSep ":" ([
       "niveum=${toString ./.}"
       "nixos-config=${toString ./.}/systems/${name}/configuration.nix"
       "system-secrets=${systemSecrets}"
       "secrets=${sharedSecrets}"
-  ] ++ nixpkgs.lib.mapAttrsToList (name: value: "${name}=${value}") inputs);
+      "nixpkgs=${
+        toString (
+          if name == "kabsa" || name == "manakish"
+          then inputs.nixos-unstable
+          else inputs.nixos-stable
+        )
+      }"
+    ]
+    ++ nixpkgs.lib.mapAttrsToList (name: value: "${name}=${value}") inputs);
   # cd ~/.password-store/shared && find * -type f | sed 's/.gpg$//'
   sharedSecrets = ensureFiles [
     "di.fm/key"
     "eduroam/identity"
     "eduroam/password"
+    "github/notification.token"
+    "hass/token"
     "mail/cock"
     "mail/fastmail"
     "mail/gmail/amroplay"
     "mail/gmail/kieran.meinhardt"
     "mail/meinhaki"
+    "mail/dslalewa"
     "mail/posteo"
     "nextcloud-fysi/password"
     "nextcloud/password"
@@ -37,10 +55,15 @@ let
     "spotify/username"
     "spotify/password"
   ];
-  systemSecrets = let basic = [ "retiolum.ed25519" "retiolum.key" "syncthing/cert.pem" "syncthing/key.pem"]; in {
+  systemSecrets = let
+    basic = ["retiolum.ed25519" "retiolum.key" "syncthing/cert.pem" "syncthing/key.pem"];
+  in
+    {
       zaatar = ensureFiles (["moodle.token" "telegram/moodle-dl.token" "mpd-web.key"] ++ basic);
       kabsa = ensureFiles basic;
       manakish = ensureFiles basic;
+      tahina = ensureFiles basic;
+      ful = ensureFiles (["root.password"] ++ basic);
       makanek = ensureFiles ([
           "irc/retiolum"
           "irc/hackint"
@@ -60,8 +83,12 @@ let
           "telegram/menstruation.token"
           "telegram/cool_village.token"
           "telegram/kmein.token"
+          "telegram/krebs.token"
           "telegram/prometheus.token"
           "weechat/relay"
-    ] ++ basic);
+        ]
-  }.${name};
+        ++ basic);
-in toString (pkgs.writers.writeDash "build" "NIX_PATH=${nixPath} nix-build '<nixpkgs/nixos>' -A system --dry-run")
+    }
+    .${name};
+in
+  toString (pkgs.writers.writeDash "build" "NIX_PATH=${nixPath} nix-build '<nixpkgs/nixos>' -A system --dry-run")

configs/alacritty.nix

@@ -1,28 +1,17 @@
-{ pkgs, lib, config, ... }:
 {
-  environment.variables.TERMINAL = "alacritty";
+  pkgs,
-
+  lib,
-  environment.systemPackages = [
+  config,
-    pkgs.alacritty
+  ...
-  ];
+}: let
-
+  alacritty-cfg = theme:
-  home-manager.users.me.xdg.configFile =
+    (pkgs.formats.yaml {}).generate "alacritty.yml" {
-  let
+      window.opacity = 0.95;
-    inherit (import <niveum/lib>) colours;
-    colourNames = [ "black" "red" "green" "yellow" "blue" "magenta" "cyan" "white" ];
-    colourPairs = lib.getAttrs colourNames colours;
-  in {
-    "alacritty/alacritty.yml".source = (pkgs.formats.yaml {}).generate "alacritty.yml" {
-      background_opacity = 0.9;
-      colors = {
-        primary = { inherit (colours) background foreground; };
-        normal = lib.mapAttrs (_: colour: colour.dark) colourPairs;
-        bright = lib.mapAttrs (_: colour: colour.bright) colourPairs;
-      };
       font = {
         normal.family = "Monospace";
         size = 6;
       };
+      live_config_reload = true;
       key_bindings = [
         {
           key = "Plus";
@@ -40,6 +29,34 @@
           action = "ResetFontSize";
         }
       ];
+      colors = let
+        colourNames = ["black" "red" "green" "yellow" "blue" "magenta" "cyan" "white"];
+        colourPairs = lib.getAttrs colourNames theme;
+      in {
+        primary = {inherit (theme) background foreground;};
+        cursor = {inherit (theme) cursor;};
+        normal = lib.mapAttrs (_: colour: colour.dark) colourPairs;
+        bright = lib.mapAttrs (_: colour: colour.bright) colourPairs;
       };
     };
+  alacritty-pkg = pkgs.symlinkJoin {
+    name = "alacritty";
+    paths = [
+      (pkgs.writeDashBin "alacritty" ''
+        ${pkgs.alacritty}/bin/alacritty --config-file /var/theme/config/alacritty.yml "$@"
+      '')
+      pkgs.alacritty
+    ];
+  };
+in {
+  environment.variables.TERMINAL = "alacritty";
+
+  environment.systemPackages = [
+    alacritty-pkg
+  ];
+
+  environment.etc = {
+    "themes/dark/alacritty.yml".source = alacritty-cfg (import <niveum/lib/colours/ayu-dark.nix>);
+    "themes/light/alacritty.yml".source = alacritty-cfg (import <niveum/lib/colours/ayu-light.nix>);
+  };
 }

configs/backup.nix

@@ -1,12 +1,17 @@
-{ pkgs, config, ... }:
-let
-  inherit (import <niveum/lib>) restic;
-in
 {
+  pkgs,
+  config,
+  ...
+}: let
+  inherit (import <niveum/lib>) restic;
+in {
   services.restic.backups.niveum = {
     initialize = true;
     inherit (restic) repository;
-    timerConfig = { OnCalendar = "8:00"; RandomizedDelaySec = "1h"; };
+    timerConfig = {
+      OnCalendar = "8:00";
+      RandomizedDelaySec = "1h";
+    };
     passwordFile = toString <secrets/restic/password>;
     extraBackupArgs = [
       "--exclude=/home/kfm/projects/nixpkgs/.git"

configs/battery.nix

@@ -1,11 +1,14 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   boot.extraModulePackages = with config.boot.kernelPackages; [
     tp_smapi
     acpi_call
   ];
   boot.kernelModules = ["tp_smapi" "acpi_call"];
-  environment.systemPackages = [ pkgs.tpacpi-bat ];
+  environment.systemPackages = [pkgs.tpacpi-bat pkgs.powertop];
 
   services.tlp = {
     enable = true;

configs/beets.nix

@@ -1,5 +1,8 @@
-{ lib, pkgs, ... }:
 {
+  lib,
+  pkgs,
+  ...
+}: {
   environment.systemPackages = [pkgs.beets];
   home-manager.users.me.xdg.configFile = {
     "beets/config.yaml".source = (pkgs.formats.yaml {}).generate "config.yaml" {

configs/bluetooth.nix

@@ -1,11 +1,17 @@
-{ pkgs, lib, ... }: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   hardware.bluetooth = {
     enable = true;
     settings.General.Enable =
       lib.concatStringsSep "," ["Source" "Sink" "Media" "Socket"];
   };
 
-  environment.systemPackages = [ pkgs.blueman ];
+  services.blueman.enable = true;
 
-  home-manager.users.me = { services.blueman-applet.enable = false; };
+  # environment.systemPackages = [pkgs.blueman];
+
+  home-manager.users.me = {services.blueman-applet.enable = true;};
 }

configs/chromium.nix

@@ -2,11 +2,12 @@
   programs.chromium = {
     enable = true;
     extensions = [
-      "nngceckbapebfimnlniiiahkandclblb" # BitWarden
       # "ihlenndgcmojhcghmfjfneahoeklbjjh" # cVim
       # "fpnmgdkabkmnadcjpehmlllkndpkmiak" # Wayback Machine
       "cjpalhdlnbpafiamejdnhcphjbkeiagm" # uBlock Origin
-      "khncfooichmfjbepaaaebmommgaepoid" # Remove YouTube Recommended Videos
+      "pjjgklgkfeoeiebjogplpnibpfnffkng" # undistracted
+      "nhdogjmejiglipccpnnnanhbledajbpd" # vuejs devtools
+      "eimadpbcbfnmbkopoojfekhnkhdbieeh" # dark reader
     ];
   };
 

configs/cloud.nix

@@ -1,4 +1,11 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (import <niveum/lib>) tmpfilesConfig;
+in {
   imports = [
     <niveum/modules/dropbox.nix>
   ];
@@ -7,17 +14,45 @@
     dropbox.enable = false;
   };
 
-  system.activationScripts.home-symlinks = ''
+  systemd.tmpfiles.rules = map tmpfilesConfig [
-    ln -sfn ${config.users.users.me.home}/cloud/syncthing/common/mahlzeit ${config.users.users.me.home}/mahlzeit
+    {
-    ln -sfn ${config.users.users.me.home}/cloud/Seafile/Wiki ${config.users.users.me.home}/notes
+      type = "L+";
-    ln -sfn ${config.users.users.me.home}/cloud/Seafile/Uni ${config.users.users.me.home}/uni
+      user = config.users.users.me.name;
-  '';
+      group = "users";
+      mode = "0755";
+      argument = "${config.users.users.me.home}/cloud/Seafile/Wiki";
+      path = "${config.users.users.me.home}/notes";
+    }
+    {
+      type = "L+";
+      user = config.users.users.me.name;
+      group = "users";
+      mode = "0755";
+      argument = "${config.users.users.me.home}/cloud/Seafile/Uni";
+      path = "${config.users.users.me.home}/uni";
+    }
+    {
+      type = "L+";
+      user = config.users.users.me.name;
+      group = "users";
+      mode = "0755";
+      argument = "${config.users.users.me.home}/cloud/syncthing/common/mahlzeit";
+      path = "${config.users.users.me.home}/mahlzeit";
+    }
+  ];
 
   home-manager.users.me = {
+    services.gnome-keyring.enable = true;
     services.nextcloud-client = {
       enable = true;
       startInBackground = true;
     };
+    systemd.user.services.nextcloud-client = {
+      Unit = {
+        Wants = ["gnome-keyring.service"];
+        After = ["gnome-keyring.service"];
+      };
+    };
   };
 
   environment.systemPackages = [
@@ -50,8 +85,8 @@
     cert = toString <system-secrets/syncthing/cert.pem>;
     key = toString <system-secrets/syncthing/key.pem>;
     inherit ((import <niveum/lib>).syncthing) devices;
-    folders =
+    folders = let
-      let cloud-dir = "${config.users.users.me.home}/cloud";
+      cloud-dir = "${config.users.users.me.home}/cloud";
     in {
       "${cloud-dir}/syncthing/common".devices = ["kabsa" "manakish"];
       "${cloud-dir}/syncthing/library".devices = ["kabsa" "manakish" "heym"];

configs/copyq.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
+{
-let
+  config,
+  pkgs,
+  ...
+}: let
   copyqConfig = pkgs.writers.writeDash "copyq-config" ''
     ${pkgs.copyq}/bin/copyq config check_clipboard true
     ${pkgs.copyq}/bin/copyq config check_selection false

configs/default.nix

@@ -1,5 +1,10 @@
-{ pkgs, lib, config, options, ... }:
+{
-let
+  pkgs,
+  lib,
+  config,
+  options,
+  ...
+}: let
   inherit (lib.strings) makeBinPath;
   inherit (import <niveum/lib>) localAddresses kieran;
 in {
@@ -25,11 +30,20 @@ in {
             tocharian-font = pkgs.callPackage <niveum/packages/tocharian-font.nix> {};
             iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> {};
             ix = pkgs.callPackage <niveum/packages/ix.nix> {};
+            rofi-pass = pkgs.rofi-pass.overrideAttrs (final: previous: {
+              patches = [
+                # password store androi
+                <niveum/packages/rofi-pass.patch>
+              ];
+            });
           };
         };
         overlays = [
           (self: super: {
-            scripts = import <niveum/packages/scripts> { pkgs = super; lib = super.lib; };
+            scripts = import <niveum/packages/scripts> {
+              pkgs = super;
+              lib = super.lib;
+            };
           })
         ];
       };
@@ -44,6 +58,7 @@ in {
           enable = true;
           options = {
             selection-clipboard = "clipboard";
+            recolor-keephue = true;
             # first-page-column = "1:1"; # makes side-by-side mode start on the left side
           };
         };
@@ -57,8 +72,7 @@ in {
       users.users.me = {
         name = "kfm";
         description = kieran.name;
-        hashedPassword =
+        hashedPassword = "$6$w9hXyGFl/.IZBXk$5OiWzS1G.5hImhh1YQmZiCXYNAJhi3X6Y3uSLupJNYYXPLMsQpx2fwF4Xr2uYzGMV8Foqh8TgUavx1APD9rcb/";
-          "$6$w9hXyGFl/.IZBXk$5OiWzS1G.5hImhh1YQmZiCXYNAJhi3X6Y3uSLupJNYYXPLMsQpx2fwF4Xr2uYzGMV8Foqh8TgUavx1APD9rcb/";
         isNormalUser = true;
         uid = 1000;
       };
@@ -72,17 +86,18 @@ in {
       hardware.pulseaudio = {
         enable = true;
         package = pkgs.pulseaudioFull;
-        extraModules = [ pkgs.pulseaudio-modules-bt ];
         # copy server:/run/pulse/.config/pulse/cookie to client:~/.config/pulse/cookie to authenticate a client machine
         zeroconf.discovery.enable = true;
         extraConfig = ''
-          load-module ${toString [
+          load-module ${
+            toString [
               "module-tunnel-sink-new"
               "server=zaatar.r"
               "sink_name=zaatar"
               "channels=2"
               "rate=44100"
-          ]}
+            ]
+          }
         '';
       };
 
@@ -91,8 +106,7 @@ in {
       environment.systemPackages = [pkgs.pavucontrol pkgs.ncpamixer pkgs.pamixer pkgs.pulsemixer];
     }
     {
-      environment.interactiveShellInit =
+      environment.interactiveShellInit = "export PATH=$PATH:$HOME/projects/niveum";
-        "export PATH=$PATH:$HOME/projects/niveum";
       environment.shellAliases = let
         wcd = pkgs.writers.writeDash "wcd" ''
           cd "$(readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname)/.."
@@ -103,12 +117,15 @@ in {
         take = pkgs.writers.writeDash "take" ''
           mkdir "$1" && cd "$1"
         '';
+        cdt = pkgs.writers.writeDash "cdt" ''
+          cd "$(mktemp -d)"
+          pwd
+        '';
         swallow = command: "${pkgs.scripts.swallow}/bin/swallow ${command}";
       in {
         "ß" = "${pkgs.utillinux}/bin/setsid";
         cat = "${pkgs.bat}/bin/bat --style=plain";
-        chromium-incognito =
+        chromium-incognito = "chromium --user-data-dir=$(mktemp -d /tmp/chr.XXXXXX) --no-first-run --incognito";
-          "chromium --user-data-dir=$(mktemp -d /tmp/chr.XXXXXX) --no-first-run --incognito";
         cp = "cp --interactive";
         ip = "${pkgs.iproute}/bin/ip -c";
         l = "ls --color=auto --time-style=long-iso --almost-all";
@@ -124,20 +141,25 @@ in {
         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.sxiv}/bin/sxiv";
+        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 =
+        yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
-          "${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -ic"; # Download video link
+        yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -xic"; # Download with audio
-        yta =
+      };
-          "${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -xic"; # Download with audio
+    }
+    {
+      i18n = {
+        defaultLocale = "en_DK.UTF-8";
+        supportedLocales = ["all"];
       };
     }
-    { i18n.defaultLocale = "en_DK.UTF-8"; }
     {
       services.xserver = {
         enable = true;
@@ -159,13 +181,15 @@ in {
     {
       security.wrappers = {
         pmount = {
+          setuid = true;
           owner = "root";
-          group = "users";
+          group = "root";
           source = "${pkgs.pmount}/bin/pmount";
         };
         pumount = {
+          setuid = true;
           owner = "root";
-          group = "users";
+          group = "root";
           source = "${pkgs.pmount}/bin/pumount";
         };
       };
@@ -176,7 +200,7 @@ in {
 
       environment.systemPackages = [
         pkgs.gnupg
-        (pkgs.pass.withExtensions (e: [e.pass-otp]))
+        (pkgs.pass.withExtensions (e: [e.pass-otp e.pass-import e.pass-genphrase]))
       ];
     }
     {
@@ -189,10 +213,15 @@ in {
       };
     }
     {
-      networking.hosts = lib.mapAttrs' (name: address: {
+      networking.hosts =
+        lib.mapAttrs' (name: address: {
           name = address;
           value = ["${name}.local"];
-      }) localAddresses;
+        })
+        localAddresses;
+    }
+    {
+      home-manager.users.me.home.stateVersion = "22.05";
     }
     ./alacritty.nix
     ./backup.nix
@@ -231,7 +260,7 @@ in {
     ./polkit.nix
     ./power-action.nix
     ./printing.nix
-    ./openweathermap.nix
+    # ./openweathermap.nix
     ./wallpaper.nix
     ./redshift.nix
     ./retiolum.nix
@@ -241,13 +270,14 @@ in {
     ./ssh.nix
     ./sshd.nix
     ./sudo.nix
-    ./sxiv.nix
+    ./nsxiv.nix
-    ./theming.nix
+    ./themes.nix
     ./tmux.nix
     ./traadfri.nix
     ./unclutter.nix
     ./vscode.nix
     ./watson.nix
     ./zsh.nix
+    ./tor.nix
   ];
 }

configs/direnv.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: let
-let
   nixify = pkgs.writers.writeDashBin "nixify" ''
     set -efuC
 
@@ -22,14 +21,14 @@ in {
 
   home-manager.users.me.programs.direnv = {
     enable = true;
-    stdlib = builtins.readFile ("${
+    stdlib = builtins.readFile "${
       pkgs.fetchFromGitHub {
         owner = "Mic92";
         repo = "dotfiles";
         rev = "a0a9b7e358fa70a85cd468f8ca1fbb02ae0a91df";
         sha256 = "1y9h5s1lf59sczsm0ksq2x1yhl98ba9lwk5yil3q53rg7n4574pg";
       }
-      }/home/.direnvrc");
+    }/home/.direnvrc";
   };
 
   programs.zsh.interactiveShellInit = ''

configs/distrobump.nix

@@ -1,4 +1,9 @@
-{ lib, config, pkgs, ... }: {
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     (import <stockholm/makefu/3modules/bump-distrowatch.nix> {
       inherit lib config;

configs/docker.nix

@@ -1,4 +1,8 @@
-{ lib, pkgs, ... }: {
+{
+  lib,
+  pkgs,
+  ...
+}: {
   virtualisation.docker = {
     enable = true;
     # for ICE wifi, ref https://gist.github.com/sunsided/7840e89ff4e11b64a2d7503fafa0290c
@@ -8,5 +12,5 @@
     ];
   };
   users.users.me.extraGroups = ["docker"];
-  environment.systemPackages = [ pkgs.docker pkgs.docker_compose ];
+  environment.systemPackages = [pkgs.docker pkgs.docker-compose];
 }

configs/dunst.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
+{
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (import <niveum/lib>) defaultApplications colours theme;
 in {
   home-manager.users.me.services.dunst = {

configs/flameshot-once.nix

@@ -1,5 +1,8 @@
-{ lib, pkgs, ... }:
+{
-let
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (import <niveum/lib>) defaultApplications;
   flameshot-once =
     pkgs.callPackage <stockholm/krebs/5pkgs/simple/flameshot-once> {};

configs/flix.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
+{
-let
+  config,
+  pkgs,
+  ...
+}: let
   flixLocation = "/media/flix";
   cacheLocation = "/var/cache/flix";
   indexFilename = "index";
@@ -74,5 +77,4 @@ in {
         | ${pkgs.findutils}/bin/xargs -I '{}' ${pkgs.utillinux}/bin/setsid ${pkgs.xdg_utils}/bin/xdg-open '{}'
     '')
   ];
-
 }

configs/fonts.nix

@@ -1,42 +1,54 @@
 {pkgs, ...}: {
-  nixpkgs.config.joypixels.acceptLicense = true;
-
   fonts = {
     enableDefaultFonts = true;
     fontDir.enable = true;
     fonts = with pkgs; [
       alegreya
       alegreya-sans
+      amiri
+      annapurna-sil
+      cantarell-fonts
+      charis-sil
       corefonts
+      crimson
       eb-garamond
+      font-awesome_6
+      etBook
+      ezra-sil
       fira
-      font-awesome-ttf
+      font-awesome
+      galatia-sil
+      gentium
+      gfs-fonts
+      gyre-fonts
       ibm-plex
-      inconsolata
+      jetbrains-mono
-      iosevka
+      libertinus
-      libertine
+      libre-bodoni
       lmodern
+      merriweather
+      ocr-a
+      roboto
+      roboto-mono
       noto-fonts
       noto-fonts-cjk
       noto-fonts-emoji
-      roboto
-      roboto-mono
       roboto-slab
+      scheherazade-new
       source-code-pro
-      source-serif-pro
       source-sans-pro
-      ubuntu_font_family
+      source-serif-pro
-      gfs-fonts
+      theano
-      jetbrains-mono
-      twemoji-color-font
-      joypixels
       tocharian-font
-    ];
+      vistafonts
+      vollkorn
+      zilla-slab
+    ]; # google-fonts league-of-moveable-type
     fontconfig.defaultFonts = {
-      monospace = [ "JetBrains Mono" "JoyPixels" ];
+      monospace = ["Noto Sans Mono"];
-      serif = [ "Roboto Slab" ];
+      serif = ["Noto Serif" "Noto Naskh Arabic" "Noto Serif Devanagari"];
-      sansSerif = [ "Roboto" "Noto Sans" ];
+      sansSerif = ["Noto Sans Display" "Noto Kufi Arabic" "Noto Sans Devanagari" "Noto Sans CJK JP"];
-      emoji = [ "JoyPixels" ];
+      emoji = ["Noto Color Emoji" "Noto Emoji"];
     };
   };
 }

configs/fzf.nix

@@ -1,4 +1,8 @@
-{ pkgs, lib, ... }: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   environment = {
     systemPackages = [pkgs.fzf];
     variables = {

configs/git.nix

@@ -1,8 +1,11 @@
-{ pkgs, config, lib, ... }:
-let
-  inherit (import <niveum/lib>) kieran ignorePaths;
-in
 {
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  inherit (import <niveum/lib>) kieran ignorePaths;
+in {
   environment.systemPackages = [
     pkgs.mr
     pkgs.git
@@ -10,6 +13,7 @@ in
     pkgs.gitAndTools.gh
     pkgs.gitAndTools.git-extras
     pkgs.gitAndTools.git-trim
+    pkgs.gitAndTools.git-absorb
     pkgs.gitstats
     pkgs.patch
     pkgs.patchutils
@@ -38,8 +42,7 @@ in
         diffs = "diff --staged";
         last = "log -1 HEAD";
         logs = "log --pretty=oneline";
-        graph =
+        graph = "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all";
-          "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all";
       };
       ignores = ignorePaths;
       extraConfig = {
@@ -47,12 +50,12 @@ in
         rebase.autoStash = true;
         merge.autoStash = true;
 
-        # ref https://github.com/dandavison/delta
+        # # ref https://github.com/dandavison/delta
-        core.pager = "${pkgs.delta}/bin/delta";
+        # core.pager = "${pkgs.delta}/bin/delta";
-        interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
+        # interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
-        delta.navigate = true;
+        # delta.navigate = true;
-        merge.conflictStyle = "diff3";
+        # merge.conflictStyle = "diff3";
-        diff.colorMoved = "default";
+        # diff.colorMoved = "default";
       };
     };
   };

configs/hledger.nix

@@ -1,6 +1,28 @@
-{ config, pkgs, ... }: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   imports = [<niveum/modules/hledger.nix>];
 
+  environment.systemPackages = let
+    timeLedger = "$HOME/projects/ledger/time.timeclock";
+  in [
+    (pkgs.writers.writeDashBin "hora-edit" ''
+      $EDITOR + "${timeLedger}" && ${pkgs.git}/bin/git -C "$(${pkgs.coreutils}/bin/dirname ${timeLedger})" commit --all --message "$(${pkgs.coreutils}/bin/date -Im)"
+    '')
+    (pkgs.writers.writeDashBin "hora" ''
+      ${pkgs.hledger}/bin/hledger -f "${timeLedger}" "$@"
+    '')
+    (pkgs.writers.writeDashBin "hora-filli" ''
+      ${pkgs.hledger}/bin/hledger -f "${timeLedger}" register fillidefilla -O csv \
+        -b "$(date -d "$(date +%Y-%m)-20 last month" +%Y-%m-%d)" \
+        -e "$(date -d "$(date +%Y-%m)-20" +%Y-%m-%d)" \
+        | sed 's/(fillidefilla:\(.*\))/\1/g' \
+        | xsv select date,amount,total,account,description
+    '')
+  ];
+
   niveum.hledger = {
     enable = true;
     ledgerFile = "$HOME/projects/ledger/all.journal";

configs/hu-berlin.nix

@@ -1,5 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
-let
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
   inherit (lib.strings) fileContents;
   inherit (import <niveum/lib>) sshPort;
   eduroam = {
@@ -32,7 +36,6 @@ in {
     options = hu-berlin-cifs-options;
   };
 
-
   home-manager.users.me.programs.ssh = {
     matchBlocks = {
       "alew.hu-berlin.de" = {
@@ -46,7 +49,8 @@ in {
     (pkgs.writers.writeDashBin "hu-ip" ''
       ${pkgs.w3m}/bin/w3m -dump meineip.hu-berlin.de | head --lines=-4 | tail --lines=+3
     '')
-    (pkgs.writers.writePython3Bin "hu-eduroam-install"
+    (
+      pkgs.writers.writePython3Bin "hu-eduroam-install"
       {
         libraries = with pkgs.python3Packages; [distro pyopenssl dbus-python];
         flakeIgnore = ["E501" "E123" "W504" "E722" "F821" "E226" "E126" "E265" "W291"];
@@ -63,13 +67,15 @@ in {
     wants = ["network-online.target"];
     conflicts = ["openvpn-hu-berlin.service"];
     script = ''
-      ${pkgs.openfortivpn}/bin/openfortivpn -c ${pkgs.writeText "hu-berlin.config" ''
+      ${pkgs.openfortivpn}/bin/openfortivpn -c ${
+        pkgs.writeText "hu-berlin.config" ''
           host = forti-ssl.vpn.hu-berlin.de
           port = 443
           trusted-cert = 42193a913d276d9eb86217612956e1e6464d6f07bed5393a4787c87adc4bd359
           username = ${eduroam.identity}@split_tunnel
           password = ${eduroam.password}
-      ''}
+        ''
+      }
     '';
   };
 
@@ -82,8 +88,7 @@ in {
       password = eduroam.password;
     };
     config = fileContents (pkgs.fetchurl {
-      url =
+      url = "https://www.cms.hu-berlin.de/de/dl/netze/vpn/openvpn/hu-berlin.ovpn";
-        "https://www.cms.hu-berlin.de/de/dl/netze/vpn/openvpn/hu-berlin.ovpn";
       sha256 = "15b55aibik5460svjq2gwxrcyh6ay4k8savd6cd5lncgndmd8p8h";
     });
   };

configs/i3.nix

@@ -1,5 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
-let
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
   inherit (import <niveum/lib>) defaultApplications colours;
   klem = import <niveum/packages/scripts/klem.nix> {
     inherit pkgs lib;
@@ -30,6 +34,7 @@ let
       "devanagari" = pkgs.writers.writeDash "devanagari" ''
         ${pkgs.scripts.devanagari}/bin/devanagari
       '';
+      "avesta" = pkgs.writeScript "avesta" (builtins.readFile <niveum/packages/scripts/avesta.sed>);
       "curl" = pkgs.writers.writeDash "curl" ''
         ${pkgs.curl}/bin/curl -fSs "$(${pkgs.coreutils}/bin/cat)"
       '';
@@ -45,7 +50,6 @@ let
   move-to-new-workspace = pkgs.writers.writeDash "new-workspace" ''
     i3-msg move container to workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
   '';
-
 in {
   services.xserver = {
     displayManager.defaultSession = "none+i3";
@@ -73,7 +77,10 @@ in {
   home-manager.users.me.xsession.windowManager.i3 = {
     enable = true;
     config = rec {
-      fonts = {names = ["Sans"]; size = 10.0;};
+      fonts = {
+        names = ["Sans"];
+        size = 10.0;
+      };
       modifier = "Mod4";
       window = {
         titlebar = false;
@@ -111,31 +118,43 @@ in {
           text = colours.foreground;
         };
       in rec {
-        focused = scheme // {
+        focused =
+          scheme
+          // {
             border = colours.cyan.bright;
             indicator = colours.cyan.bright;
             childBorder = colours.cyan.bright;
           };
-        unfocused = scheme // {
+        unfocused =
+          scheme
+          // {
             border = colours.background;
             indicator = colours.background;
             childBorder = colours.background;
           };
         focusedInactive = unfocused;
-        urgent = scheme // {
+        urgent =
+          scheme
+          // {
             border = colours.red.bright;
             indicator = colours.red.bright;
             childBorder = colours.red.bright;
           };
-        placeholder = scheme // {
+        placeholder =
+          scheme
+          // {
             border = colours.green.bright;
             indicator = colours.green.bright;
             childBorder = colours.green.bright;
           };
       };
-      bars = [{
+      bars = [
+        {
           workspaceButtons = false;
-        fonts = {names = ["Sans"]; size = 8.0;};
+          fonts = {
+            names = ["Monospace" "Font Awesome 6 Free"];
+            size = 8.0;
+          };
           mode = "hide"; # "dock"
           position = "bottom";
           colors = rec {
@@ -148,14 +167,15 @@ in {
               text = colours.foreground;
             };
           };
-        statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ${
+          statusCommand = "env I3RS_GITHUB_TOKEN=${lib.strings.fileContents <secrets/github/notification.token>} ${pkgs.i3status-rust}/bin/i3status-rs ${
             (pkgs.formats.toml {}).generate "i3status-rust.toml" (import <niveum/lib/i3status-rust.nix> {
               inherit (config.niveum) batteryName wirelessInterface;
               inherit colours;
               inherit pkgs;
             })
           }";
-      }];
+        }
+      ];
       modes.resize = {
         "Escape" = ''mode "default"'';
         "Return" = ''mode "default"'';
@@ -197,6 +217,11 @@ in {
         "${modifier}+r" = "mode resize";
         "${modifier}+v" = "split v";
         "${modifier}+w" = "layout tabbed";
+        "${modifier}+q" = "exec ${pkgs.writers.writeDash "newsboat-sync" ''
+          notify-send --app-name="newsboat" "Updating ..."
+          newsboat -x reload
+          notify-send --app-name="newsboat" "Finished updating."
+        ''}";
 
         # "${modifier}+Shift+y" = "exec ${pkgs.qutebrowser}/bin/qutebrowser";
         "${modifier}+Return" = "exec ${(defaultApplications pkgs).terminal}";
@@ -225,11 +250,12 @@ in {
             fi
           ''
         }";
-        "${modifier}+p" = "exec --no-startup-id ${pkgs.pass}/bin/passmenu -l 5";
+        "${modifier}+p" = "exec --no-startup-id ${pkgs.rofi-pass}/bin/rofi-pass";
         "${modifier}+u" = "exec ${pkgs.scripts.unicodmenu}/bin/unicodmenu";
 
+        "${modifier}+F6" = "exec ${pkgs.xorg.xkill}/bin/xkill";
         "${modifier}+F7" = "exec ${pkgs.scripts.showkeys-toggle}/bin/showkeys-toggle";
-        "${modifier}+F8" = "exec ${pkgs.xorg.xkill}/bin/xkill";
+        "${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";

configs/kdeconnect.nix

@@ -1,13 +1,17 @@
 {
   networking.firewall = {
-    allowedTCPPortRanges = [{
+    allowedTCPPortRanges = [
+      {
         from = 1714;
         to = 1764;
-    }];
+      }
-    allowedUDPPortRanges = [{
+    ];
+    allowedUDPPortRanges = [
+      {
         from = 1714;
         to = 1764;
-    }];
+      }
+    ];
   };
 
   home-manager.users.me = {

configs/keyboard.nix

@@ -1,17 +1,50 @@
-{ pkgs, lib, ... }:
+{
-let commaSep = builtins.concatStringsSep ",";
+  pkgs,
+  lib,
+  ...
+}: let
+  commaSep = builtins.concatStringsSep ",";
+  xkbOptions = ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
+  languages = {
+    de = "T3";
+    gr = "polytonic";
+    ru = "phonetic";
+    ara = "buckwalter";
+  };
+  defaultLanguage = "de";
 in {
+  # man 7 xkeyboard-config
   services.xserver = {
-    layout = commaSep [ "de" "gr" ];
+    layout = "de";
-    xkbVariant = commaSep [ "T3" "polytonic" ];
+    # T3: https://upload.wikimedia.org/wikipedia/commons/a/a9/German-Keyboard-Layout-T3-Version1-large.png
+    # buckwalter: http://www.qamus.org/transliteration.htm
+    xkbVariant = "T3";
     xkbOptions =
-      commaSep [ "compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle" ];
+      commaSep xkbOptions;
     libinput.enable = true;
   };
 
   console.keyMap = "de";
 
+  environment.systemPackages =
+    lib.mapAttrsToList
+    (language: variant:
+      pkgs.writers.writeDashBin "kb-${language}" ''
+        ${pkgs.xorg.setxkbmap}/bin/setxkbmap ${defaultLanguage},${language} ${languages.${defaultLanguage}},${variant} ${toString (map (option: "-option ${option}") xkbOptions)}
+      '')
+    languages;
+
   # improve held key rate
-  services.xserver.displayManager.sessionCommands =
+  services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xset}/bin/xset r rate 300 50";
-    "${pkgs.xorg.xset}/bin/xset r rate 300 50";
+
+  systemd.user.services.gxkb = {
+    wantedBy = ["graphical-session.target"];
+    serviceConfig = {
+      SyslogIdentifier = "gxkb";
+      ExecStart = "${pkgs.gxkb}/bin/gxkb";
+      Restart = "always";
+      RestartSec = "15s";
+      StartLimitBurst = 0;
+    };
+  };
 }

configs/khal.nix

@@ -1,5 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
-let
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
   davHome = "~/.local/share/dav";
   kmeinCloud = {
     davEndpoint = "https://cloud.xn--kiern-0qa.de/remote.php/dav";
@@ -11,8 +15,7 @@ let
     username = "kmein";
     password = lib.fileContents <secrets/nextcloud-fysi/password>;
   };
-in
+in {
-{
   environment.systemPackages = [pkgs.khal pkgs.vdirsyncer pkgs.khard pkgs.todoman];
 
   systemd.user.services.vdirsyncer = {

configs/lb.nix

@@ -1,5 +1,8 @@
-{ lib, pkgs, ... }:
 {
+  lib,
+  pkgs,
+  ...
+}: {
   systemd.services.lb-subscription = {
     enable = true;
     wants = ["network-online.target"];

configs/mime.nix

@@ -7,8 +7,8 @@
         "application/pdf" = "org.pwmt.zathura.desktop";
         "application/vnd.oasis.opendocument.text" = "writer.desktop";
         "application/vnd.openxmlformats-officedocument.wordprocessingml.document" = "writer.desktop";
-        "image/jpeg" = "sxiv.desktop";
+        "image/jpeg" = "nsxiv.desktop";
-        "image/png" = "sxiv.desktop";
+        "image/png" = "nsxiv.desktop";
         "image/vnd.djvu+multipage" = "org.pwmt.zathura.desktop";
         "text/html" = "brave-browser.desktop";
         "text/markdown" = "nvim.desktop";
@@ -21,7 +21,6 @@
         "x-scheme-handler/webcal" = "brave-browser.desktop";
         "inode/directory" = "pcmanfm.desktop";
       };
-
     };
   };
 }

configs/monitoring.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   services.nginx.virtualHosts.default = {
     locations."= /stub_status".extraConfig = "stub_status;";
   };
@@ -43,14 +46,21 @@
 
     serviceConfig = {
       ExecStart = ''
-        ${pkgs.grafana-loki}/bin/promtail --config.file ${(pkgs.formats.yaml {}).generate "promtail.yaml" {
+        ${pkgs.grafana-loki}/bin/promtail --config.file ${
+          (pkgs.formats.yaml {}).generate "promtail.yaml" {
             server = {
               http_listen_port = 28183;
               grpc_listen_port = 0;
             };
             positions.filename = "/tmp/positions.yaml";
             clients = [
-            { url = "http://${if config.networking.hostName == "makanek" then "127.0.0.1" else "makanek.r"}:3100/loki/api/v1/push"; }
+              {
+                url = "http://${
+                  if config.networking.hostName == "makanek"
+                  then "127.0.0.1"
+                  else "makanek.r"
+                }:3100/loki/api/v1/push";
+              }
             ];
             scrape_configs = [
               {
@@ -68,7 +78,8 @@
                 ];
               }
             ];
-        }}
+          }
+        }
       '';
     };
   };

configs/mpv.nix

@@ -1,14 +1,27 @@
-{ pkgs, lib, ... }: let
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
   swallow = command: "${pkgs.scripts.swallow}/bin/swallow ${command}";
 in {
   environment.shellAliases.smpv = swallow "mpv";
 
+  nixpkgs.overlays = [
+    (self: super: {
+      mpv = config.home-manager.users.me.programs.mpv.finalPackage;
+    })
+  ];
+
   home-manager.users.me = {
     programs.mpv = {
       enable = true;
       config = {
+        ytdl-format = "bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best";
         ytdl-raw-options = lib.concatStringsSep "," [''sub-lang="de,en"'' "write-sub=" "write-auto-sub="];
         screenshot-template = "%F-%wH%wM%wS-%#04n";
+        script-opts = "ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp";
       };
       bindings = {
         "Alt+RIGHT" = "add video-rotate 90";
@@ -22,6 +35,7 @@ in {
       };
       scripts = [
         pkgs.mpvScripts.youtube-quality
+        (pkgs.callPackage <niveum/packages/mpv-visualizer.nix> {})
       ];
     };
   };

configs/neomutt.nix

@@ -1,134 +1,41 @@
-{ pkgs, lib, ... }:
+{
-let
+  pkgs,
+  lib,
+  ...
+}: let
   mainMailbox = "posteo";
 
-  accounts.uni = {
+  accounts = import <niveum/lib/email.nix> {inherit lib mainMailbox;};
-    user = "meinhark";
+in {
-    password = lib.strings.fileContents <secrets/eduroam/password>;
-    address = "kieran.felix.meinhardt@hu-berlin.de";
-    imap = "mailbox.cms.hu-berlin.de";
-    smtp = "mailhost.cms.hu-berlin.de";
-    smtpSettings = smtp: "smtp://${smtp}";
-    folders = {
-      drafts = "Drafts";
-      sent = "Sent";
-      trash = "Trash";
-    };
-  };
-
-  accounts.uni-old = {
-    user = "meinhark";
-    password = lib.strings.fileContents <secrets/eduroam/password>;
-    address = "meinhark@informatik.hu-berlin.de";
-    imap = "mailbox.informatik.hu-berlin.de";
-    smtp = "mailhost.informatik.hu-berlin.de";
-    smtpSettings = smtp: "smtp://${smtp}";
-    folders = {
-      drafts = "Drafts";
-      sent = "Sent";
-      trash = "Trash";
-    };
-  };
-
-  accounts.work-uni = {
-    user = "meinhaki";
-    password = lib.strings.fileContents <secrets/mail/meinhaki>;
-    address = "kieran.meinhardt@hu-berlin.de";
-    imap = "mailbox.cms.hu-berlin.de";
-    smtp = "mailhost.cms.hu-berlin.de";
-    smtpSettings = smtp: "smtp://${smtp}";
-    folders = {
-      drafts = "Drafts";
-      sent = "Sent";
-      trash = "Trash";
-    };
-  };
-
-  accounts.work-fysi = rec {
-    user = "kieran@fysi.tech";
-    address = user;
-    password = lib.strings.fileContents <secrets/mail/fastmail>;
-    imap = "imap.fastmail.com";
-    smtp = "smtp.fastmail.com";
-    smtpSettings = smtp: "smtps://${smtp}:465";
-    folders = {
-      drafts = "Drafts";
-      sent = "Sent";
-      trash = "Trash";
-    };
-  };
-
-  accounts.cock = rec {
-    user = "2210@cock.li";
-    address = user;
-    password = lib.strings.fileContents <secrets/mail/cock>;
-    imap = "mail.cock.li";
-    smtp = imap;
-    smtpSettings = smtp: "smtp://${smtp}:587";
-    folders = {
-      drafts = "Drafts";
-      sent = "Sent";
-      trash = "Trash";
-    };
-  };
-
-  accounts."${mainMailbox}" = rec {
-    user = "kieran.meinhardt@posteo.net";
-    address = user;
-    password = lib.strings.fileContents <secrets/mail/posteo>;
-    imap = "posteo.de";
-    smtp = imap;
-    smtpSettings = smtp: "smtp://${smtp}";
-    folders = {
-      drafts = "Drafts";
-      sent = "Sent";
-      trash = "Trash";
-    };
-  };
-
-  accounts.google-amro = rec {
-    user = "amroplay@gmail.com";
-    address = user;
-    password = lib.strings.fileContents <secrets/mail/gmail/amroplay>;
-    imap = "imap.gmail.com";
-    smtp = "smtp.gmail.com";
-    smtpSettings = smtp: "smtps://${smtp}:465";
-    folders = {
-      drafts = "[Gmail]/Drafts";
-      sent = "[Gmail]/Sent Mail";
-      trash = "[Gmail]/Bin";
-    };
-  };
-
-  accounts.google-kieran = rec {
-    user = "kieran.meinhardt@gmail.com";
-    address = user;
-    password = lib.strings.fileContents <secrets/mail/gmail/kieran.meinhardt>;
-    imap = "imap.gmail.com";
-    smtp = "smtp.gmail.com";
-    smtpSettings = smtp: "smtps://${smtp}:465";
-    folders = {
-      drafts = "[Gmail]/Entwürfe";
-      sent = "[Gmail]/Gesendet";
-      trash = "[Gmail]/Papierkorb";
-    };
-  };
-in
-{
   environment.systemPackages = [pkgs.neomutt];
   environment.shellAliases.mua = "${pkgs.neomutt}/bin/neomutt -f ${mainMailbox}←";
 
-  home-manager.users.me.xdg.configFile."neomutt/neomuttrc".text = ''
+  home-manager.users.me.xdg.configFile."neomutt/neomuttrc".text = let
-    set mailcap_path = ${pkgs.writeText "mailcap" ''
+    as-pdf = pkgs.writers.writeDash "as-pdf" ''
+      d=$(mktemp -d)
+      trap clean EXIT
+      clean() {
+        rm -rf "$d"
+      }
+      ${pkgs.libreoffice}/bin/libreoffice --headless --convert-to pdf "$1" --outdir "$d"
+      ${pkgs.zathura}/bin/zathura "$d"/*.pdf
+    '';
+  in ''
+    set mailcap_path = ${
+      pkgs.writeText "mailcap" ''
         text/plain; $EDITOR %s ;
         text/html; ${pkgs.lynx}/bin/lynx -assume_charset=%{charset} -display_charset=utf-8 -dump %s; nametemplate=%s.html; copiousoutput;
-      image/*; ${pkgs.sxiv}/bin/sxiv %s ;
+        image/*; ${pkgs.nsxiv}/bin/nsxiv %s ;
         video/*; ${pkgs.utillinux}/bin/setsid ${pkgs.mpv}/bin/mpv --quiet %s &; copiousoutput
         audio/*; ${pkgs.mpv}/bin/mpv %s ;
         application/pdf; ${pkgs.zathura}/bin/zathura %s ;
         application/pgp-encrypted; ${pkgs.gnupg}/bin/gpg -d '%s'; copiousoutput;
         application/pgp-keys; ${pkgs.gnupg}/bin/gpg --import '%s'; copiousoutput;
-    ''}:$mailcap_path
+        application/vnd.openxmlformats-officedocument.wordprocessingml.document; ${as-pdf} %s;
+        application/vnd.oasis.opendocument.text; ${as-pdf} %s;
+        application/vnd.openxmlformats*; ${pkgs.libreoffice}/bin/soffice '%s';
+      ''
+    }:$mailcap_path
 
     set sidebar_visible
     set sidebar_format = "%D%?F? [%F]?%* %?N?%N/?%S"
@@ -180,31 +87,39 @@ in
 
     set header_cache="~/.cache/mutt" message_cachedir="~/.cache/mutt"
 
-    source ${pkgs.writeText "accounts.neomuttrc" ''
+    source ${
+      pkgs.writeText "accounts.neomuttrc" ''
         set realname = "Kierán Meinhardt"
         account-hook . 'unset imap_user imap_pass smtp_user smtp_pass'
         # set accordingly: postponed trash record
-      ${lib.concatStringsSep "\n\n" (lib.mapAttrsToList (name: account: let imapRoot = "imaps://${account.user}@${account.imap}"; in ''
+        ${
+          lib.concatStringsSep "\n\n" (lib.mapAttrsToList (name: account: let
+              imapRoot = "imaps://${account.user}@${account.imap}";
+            in ''
               account-hook ${account.user}@${account.imap} 'set imap_user="${account.user}" imap_pass="${account.password}"'
               account-hook ${account.user}@${account.smtp} 'set smtp_user="${account.user}" smtp_pass="${account.password}"'
               folder-hook  ${account.user}@${account.imap} 'set smtp_url="${account.smtpSettings "${account.user}@${account.smtp}"}" from="${account.address}" record="${imapRoot}/${account.folders.sent}" postponed="${imapRoot}/${account.folders.drafts}" trash="${imapRoot}/${account.folders.trash}"'
               named-mailboxes "${name}←" "${imapRoot}" "${name}→" "${imapRoot}/${account.folders.sent}"
-      '') accounts)}
+            '')
-    ''}
+            accounts)
+        }
+      ''
+    }
 
     set spoolfile="${mainMailbox}"
 
-    source ${pkgs.writeText "colors.neomuttrc" ''
+    source ${
+      pkgs.writeText "colors.neomuttrc" ''
         # Default index colors:
         color index_number blue default
         color index red default '.*'
         color index_flags lightcyan default '.*'
         color index_author yellow default '.*'
-      color index_subject lightblack default '.*'
+        color index_subject default default '.*'
 
         # New mail is boldened:
-      color index_author lightyellow black "~N"
+        color index_author lightyellow default "~N"
-      color index_subject lightwhite black "~N"
+        color index_subject lightwhite default "~N"
 
         # Flagged mail is highlighted:
         color index_flags lightmagenta default '~F'
@@ -243,6 +158,7 @@ in
         mono body bold "^gpg: Good signature"
         mono body bold "^gpg: BAD signature from.*"
         color body red default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
-    ''}
+      ''
+    }
   '';
 }

configs/neovim.nix

@@ -5,7 +5,9 @@
   environment.shellAliases.view = "nvim -R";
 
   nixpkgs.config.packageOverrides = pkgs: {
-    vimPlugins = pkgs.vimPlugins // {
+    vimPlugins =
+      pkgs.vimPlugins
+      // {
         cheat-sh-vim = pkgs.callPackage <niveum/packages/vimPlugins/cheat-sh.nix> {};
         vim-fetch = pkgs.callPackage <niveum/packages/vimPlugins/vim-fetch.nix> {};
         vim-colors-paramount = pkgs.callPackage <niveum/packages/vimPlugins/vim-colors-paramount.nix> {};
@@ -42,6 +44,15 @@
             vim-repeat
             vim-sensible
             vim-surround
+            (pkgs.vimUtils.buildVimPlugin {
+              name = "vim-dim-1.1.0";
+              src = pkgs.fetchFromGitHub {
+                owner = "jeffkreeftmeijer";
+                repo = "vim-dim";
+                rev = "1.1.0";
+                sha256 = "sha256-lyTZUgqUEEJRrzGo1FD8/t8KBioPrtB3MmGvPeEVI/g=";
+              };
+            })
           ];
           opt = [
             csv

configs/networkmanager.nix

@@ -1,6 +1,10 @@
-{ lib, pkgs, ... }:
+{
-let
+  lib,
-  profile = name: custom: lib.recursiveUpdate {
+  pkgs,
+  ...
+}: let
+  profile = name: custom:
+    lib.recursiveUpdate {
       connection.id = name;
       connection.type = "wifi";
       connection.interface-name = "wlp3s0";
@@ -14,7 +18,8 @@ let
       ipv6.dns-search = "";
       ipv6.method = "auto";
       proxy = {};
-  } custom;
+    }
+    custom;
   eduroamProfile = {
     connection.uuid = "eae9fee6-a7d2-4120-a609-440b457d6fcf";
     wifi-security = {
@@ -36,12 +41,17 @@ let
       phase2-auth = "pap";
     };
   };
-in
+in {
-{
   imports = [<niveum/modules/networkmanager-declarative.nix>];
 
+  programs.nm-applet.enable = true;
+
   networking.networkmanager = {
     enable = true;
+    plugins = [
+      pkgs.networkmanager-openvpn
+      pkgs.networkmanager-fortisslvpn
+    ];
     wifi.macAddress = "random";
     ethernet.macAddress = "random";
     unmanaged = ["docker*"];
@@ -82,5 +92,10 @@ in
 
   users.users.me.extraGroups = ["networkmanager"];
 
-  environment.systemPackages = [ pkgs.speedtest-cli ];
+  environment.systemPackages = [
+    pkgs.speedtest-cli
+    pkgs.networkmanager-openvpn
+    pkgs.networkmanagerapplet
+    pkgs.networkmanager-fortisslvpn
+  ];
 }

configs/newsboat.nix

@@ -1,11 +1,13 @@
-{ pkgs, config, ... }:
+{
-let
+  pkgs,
+  config,
+  ...
+}: let
   ytdl-format = "'bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best'";
 
-  youtube-download = "${pkgs.ts}/bin/ts ${pkgs.youtube-dl}/bin/youtube-dl -f ${ytdl-format} --add-metadata";
+  youtube-download = "${pkgs.ts}/bin/ts ${pkgs.yt-dlp}/bin/yt-dlp -f ${ytdl-format} --add-metadata";
 
-  newsboat-home =
+  newsboat-home = "${config.users.users.me.home}/cloud/Seafile/Documents/newsboat";
-    "${config.users.users.me.home}/cloud/Seafile/Documents/newsboat";
   linkhandler-bin = "${pkgs.scripts.linkhandler}/bin/linkhandler";
 
   newsboat-config = pkgs.writeText "config" ''
@@ -48,7 +50,7 @@ let
     save-path ${newsboat-home}/saved/
 
     highlight all "---.*---" yellow default
-    highlight feedlist ".*(0/0))" black default
+    # highlight feedlist ".*(0/0))" default default
     highlight article "^Title:.*" yellow default bold
     highlight article "^Author:.*" yellow default
     highlight article "^Flags:.*" red default
@@ -56,14 +58,12 @@ let
     highlight article "\\[image [0-9][0-9]*\\]" color109 default bold
     highlight article "\\[embedded flash: [0-9][0-9]*\\]" color66 default bold
 
-    color background white default
-    color listnormal white default
-    color listnormal_unread white default bold
     color listfocus blue default
     color listfocus_unread blue default bold
     color info red default bold
-    color article white default
   '';
+
+  newsboat-sql = "${pkgs.sqlite}/bin/sqlite3 ${newsboat-home}/cache.db";
 in {
   nixpkgs.config.packageOverrides = pkgs: {
     newsboat = pkgs.writers.writeDashBin "newsboat" ''
@@ -73,8 +73,23 @@ in {
 
   environment.systemPackages = [
     pkgs.newsboat
+    (pkgs.writers.writeDashBin "newsboat-unread-count" ''
+      if [ -f ${newsboat-home}/cache.db.lock ]; then
+        ${pkgs.jq}/bin/jq -n '{state: "Info", text: "↻", icon: "rss"}'
+      else
+
+        ${pkgs.jq}/bin/jq -n \
+          --argjson unread "$(${newsboat-sql} "SELECT COUNT(DISTINCT id) FROM rss_item WHERE unread=1")" \
+          --argjson watchLater "$(${newsboat-sql} "SELECT COUNT(DISTINCT id) FROM rss_item WHERE flags='e' AND deleted=0")" \
+          '{
+            state: (if $unread > 0 then "Good" else "Idle" end),
+            text: (if $unread > 0 then "\($unread)" else "[\($watchLater)]" end),
+            icon: "rss"
+          }'
+      fi
+    '')
     (pkgs.writers.writeDashBin "mpv-watch-later" ''
-      ${pkgs.sqlite}/bin/sqlite3 ${newsboat-home}/cache.db "SELECT url FROM rss_item WHERE flags='e' AND deleted=0 ORDER BY pubDate DESC" \
+      ${newsboat-sql} "SELECT url FROM rss_item WHERE flags='e' AND deleted=0 ORDER BY pubDate DESC" \
         | ${pkgs.findutils}/bin/xargs ${pkgs.mpv}/bin/mpv
     '')
   ];

configs/nix.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   nixpkgs = {
     config.allowUnfree = true;
     overlays = [
@@ -10,5 +9,16 @@
   nix = {
     package = pkgs.nixUnstable;
     extraOptions = "experimental-features = nix-command flakes";
+    settings = {
+      substituters = [
+        "http://cache.prism.r"
+        "https://cache.nixos.org/"
+      ];
+      trusted-public-keys = [
+        "cache.prism-1:+S+6Lo/n27XEtvdlQKuJIcb1yO5NUqUCE2lolmTgNJU="
+        "cache.prism-2:YwmCm3/s/D+SxrPKN/ETjlpw/219pNUbpnluatp6FKI="
+        "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs="
+      ];
+    };
   };
 }

configs/nsxiv.nix

@@ -0,0 +1,66 @@
+{
+  pkgs,
+  lib,
+  ...
+}: let
+  important-directories = pkgs.writeText "directories" ''
+    h	~/
+    d	~/cloud/Dropbox/
+    g	~/cloud/gdrive/
+    s	~/cloud/Seafile/
+    kk	~/cloud/keybase/private/kmein/
+    kp	~/cloud/keybase/public/kmein/
+    t	/tmp
+    D	~/Downloads
+    cf	''${XDG_CONFIG_HOME:-$HOME/.config}
+  '';
+in {
+  environment.systemPackages = [pkgs.nsxiv];
+
+  # TODO fix
+  home-manager.users.me.xdg.configFile."nsxiv/exec/key-handler".source = pkgs.writers.writeDash "key-handler" ''
+    PATH=$PATH:${
+      lib.makeBinPath [
+        pkgs.gnused
+        pkgs.gawk
+        pkgs.dmenu
+        pkgs.coreutils
+        pkgs.libnotify
+        pkgs.imagemagick
+        pkgs.xclip
+      ]
+    }
+
+    echo >&2 key "$1" pressed
+    while read file; do
+        case "$1" in
+        "c")
+          [ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" ${important-directories} | awk '{print $2}' | dmenu -l 20 -i -p "Copy file(s) to where?" | sed "s|~|$HOME|g")"
+          [ -z "$destdir" ] && exit
+          [ ! -d "$destdir" ] && notify-send "$destdir is not a directory, cancelled." && exit
+          cp "$file" "$destdir" && notify-send -i "$(readlink -f "$file")" "$file copied to $destdir." &
+          ;;
+        "m")
+          [ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" ${important-directories} | awk '{print $2}' | dmenu -l 20 -i -p "Move file(s) to where?" | sed "s|~|$HOME|g")"
+          [ -z "$destdir" ] && exit
+          [ ! -d "$destdir" ] && notify-send "$destdir is not a directory, cancelled." && exit
+          mv "$file" "$destdir" && notify-send -i "$(readlink -f "$file")" "$file moved to $destdir." &
+          ;;
+        "r")
+          convert -rotate 90 "$file" "$file" ;;
+        "R")
+          convert -rotate -90 "$file" "$file" ;;
+        "f")
+          convert -flop "$file" "$file" ;;
+        "y")
+          echo -n "$file" | xclip -selection clipboard &&
+          notify-send "$file copied to clipboard" & ;;
+        "Y")
+          readlink -f "$file" | xclip -selection clipboard &&
+            notify-send "$(readlink -f "$file") copied to clipboard" & ;;
+        "d")
+          [ "$(printf "No\\nYes" | dmenu -i -p "Really delete $file?")" = "Yes" ] && rm "$file" && notify-send "$file deleted." ;;
+        esac
+      done
+  '';
+}

configs/openweathermap.nix

@@ -1,5 +1,8 @@
-{ pkgs, lib, ... }:
+{
-let
+  pkgs,
+  lib,
+  ...
+}: let
   openweathermap-repo = pkgs.fetchFromGitHub {
     owner = "ip1981";
     repo = "openweathermap";

configs/packages.nix

@@ -1,13 +1,17 @@
-{ pkgs, lib, ... }:
+{
-let
+  pkgs,
+  lib,
+  ...
+}: let
   hc = pkgs.callPackage <stockholm/tv/5pkgs/simple/hc.nix> {};
   worldradio = pkgs.callPackage <niveum/packages/worldradio.nix> {};
   menstruation = pkgs.callPackage <menstruation-backend> {};
   pandoc-doc = pkgs.callPackage <niveum/packages/man/pandoc.nix> {};
 
-  nixpkgs-unstable = import <nixpkgs-unstable> { config.allowUnfree = true; };
+  zoteroStyle = {
-
+    name,
-  zoteroStyle = { name, sha256 }: {
+    sha256,
+  }: {
     name = "${name}.csl";
     path = pkgs.fetchurl {
       url = "https://www.zotero.org/styles/${name}";
@@ -17,20 +21,21 @@ let
   cslDirectory = pkgs.linkFarm "citation-styles" [
     (zoteroStyle {
       name = "chicago-author-date-de";
-      sha256 = "0fz0xn46rkciblr34a7x2v60j0lbq9l3fmzi43iphph27m0czn6s";
+      sha256 = "sha256-ddMYk4A9DJQhx9ldkmF7PhwKuc7wUSr26uHHGAze9Ps=";
     })
     (zoteroStyle {
       name = "din-1505-2";
-      sha256 = "1pvy1b7qm13mnph7z365rrz1j082bl2y8ih73rhzd0zd6dz1jyjq";
+      sha256 = "sha256-bXZbB850fek8J6wMVFL32ndI7F4wiKKr1qUC71ezreE=";
     })
     (zoteroStyle {
       name = "apa";
-      sha256 = "1878vxp0y0h05yzaghnd51n981623mxskw3lsdyzmffqhihvv111";
+      sha256 = "sha256-yq4fW6hQknycLjaj5fPbXLrQlGBp5myXiOSHBU90jEc=";
     })
   ];
 
-
+  astrolog = pkgs.astrolog.overrideAttrs (old:
-  astrolog = nixpkgs-unstable.astrolog.overrideAttrs (old: old // {
+    old
+    // {
       installPhase = ''
         ${old.installPhase}
         # set sensible defaults
@@ -50,7 +55,6 @@ let
     });
 
   recht = pkgs.callPackage <recht> {};
-
 in {
   home-manager.users.me.home.file = {
     ".csl".source = cslDirectory;
@@ -67,7 +71,7 @@ in {
     whois
     dnsutils
     # FILE MANAGERS
-    ranger
+    lf
     pcmanfm
     # MEDIA
     ffmpeg
@@ -89,17 +93,19 @@ in {
     fd # better find
     file # determine file type
     dos2unix
+    genpass # generate passwords
     ncdu # ncurses disk usage
+    rmlint # remove duplicate files
     python3Packages.jsonschema # json validation
     jq # json toolkit
     pup # html toolkit
     htmlq
     xsv # csv toolkit
     xmlstarlet # xml toolkit
-    manpages
+    man-pages
     posix_man_pages
     tree
-    fuse_exfat # to mount windows drives
+    exfat # to mount windows drives
     parallel # for parallel, since moreutils shadows task spooler
     ripgrep # better grep
     rlwrap
@@ -111,28 +117,32 @@ in {
     arandr # xrandr for noobs
     libnotify # for notify-send
     xclip # clipboard CLI
-    dragon-drop # drag and drop
+    xdragon # drag and drop
     xorg.xkill # kill by clicking
     audacity
     calibre
+    electrum
     inkscape
     astrolog
-    anki # flashcards
+    anki-bin # flashcards
     jbofihe # lojbanic software
-    nixpkgs-unstable.zoom-us # video conferencing
+    zoom-us # video conferencing
+    alejandra # nix formatter
     pdfgrep # search in pdf
     pdftk # pdf toolkit
     mupdf
     poppler_utils # pdf toolkit
     foxitreader # for viewing pdf annotations
+    okular # the word is nucular
     xournalpp # for annotating pdfs
     pdfpc # presenter console for pdf slides
     hc # print files as qr codes
-    youtubeDL
+    yt-dlp
     espeak
     bc # calculator
     pari # gp -- better calculator
     scripts.auc
+    scripts.stackoverflow
     scripts.infschmv
     scripts.qrpaste
     scripts.ttspaste
@@ -142,6 +152,7 @@ in {
     scripts.showkeys-toggle
     scripts.kirciuoklis
     scripts.favicon
+    scripts.heuretes
     scripts.ipa # XSAMPA to IPA converter
     scripts.playlist
     scripts.mpv-tv
@@ -153,7 +164,7 @@ in {
     scripts.vimv
     scripts.swallow # window swallowing
     scripts.literature-quote
-    scripts.nav # json navigation
+    jless # less(1) for json
     scripts.notetags
     scripts.booksplit
     scripts.dmenurandr
@@ -167,7 +178,6 @@ in {
     scripts.fkill
     scripts.wttr
     scripts.unicodmenu
-    scripts.horoscope
     scripts.closest
     scripts.trans
     scripts.mpv-radio
@@ -225,7 +235,7 @@ in {
     ]))
     python3Packages.poetry
 
-    htmlTidy
+    html-tidy
     nodePackages.csslint
     nodePackages.jsonlint
     nodePackages.prettier
@@ -253,12 +263,15 @@ in {
     binutils # for strip, ld, ...
     # nightly.rust
     shellcheck
-  ];
 
+    (pkgs.writers.writeDashBin "hass-cli" ''
+      HASS_SERVER=http://zaatar.r:8123 HASS_TOKEN=${lib.strings.fileContents <secrets/hass/token>} exec ${pkgs.home-assistant-cli}/bin/hass-cli "$@"
+    '')
+    scripts.rofi-hass
+  ];
 
   home-manager.users.me.xdg.configFile."pycodestyle".text = ''
     [pycodestyle]
     max-line-length = 110
   '';
-
 }

configs/polkit.nix

@@ -1,8 +1,6 @@
-{ config, ... }:
+{config, ...}: let
-let
   user = config.users.users.me.name;
-in
+in {
-{
   security.polkit.extraConfig = ''
     polkit.addRule(function(action, subject) {
       if (subject.user == "${user}" && action.id == "org.freedesktop.systemd1.manage-units") {

configs/power-action.nix

@@ -1,8 +1,10 @@
-{ pkgs, config, ... }:
-let
-  suspend = pkgs.writers.writeDash "suspend" "${pkgs.systemd}/bin/systemctl suspend";
-in
 {
+  pkgs,
+  config,
+  ...
+}: let
+  suspend = pkgs.writers.writeDash "suspend" "${pkgs.systemd}/bin/systemctl suspend";
+in {
   imports = [<stockholm/krebs/3modules/power-action.nix>];
 
   krebs.power-action = {

configs/printing.nix

@@ -1,19 +1,21 @@
-{ pkgs, ... }:
+{pkgs, ...}: let
-let
   inherit (import <niveum/lib>) localAddresses;
-  hp-driver = pkgs.hplipWithPlugin;
+  hp-driver = pkgs.hplip;
 in {
   services.printing = {
     enable = true;
     drivers = [hp-driver];
   };
 
-  hardware.sane = {
+  environment.systemPackages = [
-    enable = true;
+    pkgs.system-config-printer
-    extraBackends = [ hp-driver ];
+  ];
-  };
 
-  hardware.printers.ensurePrinters = [{
+  # allow connecting to .local printers
+  services.avahi.nssmdns = true;
+
+  hardware.printers.ensurePrinters = [
+    {
       name = "OfficeJet";
       location = "Zimmer";
       deviceUri = "https://${localAddresses.officejet}";
@@ -25,9 +27,11 @@ in {
         OutputMode = "Normal";
         ColorModel = "KGray"; # RGB CMYGray KGray
       };
-  }];
     }
-
+  ];
-/* HP/hp-officejet_4650_series.ppd.gz
+}
+/*
+HP/hp-officejet_4650_series.ppd.gz
 drv:///hp/hpcups.drv/hp-officejet_4650_series.ppd
 */
+

configs/retiolum.nix

@@ -1,4 +1,8 @@
-{ config, pkgs, ... }: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     <niveum/modules/retiolum.nix>
   ];

configs/rofi.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
+{
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (import <niveum/lib>) colours;
 in {
   home-manager.users.me.programs.rofi = {

configs/seafile.nix

@@ -1,5 +1,8 @@
-{ pkgs, config, ... }:
 {
+  pkgs,
+  config,
+  ...
+}: {
   services.xserver.displayManager.sessionCommands = "${pkgs.seafile-client}/bin/seafile-applet &";
 
   home-manager.users.me.xdg.configFile = {

configs/ssh.nix

@@ -1,8 +1,22 @@
-{ pkgs, config, lib, ... }:
+{
-let
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
   inherit (import <niveum/lib>) sshPort kieran;
+  externalNetwork = import <niveum/lib/external-network.nix>;
+  sshIdentity = name: "${config.users.users.me.home}/.ssh/${name}";
+  ssh-passphease = lib.strings.fileContents <system-secrets/ssh/passphrase>;
 in {
-  services.xserver.displayManager.sessionCommands = "${pkgs.openssh}/bin/ssh-add";
+  services.xserver.displayManager.sessionCommands = toString (pkgs.writeScript "ssh-add" ''
+    #!${pkgs.expect}/bin/expect -f
+    spawn ${pkgs.openssh}/bin/ssh-add
+    expect "Enter passphrase for *:"
+    send "${ssh-passphrase}\n";
+    expect "Identity added: *"
+    interact
+  '');
 
   programs.ssh.startAgent = true;
 
@@ -21,7 +35,17 @@ in {
         port = sshPort;
       };
       makanek = {
-        hostname = "makanek.r";
+        hostname = externalNetwork.makanek;
+        user = "root";
+        port = sshPort;
+      };
+      ful = {
+        hostname = externalNetwork.ful;
+        user = "root";
+        port = sshPort;
+      };
+      tahina = {
+        hostname = "tahina.r";
         user = "root";
         port = sshPort;
       };
@@ -30,11 +54,6 @@ in {
         user = "kfm";
         port = sshPort;
       };
-      toum = {
-        hostname = "toum.r";
-        user = "root";
-        port = sshPort;
-      };
       kabsa = {
         hostname = "kabsa.r";
         user = "kfm";
@@ -48,6 +67,16 @@ in {
         hostname = "135.181.85.233";
         user = "root";
       };
+      "fysi-dev1" = {
+        hostname = "94.130.229.139";
+        user = "root";
+        identityFile = sshIdentity "fysiweb";
+      };
+      "fysi-shared0" = {
+        hostname = "49.12.205.235";
+        user = "root";
+        identityFile = sshIdentity "fysiweb";
+      };
     };
   };
 }

configs/sshd.nix

@@ -1,8 +1,11 @@
-{ config, lib, pkgs, ... }:
-let
-  inherit (import <niveum/lib>) sshPort kieran;
-in
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (import <niveum/lib>) sshPort kieran;
+in {
   users.motd = "Welcome to ${config.networking.hostName}!";
 
   services.openssh = {

configs/stardict.nix

@@ -1,5 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
-let
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
   dictionaries = {
     lojban = {
       jbo-deu = pkgs.fetchzip {
@@ -100,7 +104,9 @@ let
         sha256 = "0cx086zvb86bmz7i8vnsch4cj4fb0cp165g4hig4982zakj6f2jd";
       };
     };
-    sanskrit = let repo = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f"; in {
+    sanskrit = let
+      repo = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f";
+    in {
       BoehtlingkRoth = pkgs.fetchzip {
         url = "${repo}/sa-head/german-entries/tars/Bohtlingk-and-Roth-Grosses-Petersburger-Worterbuch__2021-10-05_14-23-18Z__19MB.tar.gz";
         sha256 = "13414a8rgd7hd5ffar6nl68nk3ys60wjkgb7m11hp0ahaasmf6ly";
@@ -156,7 +162,8 @@ let
 
   makeStardictDataDir = dicts: pkgs.linkFarm "dictionaries" (lib.mapAttrsToList (name: path: {inherit name path;}) dicts);
 
-  makeStardict = name: dicts: pkgs.writers.writeDashBin name ''
+  makeStardict = name: dicts:
+    pkgs.writers.writeDashBin name ''
       set -efu
       export SDCV_PAGER=${toString sdcvPager}
       exec ${pkgs.sdcv}/bin/sdcv --color --only-data-dir --data-dir ${makeStardictDataDir dicts} "$@"
@@ -266,8 +273,7 @@ let
       s!</\?p[^>]*>!!gI
     " | less -FR
   '';
-in
+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";
@@ -281,7 +287,12 @@ in
         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.classics
+    // dictionaries.sanskrit
+    // dictionaries.oed
+    // dictionaries.russian
+    // dictionaries.englishGerman));
 
   environment.systemPackages = [
     pkgs.goldendict
@@ -293,7 +304,6 @@ in
     (makeStardict "jbo" dictionaries.lojban)
   ];
 }
-
 /*
 https://github.com/latin-dict/Georges1910/releases/download/v1.0/Georges1910-stardict.zip
 https://github.com/nikita-moor/latin-dictionary/releases/download/2020-02-14/LiddellScott1940-stardict.zip
@@ -355,3 +365,4 @@ MacDonell = pkgs.fetchzip {
   stripRoot = false;
 };
 */
+

configs/sxiv.nix

@@ -1,64 +0,0 @@
-{ pkgs, lib, ... }:
-let
-  important-directories = pkgs.writeText "directories" ''
-    h	~/
-    d	~/cloud/Dropbox/
-    g	~/cloud/gdrive/
-    s	~/cloud/Seafile/
-    kk	~/cloud/keybase/private/kmein/
-    kp	~/cloud/keybase/public/kmein/
-    t	/tmp
-    D	~/Downloads
-    cf	''${XDG_CONFIG_HOME:-$HOME/.config}
-  '';
-in {
-  environment.systemPackages = [ pkgs.sxiv ];
-
-  # TODO fix
-  home-manager.users.me.xdg.configFile."sxiv/exec/key-handler".source =
-    pkgs.writers.writeDash "key-handler" ''
-      PATH=$PATH:${
-        lib.makeBinPath [
-          pkgs.gnused
-          pkgs.gawk
-          pkgs.dmenu
-          pkgs.coreutils
-          pkgs.libnotify
-          pkgs.imagemagick
-          pkgs.xclip
-        ]
-      }
-
-      echo >&2 key "$1" pressed
-      while read file; do
-          case "$1" in
-          "c")
-            [ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" ${important-directories} | awk '{print $2}' | dmenu -l 20 -i -p "Copy file(s) to where?" | sed "s|~|$HOME|g")"
-            [ -z "$destdir" ] && exit
-            [ ! -d "$destdir" ] && notify-send "$destdir is not a directory, cancelled." && exit
-            cp "$file" "$destdir" && notify-send -i "$(readlink -f "$file")" "$file copied to $destdir." &
-            ;;
-          "m")
-            [ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" ${important-directories} | awk '{print $2}' | dmenu -l 20 -i -p "Move file(s) to where?" | sed "s|~|$HOME|g")"
-            [ -z "$destdir" ] && exit
-            [ ! -d "$destdir" ] && notify-send "$destdir is not a directory, cancelled." && exit
-            mv "$file" "$destdir" && notify-send -i "$(readlink -f "$file")" "$file moved to $destdir." &
-            ;;
-          "r")
-            convert -rotate 90 "$file" "$file" ;;
-          "R")
-            convert -rotate -90 "$file" "$file" ;;
-          "f")
-            convert -flop "$file" "$file" ;;
-          "y")
-            echo -n "$file" | xclip -selection clipboard &&
-            notify-send "$file copied to clipboard" & ;;
-          "Y")
-            readlink -f "$file" | xclip -selection clipboard &&
-              notify-send "$(readlink -f "$file") copied to clipboard" & ;;
-          "d")
-            [ "$(printf "No\\nYes" | dmenu -i -p "Really delete $file?")" = "Yes" ] && rm "$file" && notify-send "$file deleted." ;;
-          esac
-        done
-    '';
-}

configs/telegram-bots/astrology.nix

@@ -1,6 +1,11 @@
-{ pkgs, lib, ... }:
+{
-let
+  config,
-  nixpkgs-unstable = import <nixpkgs-unstable> {};
+  pkgs,
+  lib,
+  ...
+}: let
+  unstable = import <nixos-unstable> {inherit (config.nixpkgs) config;};
+
   toSymbols = pkgs.writers.writeDash "to-symbols" ''
     ${pkgs.gnused}/bin/sed '
       s/\bTri\b/△/;
@@ -39,7 +44,7 @@ let
   '';
 in {
   niveum.telegramBots.transits = {
-    enable = true;
+    enable = false;
     time = "*:0/1";
     token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
     chatIds = ["-1001796440545"];
@@ -47,8 +52,8 @@ in {
       now=$(${pkgs.coreutils}/bin/date +%_H:%M | ${pkgs.gnused}/bin/sed 's/^\s*//')
       date=$(${pkgs.coreutils}/bin/date +'%m %d %Y')
       {
-        ${nixpkgs-unstable.astrolog}/bin/astrolog -qd $date -zN Berlin -Yt -Yd -d -R Uranus Neptune Pluto "North Node"
+        ${unstable.astrolog}/bin/astrolog -qd $date -zN Berlin -Yt -Yd -d -R Uranus Neptune Pluto "North Node"
-        ${nixpkgs-unstable.astrolog}/bin/astrolog -Yt -Yd -q 10 22 1999 6:32 -zN Kassel -td $date -R Uranus Neptune Pluto "North Node"
+        ${unstable.astrolog}/bin/astrolog -Yt -Yd -q 10 22 1999 6:32 -zN Kassel -td $date -R Uranus Neptune Pluto "North Node"
       } | ${toSymbols} | ${pkgs.coreutils}/bin/sort -n | ${pkgs.gnugrep}/bin/grep "^$now" || :
     '');
   };

configs/telegram-bots/autorenkalender.nix

@@ -1,5 +1,8 @@
-{ pkgs, lib, ... }:
+{
-let
+  pkgs,
+  lib,
+  ...
+}: let
   autorenkalender-package = pkgs.fetchFromGitHub {
     owner = "kmein";
     repo = "autorenkalender";
@@ -17,4 +20,12 @@ in {
     parseMode = "Markdown";
     command = "${autorenkalender}/bin/autorenkalender";
   };
+
+  niveum.passport.services = [
+    {
+      title = "Autorenkalender";
+      description = "sends <a href=\"https://www.projekt-gutenberg.org/\">Projekt Gutenberg</a>'s anniversary information to Telegram.";
+      link = "https://t.me/Autorenkalender";
+    }
+  ];
 }

configs/telegram-bots/default.nix

@@ -1,6 +1,15 @@
-{ config, pkgs, lib, ... }:
+{
-let
+  config,
-  telebots = pkgs.callPackage <telebots> {};
+  pkgs,
+  lib,
+  ...
+}: let
+  nixpkgs-21-11 = import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixos-21.11.tar.gz") {
+    config.permittedInsecurePackages = [
+      "python3.9-poetry-1.1.12"
+    ];
+  };
+  telebots = nixpkgs-21-11.callPackage <telebots> {};
   reverseDirectory = "/run/telegram-reverse";
   proverbDirectory = "/run/telegram-proverb";
   inherit (import <niveum/lib>) tmpfilesConfig;
@@ -9,18 +18,39 @@ in {
     ./literature-quote.nix
     ./astrology.nix
     ./autorenkalender.nix
+    ./hesychius.nix
+    ./smyth.nix
     ./nachtischsatan.nix
     ./tlg-wotd.nix
     <niveum/modules/telegram-bot.nix>
   ];
 
-  systemd.tmpfiles.rules = map (path: tmpfilesConfig {
+  systemd.tmpfiles.rules = map (path:
+    tmpfilesConfig {
       type = "d";
       mode = "0750";
       age = "1h";
       inherit path;
     }) [reverseDirectory proverbDirectory];
 
+  niveum.passport.services = [
+    {
+      title = "Rückwarts-Bot";
+      link = "https://t.me/RueckwaertsBot";
+      description = "reverses things on Telegram.";
+    }
+    {
+      title = "BetaCode-Bot";
+      link = "https://t.me/BetaCodeBot";
+      description = "converts <a href=\"https://en.wikipedia.org/wiki/Beta_Code\">beta code</a> to polytonic Greek on Telegram.";
+    }
+    {
+      title = "Sprichwortgenerator-Bot";
+      link = "https://t.me/SprichwortGeneratorBot";
+      description = "generates useless German proverbs with optional stock photo background on Telegram.";
+    }
+  ];
+
   systemd.services.telegram-reverse = {
     wantedBy = ["multi-user.target"];
     description = "Telegram reverse bot";

configs/telegram-bots/hesychius.nix

@@ -0,0 +1,25 @@
+{
+  pkgs,
+  lib,
+  ...
+}: let
+  hesychius = <scripts> + "/hesychius/hesychius.txt";
+in {
+  niveum.telegramBots.hesychius = {
+    enable = true;
+    time = "08:00";
+    token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
+    chatIds = ["@HesychiosAlexandreus"];
+    command = "${pkgs.coreutils}/bin/shuf -n1 ${hesychius}";
+  };
+
+  systemd.timers.telegram-bot-hesychius.timerConfig.RandomizedDelaySec = "10h";
+
+  niveum.passport.services = [
+    {
+      title = "Hesychius of Alexandria Bot";
+      description = "sends a random word from Hesychius of Alexandria's lexicon to Telegram.";
+      link = "https://t.me/HesychiosAlexandreus";
+    }
+  ];
+}

configs/telegram-bots/literature-quote.nix

@@ -1,5 +1,8 @@
-{ pkgs, lib, ... }:
+{
-let
+  pkgs,
+  lib,
+  ...
+}: let
   scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
   inherit (scripts) literature-quote;
 in {
@@ -7,8 +10,15 @@ in {
     enable = true;
     time = "08/6:00";
     token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
-    chatIds = [ "18980945" "757821027" "455964311" ];
+    chatIds = ["-1001760262519"];
     command = "${literature-quote}/bin/literature-quote";
     parseMode = "Markdown";
   };
+
+  niveum.passport.services = [
+    {
+      title = "Literature quote bot";
+      description = "sends me and my friends three <a href=\"https://logotheca.xn--kiern-0qa.de/\">logotheca</a> quotes a day.";
+    }
+  ];
 }

configs/telegram-bots/nachtischsatan.nix

@@ -1,5 +1,8 @@
-{ pkgs, lib, ... }:
+{
-let
+  pkgs,
+  lib,
+  ...
+}: let
   nachtischsatan-bot = {token}:
     pkgs.writers.writePython3 "nachtischsatan-bot" {
       libraries = [pkgs.python3Packages.python-telegram-bot];
@@ -31,4 +34,12 @@ in {
     });
     serviceConfig.Restart = "always";
   };
+
+  niveum.passport.services = [
+    {
+      title = "Nachtischsatan-Bot";
+      link = "https://t.me/NachtischsatanBot";
+      description = "*flubberflubber*";
+    }
+  ];
 }

configs/telegram-bots/smyth.nix

@@ -0,0 +1,37 @@
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  niveum.telegramBots.smyth = {
+    enable = true;
+    time = "06/6:00";
+    token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
+    chatIds = ["@HerbertWeirSmyth"];
+    command = toString (pkgs.writers.writeDash "random-smyth" ''
+      set -efu
+
+      RANDOM_SECTION=$(
+        ${pkgs.curl}/bin/curl -sSL http://www.perseus.tufts.edu/hopper/xmltoc?doc=Perseus%3Atext%3A1999.04.0007%3Asmythp%3D1 \
+          | ${pkgs.gnugrep}/bin/grep -o 'ref="[^"]*"' \
+          | ${pkgs.coreutils}/bin/shuf -n1 \
+          | ${pkgs.gnused}/bin/sed 's/^ref="//;s/"$//'
+      )
+
+      ${pkgs.curl}/bin/curl -sSL http://www.perseus.tufts.edu/hopper/text?doc=$RANDOM_SECTION\
+        | ${pkgs.htmlq}/bin/htmlq '#text_main' \
+        | ${pkgs.gnused}/bin/sed 's/<\/\?hr>//g' \
+        | ${pkgs.pandoc}/bin/pandoc -f html -t plain --wrap=none
+    '');
+  };
+
+  systemd.timers.telegram-bot-smyth.timerConfig.RandomizedDelaySec = "3h";
+
+  niveum.passport.services = [
+    {
+      title = "Herbert Weir Smyth Bot";
+      description = "sends a random section from Smyth's Ancient Greek grammar to Telegram.";
+      link = "https://t.me/HerbertWeirSmyth";
+    }
+  ];
+}

configs/telegram-bots/tlg-wotd.nix

@@ -1,5 +1,8 @@
-{ pkgs, lib, ... }:
 {
+  pkgs,
+  lib,
+  ...
+}: {
   niveum.telegramBots.tlg-wotd = {
     enable = true;
     time = "9:30";
@@ -14,4 +17,12 @@
     '');
     parseMode = "Markdown";
   };
+
+  niveum.passport.services = [
+    {
+      title = "Thesaurus Linguae Graecae Word of the Day";
+      description = "sends <a href=\"https://stephanus.tlg.uci.edu/\">TLG</a>'s word of the day to Telegram.";
+      link = "https://t.me/tlgwotd";
+    }
+  ];
 }

configs/themes.nix

@@ -0,0 +1,82 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  switch-theme = pkgs.writers.writeDashBin "switch-theme" ''
+    set -efux
+    if [ "$1" = toggle ]; then
+      if [ "$(${pkgs.coreutils}/bin/cat /var/theme/current_theme)" = dark ]; then
+        ${placeholder "out"}/bin/switch-theme light
+      else
+        ${placeholder "out"}/bin/switch-theme dark
+      fi
+    elif test -e "/etc/themes/$1"; then
+      mkdir -p /var/theme/config
+      ${pkgs.rsync}/bin/rsync --chown=${config.users.users.me.name}:users -a --delete "/etc/themes/$1/" /var/theme/config/
+      echo "$1" > /var/theme/current_theme
+      ${pkgs.coreutils}/bin/chown ${config.users.users.me.name}:users /var/theme/current_theme
+      ${pkgs.xorg.xrdb}/bin/xrdb -merge /var/theme/config/xresources
+      ${pkgs.procps}/bin/pkill -HUP xsettingsd
+    else
+      echo "theme $1 not found"
+    fi
+  '';
+in {
+  systemd.services.xsettingsd = {
+    wantedBy = ["multi-user.target"];
+    after = ["display-manager.service"];
+    environment.DISPLAY = ":0";
+    serviceConfig = {
+      ExecStart = "${pkgs.xsettingsd}/bin/xsettingsd -c /var/theme/config/xsettings.conf";
+      User = config.users.users.me.name;
+      Restart = "always";
+      RestartSec = "15s";
+    };
+  };
+
+  systemd.tmpfiles.rules = [
+    "d /var/theme/ 755 ${config.users.users.me.name} users"
+  ];
+
+  environment.systemPackages = [
+    switch-theme
+    pkgs.capitaine-cursors
+  ];
+
+  home-manager.users.me = {
+    home.pointerCursor = {
+      name = "capitaine-cursors-white";
+      package = pkgs.capitaine-cursors;
+      size = 16;
+    };
+  };
+
+  environment.etc = {
+    "themes/light/xsettings.conf".text = ''
+      Net/ThemeName "Adwaita"
+    '';
+    "themes/light/xresources".text = ''
+      *background: #ffffff
+      *foreground: #000000
+    '';
+    "themes/dark/xsettings.conf".text = ''
+      Net/ThemeName "Adwaita-dark"
+    '';
+    "themes/dark/xresources".text = ''
+      *background: #000000
+      *foreground: #ffffff
+    '';
+  };
+
+  system.activationScripts.theme.text = ''
+    export DISPLAY=:0
+    if test -e /var/theme/current_theme; then
+      ${switch-theme}/bin/switch-theme "$(cat /var/theme/current_theme)" ||
+      ${switch-theme}/bin/switch-theme dark
+    else
+      ${switch-theme}/bin/switch-theme dark
+    fi
+  '';
+}

configs/theming.nix

@@ -1,9 +1,12 @@
-{ lib, config, pkgs, ... }:
+{
-let
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
   theme = (import <niveum/lib>).theme pkgs;
 in {
-  environment.systemPackages =
+  environment.systemPackages = [theme.gtk.package theme.icon.package theme.cursor.package];
-    [ theme.gtk.package theme.icon.package theme.cursor.package ];
 
   services.xserver.displayManager.lightdm.greeters.gtk = {
     theme = {inherit (theme.gtk) name package;};
@@ -20,6 +23,11 @@ in {
       enable = true;
       platformTheme = "gtk";
     };
-    xsession.pointerCursor = theme.cursor // { size = 16; };
+    home.pointerCursor =
+      theme.cursor
+      // {
+        size = 16;
+        x11.enable = true;
+      };
   };
 }

configs/tmux.nix

@@ -9,26 +9,44 @@
     keyMode = "vi";
     clock24 = true;
     terminal = "screen-256color";
+    baseIndex = 1;
+    aggressiveResize = true;
+    escapeTime = 50;
+    historyLimit = 7000;
+    shortcut = "a";
     extraConfig = ''
+      set -g mouse on
+
+      unbind *
+      bind * list-clients
+
+      # naVIgate
+      bind h select-pane -L
+      bind j select-pane -D
+      bind k select-pane -U
+      bind l select-pane -R
+
+      # Use C-h and C-l to cycle through panes
+      bind -r C-h select-window -t :-
+      bind -r C-l select-window -t :+
+
+      setw -g monitor-activity on
+      set -g visual-activity on
+
       set -g status-interval 2
       set -g status-left-length 32
       set -g status-right-length 150
 
-      set -g status-bg default
+      set -g status-bg colour242
 
       setw -g window-status-format "#[fg=colour12,bg=colour233] #I #[fg=white,bg=colour237] #W "
       setw -g window-status-current-format "#[fg=colour12,bg=colour233] * #[fg=white,bg=colour237,bold] #W "
 
       set -g status-left ""
-      set -g status-right "#[fg=colour255,bg=colour237,bold] %Y-%m-%d #[default]#[fg=colour12,bg=colour233] %H:%M "
+      set -g status-right "#[fg=colour255,bg=colour237,bold] #(hostname -I) #[default]#[fg=colour12,bg=colour233] %FT%R "
       set -g status-justify left
 
       set -g status-position bottom
-
-      set -g mouse on
-
-      unbind *
-      bind * list-clients
     '';
   };
 }

configs/tor.nix

@@ -1,4 +1,4 @@
-{
+{pkgs, ...}: {
   services.tor.enable = true;
-  services.tor.torsocks.enable = true;
+  environment.systemPackages = [pkgs.tor];
 }

configs/traadfri.nix

@@ -1,9 +1,11 @@
-{ pkgs, lib, ... }:
+{
-let
+  pkgs,
+  lib,
+  ...
+}: let
   inherit (import <niveum/lib>) localAddresses;
   living-room-id = 131090;
-in
+in {
-{
   imports = [<niveum/modules/traadfri.nix>];
 
   environment.systemPackages = [

configs/wallpaper.nix

@@ -1,5 +1,8 @@
-{ pkgs, lib, ... }:
 {
+  pkgs,
+  lib,
+  ...
+}: {
   imports = [<stockholm/krebs/3modules/fetchWallpaper.nix>];
 
   krebs.fetchWallpaper = {

configs/watson.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   environment.systemPackages = [pkgs.watson];
 
   environment.variables.WATSON_DIR = "${config.users.users.me.home}/cloud/Seafile/Documents/watson";

configs/zsh.nix

@@ -1,4 +1,8 @@
-{ config, pkgs, ... }: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   home-manager.users.me.home.file.".zshrc".text = ''
     # nothing to see here
   '';

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1644229661,
+        "lastModified": 1659877975,
-        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
@@ -18,20 +18,21 @@
     "home-manager": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs"
+          "nixos-unstable"
-        ]
+        ],
+        "utils": "utils"
       },
       "locked": {
-        "lastModified": 1643933536,
+        "lastModified": 1661573386,
-        "narHash": "sha256-yRmsWAG4DnLxLIUtlaZsl0kH7rN5xSoyNRlf0YZrcH4=",
+        "narHash": "sha256-pBEg8iY00Af/SAtU2dlmOAv+2x7kScaGlFRDjNoVJO8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2860d7e3bb350f18f7477858f3513f9798896831",
+        "rev": "d89bdff445eadff03fe414e9c30486bc8166b72b",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-21.11",
+        "ref": "master",
         "repo": "home-manager",
         "type": "github"
       }
@@ -42,19 +43,19 @@
           "flake-utils"
         ],
         "nixpkgs": [
-          "nixpkgs"
+          "nixos-stable"
         ]
       },
       "locked": {
-        "lastModified": 1644957911,
+        "lastModified": 1661273257,
-        "narHash": "sha256-ggie/j7pdBqzDs4W7OiPmhqH9IGbXAbJxGqBdVxA8jA=",
+        "narHash": "sha256-cywpSH3D291AwdO/ecJxHeN2Vuuz0cIy/NEXMsFT+Og=",
-        "owner": "Mic92",
+        "owner": "kmein",
         "repo": "krops",
-        "rev": "86fb3d2ee94fd8306231853b323ed8804edf26ec",
+        "rev": "542bc544ec8b0b807933a812d098e601683b0956",
         "type": "github"
       },
       "original": {
-        "owner": "Mic92",
+        "owner": "kmein",
         "repo": "krops",
         "type": "github"
       }
@@ -62,11 +63,11 @@
     "menstruation-backend": {
       "flake": false,
       "locked": {
-        "lastModified": 1634573652,
+        "lastModified": 1649545504,
-        "narHash": "sha256-FIj8oCOJO+Wqxr2o5MMqIShvzMJud4iUq3o8y4NIRvw=",
+        "narHash": "sha256-TVm3246ML7gWPeGm+bdb+Qo8o/7nve7sQ2hBdCZm3z8=",
         "owner": "kmein",
         "repo": "menstruation.rs",
-        "rev": "dd405fe2acf32441e8ac56e488e689bb1c4bea82",
+        "rev": "d9f3c6d53542fd7c7ed191e37cf4e342d4a47bcb",
         "type": "github"
       },
       "original": {
@@ -96,7 +97,7 @@
       "locked": {
         "lastModified": 1554228333,
         "narHash": "sha256-hG/PlcCvCQhNcU55NpHfATkyH9k6cZmO7uvBoJjasXU=",
-        "ref": "master",
+        "ref": "refs/heads/master",
         "rev": "c528cf970e292790b414b4c1c8c8e9d7e73b2a71",
         "revCount": 32,
         "type": "git",
@@ -107,34 +108,34 @@
         "url": "https://cgit.krebsco.de/nix-writers"
       }
     },
-    "nixpkgs": {
+    "nixos-stable": {
       "locked": {
-        "lastModified": 1644837400,
+        "lastModified": 1661520432,
-        "narHash": "sha256-treFS89w/xKzeTjJSJdYp/Ceddv6oqq7bL9mZMQDPi0=",
+        "narHash": "sha256-9z+WDeXiu3hobvSsL0SbHDx4s+kFmm8eussySuX4zCM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a03ae0e6d078cfdbb8404c3bff3622bd4e2f1c57",
+        "rev": "f11e12ac6af528c1ba12426ce83cee26f21ceafd",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-21.11",
+        "ref": "nixos-22.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
+    "nixos-unstable": {
       "locked": {
-        "lastModified": 1644951967,
+        "lastModified": 1660305968,
-        "narHash": "sha256-j+l8bt++dsYTJSGABuqeBEom5aNpD4n0BsOTdewFYuU=",
+        "narHash": "sha256-r0X1pZCSEA6mzt5OuTA7nHuLmvnbkwgpFAh1iLIx4GU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "05e1f8a2c7797b0d9f9e07ab2aaeccecdcf9b7da",
+        "rev": "c4a0efdd5a728e20791b8d8d2f26f90ac228ee8d",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "master",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -158,11 +159,11 @@
     "retiolum": {
       "flake": false,
       "locked": {
-        "lastModified": 1644849126,
+        "lastModified": 1660680907,
-        "narHash": "sha256-iaRNvfQrUD+ZownDWWNdDwhVPgSsU5ojvVdswVq1IpY=",
+        "narHash": "sha256-D6XkykgU1BiDAnnFG9NwSqBRKCZAHK+2+Ri2/m9rzo8=",
         "owner": "krebs",
         "repo": "retiolum",
-        "rev": "6de359ef848dc1f38fb76731c35e712ee885fd88",
+        "rev": "c4d6b07be29b3b9267027ed25792a2cb350459d5",
         "type": "github"
       },
       "original": {
@@ -179,8 +180,8 @@
         "menstruation-backend": "menstruation-backend",
         "menstruation-telegram": "menstruation-telegram",
         "nix-writers": "nix-writers",
-        "nixpkgs": "nixpkgs",
+        "nixos-stable": "nixos-stable",
-        "nixpkgs-unstable": "nixpkgs-unstable",
+        "nixos-unstable": "nixos-unstable",
         "recht": "recht",
         "retiolum": "retiolum",
         "scripts": "scripts",
@@ -194,11 +195,11 @@
     "scripts": {
       "flake": false,
       "locked": {
-        "lastModified": 1639436812,
+        "lastModified": 1662493500,
-        "narHash": "sha256-6CajvfDo7t4ANgjc7DxqH7lI3WRE4MK8q3mBKAjk80k=",
+        "narHash": "sha256-EdAEKDQ6z7oinqQ28ELE3+taJ106DgmhNJt/rpqHJic=",
         "owner": "kmein",
         "repo": "scripts",
-        "rev": "d34a8161ba11135a45d3141dc9af482db945d63c",
+        "rev": "51c641ac3c1100d80313696663db70c2eb3698dc",
         "type": "github"
       },
       "original": {
@@ -210,11 +211,11 @@
     "stockholm": {
       "flake": false,
       "locked": {
-        "lastModified": 1644865613,
+        "lastModified": 1661246925,
-        "narHash": "sha256-z7hPtMYxoQuWyLujUs5vbdZOGbjFosh+/IX3GpCDlkc=",
+        "narHash": "sha256-hGNCF4m3SuVogqoipmJzNIKoh03S/SMnO5oMHgfHWjA=",
-        "ref": "master",
+        "ref": "refs/heads/master",
-        "rev": "e3785b22b2c6cb173a58fd066c4eda80a67fb872",
+        "rev": "d1fa957ed5bf60767c83c96135f9142f6c96ea50",
-        "revCount": 10404,
+        "revCount": 10749,
         "type": "git",
         "url": "https://cgit.lassul.us/stockholm"
       },
@@ -242,11 +243,11 @@
     "tinc-graph": {
       "flake": false,
       "locked": {
-        "lastModified": 1639820904,
+        "lastModified": 1653080212,
-        "narHash": "sha256-d4s2PulBGIIQXtX7blZz+Wnmij5dK/IrBcilNGjqZC4=",
+        "narHash": "sha256-BcfppAuVNp0hMcrMG/ZxE4juSrdQbJSUIA0eHS1/Wxo=",
         "owner": "kmein",
         "repo": "tinc-graph",
-        "rev": "1b9c69ffdbdab82d30a23e44f739feea63d94163",
+        "rev": "ea0ef2e5542684d1d8e34a626cb9295dec33e70d",
         "type": "github"
       },
       "original": {
@@ -286,6 +287,21 @@
         "repo": "tuna",
         "type": "github"
       }
+    },
+    "utils": {
+      "locked": {
+        "lastModified": 1653893745,
+        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -2,82 +2,185 @@
   description = "niveum: packages, modules, systems";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11";
+    nixos-stable.url = "github:NixOS/nixpkgs/nixos-22.05";
-    nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
+    nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+
     flake-utils.url = "github:numtide/flake-utils";
     home-manager = {
-      url = "github:nix-community/home-manager/release-21.11";
+      url = "github:nix-community/home-manager/master";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixos-unstable";
     };
     krops = {
-      url = "github:Mic92/krops";
+      url = "github:kmein/krops";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixos-stable";
       inputs.flake-utils.follows = "flake-utils";
     };
 
     # legacy
-    menstruation-backend = { url = "github:kmein/menstruation.rs"; flake = false; };
+    menstruation-backend = {
-    menstruation-telegram = { url = "github:kmein/menstruation-telegram"; flake = false; };
+      url = "github:kmein/menstruation.rs";
-    nix-writers = { url = "git+https://cgit.krebsco.de/nix-writers"; flake = false; };
+      flake = false;
-    recht = { url = "github:kmein/recht"; flake = false; };
+    };
-    retiolum = { url = "github:krebs/retiolum"; flake = false; };
+    menstruation-telegram = {
-    scripts = { url = "github:kmein/scripts"; flake = false; };
+      url = "github:kmein/menstruation-telegram";
-    stockholm = { url = "git+https://cgit.lassul.us/stockholm"; flake = false; };
+      flake = false;
-    telebots = { url = "github:kmein/telebots"; flake = false; };
+    };
-    tinc-graph = { url = "github:kmein/tinc-graph"; flake = false; };
+    nix-writers = {
-    traadfri = { url = "github:kmein/traadfri"; flake = false; };
+      url = "git+https://cgit.krebsco.de/nix-writers";
-    tuna = { url = "github:kmein/tuna"; flake = false; };
+      flake = false;
+    };
+    recht = {
+      url = "github:kmein/recht";
+      flake = false;
+    };
+    retiolum = {
+      url = "github:krebs/retiolum";
+      flake = false;
+    };
+    scripts = {
+      url = "github:kmein/scripts";
+      flake = false;
+    };
+    stockholm = {
+      url = "git+https://cgit.lassul.us/stockholm";
+      flake = false;
+    };
+    telebots = {
+      url = "github:kmein/telebots";
+      flake = false;
+    };
+    tinc-graph = {
+      url = "github:kmein/tinc-graph";
+      flake = false;
+    };
+    traadfri = {
+      url = "github:kmein/traadfri";
+      flake = false;
+    };
+    tuna = {
+      url = "github:kmein/tuna";
+      flake = false;
+    };
   };
 
-  outputs =
+  outputs = {
-  { self
+    self,
-  , flake-utils
+    flake-utils,
-  , home-manager
+    home-manager,
-  , krops
+    krops,
-  , menstruation-backend
+    menstruation-backend,
-  , menstruation-telegram
+    menstruation-telegram,
-  , nix-writers
+    nix-writers,
-  , nixpkgs
+    nixos-unstable,
-  , nixpkgs-unstable
+    nixos-stable,
-  , recht
+    recht,
-  , retiolum
+    retiolum,
-  , scripts
+    scripts,
-  , stockholm
+    stockholm,
-  , telebots
+    telebots,
-  , tinc-graph
+    tinc-graph,
-  , traadfri
+    traadfri,
-  , tuna
+    tuna,
-  }@inputs:
+  } @ inputs: let
-  let
     system = "x86_64-linux";
-    pkgs = nixpkgs.legacyPackages.${system};
+    pkgs = nixos-stable.legacyPackages.${system};
-    source = name: {
+    home =
+      if nixos-stable.lib.inPureEvalMode or false
+      then _: /nonexistent
+      else import lib/home.nix;
+    source = {
+      sources,
+      unstable,
+      name,
+    }:
+      {
         niveum.file = toString ./.;
         nixos-config.symlink = "niveum/systems/${name}/configuration.nix";
         system-secrets.pass = {
-        dir = toString ~/.password-store;
+          dir = toString (home /.password-store);
           name = "systems/${name}";
         };
         secrets.pass = {
-        dir = toString ~/.password-store;
+          dir = toString (home /.password-store);
           name = "shared";
         };
-    } // nixpkgs.lib.mapAttrs' (name: value: {
+        nixpkgs.git = {
+          url = "https://github.com/NixOS/nixpkgs";
+          ref =
+            (
+              if unstable
+              then inputs.nixos-unstable
+              else inputs.nixos-stable
+            )
+            .rev;
+          shallow = true;
+        };
+      }
+      // nixos-stable.lib.mapAttrs' (name: value: {
         inherit name;
-      value.file = toString value;
+        value.git = {
-    }) (nixpkgs.lib.filterAttrs (name: _: !builtins.elem name [ "flake-utils" "krops" "self" ]) inputs);
+          url = let
-    deployScriptFor = {name, host}: let inherit (import ./lib/default.nix) sshPort; in toString (krops.packages.${system}.writeDeploy "deploy-${name}" {
+            github = x: "https://github.com/${x}";
-      source = krops.lib.evalSource [ (source name) ];
+          in
-      target = "root@${host}:${toString sshPort}";
+            {
+              home-manager = github "nix-community/home-manager";
+              menstruation-backend = github "kmein/menstruation.rs";
+              menstruation-telegram = github "kmein/menstruation-telegram";
+              nixos-unstable = github "NixOS/nixpkgs";
+              nix-writers = "https://cgit.krebsco.de/nix-writers";
+              recht = github "kmein/recht";
+              retiolum = github "krebs/retiolum";
+              stockholm = "https://cgit.lassul.us/stockholm";
+              scripts = github "kmein/scripts";
+              telebots = github "kmein/telebots";
+              tinc-graph = github "kmein/tinc-graph";
+              traadfri = github "kmein/traadfri";
+            }
+            .${name};
+          ref = value.rev;
+          shallow = true;
+        };
+      }) (nixos-stable.lib.filterAttrs (name: _: builtins.elem name sources) inputs);
+    deployScriptFor = {
+      name,
+      user ? "root",
+      host,
+      unstable ? false,
+      sshPort ? (import ./lib/default.nix).sshPort,
+      sources,
+    }:
+      toString (krops.packages.${system}.writeDeploy "deploy-${name}" {
+        source = krops.lib.evalSource [(source {inherit sources unstable name;})];
+        target = "${user}@${host}:${toString sshPort}";
+        useNixOutputMonitor = true;
       });
   in {
     apps.${system} = let
       forSystems = f: builtins.listToAttrs (map f (builtins.attrNames (builtins.readDir ./systems)));
+      externalNetwork = import ./lib/external-network.nix;
       deployScripts = forSystems (name: {
         name = "deploy-${name}";
         value = {
           type = "app";
-          program = deployScriptFor { inherit name; host = "${name}.r"; };
+          program = deployScriptFor {
+            inherit name;
+            host =
+              if externalNetwork ? name
+              then externalNetwork.${name}
+              else "${name}.r";
+            unstable = name == "kabsa" || name == "manakish";
+            sources =
+              ["nix-writers" "nixpkgs" "retiolum" "stockholm"]
+              ++ {
+                zaatar = ["traadfri"];
+                ful = [];
+                tahina = [];
+                kabsa = ["traadfri" "nixos-unstable" "home-manager" "menstruation-backend" "recht"];
+                manakish = ["traadfri" "nixos-unstable" "home-manager" "menstruation-backend" "recht"];
+                makanek = ["nixos-unstable" "menstruation-telegram" "menstruation-backend" "scripts" "telebots" "tinc-graph"];
+              }
+              .${name};
+          };
         };
       });
       ciScripts = forSystems (name: {
@@ -87,6 +190,7 @@
           program = import ./ci.nix {inherit name system inputs;};
         };
       });
-    in deployScripts // ciScripts;
+    in
+      deployScripts // ciScripts;
   };
 }

lib/colours/ayu-dark.nix

@@ -0,0 +1,37 @@
+{
+  black = {
+    dark = "#000000";
+    bright = "#323232";
+  };
+  red = {
+    dark = "#ff3333";
+    bright = "#ff6565";
+  };
+  green = {
+    dark = "#b8cc52";
+    bright = "#e9fe83";
+  };
+  yellow = {
+    dark = "#e6c446";
+    bright = "#fff778";
+  };
+  blue = {
+    dark = "#36a3d9";
+    bright = "#68d4ff";
+  };
+  magenta = {
+    dark = "#f07078";
+    bright = "#ffa3aa";
+  };
+  cyan = {
+    dark = "#95e5cb";
+    bright = "#c7fffc";
+  };
+  white = {
+    dark = "#ffffff";
+    bright = "#ffffff";
+  };
+  background = "#0e1419";
+  foreground = "#e5e1cf";
+  cursor = "#f19618";
+}

lib/colours/ayu-light.nix

@@ -0,0 +1,37 @@
+{
+  black = {
+    dark = "#000000";
+    bright = "#323232";
+  };
+  red = {
+    dark = "#ff3333";
+    bright = "#ff6565";
+  };
+  green = {
+    dark = "#86b200";
+    bright = "#b8e532";
+  };
+  yellow = {
+    dark = "#f19618";
+    bright = "#ffc849";
+  };
+  blue = {
+    dark = "#41a6d9";
+    bright = "#73d7ff";
+  };
+  magenta = {
+    dark = "#f07078";
+    bright = "#ffa3aa";
+  };
+  cyan = {
+    dark = "#4cbe99";
+    bright = "#7ff0cb";
+  };
+  white = {
+    dark = "#ffffff";
+    bright = "#ffffff";
+  };
+  background = "#fafafa";
+  foreground = "#5b6673";
+  cursor = "#ff6900";
+}

lib/default-applications.nix

@@ -1,5 +1,5 @@
 pkgs: rec {
-  terminal = "${pkgs.alacritty}/bin/alacritty";
+  terminal = "alacritty";
   browser = "${pkgs.brave}/bin/brave";
   fileManager = "${terminal} -e ${pkgs.ranger}/bin/ranger";
 }

lib/default.nix

@@ -1,5 +1,13 @@
 rec {
-  tmpfilesConfig = {type, path, mode ? "-", user ? "-", group ? "-", age ? "-", argument ? "-"}: "${type} '${path}' ${mode} ${user} ${group} ${age} ${argument}";
+  tmpfilesConfig = {
+    type,
+    path,
+    mode ? "-",
+    user ? "-",
+    group ? "-",
+    age ? "-",
+    argument ? "-",
+  }: "${type} '${path}' ${mode} ${user} ${group} ${age} ${argument}";
 
   restic = rec {
     port = 3571;
@@ -8,14 +16,25 @@ rec {
   };
 
   firewall = lib: {
-    accept = { source, protocol, dport }: "nixos-fw -s ${lib.escapeShellArg source} -p ${lib.escapeShellArg protocol} --dport ${lib.escapeShellArg (toString dport)} -j nixos-fw-accept";
+    accept = {
+      source,
+      protocol,
+      dport,
+    }: "nixos-fw -s ${lib.escapeShellArg source} -p ${lib.escapeShellArg protocol} --dport ${lib.escapeShellArg (toString dport)} -j nixos-fw-accept";
     addRules = lib.concatMapStringsSep "\n" (rule: "iptables -A ${rule}");
     removeRules = lib.concatMapStringsSep "\n" (rule: "iptables -D ${rule} || true");
   };
 
   serveHtml = file: pkgs: ''
     default_type "text/html";
-    root ${pkgs.linkFarm "fahrplan" [{ name = "index.html"; path = file; }]};
+    root ${
+      pkgs.linkFarm "www" [
+        {
+          name = "index.html";
+          path = file;
+        }
+      ]
+    };
     index index.html;
   '';
 
@@ -50,7 +69,8 @@ rec {
     github = "kmein";
     email = "kmein@posteo.de";
     name = "Kierán Meinhardt";
-    sshKeys = pkgs: pkgs.lib.strings.splitString "\n" (pkgs.lib.strings.fileContents (pkgs.fetchurl {
+    sshKeys = pkgs:
+      pkgs.lib.strings.splitString "\n" (pkgs.lib.strings.fileContents (pkgs.fetchurl {
         url = "https://github.com/kmein.keys";
         sha256 = "09c6ny0rmpid1m0pc1wsmb3wyy9g721lf4kv55i4lrp42b3i2d5b";
       }));
@@ -62,6 +82,7 @@ rec {
     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";
   };
 
   ignorePaths = [

lib/email.nix

@@ -0,0 +1,131 @@
+{
+  lib,
+  mainMailbox ? "posteo",
+  ...
+}: {
+  uni = {
+    user = "meinhark";
+    password = lib.strings.fileContents <secrets/eduroam/password>;
+    address = "kieran.felix.meinhardt@hu-berlin.de";
+    imap = "mailbox.cms.hu-berlin.de";
+    smtp = "mailhost.cms.hu-berlin.de";
+    smtpSettings = smtp: "smtp://${smtp}";
+    folders = {
+      drafts = "Drafts";
+      sent = "Sent";
+      trash = "Trash";
+    };
+  };
+
+  uni-old = {
+    user = "meinhark";
+    password = lib.strings.fileContents <secrets/eduroam/password>;
+    address = "meinhark@informatik.hu-berlin.de";
+    imap = "mailbox.informatik.hu-berlin.de";
+    smtp = "mailhost.informatik.hu-berlin.de";
+    smtpSettings = smtp: "smtp://${smtp}";
+    folders = {
+      drafts = "Drafts";
+      sent = "Sent";
+      trash = "Trash";
+    };
+  };
+
+  work-uni = {
+    user = "meinhaki";
+    password = lib.strings.fileContents <secrets/mail/meinhaki>;
+    address = "kieran.meinhardt@hu-berlin.de";
+    imap = "mailbox.cms.hu-berlin.de";
+    smtp = "mailhost.cms.hu-berlin.de";
+    smtpSettings = smtp: "smtp://${smtp}";
+    folders = {
+      drafts = "Drafts";
+      sent = "Sent";
+      trash = "Trash";
+    };
+  };
+
+  work-admin = {
+    user = "dslalewa";
+    password = lib.strings.fileContents <secrets/mail/dslalewa>;
+    address = "admin.alew.vglsprwi@hu-berlin.de";
+    imap = "mailbox.cms.hu-berlin.de";
+    smtp = "mailhost.cms.hu-berlin.de";
+    smtpSettings = smtp: "smtp://${smtp}";
+    folders = {
+      drafts = "Drafts";
+      sent = "Sent";
+      trash = "Trash";
+    };
+  };
+
+  work-fysi = rec {
+    user = "kieran@fysi.tech";
+    address = user;
+    password = lib.strings.fileContents <secrets/mail/fastmail>;
+    imap = "imap.fastmail.com";
+    smtp = "smtp.fastmail.com";
+    smtpSettings = smtp: "smtps://${smtp}:465";
+    folders = {
+      drafts = "Drafts";
+      sent = "Sent";
+      trash = "Trash";
+    };
+  };
+
+  cock = rec {
+    user = "2210@cock.li";
+    address = user;
+    password = lib.strings.fileContents <secrets/mail/cock>;
+    imap = "mail.cock.li";
+    smtp = imap;
+    smtpSettings = smtp: "smtp://${smtp}:587";
+    folders = {
+      drafts = "Drafts";
+      sent = "Sent";
+      trash = "Trash";
+    };
+  };
+
+  "${mainMailbox}" = rec {
+    user = "kieran.meinhardt@posteo.net";
+    address = user;
+    password = lib.strings.fileContents <secrets/mail/posteo>;
+    imap = "posteo.de";
+    smtp = imap;
+    smtpSettings = smtp: "smtp://${smtp}";
+    folders = {
+      drafts = "Drafts";
+      sent = "Sent";
+      trash = "Trash";
+    };
+  };
+
+  google-amro = rec {
+    user = "amroplay@gmail.com";
+    address = user;
+    password = lib.strings.fileContents <secrets/mail/gmail/amroplay>;
+    imap = "imap.gmail.com";
+    smtp = "smtp.gmail.com";
+    smtpSettings = smtp: "smtps://${smtp}:465";
+    folders = {
+      drafts = "[Gmail]/Drafts";
+      sent = "[Gmail]/Sent Mail";
+      trash = "[Gmail]/Bin";
+    };
+  };
+
+  google-kieran = rec {
+    user = "kieran.meinhardt@gmail.com";
+    address = user;
+    password = lib.strings.fileContents <secrets/mail/gmail/kieran.meinhardt>;
+    imap = "imap.gmail.com";
+    smtp = "smtp.gmail.com";
+    smtpSettings = smtp: "smtps://${smtp}:465";
+    folders = {
+      drafts = "[Gmail]/Entwürfe";
+      sent = "[Gmail]/Gesendet";
+      trash = "[Gmail]/Papierkorb";
+    };
+  };
+}

lib/external-network.nix

@@ -0,0 +1,4 @@
+{
+  ful = "130.61.217.114";
+  makanek = "88.99.83.173";
+}

lib/goldendict-config.nix

@@ -1,4 +1,7 @@
-{pkgs, path}: ''
+{
+  pkgs,
+  path,
+}: ''
   <config>
    <paths>
     <path recursive="1">${path}</path>

lib/home.nix

@@ -0,0 +1,2 @@
+# https://github.com/hercules-ci/gitignore.nix/pull/58/files
+path: ~/. + path

lib/i3status-rust.nix

@@ -1,22 +1,17 @@
-{ pkgs, wirelessInterface, colours, batteryName }:
+{
-let
+  pkgs,
+  wirelessInterface,
+  colours,
+  batteryName,
+}: let
   inherit (pkgs) lib;
 
   setsid = script:
     pkgs.writers.writeDash "setsid-command" ''
       ${pkgs.utillinux}/bin/setsid ${script}
     '';
-  coronaBlock = {
+
-    block = "custom";
+  accounts = import <niveum/lib/email.nix> {inherit lib;};
-    interval = 60 * 2; # every two minutes
-    command = pkgs.writers.writeDash "corona" ''
-      ${pkgs.curl}/bin/curl https://corona-stats.online/germany \
-        | ${pkgs.gnugrep}/bin/grep Germany \
-        | ${pkgs.gnused}/bin/sed 's/\s*//g' \
-        | ${pkgs.ansifilter}/bin/ansifilter \
-        | ${pkgs.gawk}/bin/awk -F'│' '{print "🤒 " $8 " 💀 " $5}'
-    '';
-  };
 in {
   theme = {
     name = "plain";
@@ -24,7 +19,7 @@ in {
       critical_fg = colours.red.bright;
       good_fg = colours.green.bright;
       idle_fg = colours.foreground;
-      info_fg = colours.foreground;
+      info_fg = colours.cyan.bright;
       warning_fg = colours.yellow.bright;
       warning_bg = colours.background;
       alternating_tint_bg = colours.background;
@@ -33,53 +28,15 @@ in {
       good_bg = colours.background;
       idle_bg = colours.background;
       info_bg = colours.background;
-      separator = "/ ";
+      separator = "";
       separator_bg = "auto";
       separator_fg = colours.black.bright;
     };
   };
-  icons = {
+  icons.name = "awesome6";
-    name = "none";
+  icons.overrides.rss = "";
-    overrides = {
+  icons.overrides.vpn = "";
-      bat = "🔋";
+  icons.overrides.irc = "";
-      bat_charging = "🔌";
-      bat_discharging = "🔋";
-      bat_empty = " ";
-      bat_full = " ";
-      bat_half = " ";
-      bat_quarter = " ";
-      bat_three_quarters = " ";
-      cogs = "🚦 ";
-      cpu = "🖥 ";
-      disk_drive = "💽";
-      mail = "📧 ";
-      memory_mem = "🧠 ";
-      music = "🎵";
-      music_next = "⏭";
-      music_pause = "";
-      music_play = "▶";
-      music_prev = "⏮";
-      net_down = "❎";
-      net_up = "🌐";
-      net_vpn = "🛡 ";
-      net_wired = "🌐";
-      net_wireless = "📶";
-      pomodoro = "🍅 ";
-      time = "📅 ";
-      toggle_off = "👎";
-      toggle_on = "👍";
-      volume_empty = "🔈 ";
-      volume_full = "🔊 ";
-      volume_half = "🔉 ";
-      volume_muted = "🔇";
-      weather_clouds = "🌥";
-      weather_default = "🌡";
-      weather_rain = "🌧";
-      weather_snow = "🌨";
-      weather_sun = "🌣";
-      weather_thunder = "🌩";
-    };
-  };
   block = [
     {
       block = "weather";
@@ -95,41 +52,121 @@ in {
     {
       block = "custom";
       interval = 60 * 5;
-      command = let spacetime = import <niveum/configs/spacetime.nix>; in pkgs.writers.writePython3 "sun.py" { libraries = [ pkgs.python3Packages.astral ]; flakeIgnore = [ "E121" "E501" ]; }
+      command = let
+        spacetime = import <niveum/configs/spacetime.nix>;
+      in
+        pkgs.writers.writePython3 "sun.py" {
+          libraries = [pkgs.python3Packages.astral];
+          flakeIgnore = ["E121" "E501"];
+        }
         ''
           import astral
           import astral.moon
           import astral.sun
 
-        moon_phases = {
-          0: "🌑",
-          3.5: "🌒",
-          7: "🌓",
-          10.5: "🌔",
-          14: "🌕",
-          17.5: "🌖",
-          21: "🌗",
-          24.5: "🌘",
-          28: "🌑",
-        }
           current_phase = astral.moon.phase()
-        closest_phase = min(moon_phases.keys(), key=lambda x: abs(current_phase - x))
 
           city = astral.LocationInfo("Berlin", "Germany", "${spacetime.time.timeZone}", ${toString spacetime.location.latitude}, ${toString spacetime.location.longitude})
           sun = astral.sun.sun(city.observer, date=astral.today(), tzinfo=city.timezone)
 
-        print("🌅 {} 🌇 {} {} {}".format(sun["sunrise"].strftime("%R"), sun["sunset"].strftime("%R"), moon_phases[closest_phase], round(current_phase, 1)))
+          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"];
+    }
+    {
+      block = "custom";
+      interval = 10;
+      command = "newsboat-unread-count";
+      json = true;
+    }
+    {
+      block = "custom";
+      interval = 10;
+      command = pkgs.writers.writeDash "todo" ''
+        ${pkgs.todoman}/bin/todo --porcelain | ${pkgs.jq}/bin/jq -r '
+          map(select(.due != null))
+          | (map(select(.due < now)) | length) as $overdue
+          | (map(select(.due >= now and .due < now + (60 * 60 * 24))) | length) as $dueToday
+          | {
+            icon: "tasks",
+            text: (($overdue + $dueToday) as $sum | if $sum > 0 then $sum | tostring else "" end),
+            state: (
+              if $overdue > 0 then
+                "Critical"
+              elif $dueToday > 0 then
+                "Warning"
+              else
+                "Idle"
+              end
+            )
+          }
+        '
+      '';
+      json = true;
+      hide_when_empty = true;
+    }
+    {
+      block = "custom";
+      interval = 60 * 5;
+      command = let
+        query-account = name: account: "${pkgs.writers.writeDash "query-imap-${name}" ''
+          ${pkgs.coreutils}/bin/timeout 1 ${pkgs.curl}/bin/curl -sSL -u ${lib.escapeShellArg "${account.user}:${account.password}"} imaps://${account.imap} -X 'STATUS INBOX (UNSEEN)' \
+            | ${pkgs.gnugrep}/bin/grep -Eo '[0-9]+' \
+            | sed 's/^/{"${name}":/;s/$/}/'
+        ''} &";
+      in
+        pkgs.writers.writeDash "unread-mail" ''
+          {
+            ${lib.concatStringsSep "\n" (lib.mapAttrsToList query-account accounts)}
+            wait
+          } | jq -s 'if length == 0 then {text: "", icon: "mail", state: "Idle"} else
+            add
+            | (values | add) as $sum
+            | {
+              text: (if $sum > 0 then $sum | tostring else "" end),
+              icon: "mail",
+              state: (
+                if .uni > 0 or .["work-uni"] > 0 or .posteo > 0 then
+                  "Warning"
+                elif $sum > 0 then
+                  "Info"
+                else
+                  "Idle"
+                end
+              )
+            } end'
+        '';
+      json = true;
+      hide_when_empty = true;
+    }
+    {
+      block = "custom";
+      interval = 60;
+      command = pkgs.writers.writeDash "weechat" ''
+        ssh -o ConnectTimeout=1 makanek cat /var/lib/weechat/hotlist.txt | sed 's/,/\n/g' | wc -l | jq '{
+          text: (if . > 0 then . | tostring else "" end),
+          state: (if . > 0 then "Info" else "Idle" end),
+          icon: "irc"
+        }'
+      '';
+      json = true;
+      hide_when_empty = true;
+    }
     {
       block = "custom";
       interval = 5;
       command = pkgs.writers.writeDash "hu-berlin-vpn" ''
         PATH=${lib.makeBinPath [pkgs.systemd]}
-        (systemctl is-active --quiet openvpn-hu-berlin.service && echo "🎓👍 (OpenVPN)") \
+        (systemctl is-active --quiet openvpn-hu-berlin.service && echo '{"state": "Good", "text": "OpenVPN", "icon": "vpn"}') \
-          || (systemctl is-active --quiet hu-vpn.service && echo "🎓👍 (PPP+SSL)") \
+          || (systemctl is-active --quiet hu-vpn.service && echo '{"state": "Good", "text": "PPP+SSL", "icon": "vpn"}') \
-          || echo "🎓👎"
+          || echo '{"state": "Idle", "icon": "vpn", "text": ""}'
       '';
+      json = true;
+      hide_when_empty = true;
     }
     {
       block = "net";
@@ -156,9 +193,35 @@ in {
     }
     {block = "load";}
     {
-      block = "time";
+      block = "custom";
       interval = 1;
-      format = "%Y-%m-%d (%W %a) %H:%M";
+      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
+            )
+          }'
+      '';
     }
   ];
 }

lib/radio-news.html

@@ -0,0 +1,163 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>lassulus radio news</title>
+    <style>
+      body {
+        font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+      }
+
+      main {
+        max-width: 800px;
+        margin: 0 auto;
+        display: grid;
+        grid-template-columns: 2fr 1fr;
+        grid-gap: 2em;
+      }
+
+      #news-list ul {
+        list-style: none;
+        padding-left: 0;
+      }
+
+      #news-list li {
+        margin-bottom: 1em;
+      }
+
+      #news-list time {
+        display: block;
+        color: grey;
+      }
+
+      form label {
+        display: block;
+      }
+
+      form input,
+      form textarea {
+        width: 100%;
+        margin-bottom: 1em;
+      }
+
+      @media only screen and (max-width: 768px) {
+        main {
+          grid-template-columns: 1fr;
+        }
+      }
+    </style>
+    <script>
+      const newsEndpoint = "http://radio-news.r";
+
+      function isoString(date) {
+        return date.toISOString().slice(0, -5) + "Z";
+      }
+
+      function setNextNews() {
+        document.getElementById("next-news").innerHTML = (
+          60 - new Date().getUTCMinutes()
+        ).toString();
+      }
+
+      setInterval(setNextNews, 6000);
+
+      function fetchNews() {
+        fetch(newsEndpoint).then((response) => {
+          response.json().then((news) => {
+            const newsList = document.getElementById("news-list");
+            newsList.innerHTML = "";
+            const ul = document.createElement("ul");
+            for (const newsItem of news) {
+              const start = new Date(newsItem.from);
+              const end = new Date(newsItem.to);
+
+              const li = document.createElement("li");
+
+              const startDate = document.createElement("time");
+              startDate.className = "start";
+              startDate.title = isoString(start);
+              startDate.setAttribute("datetime", isoString(start));
+              startDate.appendChild(
+                document.createTextNode(start.toLocaleString())
+              );
+
+              const endDate = document.createElement("time");
+              endDate.className = "end";
+              endDate.title = isoString(end);
+              endDate.setAttribute("datetime", isoString(end));
+              endDate.appendChild(
+                document.createTextNode(end.toLocaleString())
+              );
+
+              li.appendChild(document.createTextNode(newsItem.text));
+              li.appendChild(startDate);
+              li.appendChild(endDate);
+              ul.appendChild(li);
+            }
+            newsList.appendChild(ul);
+          });
+        });
+      }
+
+      function sendNews(event) {
+        event.preventDefault();
+        const formData = new FormData(event.target);
+
+        const request = new XMLHttpRequest();
+        request.open("POST", newsEndpoint, false); // synchronous
+        request.send(
+          JSON.stringify({
+            from: isoString(new Date(formData.get("from"))),
+            to: isoString(new Date(formData.get("to"))),
+            text: formData.get("text"),
+          })
+        );
+        location.reload();
+      }
+
+      const pad2 = (int) => (int < 10 ? `0${int}` : int.toString());
+
+      const localIsoString = (date) =>
+        `${date.getFullYear()}-${pad2(date.getMonth() + 1)}-${pad2(
+          date.getDate()
+        )}T${pad2(date.getHours())}:${pad2(date.getMinutes())}`;
+
+      function setDate() {
+        let now = new Date();
+        document.getElementById("time-from").value = localIsoString(now);
+
+        now.setHours(now.getHours() + 1);
+        document.getElementById("time-to").value = localIsoString(now);
+      }
+
+      window.onload = () => {
+        setDate();
+        setNextNews();
+        fetchNews();
+      };
+    </script>
+  </head>
+  <body>
+    <main>
+      <section>
+        <h1>Submit news</h1>
+        <form onsubmit="sendNews(event)">
+          <label>Start time</label>
+          <input type="datetime-local" id="time-from" name="from" required />
+          <label>End time</label>
+          <input type="datetime-local" id="time-to" name="to" required />
+          <label>News text</label>
+          <textarea name="text" rows="10" required></textarea>
+          <input type="submit" />
+        </form>
+        Next news report should start in <span id="next-news"></span> minutes.
+      </section>
+      <aside>
+        <h1>Planned news</h1>
+        <div id="news-list">
+          <em>No news planned yet.</em>
+        </div>
+      </aside>
+    </main>
+  </body>
+</html>

lib/retiolum-network.nix

@@ -4,6 +4,11 @@
     ipv6 = "42:0:3c46:861f:a118:8e9a:82c9:3d";
   };
 
+  ful = {
+    ipv4 = "10.243.2.107";
+    ipv6 = "42:0:3c46:2c8b:a564:1213:9fb4:1bc4";
+  };
+
   zaatar = {
     ipv4 = "10.243.2.34";
     ipv6 = "42:0:3c46:156e:10b6:3bd6:6e82:b2cd";
@@ -18,4 +23,9 @@
     ipv4 = "10.243.2.85";
     ipv6 = "42:0:3c46:ac99:ae36:cb8:c551:ba27";
   };
+
+  tahina = {
+    ipv4 = "10.243.2.74";
+    ipv6 = "42:0:3c46:2923:1c90:872:edd6:306";
+  };
 }

lib/vim/init.vim

@@ -7,8 +7,7 @@ nnoremap <C-p> :FZF<CR>
 nnoremap <C-l> :Rg<CR>
 let g:fzf_layout = { 'down': '~15%' }
 
-colorscheme paramount
+colorscheme dim
-set background=dark
 " transparent background
 hi Normal guibg=NONE ctermbg=NONE
 
@@ -35,11 +34,17 @@ nnoremap <Leader>a <Plug>(ale_hover)
 nnoremap <Leader>d <Plug>(ale_go_to_definition_in_tab)
 nnoremap <Leader>rf <Plug>(ale_find_references)
 
+" Hit `%` on `if` to jump to `else`.
+runtime macros/matchit.vim
+
 filetype plugin indent on
+set autoindent
 set notitle
 set nospell
-set nocompatible
 set smartcase ignorecase " you need these two
+set backspace=indent,eol,start
+set hidden
+set ruler
 set shiftwidth=2 tabstop=2 expandtab
 set laststatus=1
 set number
@@ -109,6 +114,8 @@ command! ToggleBackground call s:toggle_background()
 inoremap <F12> <C-O>:ToggleBackground<CR>
 nnoremap <F12> :ToggleBackground<CR>
 
+augroup filetypes
+  autocmd!
   autocmd bufnewfile,bufread *.4th set filetype=forth
   autocmd bufnewfile,bufread *.asm set filetype=nasm
   autocmd bufnewfile,bufread *.c set keywordprg=man\ 3
@@ -128,10 +135,12 @@ autocmd bufnewfile,bufread *.md packadd vim-pandoc | packadd vim-pandoc-syntax |
   autocmd filetype haskell packadd haskell-vim | set keywordprg=hoogle\ -i
   autocmd filetype javascript packadd vim-javascript
   autocmd filetype make setlocal noexpandtab
-
   autocmd filetype html packadd emmet-vim
   autocmd filetype gitcommit setlocal spell spelllang=en
   autocmd filetype mail setlocal spell spelllang=de textwidth=0
+augroup end
+
+
 autocmd bufreadpost *
       \ if line("'\"") > 0 && line("'\"") <= line("$") |
       \ exe "normal! g`\"" |

modules/dropbox.nix

@@ -1,6 +1,11 @@
-{ pkgs, lib, config, ... }:
+{
-with lib;
+  pkgs,
-let cfg = config.niveum.dropbox;
+  lib,
+  config,
+  ...
+}:
+with lib; let
+  cfg = config.niveum.dropbox;
 in {
   options.niveum.dropbox = {enable = mkEnableOption "Dropbox";};
 

modules/hledger.nix

@@ -1,6 +1,10 @@
-{ config, lib, pkgs, ... }:
+{
-with lib;
+  config,
-let
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
   cfg = config.niveum.hledger;
   hledger-git = pkgs.writers.writeDashBin "hledger-git" ''
     LEDGER_DIR="$(dirname $LEDGER_FILE)"

modules/minecraft.nix

@@ -1,6 +1,11 @@
-{ pkgs, lib, config, ... }:
+{
-with lib;
+  pkgs,
-let cfg = config.niveum.minecraft;
+  lib,
+  config,
+  ...
+}:
+with lib; let
+  cfg = config.niveum.minecraft;
 in {
   options.niveum.minecraft = {enable = mkEnableOption "Minecraft";};
 

modules/moodle-dl.nix

@@ -1,6 +1,10 @@
-{ config, lib, pkgs, ... }:
+{
-with lib;
+  config,
-let
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
   cfg = config.services.moodle-dl;
   json = pkgs.formats.json {};
   moodle-dl-json = json.generate "moodle-dl.json" cfg.settings;
@@ -52,7 +56,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-
     users.users.moodle-dl = {
       isSystemUser = true;
       home = cfg.directory;

modules/networkmanager-declarative.nix

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

modules/passport.nix

@@ -0,0 +1,135 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.niveum.passport;
+  sortOn = a: lib.sort (as1: as2: lib.lessThan (lib.getAttr a as1) (lib.getAttr a as2));
+  css = ''
+    body {
+      margin: 0;
+      font-family: "Fira Sans Condensed", sans-serif;
+    }
+
+    main {
+      margin: 0 auto;
+      display: grid;
+      grid-template-columns: 1fr 3fr;
+      grid-gap: 2em;
+    }
+    @media only screen and (max-width: 768px) {
+      main {
+        grid-template-columns: 1fr;
+      }
+    }
+
+    footer, section {
+      padding: 1em;
+    }
+
+    footer {
+      text-align: center;
+    }
+
+    dl {
+      border: 3px double #ccc;
+      padding: 0.5em;
+    }
+    dt {
+      float: left;
+      clear: left;
+      width: 200px;
+      text-align: right;
+      font-weight: bold;
+      margin-right: 1em;
+      margin-bottom: 1em;
+    }
+    dd {
+      margin: 0 0 0 110px;
+      padding: 0 0 0.5em 0;
+      margin-bottom: 1em;
+    }
+  '';
+in
+  with lib; {
+    options.niveum.passport = {
+      enable = mkEnableOption "server passport";
+
+      introductionHTML = mkOption {type = types.str;};
+
+      virtualHost = mkOption {
+        type = types.str;
+      };
+
+      services = mkOption {
+        type = types.listOf (types.submodule {
+          options = {
+            title = mkOption {type = types.str;};
+            link = mkOption {
+              type = types.nullOr types.str;
+              default = null;
+            };
+            description = mkOption {
+              type = types.str;
+              default = "";
+            };
+          };
+        });
+        default = [];
+      };
+    };
+
+    config = mkIf cfg.enable {
+      services.nginx.enable = true;
+
+      services.nginx.virtualHosts."${cfg.virtualHost}".locations."/passport".extraConfig = ''
+        default_type "text/html";
+        root ${
+          pkgs.linkFarm "www" [
+            {
+              name = "passport/index.html";
+              path = pkgs.writeText "index.html" ''
+                <!doctype html>
+                <head>
+                  <meta charset="utf-8">
+                  <meta name="viewport" content="width=device-width, initial-scale=1">
+                  <title>${config.networking.hostName} passport</title>
+                  <style>${css}</style>
+                </head>
+                <body>
+                  <main>
+                    <section id="server">
+                    <h1>${config.networking.hostName}</h1>
+                    ${cfg.introductionHTML}
+                    </section>
+
+                    <section id="services">
+                    <h2>Services</h2>
+                    <dl>
+                    ${lib.strings.concatMapStringsSep "\n" (service: ''
+                  <dt>
+                  ${lib.optionalString (service.link != null) "<a href=\"${service.link}\">"}
+                  ${service.title}
+                  ${lib.optionalString (service.link != null) "</a>"}
+                  </dt>
+                  <dd>
+                  ${service.description}
+                  </dd>
+                '') (sortOn "title" cfg.services)}
+                    </dl>
+                    </section>
+                  </main>
+
+                  <footer>
+                    <tt>${config.networking.hostName}</tt> is part of the <i><a href="https://github.com/kmein/niveum/tree/master/systems/${config.networking.hostName}">niveum</a></i> network.
+                  </footer>
+                </body>
+              '';
+            }
+          ]
+        };
+        index index.html;
+      '';
+    };
+  }

modules/retiolum.nix

@@ -1,6 +1,10 @@
-{ config, pkgs, lib, ... }:
+{
-with lib;
+  config,
-let
+  pkgs,
+  lib,
+  ...
+}:
+with lib; let
   netname = "retiolum";
   cfg = config.networking.retiolum;
 in {
@@ -27,10 +31,10 @@ in {
   };
 
   config = {
-
     services.tinc.networks.${netname} = {
       name = cfg.nodename;
-      hosts = builtins.mapAttrs
+      hosts =
+        builtins.mapAttrs
         (name: _: builtins.readFile "${<retiolum/hosts>}/${name}")
         (builtins.readDir <retiolum/hosts>);
       rsaPrivateKeyFile = toString <system-secrets/retiolum.key>;

modules/spotifyd.nix

@@ -1,13 +1,17 @@
-{ config, lib, pkgs, ... }:
+{
-
+  config,
-with lib;
+  lib,
-
+  pkgs,
-let
+  ...
+}:
+with lib; let
   cfg = config.services.spotifyd;
   toml = pkgs.formats.toml {};
-  spotifydConf = if cfg.settings != {} then toml.generate "spotify.conf" cfg.settings else pkgs.writeText "spotifyd.conf" cfg.config;
+  spotifydConf =
-in
+    if cfg.settings != {}
-{
+    then toml.generate "spotify.conf" cfg.settings
+    else pkgs.writeText "spotifyd.conf" cfg.config;
+in {
   options = {
     services.spotifyd = {
       enable = mkEnableOption "spotifyd, a Spotify playing daemon";

modules/system-dependent.nix

@@ -1,6 +1,10 @@
-{ config, lib, pkgs, ... }:
-with lib;
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
   options.niveum = {
     wirelessInterface = mkOption {type = types.str;};
 

modules/telegram-bot.nix

@@ -1,6 +1,10 @@
-{ lib, config, pkgs, ... }:
+{
-with lib;
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}:
+with lib; let
   cfg = config.niveum.telegramBots;
 
   botService = name: bot:
@@ -9,15 +13,16 @@ let
       startAt = bot.time;
       serviceConfig.Type = "oneshot";
       wants = ["network-online.target"];
-      script = strings.concatStringsSep "\n" ([ "QUOTE=$(${bot.command})" "if [ -n \"$QUOTE\" ]; then" ]
+      script = strings.concatStringsSep "\n" (["QUOTE=$(${bot.command})" "if [ -n \"$QUOTE\" ]; then" "echo $QUOTE >&2"]
         ++ map (chatId: ''
-          ${pkgs.curl}/bin/curl -s -X POST "https://api.telegram.org/bot${bot.token}/sendMessage" \
+          ${pkgs.curl}/bin/curl -X POST "https://api.telegram.org/bot${bot.token}/sendMessage" \
             -d chat_id="${chatId}" \
             -d text="$QUOTE" ${
             lib.strings.optionalString (bot.parseMode != null)
             "-d parse_mode=${bot.parseMode}"
-            }
+          } | ${pkgs.jq}/bin/jq -e .ok
-        '') bot.chatIds
+        '')
+        bot.chatIds
         ++ ["fi"]);
     };
 in {

modules/traadfri.nix

@@ -1,6 +1,10 @@
-{ pkgs, lib, config, ... }:
+{
-with lib;
+  pkgs,
-let
+  lib,
+  config,
+  ...
+}:
+with lib; let
   cfg = config.niveum.traadfri;
   traadfri = pkgs.callPackage <traadfri> {
     libcoap = pkgs.callPackage <niveum/packages/libcoap.nix> {tls = true;};
@@ -22,18 +26,24 @@ in {
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = [
+    environment.systemPackages =
+      [
         (pkgs.writers.writeDashBin "traadfri" ''
           TRAADFRI_USER="${cfg.user}" \
           TRAADFRI_KEY="${cfg.key}" \
           TRAADFRI_HUB="${cfg.host}" \
           ${traadfri}/bin/traadfri $@
         '')
-    ] ++ lib.mapAttrsToList (name: value: pkgs.writers.writeDashBin "traadfri-${name}" ''
+      ]
+      ++ lib.mapAttrsToList (name: value:
+        pkgs.writers.writeDashBin "traadfri-${name}" ''
           exec traadfri --target Room ${toString value} "$@"
-    '') cfg.rooms
+        '')
-    ++ lib.mapAttrsToList (name: value: pkgs.writers.writeDashBin "traadfri-${name}" ''
+      cfg.rooms
+      ++ lib.mapAttrsToList (name: value:
+        pkgs.writers.writeDashBin "traadfri-${name}" ''
           exec traadfri --target Bulb ${toString value} "$@"
-    '') cfg.bulbs;
+        '')
+      cfg.bulbs;
   };
 }

modules/tuna.nix

@@ -1,6 +1,10 @@
-{ config, lib, pkgs, ... }:
+{
-with lib;
+  config,
-let
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
   tuna = pkgs.callPackage <tuna> {};
   cfg = config.services.tuna;
 in {

overlays/overlays.nix

@@ -1,6 +1,6 @@
 self: super:
-with super.lib;
+with super.lib; let
-let
   eval = import <nixpkgs/nixos/lib/eval-config.nix>;
   paths = (eval {modules = [(import <nixos-config>)];}).config.nixpkgs.overlays;
-in foldl' (flip extends) (_: super) paths self
+in
+  foldl' (flip extends) (_: super) paths self

packages/daybook.nix

@@ -1,4 +1,10 @@
-{ lib, stdenv, makeWrapper, pandoc, fetchFromGitHub }:
+{
+  lib,
+  stdenv,
+  makeWrapper,
+  pandoc,
+  fetchFromGitHub,
+}:
 stdenv.mkDerivation {
   name = "daybook";
   src = fetchFromGitHub {

packages/depp.nix

@@ -1,5 +1,7 @@
-{ lib, writeShellScriptBin }:
+{
-let
+  lib,
+  writeShellScriptBin,
+}: let
   aliasFlag = name: value: "-c alias.${name}=${lib.escapeShellArg value}";
   aliases = {
     eroeffne = "init";
@@ -20,7 +22,8 @@ let
     tagebuch = "log";
     zustand = "status";
   };
-in writeShellScriptBin "depp" ''
+in
+  writeShellScriptBin "depp" ''
     if [ $# -gt 0 ]; then
       git ${lib.concatStringsSep " " (lib.attrsets.mapAttrsToList aliasFlag aliases)} "$@"
     else

packages/devanagari/devanagari.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 const { createInterface } = require("readline");
-const Sanscript = require("@sanskrit-coders/sanscript");
+const Sanscript = require("@indic-transliteration/sanscript");
 
 const rl = createInterface({
   input: process.stdin,
@@ -9,5 +9,9 @@ const rl = createInterface({
 });
 
 rl.on("line", (line) => {
-  console.log(Sanscript.t(line, "hk", "devanagari"));
+  console.log(
+    Sanscript.t(line, "hk", "devanagari")
+      .replace(/\.\./g, "॥")
+      .replace(/[,.]/g, "।")
+  );
 });

packages/devanagari/package.json

@@ -5,6 +5,6 @@
   "bin": "devanagari.js",
   "author": "kmein",
   "devDependencies": {
-    "@sanskrit-coders/sanscript": "^1.1.5"
+    "@indic-transliteration/sanscript": "^1.2.7"
   }
 }

packages/devanagari/yarn.lock

@@ -2,7 +2,20 @@
 # yarn lockfile v1
 
 
-"@sanskrit-coders/sanscript@^1.1.5":
+"@indic-transliteration/common_maps@^1.0.0":
-  version "1.1.5"
+  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@sanskrit-coders/sanscript/-/sanscript-1.1.5.tgz#a22222cf7a5d55f7b19e210242c59f6f819fd643"
+  resolved "https://registry.yarnpkg.com/@indic-transliteration/common_maps/-/common_maps-1.0.0.tgz#c1f1c893ae49e01fe498ef1877bdd0153bc90b42"
-  integrity sha512-YA7MchP2CD2JnAOkj+ORDUFrISiPqx3muvhKvRO3KFOx9UfvpIdEUORoKWJ88lr1uH9T32jDxjns/MSclmDczA==
+  integrity sha512-NUza2GKxc6/0YiWWew3qsFenEgksnFSZWvNGqyyKYnII9wZS/U+w1jY/yYN9aR+foA/rPymvckM2/hKv9Ow2dQ==
+
+"@indic-transliteration/sanscript@^1.2.7":
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/@indic-transliteration/sanscript/-/sanscript-1.2.7.tgz#c07aaa979f6d60fb0bbf35cdbd1d3bb1c487d931"
+  integrity sha512-Jm5z+wWxMUlw6dGHK7BHQUBjRnVHmfidmB7NiTbkdKPP89BDOB16zIKvXZY5XTsvkXmcyqF+DbJqiB9zzUhDKA==
+  dependencies:
+    "@indic-transliteration/common_maps" "^1.0.0"
+    toml "^2.3.6"
+
+toml@^2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/toml/-/toml-2.3.6.tgz#25b0866483a9722474895559088b436fd11f861b"
+  integrity sha512-gVweAectJU3ebq//Ferr2JUY4WKSDe5N+z0FvjDncLGyHmIDoxgY/2Ie4qfEIDm4IS7OA6Rmdm7pdEEdMcV/xQ==

packages/devanagari/yarn.nix

@@ -1,4 +1,10 @@
-{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
+{
+  fetchurl,
+  fetchgit,
+  linkFarm,
+  runCommandNoCC,
+  gnutar,
+}: rec {
   offline_cache = linkFarm "offline" packages;
   packages = [
     {