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

@@ -37,6 +37,7 @@
     "di.fm/key"
     "eduroam/identity"
     "eduroam/password"
+    "github/notification.token"
     "hass/token"
     "mail/cock"
     "mail/fastmail"
@@ -62,7 +63,7 @@
       kabsa = ensureFiles basic;
       manakish = ensureFiles basic;
       tahina = ensureFiles basic;
-      ful = ensureFiles basic;
+      ful = ensureFiles (["root.password"] ++ basic);
       makanek = ensureFiles ([
           "irc/retiolum"
           "irc/hackint"

configs/bluetooth.nix

@@ -9,7 +9,9 @@
       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/default.nix

@@ -30,6 +30,12 @@ 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 = [
@@ -52,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
           };
         };
@@ -137,7 +144,7 @@ in {
         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}";
@@ -147,7 +154,12 @@ in {
         yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -xic"; # Download with audio
       };
     }
-    {i18n.defaultLocale = "en_DK.UTF-8";}
+    {
+      i18n = {
+        defaultLocale = "en_DK.UTF-8";
+        supportedLocales = ["all"];
+      };
+    }
     {
       services.xserver = {
         enable = true;
@@ -208,6 +220,9 @@ in {
         })
         localAddresses;
     }
+    {
+      home-manager.users.me.home.stateVersion = "22.05";
+    }
     ./alacritty.nix
     ./backup.nix
     ./bash.nix
@@ -255,7 +270,7 @@ in {
     ./ssh.nix
     ./sshd.nix
     ./sudo.nix
-    ./sxiv.nix
+    ./nsxiv.nix
     ./themes.nix
     ./tmux.nix
     ./traadfri.nix

configs/fonts.nix

@@ -1,5 +1,4 @@
 {pkgs, ...}: {
-  nixpkgs.config.joypixels.acceptLicense = true;
   fonts = {
     enableDefaultFonts = true;
     fontDir.enable = true;
@@ -13,6 +12,7 @@
       corefonts
       crimson
       eb-garamond
+      font-awesome_6
       etBook
       ezra-sil
       fira
@@ -21,10 +21,8 @@
       gentium
       gfs-fonts
       gyre-fonts
-      ia-writer-duospace
       ibm-plex
       jetbrains-mono
-      joypixels
       libertinus
       libre-bodoni
       lmodern
@@ -32,6 +30,9 @@
       ocr-a
       roboto
       roboto-mono
+      noto-fonts
+      noto-fonts-cjk
+      noto-fonts-emoji
       roboto-slab
       scheherazade-new
       source-code-pro
@@ -43,13 +44,11 @@
       vollkorn
       zilla-slab
     ]; # google-fonts league-of-moveable-type
-    fontconfig.defaultFonts = let
-      emojiFont = "JoyPixels";
-    in {
-      monospace = ["JetBrains Mono" emojiFont];
-      serif = ["Merriweather"];
-      sansSerif = ["Cantarell" emojiFont];
-      emoji = [emojiFont];
+    fontconfig.defaultFonts = {
+      monospace = ["Noto Sans Mono"];
+      serif = ["Noto Serif" "Noto Naskh Arabic" "Noto Serif Devanagari"];
+      sansSerif = ["Noto Sans Display" "Noto Kufi Arabic" "Noto Sans Devanagari" "Noto Sans CJK JP"];
+      emoji = ["Noto Color Emoji" "Noto Emoji"];
     };
   };
 }

configs/hledger.nix

@@ -14,6 +14,13 @@
     (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 = {

configs/i3.nix

@@ -152,7 +152,7 @@ in {
         {
           workspaceButtons = false;
           fonts = {
-            names = ["Sans"];
+            names = ["Monospace" "Font Awesome 6 Free"];
             size = 8.0;
           };
           mode = "hide"; # "dock"
@@ -167,7 +167,7 @@ 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;
@@ -217,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}";
@@ -245,7 +250,7 @@ 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";

configs/keyboard.nix

@@ -4,6 +4,7 @@
   ...
 }: let
   commaSep = builtins.concatStringsSep ",";
+  xkbOptions = ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
   languages = {
     de = "T3";
     gr = "polytonic";
@@ -14,12 +15,12 @@
 in {
   # man 7 xkeyboard-config
   services.xserver = {
-    layout = commaSep (builtins.attrNames languages);
+    layout = "de";
     # T3: https://upload.wikimedia.org/wikipedia/commons/a/a9/German-Keyboard-Layout-T3-Version1-large.png
     # buckwalter: http://www.qamus.org/transliteration.htm
-    xkbVariant = commaSep (builtins.attrValues languages);
+    xkbVariant = "T3";
     xkbOptions =
-      commaSep ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
+      commaSep xkbOptions;
     libinput.enable = true;
   };
 
@@ -29,7 +30,7 @@ in {
     lib.mapAttrsToList
     (language: variant:
       pkgs.writers.writeDashBin "kb-${language}" ''
-        ${pkgs.xorg.setxkbmap}/bin/setxkbmap ${defaultLanguage},${language} ${languages.${defaultLanguage}},${variant}
+        ${pkgs.xorg.setxkbmap}/bin/setxkbmap ${defaultLanguage},${language} ${languages.${defaultLanguage}},${variant} ${toString (map (option: "-option ${option}") xkbOptions)}
       '')
     languages;
 

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/png" = "sxiv.desktop";
+        "image/jpeg" = "nsxiv.desktop";
+        "image/png" = "nsxiv.desktop";
         "image/vnd.djvu+multipage" = "org.pwmt.zathura.desktop";
         "text/html" = "brave-browser.desktop";
         "text/markdown" = "nvim.desktop";

configs/neomutt.nix

@@ -5,146 +5,34 @@
 }: let
   mainMailbox = "posteo";
 
-  accounts.uni = {
-    user = "meinhark";
-    password = lib.strings.fileContents <secrets/eduroam/password>;
-    address = "kieran.felix.meinhardt@hu-berlin.de";
-    imap = "mailbox.cms.hu-berlin.de";
-    smtp = "mailhost.cms.hu-berlin.de";
-    smtpSettings = smtp: "smtp://${smtp}";
-    folders = {
-      drafts = "Drafts";
-      sent = "Sent";
-      trash = "Trash";
-    };
-  };
-
-  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-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";
-    };
-  };
-
-  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";
-    };
-  };
+  accounts = import <niveum/lib/email.nix> {inherit lib mainMailbox;};
 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
+    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;
+        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
@@ -227,11 +115,11 @@ in {
         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_subject lightwhite black "~N"
+        color index_author lightyellow default "~N"
+        color index_subject lightwhite default "~N"
 
         # Flagged mail is highlighted:
         color index_flags lightmagenta default '~F'

configs/neovim.nix

@@ -44,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/newsboat.nix

@@ -50,7 +50,7 @@
     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
@@ -58,14 +58,12 @@
     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" ''
@@ -75,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

@@ -9,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

@@ -15,10 +15,10 @@
     cf	''${XDG_CONFIG_HOME:-$HOME/.config}
   '';
 in {
-  environment.systemPackages = [pkgs.sxiv];
+  environment.systemPackages = [pkgs.nsxiv];
 
   # TODO fix
-  home-manager.users.me.xdg.configFile."sxiv/exec/key-handler".source = pkgs.writers.writeDash "key-handler" ''
+  home-manager.users.me.xdg.configFile."nsxiv/exec/key-handler".source = pkgs.writers.writeDash "key-handler" ''
     PATH=$PATH:${
       lib.makeBinPath [
         pkgs.gnused

configs/packages.nix

@@ -71,7 +71,7 @@ in {
     whois
     dnsutils
     # FILE MANAGERS
-    ranger
+    lf
     pcmanfm
     # MEDIA
     ffmpeg
@@ -93,7 +93,9 @@ 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
@@ -122,7 +124,7 @@ in {
     electrum
     inkscape
     astrolog
-    anki # flashcards
+    anki-bin # flashcards
     jbofihe # lojbanic software
     zoom-us # video conferencing
     alejandra # nix formatter
@@ -131,6 +133,7 @@ in {
     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
@@ -139,6 +142,7 @@ in {
     bc # calculator
     pari # gp -- better calculator
     scripts.auc
+    scripts.stackoverflow
     scripts.infschmv
     scripts.qrpaste
     scripts.ttspaste
@@ -148,6 +152,7 @@ in {
     scripts.showkeys-toggle
     scripts.kirciuoklis
     scripts.favicon
+    scripts.heuretes
     scripts.ipa # XSAMPA to IPA converter
     scripts.playlist
     scripts.mpv-tv

configs/printing.nix

@@ -1,16 +1,18 @@
 {pkgs, ...}: let
   inherit (import <niveum/lib>) localAddresses;
-  hp-driver = pkgs.hplipWithPlugin;
+  hp-driver = pkgs.hplip;
 in {
   services.printing = {
     enable = true;
     drivers = [hp-driver];
   };
 
-  hardware.sane = {
-    enable = true;
-    extraBackends = [hp-driver];
-  };
+  environment.systemPackages = [
+    pkgs.system-config-printer
+  ];
+
+  # allow connecting to .local printers
+  services.avahi.nssmdns = true;
 
   hardware.printers.ensurePrinters = [
     {
@@ -29,7 +31,7 @@ in {
   ];
 }
 /*
- HP/hp-officejet_4650_series.ppd.gz
- drv:///hp/hpcups.drv/hp-officejet_4650_series.ppd
- */
+HP/hp-officejet_4650_series.ppd.gz
+drv:///hp/hpcups.drv/hp-officejet_4650_series.ppd
+*/
 

configs/ssh.nix

@@ -6,8 +6,17 @@
 }: 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;
 
@@ -58,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/stardict.nix

@@ -305,64 +305,64 @@ in {
   ];
 }
 /*
- https://github.com/latin-dict/Georges1910/releases/download/v1.0/Georges1910-stardict.zip
- https://github.com/nikita-moor/latin-dictionary/releases/download/2020-02-14/LiddellScott1940-stardict.zip
- http://download.huzheng.org/bigdict/stardict-Cambridge_Dictionary_of_American_Idioms-2.4.2.tar.bz2
- http://download.huzheng.org/bigdict/stardict-Concise_Oxford_Thesaurus_2nd_Ed-2.4.2.tar.bz2
- http://download.huzheng.org/bigdict/stardict-Urban_Dictionary_P1-2.4.2.tar.bz2
- http://download.huzheng.org/bigdict/stardict-Urban_Dictionary_P2-2.4.2.tar.bz2
- 
- Duden_Rechtschreibung = pkgs.fetchzip {
-   url = "http://download.huzheng.org/babylon/german/stardict-Duden_Rechtschreibung-2.4.2.tar.bz2";
-   sha256 = "0xiprb45s88w62rn8rlbjrsagbiliay9hszsiy20glwabf6zsfji";
- };
- Duden = pkgs.fetchzip {
-   url = "http://download.huzheng.org/de/stardict-duden-2.4.2.tar.bz2";
-   sha256 = "049i4ynfqqxykv1nlkyks94mvn14s22qdax5gg7hx1ks5y4xw64j";
- };
- FreeOnlineDictionaryOfComputing = pkgs.fetchzip {
-   url = "http://download.huzheng.org/dict.org/stardict-dictd_www.dict.org_foldoc-2.4.2.tar.bz2";
-   sha256 = "1lw2i8dzxpx929cpgvv0x366dnh4drr10wzqmrhcd0kvwglqawgm";
- };
- Cappeller = pkgs.fetchzip {
-   url = "${repo}/sa-head/german-entries/tars/capeller-sanskrit-german__2021-10-05_14-23-18Z__1MB.tar.gz";
-   sha256 = "0jwrj2aih2lrcjg0lqm8jrvq9vsas9s8j4c9ggbg2n0jyz03kci3";
-   stripRoot = false;
- };
- Yates = pkgs.fetchzip {
-   url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/yates__2021-10-05_14-23-18Z__2MB.tar.gz";
-   sha256 = "1k7gbalysf48pwa06zfykrqhdk466g35xy64b30k4z8bybgdn8z2";
-   stripRoot = false;
- };
- Wilson = pkgs.fetchzip {
-   url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/wilson__2021-10-05_14-23-18Z__3MB.tar.gz";
-   sha256 = "0r5z1xif56zlw9r2jp3fvwmcjv4f2fhd9r17j30nah9awx2m1isg";
-   stripRoot = false;
- };
- SpokenSanskrit = pkgs.fetchzip {
-   url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/spokensanskrit__2019-01-12_05-13-52Z__12MB.tar.gz";
-   sha256 = "0x8j657mawvdcyd1knzvf33yp15z77d661n3h6g9hcj7wn9s5xyk";
-   stripRoot = false;
- };
- Grassmann = pkgs.fetchzip {
-   url = "${repo}/sa-head/german-entries/tars/grassman-sanskrit-german__2021-10-05_14-23-18Z__2MB.tar.gz";
-   sha256 = "0jalsykaxkl6wzrky72lz8g3jdz26lmjpyibbfaf7a5vvnr55k02";
-   stripRoot = false;
- };
- Benfey = pkgs.fetchzip {
-   url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/benfey__2021-10-05_14-23-18Z__2MB.tar.gz";
-   sha256 = "0lj3hgphqgnihn482g9kgjwbvdrcd38vc29v1fi36srn08qdhvcb";
-   stripRoot = false;
- };
- ApteSa = pkgs.fetchzip {
-   url = "${repo}/sa-head/en-entries/tars/apte-sa__2021-12-18_13-20-56Z__6MB.tar.gz";
-   sha256 = "0cq1dd02d1pvmjnibbs2cscifjnk2z0nqccf5yzzilxkzsrarh32";
-   stripRoot = false;
- };
- MacDonell = pkgs.fetchzip {
-   url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/macdonell__2021-10-05_14-23-18Z__2MB.tar.gz";
-   sha256 = "1yzmj0393mxvjv4n2lnvd2c722v2bmxxiyq7pscdwni3bxip3h8s";
-   stripRoot = false;
- };
- */
+https://github.com/latin-dict/Georges1910/releases/download/v1.0/Georges1910-stardict.zip
+https://github.com/nikita-moor/latin-dictionary/releases/download/2020-02-14/LiddellScott1940-stardict.zip
+http://download.huzheng.org/bigdict/stardict-Cambridge_Dictionary_of_American_Idioms-2.4.2.tar.bz2
+http://download.huzheng.org/bigdict/stardict-Concise_Oxford_Thesaurus_2nd_Ed-2.4.2.tar.bz2
+http://download.huzheng.org/bigdict/stardict-Urban_Dictionary_P1-2.4.2.tar.bz2
+http://download.huzheng.org/bigdict/stardict-Urban_Dictionary_P2-2.4.2.tar.bz2
+
+Duden_Rechtschreibung = pkgs.fetchzip {
+  url = "http://download.huzheng.org/babylon/german/stardict-Duden_Rechtschreibung-2.4.2.tar.bz2";
+  sha256 = "0xiprb45s88w62rn8rlbjrsagbiliay9hszsiy20glwabf6zsfji";
+};
+Duden = pkgs.fetchzip {
+  url = "http://download.huzheng.org/de/stardict-duden-2.4.2.tar.bz2";
+  sha256 = "049i4ynfqqxykv1nlkyks94mvn14s22qdax5gg7hx1ks5y4xw64j";
+};
+FreeOnlineDictionaryOfComputing = pkgs.fetchzip {
+  url = "http://download.huzheng.org/dict.org/stardict-dictd_www.dict.org_foldoc-2.4.2.tar.bz2";
+  sha256 = "1lw2i8dzxpx929cpgvv0x366dnh4drr10wzqmrhcd0kvwglqawgm";
+};
+Cappeller = pkgs.fetchzip {
+  url = "${repo}/sa-head/german-entries/tars/capeller-sanskrit-german__2021-10-05_14-23-18Z__1MB.tar.gz";
+  sha256 = "0jwrj2aih2lrcjg0lqm8jrvq9vsas9s8j4c9ggbg2n0jyz03kci3";
+  stripRoot = false;
+};
+Yates = pkgs.fetchzip {
+  url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/yates__2021-10-05_14-23-18Z__2MB.tar.gz";
+  sha256 = "1k7gbalysf48pwa06zfykrqhdk466g35xy64b30k4z8bybgdn8z2";
+  stripRoot = false;
+};
+Wilson = pkgs.fetchzip {
+  url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/wilson__2021-10-05_14-23-18Z__3MB.tar.gz";
+  sha256 = "0r5z1xif56zlw9r2jp3fvwmcjv4f2fhd9r17j30nah9awx2m1isg";
+  stripRoot = false;
+};
+SpokenSanskrit = pkgs.fetchzip {
+  url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/spokensanskrit__2019-01-12_05-13-52Z__12MB.tar.gz";
+  sha256 = "0x8j657mawvdcyd1knzvf33yp15z77d661n3h6g9hcj7wn9s5xyk";
+  stripRoot = false;
+};
+Grassmann = pkgs.fetchzip {
+  url = "${repo}/sa-head/german-entries/tars/grassman-sanskrit-german__2021-10-05_14-23-18Z__2MB.tar.gz";
+  sha256 = "0jalsykaxkl6wzrky72lz8g3jdz26lmjpyibbfaf7a5vvnr55k02";
+  stripRoot = false;
+};
+Benfey = pkgs.fetchzip {
+  url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/benfey__2021-10-05_14-23-18Z__2MB.tar.gz";
+  sha256 = "0lj3hgphqgnihn482g9kgjwbvdrcd38vc29v1fi36srn08qdhvcb";
+  stripRoot = false;
+};
+ApteSa = pkgs.fetchzip {
+  url = "${repo}/sa-head/en-entries/tars/apte-sa__2021-12-18_13-20-56Z__6MB.tar.gz";
+  sha256 = "0cq1dd02d1pvmjnibbs2cscifjnk2z0nqccf5yzzilxkzsrarh32";
+  stripRoot = false;
+};
+MacDonell = pkgs.fetchzip {
+  url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/macdonell__2021-10-05_14-23-18Z__2MB.tar.gz";
+  sha256 = "1yzmj0393mxvjv4n2lnvd2c722v2bmxxiyq7pscdwni3bxip3h8s";
+  stripRoot = false;
+};
+*/
 

configs/telegram-bots/default.nix

@@ -4,7 +4,12 @@
   lib,
   ...
 }: let
-  telebots = pkgs.callPackage <telebots> {};
+  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;
@@ -13,6 +18,8 @@ in {
     ./literature-quote.nix
     ./astrology.nix
     ./autorenkalender.nix
+    ./hesychius.nix
+    ./smyth.nix
     ./nachtischsatan.nix
     ./tlg-wotd.nix
     <niveum/modules/telegram-bot.nix>

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

@@ -10,7 +10,7 @@ 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";
   };

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";
+    }
+  ];
+}

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1652776076,
-        "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
@@ -19,14 +19,15 @@
       "inputs": {
         "nixpkgs": [
           "nixos-unstable"
-        ]
+        ],
+        "utils": "utils"
       },
       "locked": {
-        "lastModified": 1653340164,
-        "narHash": "sha256-t6BPApyasx6FOv2cEVyFBXvkEDrknyUe7bngMbNSBkA=",
+        "lastModified": 1661573386,
+        "narHash": "sha256-pBEg8iY00Af/SAtU2dlmOAv+2x7kScaGlFRDjNoVJO8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e66f0ff69a6c0698b35034b842c4b68814440778",
+        "rev": "d89bdff445eadff03fe414e9c30486bc8166b72b",
         "type": "github"
       },
       "original": {
@@ -46,15 +47,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1644957911,
-        "narHash": "sha256-ggie/j7pdBqzDs4W7OiPmhqH9IGbXAbJxGqBdVxA8jA=",
-        "owner": "Mic92",
+        "lastModified": 1661273257,
+        "narHash": "sha256-cywpSH3D291AwdO/ecJxHeN2Vuuz0cIy/NEXMsFT+Og=",
+        "owner": "kmein",
         "repo": "krops",
-        "rev": "86fb3d2ee94fd8306231853b323ed8804edf26ec",
+        "rev": "542bc544ec8b0b807933a812d098e601683b0956",
         "type": "github"
       },
       "original": {
-        "owner": "Mic92",
+        "owner": "kmein",
         "repo": "krops",
         "type": "github"
       }
@@ -96,7 +97,7 @@
       "locked": {
         "lastModified": 1554228333,
         "narHash": "sha256-hG/PlcCvCQhNcU55NpHfATkyH9k6cZmO7uvBoJjasXU=",
-        "ref": "master",
+        "ref": "refs/heads/master",
         "rev": "c528cf970e292790b414b4c1c8c8e9d7e73b2a71",
         "revCount": 32,
         "type": "git",
@@ -109,27 +110,27 @@
     },
     "nixos-stable": {
       "locked": {
-        "lastModified": 1653087707,
-        "narHash": "sha256-zfno3snrzZTWQ2B7K53QHrGZwrjnJLTRPalymrSsziU=",
+        "lastModified": 1661520432,
+        "narHash": "sha256-9z+WDeXiu3hobvSsL0SbHDx4s+kFmm8eussySuX4zCM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cbd40c72b2603ab54e7208f99f9b35fc158bc009",
+        "rev": "f11e12ac6af528c1ba12426ce83cee26f21ceafd",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-21.11",
+        "ref": "nixos-22.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1653060744,
-        "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
+        "lastModified": 1660305968,
+        "narHash": "sha256-r0X1pZCSEA6mzt5OuTA7nHuLmvnbkwgpFAh1iLIx4GU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dfd82985c273aac6eced03625f454b334daae2e8",
+        "rev": "c4a0efdd5a728e20791b8d8d2f26f90ac228ee8d",
         "type": "github"
       },
       "original": {
@@ -158,11 +159,11 @@
     "retiolum": {
       "flake": false,
       "locked": {
-        "lastModified": 1653484169,
-        "narHash": "sha256-jb4DUq1+cdyLtvUP4T/B6uw9LaN+zFRdA8ViYv/fEic=",
+        "lastModified": 1660680907,
+        "narHash": "sha256-D6XkykgU1BiDAnnFG9NwSqBRKCZAHK+2+Ri2/m9rzo8=",
         "owner": "krebs",
         "repo": "retiolum",
-        "rev": "40c6e184cecaae4fe0b4973c6cb8027a66cccaae",
+        "rev": "c4d6b07be29b3b9267027ed25792a2cb350459d5",
         "type": "github"
       },
       "original": {
@@ -194,11 +195,11 @@
     "scripts": {
       "flake": false,
       "locked": {
-        "lastModified": 1650993582,
-        "narHash": "sha256-cKcdHzyy6Y4H9+KcnCgk/Tt1Zqd8lhfiXv4LClcETLc=",
+        "lastModified": 1662493500,
+        "narHash": "sha256-EdAEKDQ6z7oinqQ28ELE3+taJ106DgmhNJt/rpqHJic=",
         "owner": "kmein",
         "repo": "scripts",
-        "rev": "c1aaeb4339e9c41057d362667554835a0f49850f",
+        "rev": "51c641ac3c1100d80313696663db70c2eb3698dc",
         "type": "github"
       },
       "original": {
@@ -210,11 +211,11 @@
     "stockholm": {
       "flake": false,
       "locked": {
-        "lastModified": 1652980569,
-        "narHash": "sha256-LJcveSM7m3YBzF7F9jpfQtEbkuHX86QdE0DDdPiX0Yg=",
-        "ref": "master",
-        "rev": "5befc5a6f260e2283863212b39749d5ed05afb63",
-        "revCount": 10545,
+        "lastModified": 1661246925,
+        "narHash": "sha256-hGNCF4m3SuVogqoipmJzNIKoh03S/SMnO5oMHgfHWjA=",
+        "ref": "refs/heads/master",
+        "rev": "d1fa957ed5bf60767c83c96135f9142f6c96ea50",
+        "revCount": 10749,
         "type": "git",
         "url": "https://cgit.lassul.us/stockholm"
       },
@@ -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,7 +2,7 @@
   description = "niveum: packages, modules, systems";
 
   inputs = {
-    nixos-stable.url = "github:NixOS/nixpkgs/nixos-21.11";
+    nixos-stable.url = "github:NixOS/nixpkgs/nixos-22.05";
     nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     flake-utils.url = "github:numtide/flake-utils";
@@ -11,7 +11,7 @@
       inputs.nixpkgs.follows = "nixos-unstable";
     };
     krops = {
-      url = "github:Mic92/krops";
+      url = "github:kmein/krops";
       inputs.nixpkgs.follows = "nixos-stable";
       inputs.flake-utils.follows = "flake-utils";
     };
@@ -84,6 +84,10 @@
   } @ inputs: let
     system = "x86_64-linux";
     pkgs = nixos-stable.legacyPackages.${system};
+    home =
+      if nixos-stable.lib.inPureEvalMode or false
+      then _: /nonexistent
+      else import lib/home.nix;
     source = {
       sources,
       unstable,
@@ -93,22 +97,49 @@
         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.file = toString (
-          if unstable
-          then inputs.nixos-unstable
-          else inputs.nixos-stable
-        );
+        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 = {
+          url = let
+            github = x: "https://github.com/${x}";
+          in
+            {
+              home-manager = github "nix-community/home-manager";
+              menstruation-backend = github "kmein/menstruation.rs";
+              menstruation-telegram = github "kmein/menstruation-telegram";
+              nixos-unstable = github "NixOS/nixpkgs";
+              nix-writers = "https://cgit.krebsco.de/nix-writers";
+              recht = github "kmein/recht";
+              retiolum = 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,
@@ -121,6 +152,7 @@
       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
@@ -138,10 +170,11 @@
               else "${name}.r";
             unstable = name == "kabsa" || name == "manakish";
             sources =
-              ["nix-writers" "nixpkgs" "retiolum"]
+              ["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"];

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/home.nix

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

lib/i3status-rust.nix

@@ -10,17 +10,8 @@
     pkgs.writers.writeDash "setsid-command" ''
       ${pkgs.utillinux}/bin/setsid ${script}
     '';
-  coronaBlock = {
-    block = "custom";
-    interval = 60 * 2; # every two minutes
-    command = pkgs.writers.writeDash "corona" ''
-      ${pkgs.curl}/bin/curl https://corona-stats.online/germany \
-        | ${pkgs.gnugrep}/bin/grep Germany \
-        | ${pkgs.gnused}/bin/sed 's/\s*//g' \
-        | ${pkgs.ansifilter}/bin/ansifilter \
-        | ${pkgs.gawk}/bin/awk -F'│' '{print "🤒 " $8 " 💀 " $5}'
-    '';
-  };
+
+  accounts = import <niveum/lib/email.nix> {inherit lib;};
 in {
   theme = {
     name = "plain";
@@ -28,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;
@@ -37,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 = {
-    name = "none";
-    overrides = {
-      bat = "🔋";
-      bat_charging = "🔌";
-      bat_discharging = "🔋";
-      bat_empty = " ";
-      bat_full = " ";
-      bat_half = " ";
-      bat_quarter = " ";
-      bat_three_quarters = " ";
-      cogs = "🚦 ";
-      cpu = "🖥 ";
-      disk_drive = "💽";
-      mail = "📧 ";
-      memory_mem = "🧠 ";
-      music = "🎵";
-      music_next = "⏭";
-      music_pause = "";
-      music_play = "▶";
-      music_prev = "⏮";
-      net_down = "❎";
-      net_up = "🌐";
-      net_vpn = "🛡 ";
-      net_wired = "🌐";
-      net_wireless = "📶";
-      pomodoro = "🍅 ";
-      time = "📅 ";
-      toggle_off = "👎";
-      toggle_on = "👍";
-      volume_empty = "🔈 ";
-      volume_full = "🔊 ";
-      volume_half = "🔉 ";
-      volume_muted = "🔇";
-      weather_clouds = "🌥";
-      weather_default = "🌡";
-      weather_rain = "🌧";
-      weather_snow = "🌨";
-      weather_sun = "🌣";
-      weather_thunder = "🌩";
-    };
-  };
+  icons.name = "awesome6";
+  icons.overrides.rss = "";
+  icons.overrides.vpn = "";
+  icons.overrides.irc = "";
   block = [
     {
       block = "weather";
@@ -111,35 +64,109 @@ in {
           import astral.moon
           import astral.sun
 
-          moon_phases = {
-            0: "🌑",
-            3.5: "🌒",
-            7: "🌓",
-            10.5: "🌔",
-            14: "🌕",
-            17.5: "🌖",
-            21: "🌗",
-            24.5: "🌘",
-            28: "🌑",
-          }
           current_phase = astral.moon.phase()
-          closest_phase = min(moon_phases.keys(), key=lambda x: abs(current_phase - x))
 
           city = astral.LocationInfo("Berlin", "Germany", "${spacetime.time.timeZone}", ${toString spacetime.location.latitude}, ${toString spacetime.location.longitude})
           sun = astral.sun.sun(city.observer, date=astral.today(), tzinfo=city.timezone)
 
-          print("🌅 {} 🌇 {} {} {}".format(sun["sunrise"].strftime("%R"), sun["sunset"].strftime("%R"), 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 hu-vpn.service && echo "🎓👍 (PPP+SSL)") \
-          || echo "🎓👎"
+        (systemctl is-active --quiet openvpn-hu-berlin.service && echo '{"state": "Good", "text": "OpenVPN", "icon": "vpn"}') \
+          || (systemctl is-active --quiet hu-vpn.service && echo '{"state": "Good", "text": "PPP+SSL", "icon": "vpn"}') \
+          || echo '{"state": "Idle", "icon": "vpn", "text": ""}'
       '';
+      json = true;
+      hide_when_empty = true;
     }
     {
       block = "net";
@@ -166,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

@@ -75,15 +75,19 @@
 
               const startDate = document.createElement("time");
               startDate.className = "start";
-              startDate.title = start.toString();
+              startDate.title = isoString(start);
               startDate.setAttribute("datetime", isoString(start));
-              startDate.appendChild(document.createTextNode(isoString(start)));
+              startDate.appendChild(
+                document.createTextNode(start.toLocaleString())
+              );
 
               const endDate = document.createElement("time");
               endDate.className = "end";
-              endDate.title = end.toString();
+              endDate.title = isoString(end);
               endDate.setAttribute("datetime", isoString(end));
-              endDate.appendChild(document.createTextNode(isoString(end)));
+              endDate.appendChild(
+                document.createTextNode(end.toLocaleString())
+              );
 
               li.appendChild(document.createTextNode(newsItem.text));
               li.appendChild(startDate);
@@ -103,24 +107,27 @@
         request.open("POST", newsEndpoint, false); // synchronous
         request.send(
           JSON.stringify({
-            from: formData.get("from") + ":00Z",
-            to: formData.get("to") + ":00Z",
+            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 = now
-          .toISOString()
-          .slice(0, 16);
+        document.getElementById("time-from").value = localIsoString(now);
 
         now.setHours(now.getHours() + 1);
-        document.getElementById("time-to").value = now
-          .toISOString()
-          .slice(0, 16);
+        document.getElementById("time-to").value = localIsoString(now);
       }
 
       window.onload = () => {
@@ -135,9 +142,9 @@
       <section>
         <h1>Submit news</h1>
         <form onsubmit="sendNews(event)">
-          <label>Start date (UTC)</label>
+          <label>Start time</label>
           <input type="datetime-local" id="time-from" name="from" required />
-          <label>End date (UTC)</label>
+          <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>

lib/streams.nix

@@ -1783,43 +1783,43 @@ in
     }
   ]
 /*
-       (caster-fm "TODO" "noasrv" 10182) # https://github.com/cccruzr/albumsyoumusthear/blob/7e00baf575e4d357cd275d54d1aeb717321141a8/HLS/IBERO_90_1.m3u
-       (caster-fm "TODO" "shaincast" 20866) # https://github.com/cccruzr/albumsyoumusthear/blob/7e00baf575e4d357cd275d54d1aeb717321141a8/HLS/IBERO_90_1.m3u
- 
- CNN news in morse code
- http://cw.dimebank.com:8080/CNNslow
- http://cw.dimebank.com:8080/CNNfast
- 
- Orchestral
- http://orion.shoutca.st:8978/stream
- 
- LoFi / Chill
- http://ice55.securenetsystems.net/DASH76
- 
- News background music
- https://c13014-l-hls.u.core.cdn.streamfarm.net/1000153copo/hk2.m3u8
- 
- ?
- http://94.23.221.158:9163/stream
- 
- Greek radio
- http://radio.hostchefs.net:8046/stream?1520818130148
- 
- : http://audiokrishna.com/stations/japa2.mp3
- http://185.105.4.53:2339//;stream.mp3
- http://cast5.servcast.net:1390/;stream.mp3
- 
- Hard rock
- http://andromeda.shoutca.st:9254/stream
- 
- Rock alternative
- http://icy.unitedradio.it/VirginRockAlternative.mp3
- 
- American nautical weather news
- http://ca.radioboss.fm:8149/stream
- 
- Christian radio in all languages
- https://jesuscomingfm.com/#
- tamazight http://live.jesuscomingfm.com:8462/;
- */
+      (caster-fm "TODO" "noasrv" 10182) # https://github.com/cccruzr/albumsyoumusthear/blob/7e00baf575e4d357cd275d54d1aeb717321141a8/HLS/IBERO_90_1.m3u
+      (caster-fm "TODO" "shaincast" 20866) # https://github.com/cccruzr/albumsyoumusthear/blob/7e00baf575e4d357cd275d54d1aeb717321141a8/HLS/IBERO_90_1.m3u
+
+CNN news in morse code
+http://cw.dimebank.com:8080/CNNslow
+http://cw.dimebank.com:8080/CNNfast
+
+Orchestral
+http://orion.shoutca.st:8978/stream
+
+LoFi / Chill
+http://ice55.securenetsystems.net/DASH76
+
+News background music
+https://c13014-l-hls.u.core.cdn.streamfarm.net/1000153copo/hk2.m3u8
+
+?
+http://94.23.221.158:9163/stream
+
+Greek radio
+http://radio.hostchefs.net:8046/stream?1520818130148
+
+: http://audiokrishna.com/stations/japa2.mp3
+http://185.105.4.53:2339//;stream.mp3
+http://cast5.servcast.net:1390/;stream.mp3
+
+Hard rock
+http://andromeda.shoutca.st:9254/stream
+
+Rock alternative
+http://icy.unitedradio.it/VirginRockAlternative.mp3
+
+American nautical weather news
+http://ca.radioboss.fm:8149/stream
+
+Christian radio in all languages
+https://jesuscomingfm.com/#
+tamazight http://live.jesuscomingfm.com:8462/;
+*/
 

lib/vim/init.vim

@@ -7,7 +7,7 @@ nnoremap <C-p> :FZF<CR>
 nnoremap <C-l> :Rg<CR>
 let g:fzf_layout = { 'down': '~15%' }
 
-colorscheme paramount
+colorscheme dim
 " transparent background
 hi Normal guibg=NONE ctermbg=NONE
 

modules/telegram-bot.nix

@@ -13,14 +13,14 @@ with lib; let
       startAt = bot.time;
       serviceConfig.Type = "oneshot";
       wants = ["network-online.target"];
-      script = strings.concatStringsSep "\n" (["QUOTE=$(${bot.command})" "if [ -n \"$QUOTE\" ]; then"]
+      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
         ++ ["fi"]);

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

packages/man/pandoc.nix

@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   src = fetchgit {
     url = "https://github.com/jgm/pandoc";
     rev = pandoc.version;
-    sha256 = "0s4mczbql35wh6bhyi542yln24f530rlsw6akcv7lmp083rrlpy4";
+    sha256 = "sha256-AY9GarrU7PBFgoYxqQkE2ghoUy7+0Gu6/Mwa+fdQM2U=";
   };
   buildPhase = ''
     mkdir -p $out/man/man1

packages/rofi-pass.patch

@@ -0,0 +1,12 @@
+diff --git a/rofi-pass b/rofi-pass
+index 48928db..13682a5 100755
+--- a/rofi-pass
++++ b/rofi-pass
+@@ -15,7 +15,7 @@ _image_viewer () {
+
+ # We expect to find these fields in pass(1)'s output
+ URL_field='url'
+-USERNAME_field='user'
++USERNAME_field='login'
+ AUTOTYPE_field='autotype'
+ OTPmethod_field='otp_method'

packages/scripts/avesta.sed

@@ -43,8 +43,8 @@ s/ń/𐬦/g
 s/ṇ/𐬧/g
 s/m/𐬨/g
 s/m̨/𐬩/g
-s/ẏ/𐬪/g
-s/y/𐬫/g
+s/ẏ/𐬫/g
+s/y/𐬪/g
 s/v/𐬬/g
 s/r/𐬭/g
 s/s/𐬯/g

packages/scripts/default.nix

@@ -96,7 +96,7 @@ in
         rm "$file"
       }
       ${pkgs.qrencode}/bin/qrencode "$(${pkgs.xclip}/bin/xclip -selection clipboard -out)" -o "$file"
-      ${pkgs.sxiv}/bin/sxiv "$file"
+      ${pkgs.nsxiv}/bin/nsxiv "$file"
     '';
 
     ttspaste = pkgs.writers.writeDashBin "ttspaste" ''
@@ -123,7 +123,7 @@ in
     };
 
     meteo = wrapScript {
-      packages = [pkgs.jq pkgs.curl pkgs.xdotool pkgs.sxiv pkgs.gnused];
+      packages = [pkgs.jq pkgs.curl pkgs.xdotool pkgs.nsxiv pkgs.gnused];
       script = ./meteo.sh;
       name = "meteo";
     };
@@ -433,7 +433,7 @@ in
     scanned = pkgs.writers.writeDashBin "scanned" ''
       [ $# -eq 1 -a -f "$1" -a -r "$1" ] || exit 1
 
-      ${pkgs.imagemagick}/bin/convert -density 150 "$1" -colorspace gray -linear-stretch 3.5%x10% -blur 0x0.5 -attenuate 0.25 +noise Gaussian "scanned-$1"
+      ${pkgs.imagemagick}/bin/convert -density 150 "$1" -rotate 0.5 -attenuate 0.25 +noise Multiplicative -colorspace Gray "scanned-$1"
     '';
 
     nix-index-update = pkgs.writers.writeDashBin "nix-index-update" ''
@@ -445,6 +445,22 @@ in
       ln -f $filename files
     '';
 
+    heuretes = let
+      database = pkgs.fetchurl {
+        url = "http://c.krebsco.de/greek.csv";
+        hash = "sha256-SYL10kerNI0HzExG6JXh765+CBBCHLO95B6OKErQ/sU=";
+      };
+    in
+      pkgs.writers.writeDashBin "heuretes" ''
+        ${pkgs.xsv}/bin/xsv search -s simple "^$*$" ${database} | ${pkgs.xsv}/bin/xsv table
+      '';
+
+    # https://nitter.net/igor_chubin/status/1557793569104183298
+    stackoverflow = pkgs.writers.writeDashBin "so" ''
+      IFS=+
+      ${pkgs.curl}/bin/curl -sSL http://cht.sh/"$*"
+    '';
+
     rofi-hass = pkgs.writers.writeBashBin "rofi-hass" ''
       export PATH=${lib.makeBinPath [pkgs.home-assistant-cli pkgs.jq pkgs.util-linux pkgs.rofi pkgs.gnused pkgs.libnotify]}
       json=$(hass-cli -o json state list 2>/dev/null)

packages/scripts/horoscope/poetry.lock

@@ -1,17 +1,17 @@
 [[package]]
 name = "click"
-version = "8.0.3"
+version = "8.1.3"
 description = "Composable command line interface toolkit"
 category = "main"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 
 [package.dependencies]
 colorama = {version = "*", markers = "platform_system == \"Windows\""}
 
 [[package]]
 name = "colorama"
-version = "0.4.4"
+version = "0.4.5"
 description = "Cross-platform colored terminal text."
 category = "main"
 optional = false
@@ -30,11 +30,11 @@ pyswisseph = "2.08.00-1"
 
 [[package]]
 name = "numpy"
-version = "1.21.1"
+version = "1.23.1"
 description = "NumPy is the fundamental package for array computing with Python."
 category = "main"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 
 [[package]]
 name = "pyswisseph"
@@ -72,56 +72,10 @@ python-versions = "^3.8"
 content-hash = "657742383232643f2fa13df5686de0cc79c624f9ae9bdb2f0fc96c7a94b5b8bf"
 
 [metadata.files]
-click = [
-    {file = "click-8.0.3-py3-none-any.whl", hash = "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3"},
-    {file = "click-8.0.3.tar.gz", hash = "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b"},
-]
-colorama = [
-    {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
-    {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
-]
-flatlib = [
-    {file = "flatlib-0.2.3-py3-none-any.whl", hash = "sha256:c846d83c965db7588581bb65ac9a6668b9a190afcad5027269f7e9c75f467bcd"},
-    {file = "flatlib-0.2.3.tar.gz", hash = "sha256:46cc956b936aa31a96082cff23448a5c27dd6e5e434a6293bc9265336c00dd5d"},
-]
-numpy = [
-    {file = "numpy-1.21.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:38e8648f9449a549a7dfe8d8755a5979b45b3538520d1e735637ef28e8c2dc50"},
-    {file = "numpy-1.21.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:fd7d7409fa643a91d0a05c7554dd68aa9c9bb16e186f6ccfe40d6e003156e33a"},
-    {file = "numpy-1.21.1-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a75b4498b1e93d8b700282dc8e655b8bd559c0904b3910b144646dbbbc03e062"},
-    {file = "numpy-1.21.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1412aa0aec3e00bc23fbb8664d76552b4efde98fb71f60737c83efbac24112f1"},
-    {file = "numpy-1.21.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e46ceaff65609b5399163de5893d8f2a82d3c77d5e56d976c8b5fb01faa6b671"},
-    {file = "numpy-1.21.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:c6a2324085dd52f96498419ba95b5777e40b6bcbc20088fddb9e8cbb58885e8e"},
-    {file = "numpy-1.21.1-cp37-cp37m-win32.whl", hash = "sha256:73101b2a1fef16602696d133db402a7e7586654682244344b8329cdcbbb82172"},
-    {file = "numpy-1.21.1-cp37-cp37m-win_amd64.whl", hash = "sha256:7a708a79c9a9d26904d1cca8d383bf869edf6f8e7650d85dbc77b041e8c5a0f8"},
-    {file = "numpy-1.21.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:95b995d0c413f5d0428b3f880e8fe1660ff9396dcd1f9eedbc311f37b5652e16"},
-    {file = "numpy-1.21.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:635e6bd31c9fb3d475c8f44a089569070d10a9ef18ed13738b03049280281267"},
-    {file = "numpy-1.21.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:4a3d5fb89bfe21be2ef47c0614b9c9c707b7362386c9a3ff1feae63e0267ccb6"},
-    {file = "numpy-1.21.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:8a326af80e86d0e9ce92bcc1e65c8ff88297de4fa14ee936cb2293d414c9ec63"},
-    {file = "numpy-1.21.1-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:791492091744b0fe390a6ce85cc1bf5149968ac7d5f0477288f78c89b385d9af"},
-    {file = "numpy-1.21.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0318c465786c1f63ac05d7c4dbcecd4d2d7e13f0959b01b534ea1e92202235c5"},
-    {file = "numpy-1.21.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:9a513bd9c1551894ee3d31369f9b07460ef223694098cf27d399513415855b68"},
-    {file = "numpy-1.21.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:91c6f5fc58df1e0a3cc0c3a717bb3308ff850abdaa6d2d802573ee2b11f674a8"},
-    {file = "numpy-1.21.1-cp38-cp38-win32.whl", hash = "sha256:978010b68e17150db8765355d1ccdd450f9fc916824e8c4e35ee620590e234cd"},
-    {file = "numpy-1.21.1-cp38-cp38-win_amd64.whl", hash = "sha256:9749a40a5b22333467f02fe11edc98f022133ee1bfa8ab99bda5e5437b831214"},
-    {file = "numpy-1.21.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:d7a4aeac3b94af92a9373d6e77b37691b86411f9745190d2c351f410ab3a791f"},
-    {file = "numpy-1.21.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d9e7912a56108aba9b31df688a4c4f5cb0d9d3787386b87d504762b6754fbb1b"},
-    {file = "numpy-1.21.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:25b40b98ebdd272bc3020935427a4530b7d60dfbe1ab9381a39147834e985eac"},
-    {file = "numpy-1.21.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:8a92c5aea763d14ba9d6475803fc7904bda7decc2a0a68153f587ad82941fec1"},
-    {file = "numpy-1.21.1-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:05a0f648eb28bae4bcb204e6fd14603de2908de982e761a2fc78efe0f19e96e1"},
-    {file = "numpy-1.21.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f01f28075a92eede918b965e86e8f0ba7b7797a95aa8d35e1cc8821f5fc3ad6a"},
-    {file = "numpy-1.21.1-cp39-cp39-win32.whl", hash = "sha256:88c0b89ad1cc24a5efbb99ff9ab5db0f9a86e9cc50240177a571fbe9c2860ac2"},
-    {file = "numpy-1.21.1-cp39-cp39-win_amd64.whl", hash = "sha256:01721eefe70544d548425a07c80be8377096a54118070b8a62476866d5208e33"},
-    {file = "numpy-1.21.1-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:2d4d1de6e6fb3d28781c73fbde702ac97f03d79e4ffd6598b880b2d95d62ead4"},
-    {file = "numpy-1.21.1.zip", hash = "sha256:dff4af63638afcc57a3dfb9e4b26d434a7a602d225b42d746ea7fe2edf1342fd"},
-]
-pyswisseph = [
-    {file = "pyswisseph-2.08.00-1.tar.gz", hash = "sha256:6b4818c0224d309c0b01f3c52df2432900dddcde345364408d99eafc9cdd1e71"},
-]
-pytz = [
-    {file = "pytz-2021.3-py2.py3-none-any.whl", hash = "sha256:3672058bc3453457b622aab7a1c3bfd5ab0bdae451512f6cf25f64ed37f5b87c"},
-    {file = "pytz-2021.3.tar.gz", hash = "sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326"},
-]
-timezonefinder = [
-    {file = "timezonefinder-5.2.0-py36.py37.py38-none-any.whl", hash = "sha256:4545533086eb25cd7ba10b97785059acbababf4577ab1b4d5c2ab56642eadfea"},
-    {file = "timezonefinder-5.2.0.tar.gz", hash = "sha256:a374570295a8dbd923630ce85f754e52578e288cb0a9cf575834415e84758352"},
-]
+click = []
+colorama = []
+flatlib = []
+numpy = []
+pyswisseph = []
+pytz = []
+timezonefinder = []

packages/scripts/meteo.sh

@@ -69,8 +69,8 @@ curl -sSL \
     "http://wetterstationen.meteomedia.de/messnetz/vorhersagegrafik/$station.png" \
     -o "$cache"
 
-if window_id=$(xdotool search --name "^sxiv - $cache$"); then
+if window_id=$(xdotool search --name "^nsxiv - $cache$"); then
   xdotool key --window "$window_id" r
 else
-  sxiv "$cache" &
+  nsxiv "$cache" &
 fi

packages/scripts/unicodmenu.nix

@@ -76,8 +76,14 @@ in
   # ref https://github.com/LukeSmithxyz/voidrice/blob/9fe6802122f6e0392c7fe20eefd30437771d7f8e/.local/bin/dmenuunicode
   writers.writeDashBin "unicodmenu" ''
     history_file=$HOME/.cache/unicodmenu
-    PATH=${lib.makeBinPath [coreutils dmenu gnused libnotify xclip xdotool]}
-    chosen=$(cat "$history_file" ${kaomoji-file} ${unicode-file} | dmenu -p unicode -i -l 10 | tee --append "$history_file" | sed "s/    .*//")
+    PATH=${lib.makeBinPath [coreutils dmenu gawk gnused libnotify xclip xdotool]}
+
+    all_characters() {
+      tac "$history_file"
+      cat ${kaomoji-file} ${unicode-file}
+    }
+
+    chosen=$(all_characters | awk '!seen[$0]++' | dmenu -p unicode -i -l 10 | tee --append "$history_file" | sed "s/    .*//")
 
     [ "$chosen" != "" ] || exit
 

packages/weechatScripts/hotlist2extern.nix

@@ -0,0 +1,33 @@
+{
+  stdenv,
+  lib,
+  fetchurl,
+  weechat,
+}:
+stdenv.mkDerivation {
+  pname = "hotlist2extern";
+  version = "1.0";
+
+  src = fetchurl {
+    url = "https://raw.githubusercontent.com/weechat/scripts/dd627975cf2e464f206f8006cb3963c8ee82044c/perl/hotlist2extern.pl";
+    sha256 = "1flpikm1kq6m9rh3hmafni9f2yi1b90w539k3hj55a5c9gddp2lr";
+  };
+
+  dontUnpack = true;
+
+  installPhase = ''
+    mkdir -p $out/share
+    cp $src $out/share/hotlist2extern.pl
+  '';
+
+  passthru = {
+    scripts = ["hotlist2extern.pl"];
+  };
+
+  meta = with lib; {
+    inherit (weechat.meta) platforms;
+    description = "Give hotlist to an external file/program";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [kmein];
+  };
+}

systems/ful/configuration.nix

@@ -39,7 +39,7 @@ in {
 
   security.acme = {
     acceptTerms = true;
-    email = kieran.email;
+    defaults.email = kieran.email;
   };
 
   users.users.root.passwordFile = toString <system-secrets/root.password>;

systems/ful/hardware-configuration.nix

@@ -16,7 +16,6 @@
     };
     initrd = {
       availableKernelModules = ["virtio_pci" "usbhid"];
-      kernelModules = ["bochs_drm"];
     };
     kernelModules = [
       "console=ttyS0"

systems/kabsa/configuration.nix

@@ -19,9 +19,9 @@ in {
     promptColours.success = "cyan";
   };
 
-  nix = {
-    buildCores = 1;
-    maxJobs = 2;
+  nix.settings = {
+    cores = 1;
+    max-jobs = 2;
   };
 
   environment.systemPackages = [pkgs.minecraft];

systems/kabsa/hardware-configuration.nix

@@ -42,6 +42,6 @@
 
   zramSwap.enable = false;
 
-  nix.maxJobs = lib.mkDefault 4;
+  nix.settings.max-jobs = lib.mkDefault 4;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }

systems/makanek/configuration.nix

@@ -17,6 +17,7 @@ in {
     ./monitoring
     ./moodle-dl-borsfaye.nix
     ./names.nix
+    ./grimm.nix
     ./nextcloud.nix
     ./radio-news.nix
     ./radio.nix
@@ -100,8 +101,14 @@ in {
 
   security.acme = {
     acceptTerms = true;
-    email = kieran.email;
+    defaults.email = kieran.email;
   };
 
-  environment.systemPackages = [pkgs.vim pkgs.git pkgs.tmux pkgs.python3];
+  environment.systemPackages = [
+    pkgs.vim
+    pkgs.git
+    pkgs.tmux
+    pkgs.python3
+    pkgs.nix-output-monitor
+  ];
 }

systems/makanek/grimm.nix

@@ -0,0 +1,30 @@
+{pkgs, ...}: let
+  port = 9610;
+  web-socket-sink-src = "${<scripts>}/grimm-scroller";
+  web-socket-sink = pkgs.callPackage web-socket-sink-src {};
+  lemmata = "${web-socket-sink-src}/dwb-compact.json";
+in {
+  systemd.services.grimm-ws = {
+    wantedBy = ["multi-user.target"];
+    script = "${web-socket-sink}/bin/web-socket-sink --host 0.0.0.0 --port ${toString port} < ${lemmata}";
+    serviceConfig = {
+      Restart = "always";
+      DynamicUser = true;
+    };
+  };
+
+  services.nginx.virtualHosts."grimm.kmein.de" = {
+    enableACME = false;
+    forceSSL = false;
+    locations = {
+      "/".root = pkgs.linkFarm "grimm" [
+        {
+          name = "index.html";
+          path = "${web-socket-sink-src}/wclient.html";
+        }
+      ];
+    };
+  };
+
+  networking.firewall.allowedTCPPorts = [port];
+}

systems/makanek/hardware-configuration.nix

@@ -29,5 +29,5 @@
   swapDevices = [];
   zramSwap.enable = true;
 
-  nix.maxJobs = lib.mkDefault 2;
+  nix.settings.max-jobs = lib.mkDefault 2;
 }

systems/makanek/menstruation.nix

@@ -7,7 +7,10 @@
   telegram = pkgs.callPackage <menstruation-telegram> {};
   backendPort = 8000;
 in {
-  services.redis.enable = true;
+  services.redis.servers.menstruation = {
+    enable = true;
+    port = 6379;
+  };
 
   environment.systemPackages = [pkgs.redis];
 
@@ -23,7 +26,7 @@ in {
     wants = [
       "network-online.target"
       "menstruation-backend.service"
-      "redis.service"
+      "redis-menstruation.service"
     ];
     wantedBy = ["multi-user.target"];
     environment = {

systems/makanek/nextcloud.nix

@@ -9,7 +9,7 @@
 in {
   services.nextcloud = {
     enable = true;
-    package = pkgs.nextcloud22;
+    package = pkgs.nextcloud24;
 
     https = true;
 

systems/makanek/radio-news.nix

@@ -17,7 +17,7 @@ in {
   ];
 
   systemd.services.stockholm-history = {
-    startAt = "hourly";
+    startAt = "*:58:00";
     script = ''
       stockholm=$(mktemp -d)
       trap clean EXIT

systems/makanek/urlwatch.nix

@@ -114,6 +114,10 @@
       url = "https://www.deutschlandfunk.de/meine-nacht-schlaeft-nicht-pflanze-mich-nicht-in-dein-herz.700.de.html?dram:article_id=486475";
       filter = [{element-by-class = "dlf-articledetail";} "html2text" "strip"];
     }
+    {
+      name = "Ist der Congress schon abgesagt?";
+      url = "https://ist-der-congress-schon-abgesagt.de/";
+    }
     {
       name = "fxght.or.flxght";
       url = "https://api.tellonym.me/profiles/name/fxght.or.flxght?limit=20";

systems/makanek/weechat.nix

@@ -5,6 +5,7 @@
 }: let
   inherit (import <niveum/lib>) kieran;
   relayPassword = lib.fileContents <system-secrets/weechat/relay>;
+  weechatHome = "/var/lib/weechat";
 in {
   systemd.services.weechat = let
     tmux = pkgs.writers.writeDash "tmux" ''
@@ -31,6 +32,7 @@ in {
           pkgs.weechatScripts.weechat-autosort
           pkgs.weechatScripts.colorize_nicks
           pkgs.weechatScripts.weechat-matrix
+          (pkgs.callPackage <niveum/packages/weechatScripts/hotlist2extern.nix> {})
         ];
         settings = let
           nick = "kmein";
@@ -55,26 +57,26 @@ in {
             server = {
               hackint = {
                 autoconnect = true;
-                address = "irc.hackint.org/6697";
+                addresses = "irc.hackint.org/6697";
                 ipv6 = true;
                 ssl = true;
-                autojoin = ["#krebs" "#hsmr" "#nixos" "#the_playlist" "#flipdot-berlin" "#hackint"];
+                autojoin = ["#eloop" "#krebs" "#hsmr" "#nixos" "#the_playlist" "#flipdot-berlin" "#hackint"];
                 sasl_mechanism = "plain";
                 sasl_username = nick;
                 sasl_password = lib.strings.fileContents <system-secrets/irc/hackint>;
               };
               libera = {
                 autoconnect = true;
-                address = "irc.libera.chat/6697";
+                addresses = "irc.libera.chat/6697";
                 ssl = true;
-                autojoin = ["#flipdot" "#haskell" "#nixos" "#fysi" "#binaergewitter" "#neovim" "#lojban" "#vim" "#newsboat"];
+                autojoin = ["#flipdot" "#haskell" "#nixos" "#fysi" "#binaergewitter" "#vim" "#newsboat"];
                 sasl_mechanism = "plain";
                 sasl_username = nick;
                 sasl_password = lib.strings.fileContents <system-secrets/irc/libera>;
               };
               oftc = {
                 autoconnect = true;
-                address = "irc.oftc.net/6697";
+                addresses = "irc.oftc.net/6697";
                 ssl = true;
                 ipv6 = true;
                 command = lib.concatStringsSep "\\;" [
@@ -85,8 +87,8 @@ in {
               };
               retiolum = {
                 autoconnect = true;
-                address = "irc.r";
-                autojoin = ["#xxx" "#brockman" "#flix" "#mukke"];
+                addresses = "irc.r";
+                autojoin = ["#xxx" "#brockman" "#flix"];
                 command = lib.concatStringsSep "\\;" [
                   "/oper admin aidsballs"
                   "/msg nickserv always-on true"
@@ -99,13 +101,20 @@ in {
               };
               news = {
                 autoconnect = true;
-                address = "news.r";
+                addresses = "news.r";
                 autojoin = ["#cook" "#drachengame" "#oepnv" "#kmeinung" "#memes"];
                 command = "/oper aids balls";
               };
             };
           };
           logger.level.irc.news = 0;
+          plugins.var.perl.hotlist2extern = {
+            external_command_hotlist = "echo %X > ${weechatHome}/hotlist.txt";
+            external_command_hotlist_empty = "echo -n %X > ${weechatHome}/hotlist.txt";
+            lowest_priority = "2";
+            use_title = "off";
+            delimiter = ",";
+          };
           matrix.server.nibbana = {
             address = "nibbana.jp";
             username = nick;
@@ -119,7 +128,7 @@ in {
           };
           filters = {
             zerocovid = {
-              buffer = "*";
+              buffer = "irc.news.*";
               tags = "*";
               regex = "[kc]orona|💉|🤒|😷|[kc]ovid|virus|lockdown|va[kc][sc]in|vaxx|mutante|mutation|impf|pandemi|κορ[ωο]ν[αο]ϊό|корона|expert|infe[ck]t|infizi|in[cz]iden[cz]|sars-cov|drosten|virolog|lauterbach|delta|omi[ck]ron|epidemi|booster|r-wert";
             };
@@ -150,7 +159,11 @@ in {
             };
           };
         };
-        extraCommands = ''/matrix connect nibbana'';
+        extraCommands = ''
+          /save
+          /matrix connect nibbana
+          /connect -all
+        '';
       };
     };
   in {
@@ -159,7 +172,7 @@ in {
     wantedBy = ["multi-user.target"];
     restartIfChanged = true;
     path = [pkgs.alacritty.terminfo];
-    environment.WEECHAT_HOME = "/var/lib/weechat";
+    environment.WEECHAT_HOME = weechatHome;
     preStart = "${pkgs.coreutils}/bin/rm $WEECHAT_HOME/*.conf";
     script = "${tmux} -2 new-session -d -s IM ${weechat}/bin/weechat";
     preStop = "${tmux} kill-session -t IM";

systems/tahina/configuration.nix

@@ -7,7 +7,6 @@
 in {
   imports = [
     ./hardware-configuration.nix
-    <niveum/configs/battery.nix>
     <niveum/configs/spacetime.nix>
     <niveum/modules/retiolum.nix>
     <niveum/configs/sshd.nix>

systems/zaatar/configuration.nix

@@ -17,7 +17,6 @@ in {
     ./tuna.nix
     ./grocy.nix
     ./spotifyd.nix
-    <home-manager/nixos>
     <niveum/configs/keyboard.nix>
     <niveum/configs/monitoring.nix>
     <niveum/configs/nix.nix>
@@ -67,6 +66,9 @@ in {
     pkgs.ncmpcpp
   ];
 
+  # since 22.05 timeout fails?
+  systemd.services.systemd-networkd-wait-online.enable = false;
+
   networking = {
     hostName = "zaatar";
     wireless.interfaces = ["wlp2s0"];

systems/zaatar/gaslight.nix

@@ -16,8 +16,8 @@
   ];
 }
 /*
- 
- ssh machine gaslight-stream | mpv -
- ssh machine gaslight-say "blablabla"
- */
+
+ssh machine gaslight-stream | mpv -
+ssh machine gaslight-say "blablabla"
+*/
 

systems/zaatar/hardware-configuration.nix

@@ -32,6 +32,6 @@
 
   swapDevices = [{device = "/dev/disk/by-label/swap";}];
 
-  nix.maxJobs = lib.mkDefault 4;
+  nix.settings.max-jobs = lib.mkDefault 4;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }

systems/zaatar/pulseaudio.nix

@@ -1,7 +1,10 @@
-{
+{pkgs, ...}: {
   sound.enable = true;
 
+  environment.systemPackages = [pkgs.ncpamixer];
+
   hardware.pulseaudio = {
+    package = pkgs.pulseaudioFull;
     enable = true;
     systemWide = true;
     tcp = {