feat: re-enable all locales 😠

how could i live without this?

.bin/filli-report

@@ -0,0 +1,6 @@
+#!/bin/sh
+hora reg 'fillidefilla' -O csv \
+  -b "$(date -d "$(date +%Y-%m)-20 last month" +%Y-%m-%d)" \
+  -e "$(date -d "$(date +%Y-%m)-19" +%Y-%m-%d)" \
+  | sed 's/(fillidefilla:\(.*\))/\1/g' \
+  | xsv select date,amount,total,account,description

.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

@@ -3,7 +3,7 @@
   system,
   name,
 }: let
-  inherit (inputs) nixpkgs;
+  nixpkgs = inputs.nixos-stable;
   pkgs = nixpkgs.legacyPackages.${system};
   ensureFiles = paths:
     pkgs.runCommand "directory" {} ''
@@ -23,6 +23,13 @@
       "nixos-config=${toString ./.}/systems/${name}/configuration.nix"
       "system-secrets=${systemSecrets}"
       "secrets=${sharedSecrets}"
+      "nixpkgs=${
+        toString (
+          if name == "kabsa" || name == "manakish"
+          then inputs.nixos-unstable
+          else inputs.nixos-stable
+        )
+      }"
     ]
     ++ nixpkgs.lib.mapAttrsToList (name: value: "${name}=${value}") inputs);
   # cd ~/.password-store/shared && find * -type f | sed 's/.gpg$//'
@@ -36,6 +43,7 @@
     "mail/gmail/amroplay"
     "mail/gmail/kieran.meinhardt"
     "mail/meinhaki"
+    "mail/dslalewa"
     "mail/posteo"
     "nextcloud-fysi/password"
     "nextcloud/password"
@@ -54,6 +62,7 @@
       kabsa = ensureFiles basic;
       manakish = ensureFiles basic;
       tahina = ensureFiles basic;
+      ful = ensureFiles (["root.password"] ++ basic);
       makanek = ensureFiles ([
           "irc/retiolum"
           "irc/hackint"
@@ -73,6 +82,7 @@
           "telegram/menstruation.token"
           "telegram/cool_village.token"
           "telegram/kmein.token"
+          "telegram/krebs.token"
           "telegram/prometheus.token"
           "weechat/relay"
         ]

configs/alacritty.nix

@@ -3,29 +3,15 @@
   lib,
   config,
   ...
-}: {
-  environment.variables.TERMINAL = "alacritty";
-
-  environment.systemPackages = [
-    pkgs.alacritty
-  ];
-
-  home-manager.users.me.xdg.configFile = let
-    inherit (import <niveum/lib>) colours;
-    colourNames = ["black" "red" "green" "yellow" "blue" "magenta" "cyan" "white"];
-    colourPairs = lib.getAttrs colourNames colours;
-  in {
-    "alacritty/alacritty.yml".source = (pkgs.formats.yaml {}).generate "alacritty.yml" {
-      background_opacity = 0.9;
-      colors = {
-        primary = {inherit (colours) background foreground;};
-        normal = lib.mapAttrs (_: colour: colour.dark) colourPairs;
-        bright = lib.mapAttrs (_: colour: colour.bright) colourPairs;
-      };
+}: let
+  alacritty-cfg = theme:
+    (pkgs.formats.yaml {}).generate "alacritty.yml" {
+      window.opacity = 0.95;
       font = {
         normal.family = "Monospace";
         size = 6;
       };
+      live_config_reload = true;
       key_bindings = [
         {
           key = "Plus";
@@ -43,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/battery.nix

@@ -8,7 +8,7 @@
     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/chromium.nix

@@ -7,6 +7,7 @@
       "cjpalhdlnbpafiamejdnhcphjbkeiagm" # uBlock Origin
       "pjjgklgkfeoeiebjogplpnibpfnffkng" # undistracted
       "nhdogjmejiglipccpnnnanhbledajbpd" # vuejs devtools
+      "eimadpbcbfnmbkopoojfekhnkhdbieeh" # dark reader
     ];
   };
 

configs/cloud.nix

@@ -3,7 +3,9 @@
   lib,
   pkgs,
   ...
-}: {
+}: let
+  inherit (import <niveum/lib>) tmpfilesConfig;
+in {
   imports = [
     <niveum/modules/dropbox.nix>
   ];
@@ -12,17 +14,45 @@
     dropbox.enable = false;
   };
 
-  system.activationScripts.home-symlinks = ''
-    ln -sfn ${config.users.users.me.home}/cloud/syncthing/common/mahlzeit ${config.users.users.me.home}/mahlzeit
-    ln -sfn ${config.users.users.me.home}/cloud/Seafile/Wiki ${config.users.users.me.home}/notes
-    ln -sfn ${config.users.users.me.home}/cloud/Seafile/Uni ${config.users.users.me.home}/uni
-  '';
+  systemd.tmpfiles.rules = map tmpfilesConfig [
+    {
+      type = "L+";
+      user = config.users.users.me.name;
+      group = "users";
+      mode = "0755";
+      argument = "${config.users.users.me.home}/cloud/Seafile/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 = [

configs/default.nix

@@ -52,6 +52,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
           };
         };
@@ -79,7 +80,6 @@ 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 = ''
@@ -144,11 +144,16 @@ in {
         wcd = "source ${wcd}";
         im = "${pkgs.openssh}/bin/ssh weechat@makanek -t tmux attach-session -t IM";
         where = "source ${where}";
-        yt = "${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -ic"; # Download video link
-        yta = "${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -xic"; # Download with audio
+        yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
+        yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -xic"; # Download with audio
+      };
+    }
+    {
+      i18n = {
+        defaultLocale = "en_DK.UTF-8";
+        supportedLocales = ["all"];
       };
     }
-    {i18n.defaultLocale = "en_DK.UTF-8";}
     {
       services.xserver = {
         enable = true;
@@ -170,13 +175,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";
         };
       };
@@ -207,6 +214,9 @@ in {
         })
         localAddresses;
     }
+    {
+      home-manager.users.me.home.stateVersion = "22.05";
+    }
     ./alacritty.nix
     ./backup.nix
     ./bash.nix
@@ -244,7 +254,7 @@ in {
     ./polkit.nix
     ./power-action.nix
     ./printing.nix
-    ./openweathermap.nix
+    # ./openweathermap.nix
     ./wallpaper.nix
     ./redshift.nix
     ./retiolum.nix
@@ -255,12 +265,13 @@ in {
     ./sshd.nix
     ./sudo.nix
     ./sxiv.nix
-    ./theming.nix
+    ./themes.nix
     ./tmux.nix
     ./traadfri.nix
     ./unclutter.nix
     ./vscode.nix
     ./watson.nix
     ./zsh.nix
+    ./tor.nix
   ];
 }

configs/docker.nix

@@ -12,5 +12,5 @@
     ];
   };
   users.users.me.extraGroups = ["docker"];
-  environment.systemPackages = [pkgs.docker pkgs.docker_compose];
+  environment.systemPackages = [pkgs.docker pkgs.docker-compose];
 }

configs/fonts.nix

@@ -1,42 +1,55 @@
 {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
+      etBook
+      ezra-sil
       fira
-      font-awesome-ttf
+      font-awesome
+      galatia-sil
+      gentium
+      gfs-fonts
+      gyre-fonts
+      ia-writer-duospace
       ibm-plex
-      inconsolata
-      iosevka
-      libertine
+      jetbrains-mono
+      joypixels
+      libertinus
+      libre-bodoni
       lmodern
-      noto-fonts
-      noto-fonts-cjk
-      noto-fonts-emoji
+      merriweather
+      ocr-a
       roboto
       roboto-mono
       roboto-slab
+      scheherazade-new
       source-code-pro
-      source-serif-pro
       source-sans-pro
-      ubuntu_font_family
-      gfs-fonts
-      jetbrains-mono
-      twemoji-color-font
-      joypixels
+      source-serif-pro
+      theano
       tocharian-font
-    ];
-    fontconfig.defaultFonts = {
-      monospace = ["JetBrains Mono" "JoyPixels"];
-      serif = ["Roboto Slab"];
-      sansSerif = ["Roboto" "Noto Sans"];
-      emoji = ["JoyPixels"];
+      vistafonts
+      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];
     };
   };
 }

configs/git.nix

@@ -50,12 +50,12 @@ in {
         rebase.autoStash = true;
         merge.autoStash = true;
 
-        # ref https://github.com/dandavison/delta
-        core.pager = "${pkgs.delta}/bin/delta";
-        interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
-        delta.navigate = true;
-        merge.conflictStyle = "diff3";
-        diff.colorMoved = "default";
+        # # ref https://github.com/dandavison/delta
+        # core.pager = "${pkgs.delta}/bin/delta";
+        # interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
+        # delta.navigate = true;
+        # merge.conflictStyle = "diff3";
+        # diff.colorMoved = "default";
       };
     };
   };

configs/hledger.nix

@@ -5,6 +5,17 @@
 }: {
   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}" "$@"
+    '')
+  ];
+
   niveum.hledger = {
     enable = true;
     ledgerFile = "$HOME/projects/ledger/all.journal";

configs/i3.nix

@@ -34,6 +34,7 @@
       "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)"
       '';
@@ -216,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}";
@@ -247,8 +253,9 @@ in {
         "${modifier}+p" = "exec --no-startup-id ${pkgs.pass}/bin/passmenu -l 5";
         "${modifier}+u" = "exec ${pkgs.scripts.unicodmenu}/bin/unicodmenu";
 
+        "${modifier}+F6" = "exec ${pkgs.xorg.xkill}/bin/xkill";
         "${modifier}+F7" = "exec ${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/keyboard.nix

@@ -4,17 +4,47 @@
   ...
 }: 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"];
-    xkbVariant = commaSep ["T3" "polytonic"];
+    layout = "de";
+    # T3: https://upload.wikimedia.org/wikipedia/commons/a/a9/German-Keyboard-Layout-T3-Version1-large.png
+    # buckwalter: http://www.qamus.org/transliteration.htm
+    xkbVariant = "T3";
     xkbOptions =
-      commaSep ["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 = "${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/mpv.nix

@@ -18,8 +18,10 @@ in {
     programs.mpv = {
       enable = true;
       config = {
+        ytdl-format = "bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best";
         ytdl-raw-options = lib.concatStringsSep "," [''sub-lang="de,en"'' "write-sub=" "write-auto-sub="];
         screenshot-template = "%F-%wH%wM%wS-%#04n";
+        script-opts = "ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp";
       };
       bindings = {
         "Alt+RIGHT" = "add video-rotate 90";

configs/neomutt.nix

@@ -47,6 +47,20 @@
     };
   };
 
+  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;
@@ -131,6 +145,7 @@ in {
         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*; ${pkgs.libreoffice}/bin/soffice '%s';
       ''
     }:$mailcap_path
 

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

@@ -48,7 +48,7 @@ in {
 
   networking.networkmanager = {
     enable = true;
-    packages = [
+    plugins = [
       pkgs.networkmanager-openvpn
       pkgs.networkmanager-fortisslvpn
     ];

configs/newsboat.nix

@@ -5,7 +5,7 @@
 }: 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 = "${config.users.users.me.home}/cloud/Seafile/Documents/newsboat";
   linkhandler-bin = "${pkgs.scripts.linkhandler}/bin/linkhandler";
@@ -75,6 +75,14 @@ in {
 
   environment.systemPackages = [
     pkgs.newsboat
+    (pkgs.writers.writeDashBin "newsboat-unread-count" ''
+      printf "🆕"
+      if [ -f ${newsboat-home}/cache.db.lock ]; then
+        echo ↻
+      else
+        ${pkgs.sqlite}/bin/sqlite3 ${newsboat-home}/cache.db "SELECT COUNT(DISTINCT id) FROM rss_item WHERE unread=1"
+      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" \
         | ${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/packages.nix

@@ -8,8 +8,6 @@
   menstruation = pkgs.callPackage <menstruation-backend> {};
   pandoc-doc = pkgs.callPackage <niveum/packages/man/pandoc.nix> {};
 
-  nixpkgs-unstable = import <nixpkgs-unstable> {config.allowUnfree = true;};
-
   zoteroStyle = {
     name,
     sha256,
@@ -23,19 +21,19 @@
   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 = nixpkgs-unstable.astrolog.overrideAttrs (old:
+  astrolog = pkgs.astrolog.overrideAttrs (old:
     old
     // {
       installPhase = ''
@@ -73,7 +71,7 @@ in {
     whois
     dnsutils
     # FILE MANAGERS
-    ranger
+    lf
     pcmanfm
     # MEDIA
     ffmpeg
@@ -95,6 +93,7 @@ in {
     fd # better find
     file # determine file type
     dos2unix
+    genpass # generate passwords
     ncdu # ncurses disk usage
     python3Packages.jsonschema # json validation
     jq # json toolkit
@@ -102,10 +101,10 @@ in {
     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
@@ -117,26 +116,27 @@ 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
-    nixpkgs-unstable.alejandra # nix formatter
+    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
@@ -161,7 +161,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
@@ -175,7 +175,6 @@ in {
     scripts.fkill
     scripts.wttr
     scripts.unicodmenu
-    scripts.horoscope
     scripts.closest
     scripts.trans
     scripts.mpv-radio
@@ -233,7 +232,7 @@ in {
     ]))
     python3Packages.poetry
 
-    htmlTidy
+    html-tidy
     nodePackages.csslint
     nodePackages.jsonlint
     nodePackages.prettier

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

@@ -5,6 +5,8 @@
   ...
 }: let
   inherit (import <niveum/lib>) sshPort kieran;
+  externalNetwork = import <niveum/lib/external-network.nix>;
+  sshIdentity = name: "${config.users.users.me.home}/.ssh/${name}";
 in {
   services.xserver.displayManager.sessionCommands = "${pkgs.openssh}/bin/ssh-add";
 
@@ -25,7 +27,12 @@ in {
         port = sshPort;
       };
       makanek = {
-        hostname = "makanek.r";
+        hostname = externalNetwork.makanek;
+        user = "root";
+        port = sshPort;
+      };
+      ful = {
+        hostname = externalNetwork.ful;
         user = "root";
         port = sshPort;
       };
@@ -39,11 +46,6 @@ in {
         user = "kfm";
         port = sshPort;
       };
-      toum = {
-        hostname = "toum.r";
-        user = "root";
-        port = sshPort;
-      };
       kabsa = {
         hostname = "kabsa.r";
         user = "kfm";
@@ -57,9 +59,15 @@ in {
         hostname = "135.181.85.233";
         user = "root";
       };
-      oracle = {
-        hostname = "130.61.171.199";
-        user = "ubuntu";
+      "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/astrology.nix

@@ -1,9 +1,11 @@
 {
+  config,
   pkgs,
   lib,
   ...
 }: let
-  nixpkgs-unstable = import <nixpkgs-unstable> {};
+  unstable = import <nixos-unstable> {inherit (config.nixpkgs) config;};
+
   toSymbols = pkgs.writers.writeDash "to-symbols" ''
     ${pkgs.gnused}/bin/sed '
       s/\bTri\b/△/;
@@ -42,7 +44,7 @@
   '';
 in {
   niveum.telegramBots.transits = {
-    enable = true;
+    enable = false;
     time = "*:0/1";
     token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
     chatIds = ["-1001796440545"];
@@ -50,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"
-        ${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 -qd $date -zN Berlin -Yt -Yd -d -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

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

@@ -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,7 @@ in {
     ./literature-quote.nix
     ./astrology.nix
     ./autorenkalender.nix
+    ./hesychius.nix
     ./nachtischsatan.nix
     ./tlg-wotd.nix
     <niveum/modules/telegram-bot.nix>
@@ -26,6 +32,24 @@ in {
       inherit path;
     }) [reverseDirectory proverbDirectory];
 
+  niveum.passport.services = [
+    {
+      title = "Rückwarts-Bot";
+      link = "https://t.me/RueckwaertsBot";
+      description = "reverses things on Telegram.";
+    }
+    {
+      title = "BetaCode-Bot";
+      link = "https://t.me/BetaCodeBot";
+      description = "converts <a href=\"https://en.wikipedia.org/wiki/Beta_Code\">beta code</a> to polytonic Greek on Telegram.";
+    }
+    {
+      title = "Sprichwortgenerator-Bot";
+      link = "https://t.me/SprichwortGeneratorBot";
+      description = "generates useless German proverbs with optional stock photo background on Telegram.";
+    }
+  ];
+
   systemd.services.telegram-reverse = {
     wantedBy = ["multi-user.target"];
     description = "Telegram reverse bot";

configs/telegram-bots/hesychius.nix

@@ -0,0 +1,23 @@
+{
+  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}";
+  };
+
+  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,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

@@ -34,4 +34,12 @@ in {
     });
     serviceConfig.Restart = "always";
   };
+
+  niveum.passport.services = [
+    {
+      title = "Nachtischsatan-Bot";
+      link = "https://t.me/NachtischsatanBot";
+      description = "*flubberflubber*";
+    }
+  ];
 }

configs/telegram-bots/tlg-wotd.nix

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

@@ -23,6 +23,11 @@ in {
       enable = true;
       platformTheme = "gtk";
     };
-    xsession.pointerCursor = theme.cursor // {size = 16;};
+    home.pointerCursor =
+      theme.cursor
+      // {
+        size = 16;
+        x11.enable = true;
+      };
   };
 }

configs/tor.nix

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

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1648297722,
-        "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
+        "lastModified": 1656928814,
+        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
+        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
         "type": "github"
       },
       "original": {
@@ -18,20 +18,21 @@
     "home-manager": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs"
-        ]
+          "nixos-unstable"
+        ],
+        "utils": "utils"
       },
       "locked": {
-        "lastModified": 1647175256,
-        "narHash": "sha256-7H+veXPM7IwdN1DoZqliwb9sghlN56koV5dnCu1kpsc=",
+        "lastModified": 1657887110,
+        "narHash": "sha256-8VV0/kZed2z8fGtEc2zr+WLxTow+JTIlMjnSisyv0GQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a8d00f5c038cf7ec54e7dac9c57b171c1217f008",
+        "rev": "4c5106ed0f3168ff2df21b646aef67e86cbfc11c",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-21.11",
+        "ref": "master",
         "repo": "home-manager",
         "type": "github"
       }
@@ -42,7 +43,7 @@
           "flake-utils"
         ],
         "nixpkgs": [
-          "nixpkgs"
+          "nixos-stable"
         ]
       },
       "locked": {
@@ -62,11 +63,11 @@
     "menstruation-backend": {
       "flake": false,
       "locked": {
-        "lastModified": 1634573652,
-        "narHash": "sha256-FIj8oCOJO+Wqxr2o5MMqIShvzMJud4iUq3o8y4NIRvw=",
+        "lastModified": 1649545504,
+        "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": 1647992509,
-        "narHash": "sha256-AG40Nt5OWz0LBs5p457emOuwLKOvTtcv/2fUdnEN3Ws=",
+        "lastModified": 1657815135,
+        "narHash": "sha256-+5Jby1ayRjtSgsM5IpRNeUgdcIutCKQWR6sypRtd1RE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d2caa9377539e3b5ff1272ac3aa2d15f3081069f",
+        "rev": "c06d5fa9c605d143b15cafdbbb61c7c95388d76e",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-21.11",
+        "ref": "nixos-22.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
+    "nixos-unstable": {
       "locked": {
-        "lastModified": 1648337267,
-        "narHash": "sha256-8DRg8UDvs63iaIaHEbWG7/lnD9ImQlMNsTZMY3PvFLc=",
+        "lastModified": 1657802959,
+        "narHash": "sha256-9+JWARSdlL8KiH3ymnKDXltE1vM+/WEJ78F5B1kjXys=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6de161729c81dc98e844793cc9c8fda29d5ef62a",
+        "rev": "4a01ca36d6bfc133bc617e661916a81327c9bbc8",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "master",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -158,11 +159,11 @@
     "retiolum": {
       "flake": false,
       "locked": {
-        "lastModified": 1647444524,
-        "narHash": "sha256-N4T1UXLkYJMQqk65LkTDpW70ujXXeZ9xe5k+LOpznAI=",
+        "lastModified": 1656449345,
+        "narHash": "sha256-J6vftINxT6Sm4TjMEtUhpVz2vnGB5Fg5Dt4095t9eIU=",
         "owner": "krebs",
         "repo": "retiolum",
-        "rev": "de6d7dc9bd671e65f2ee3004b6807625e7553e84",
+        "rev": "0371a65100b68d46e1811ec1e3efd8281bc741df",
         "type": "github"
       },
       "original": {
@@ -179,8 +180,8 @@
         "menstruation-backend": "menstruation-backend",
         "menstruation-telegram": "menstruation-telegram",
         "nix-writers": "nix-writers",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable",
+        "nixos-stable": "nixos-stable",
+        "nixos-unstable": "nixos-unstable",
         "recht": "recht",
         "retiolum": "retiolum",
         "scripts": "scripts",
@@ -194,11 +195,11 @@
     "scripts": {
       "flake": false,
       "locked": {
-        "lastModified": 1648314795,
-        "narHash": "sha256-hGIXkAcGiJnVXnl8kigZpI3VFrLmAr2+yr85hi5JwP0=",
+        "lastModified": 1658427979,
+        "narHash": "sha256-5W0omdIH6SAZyXSASxdlDK9+u8vbwAlHdh5gAEP+QHQ=",
         "owner": "kmein",
         "repo": "scripts",
-        "rev": "d1d525b92a34e55b1ad886807c284106e58716b2",
+        "rev": "9b945b3f38297b1cbd6a9efe337c0805d6e2997d",
         "type": "github"
       },
       "original": {
@@ -210,11 +211,11 @@
     "stockholm": {
       "flake": false,
       "locked": {
-        "lastModified": 1648214990,
-        "narHash": "sha256-rptATGq+jcpL+P+Cr6d3OajV6zYkbHPWlt3aQNZI2TY=",
-        "ref": "master",
-        "rev": "ae9c0b12710b5361d0d45510eb401eebfc1b3fb0",
-        "revCount": 10497,
+        "lastModified": 1656449028,
+        "narHash": "sha256-9a41If9iQrWjzFwB2G/O9ZoLRPT/O/wm3PD9nZsjmO8=",
+        "ref": "refs/heads/master",
+        "rev": "64dbf31d70497d6a66f89fdd86ac1884e28f7bc8",
+        "revCount": 10685,
         "type": "git",
         "url": "https://cgit.lassul.us/stockholm"
       },
@@ -242,11 +243,11 @@
     "tinc-graph": {
       "flake": false,
       "locked": {
-        "lastModified": 1639820904,
-        "narHash": "sha256-d4s2PulBGIIQXtX7blZz+Wnmij5dK/IrBcilNGjqZC4=",
+        "lastModified": 1653080212,
+        "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,16 +2,17 @@
   description = "niveum: packages, modules, systems";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11";
-    nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
+    nixos-stable.url = "github:NixOS/nixpkgs/nixos-22.05";
+    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";
-      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/home-manager/master";
+      inputs.nixpkgs.follows = "nixos-unstable";
     };
     krops = {
       url = "github:Mic92/krops";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixos-stable";
       inputs.flake-utils.follows = "flake-utils";
     };
 
@@ -70,8 +71,8 @@
     menstruation-backend,
     menstruation-telegram,
     nix-writers,
-    nixpkgs,
-    nixpkgs-unstable,
+    nixos-unstable,
+    nixos-stable,
     recht,
     retiolum,
     scripts,
@@ -82,41 +83,80 @@
     tuna,
   } @ inputs: let
     system = "x86_64-linux";
-    pkgs = nixpkgs.legacyPackages.${system};
-    source = name:
+    pkgs = nixos-stable.legacyPackages.${system};
+    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.git = {
+          url = "https://github.com/NixOS/nixpkgs";
+          ref =
+            (
+              if unstable
+              then inputs.nixos-unstable
+              else inputs.nixos-stable
+            )
+            .rev;
+          shallow = true;
+        };
       }
-      // nixpkgs.lib.mapAttrs' (name: value: {
+      // nixos-stable.lib.mapAttrs' (name: value: {
         inherit name;
-        value.file = toString value;
-      }) (nixpkgs.lib.filterAttrs (name: _: !builtins.elem name ["flake-utils" "krops" "self"]) inputs);
+        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,
+      user ? "root",
       host,
-    }: let
-      inherit (import ./lib/default.nix) sshPort;
-    in
+      unstable ? false,
+      sshPort ? (import ./lib/default.nix).sshPort,
+      sources,
+    }:
       toString (krops.packages.${system}.writeDeploy "deploy-${name}" {
-        source = krops.lib.evalSource [(source name)];
-        target = "root@${host}:${
-          if host == "130.61.203.118"
-          then "22"
-          else toString sshPort
-        }";
+        source = krops.lib.evalSource [(source {inherit sources unstable name;})];
+        target = "${user}@${host}:${toString sshPort}";
       });
   in {
     apps.${system} = let
       forSystems = f: builtins.listToAttrs (map f (builtins.attrNames (builtins.readDir ./systems)));
+      externalNetwork = import ./lib/external-network.nix;
       deployScripts = forSystems (name: {
         name = "deploy-${name}";
         value = {
@@ -124,9 +164,21 @@
           program = deployScriptFor {
             inherit name;
             host =
-              if name == "tahina"
-              then "130.61.203.118"
+              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};
           };
         };
       });

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

@@ -28,7 +28,7 @@ rec {
   serveHtml = file: pkgs: ''
     default_type "text/html";
     root ${
-      pkgs.linkFarm "fahrplan" [
+      pkgs.linkFarm "www" [
         {
           name = "index.html";
           path = file;
@@ -82,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/external-network.nix

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

lib/home.nix

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

lib/i3status-rust.nix

@@ -85,6 +85,11 @@ in {
     };
   };
   block = [
+    {
+      block = "custom";
+      interval = 5;
+      command = "newsboat-unread-count";
+    }
     {
       block = "weather";
       autolocate = true;

lib/radio-news.html

@@ -47,7 +47,7 @@
       }
     </style>
     <script>
-      const newsEndpoint = "http://prism.r:7999";
+      const newsEndpoint = "http://radio-news.r";
 
       function isoString(date) {
         return date.toISOString().slice(0, -5) + "Z";
@@ -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);
@@ -111,7 +115,23 @@
         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();
       };
@@ -122,10 +142,10 @@
       <section>
         <h1>Submit news</h1>
         <form onsubmit="sendNews(event)">
-          <label>Start date</label>
-          <input type="datetime-local" name="from" required />
-          <label>End date</label>
-          <input type="datetime-local" name="to" required />
+          <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" />

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";

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/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/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/gfs-fonts.nix

@@ -39,5 +39,15 @@ in
       GFS_Pyrsos = "0y0dv7y3n01bbhhnczflx1zcc7by56cffmr2xqixj2rd1nvchx0j";
       GFS_Solomos = "1mpx9mw566awvfjdfx5sbz3wz5gbnjjw56gz30mk1lw06vxf0dxz";
       GFS_Theokritos = "0haasx819x8c8yvna6pqywgi4060av2570jm34cddnz1fgnhv1b8";
+      # Heraklit
+      # Galatea
+      # Georgiou
+      # Ambrosia
+      # Fleischman
+      # Eustace
+      # Nicefore
+      # Jackson
+      # Garaldus
+      # Ignacio
     };
   }

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/scripts/avesta.sed

@@ -0,0 +1,54 @@
+#!/usr/bin/env -S sed -f
+s/ā̊/𐬃/g
+s/t̰/𐬝/g
+s/ṣ̌/𐬴/g
+s/š́/𐬳/g
+s/ą̄/𐬅/g
+s/ŋᵛ/𐬤/g
+s/ə̄/𐬇/g
+s/ŋ́/𐬣/g
+s/x́/𐬒/g
+s/xᵛ/𐬓/g
+s/a/𐬀/g
+s/ā/𐬁/g
+s/å/𐬂/g
+s/ą/𐬄/g
+s/ə/𐬆/g
+s/e/𐬈/g
+s/ē/𐬉/g
+s/o/𐬊/g
+s/ō/𐬋/g
+s/i/𐬌/g
+s/ī/𐬍/g
+s/u/𐬎/g
+s/ū/𐬏/g
+s/k/𐬐/g
+s/x/𐬑/g
+s/g/𐬔/g
+s/ġ/𐬕/g
+s/γ/𐬖/g
+s/c/𐬗/g
+s/j/𐬘/g
+s/t/𐬙/g
+s/θ/𐬚/g
+s/d/𐬛/g
+s/δ/𐬜/g
+s/p/𐬞/g
+s/f/𐬟/g
+s/b/𐬠/g
+s/β/𐬡/g
+s/ŋ/𐬢/g
+s/n/𐬥/g
+s/ń/𐬦/g
+s/ṇ/𐬧/g
+s/m/𐬨/g
+s/m̨/𐬩/g
+s/ẏ/𐬫/g
+s/y/𐬪/g
+s/v/𐬬/g
+s/r/𐬭/g
+s/s/𐬯/g
+s/z/𐬰/g
+s/š/𐬱/g
+s/ž/𐬲/g
+s/h/𐬵/g

packages/scripts/default.nix

@@ -117,7 +117,7 @@ in
       '';
 
     tag = wrapScript {
-      packages = [pkgs.vorbisTools pkgs.python3Packages.eyeD3 opustags];
+      packages = [pkgs.vorbis-tools pkgs.python3Packages.eyeD3 opustags];
       script = "${voidrice}/.local/bin/tag";
       name = "tag";
     };
@@ -307,16 +307,11 @@ in
       packages = [pkgs.xdo];
     };
 
-    ipa =
-      pkgs.writers.writeHaskellBin "ipa" {
-        libraries = with pkgs; [haskellPackages.text haskellPackages.ipa];
-      } ''
-        import Data.Maybe (fromJust)
-        import Language.IPA
-        import qualified Data.Text as T
-        import qualified Data.Text.IO as T
-        main = T.interact (T.unwords . map (unIPA . fromJust . (xSampaToIpa =<<) . mkXSampa) . T.words)
-      '';
+    ipa = wrapScript {
+      script = ./ipa.py;
+      name = "ipa";
+      packages = [pkgs.python3];
+    };
 
     default-gateway = pkgs.writers.writeDashBin "default-gateway" ''
       ${pkgs.iproute}/bin/ip -json route | ${pkgs.jq}/bin/jq --raw-output '.[0].gateway'

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/mpv-tv.nix

@@ -4,7 +4,7 @@
 }: let
   streams-tsv = pkgs.fetchurl {
     url = "https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/iptv/kodi/kodi_tv.m3u";
-    sha256 = "1cw1gmb16vwh6qfw0z3wjjfgn0zg2qplnddqzva5b0xx2g2appla";
+    sha256 = "sha256-gbHV37Yo+D3TYfDXZyb9IX8aRsguZ3qG2SYlY8NsTL0=";
     postFetch = ''
       ${pkgs.gnused}/bin/sed '/#EXTM3U/d;/#EXTINF/s/.*,//g' $out | ${pkgs.coreutils}/bin/paste -d'\t' - - > $out.tmp
       mv $out.tmp $out

packages/scripts/mushakkil.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+curl -sSL 'https://diac.alsharekh.org/Diac/DiacText' \
+  -H "Content-Type: application/json" \
+  --data-raw "$(jq --raw-input '{word: ., type: 1}')" \
+  --compressed \
+  | jq -r .diacWord

packages/scripts/pls.nix

@@ -39,6 +39,12 @@
     "make it stooop"
     "noooo"
   ];
+
+  messages.neutral = [
+    "meh"
+    "i have no opinion about this song"
+    "idk man"
+  ];
 in
   pkgs.writers.writeDashBin "pls" ''
     case "$1" in
@@ -50,6 +56,9 @@ in
         ${pkgs.curl}/bin/curl -sS -XPOST "${playlistAPI}/skip"
         echo ${lib.escapeShellArg (lib.concatStringsSep "\n" messages.bad)} | shuf -n1 | ${sendIRC}
       ;;
+      0|meh|neutral)
+        echo ${lib.escapeShellArg (lib.concatStringsSep "\n" messages.neutral)} | shuf -n1 | ${sendIRC}
+      ;;
       say|msg)
         shift
         echo "$@" | ${sendIRC}

packages/scripts/unicodmenu.nix

@@ -75,8 +75,9 @@
 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 ${kaomoji-file} ${unicode-file} | dmenu -p unicode -i -l 10 | sed "s/    .*//")
+    chosen=$(cat "$history_file" ${kaomoji-file} ${unicode-file} | dmenu -p unicode -i -l 10 | tee --append "$history_file" | sed "s/    .*//")
 
     [ "$chosen" != "" ] || exit
 

systems/ful/configuration.nix

@@ -0,0 +1,48 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (import <niveum/lib>) kieran retiolumAddresses;
+in {
+  imports = [
+    ./hardware-configuration.nix
+    # <niveum/configs/monitoring.nix>
+    <niveum/configs/nix.nix>
+    <niveum/configs/save-space.nix>
+    <niveum/configs/spacetime.nix>
+    <niveum/configs/sshd.nix>
+    <niveum/modules/retiolum.nix>
+  ];
+
+  nix.nixPath = ["/var/src"];
+
+  networking = {
+    firewall.allowedTCPPorts = [80 443];
+    hostName = "ful";
+    interfaces.enp0s3.useDHCP = true;
+    retiolum = retiolumAddresses.ful;
+    useDHCP = false;
+  };
+
+  system.stateVersion = "21.11";
+
+  services.nginx = {
+    enable = true;
+    recommendedGzipSettings = true;
+    recommendedOptimisation = true;
+    recommendedProxySettings = true;
+    recommendedTlsSettings = true;
+    sslCiphers = "AES256+EECDH:AES256+EDH:!aNULL";
+  };
+
+  security.acme = {
+    acceptTerms = true;
+    defaults.email = kieran.email;
+  };
+
+  users.users.root.passwordFile = toString <system-secrets/root.password>;
+
+  environment.systemPackages = [pkgs.vim pkgs.git pkgs.tmux pkgs.python3];
+}

systems/ful/hardware-configuration.nix

@@ -0,0 +1,40 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  imports = [<nixpkgs/nixos/modules/profiles/qemu-guest.nix>];
+
+  boot = {
+    loader = {
+      systemd-boot = {
+        enable = true;
+        configurationLimit = 1;
+      };
+      efi.canTouchEfiVariables = true;
+    };
+    initrd = {
+      availableKernelModules = ["virtio_pci" "usbhid"];
+    };
+    kernelModules = [
+      "console=ttyS0"
+      "console=tty1"
+      "nvme.shutdown_timeout=10"
+      "libiscsi.debug_libiscsi_eh=1"
+    ];
+    extraModulePackages = [];
+  };
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/9bf751c7-cf32-49fb-9354-17694c7a46e0";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/7817-285D";
+    fsType = "vfat";
+  };
+
+  swapDevices = [];
+}

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

@@ -31,6 +31,7 @@ in {
     <niveum/configs/sshd.nix>
     <niveum/configs/telegram-bots>
     <niveum/modules/retiolum.nix>
+    <niveum/modules/passport.nix>
   ];
 
   services.restic.backups.niveum = {
@@ -52,6 +53,30 @@ in {
     ];
   };
 
+  niveum.passport = {
+    enable = true;
+    introductionHTML = ''
+      <p>
+      The machine <tt>makanek</tt> is named after a Levantine type of <a href="https://en.wikipedia.org/wiki/Makanek">sausage</a> (مقانق <i>maqāniq</i>).
+      </p>
+      <p>
+      It runs on <a href="https://www.hetzner.com/cloud">Hetzner cloud</a>.
+      </p>
+      <figure>
+        <img width="200" src="https://www.albawaba.com/sites/default/files/2019-08/makanek-BeFunky-project.jpg" alt="Makanek sausages"/>
+        <figcaption>Makanek</figcaption>
+      </figure>
+    '';
+    virtualHost = "makanek.r";
+
+    services = [
+      {
+        title = "restic backup";
+        description = "This machine backups its state via restic backup.";
+      }
+    ];
+  };
+
   nix.nixPath = ["/var/src"];
 
   networking = {
@@ -75,7 +100,7 @@ in {
 
   security.acme = {
     acceptTerms = true;
-    email = kieran.email;
+    defaults.email = kieran.email;
   };
 
   environment.systemPackages = [pkgs.vim pkgs.git pkgs.tmux pkgs.python3];

systems/makanek/gitea.nix

@@ -1,13 +1,25 @@
-{
+let
+  inherit (import <niveum/lib>) sshPort;
+  domain = "https://code.kmein.de";
+in {
   services.gitea = {
     enable = true;
     disableRegistration = true;
-    rootUrl = "https://code.kmein.de";
+    rootUrl = domain;
     appName = "code.kmein.de";
+    ssh.clonePort = sshPort;
   };
   services.nginx.virtualHosts."code.kmein.de" = {
     forceSSL = true;
     enableACME = true;
     locations."/".extraConfig = "proxy_pass http://localhost:3000;";
   };
+
+  niveum.passport.services = [
+    {
+      link = domain;
+      title = "Gitea";
+      description = "hosts a couple of <tt>git</tt> repos. Registration is disabled.";
+    }
+  ];
 }

systems/makanek/hardware-configuration.nix

@@ -17,6 +17,7 @@
       enable = true;
       version = 2;
       devices = ["/dev/sda"];
+      configurationLimit = 3;
     };
   };
 
@@ -28,5 +29,5 @@
   swapDevices = [];
   zramSwap.enable = true;
 
-  nix.maxJobs = lib.mkDefault 2;
+  nix.settings.max-jobs = lib.mkDefault 2;
 }

systems/makanek/hedgedoc.nix

@@ -5,11 +5,9 @@
 }: let
   backupLocation = "/var/lib/codimd-backup";
   stateLocation = "/var/lib/codimd/state.sqlite";
-  nixpkgs-unstable = import <nixpkgs-unstable> {};
   domain = "pad.kmein.de";
+  inherit (import <niveum/lib>) tmpfilesConfig;
 in {
-  imports = [<stockholm/krebs/3modules/permown.nix>];
-
   services.nginx.virtualHosts.${domain} = {
     enableACME = true;
     forceSSL = true;
@@ -49,16 +47,28 @@ in {
     };
   };
 
-  krebs.permown.${backupLocation} = {
-    owner = "codimd";
-    group = "codimd";
-    umask = "0002";
-  };
+  niveum.passport.services = [
+    {
+      title = "Hedgedoc";
+      link = "https://${domain}";
+      description = "lets you collaborate on Markdown documents.";
+    }
+  ];
+
+  systemd.tmpfiles.rules = [
+    (tmpfilesConfig {
+      user = "codimd";
+      group = "codimd";
+      mode = "0755";
+      type = "d";
+      path = backupLocation;
+    })
+  ];
 
   systemd.services.hedgedoc-backup = {
     description = "Hedgedoc backup service";
     script = ''
-      ${nixpkgs-unstable.sqlite}/bin/sqlite3 -json ${stateLocation} "select shortid, alias, ownerId, content from Notes" \
+      ${pkgs.sqlite}/bin/sqlite3 -json ${stateLocation} "select shortid, alias, ownerId, content from Notes" \
       | ${
         pkgs.writers.writePython3 "hedgedoc-json-to-fs.py" {} ''
           import json

systems/makanek/matterbridge.nix

@@ -4,16 +4,16 @@
   ...
 }: {
   services.matterbridge = {
-    enable = true;
+    enable = false;
     configPath = let
-      bridgeBotToken = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
+      bridgeBotToken = lib.strings.fileContents <system-secrets/telegram/krebs.token>;
     in
       toString ((pkgs.formats.toml {}).generate "config.toml" {
         general = {
           RemoteNickFormat = "[{NICK}] ";
           Charset = "utf-8";
         };
-        telegram.kmein.Token = bridgeBotToken;
+        telegram.krebs.Token = bridgeBotToken;
         irc = let
           Nick = "ponte";
         in {
@@ -38,7 +38,7 @@
                 channel = "#krebs";
               }
               {
-                account = "telegram.kmein";
+                account = "telegram.krebs";
                 channel = "-330372458";
               }
               {

systems/makanek/menstruation.nix

@@ -7,15 +7,26 @@
   telegram = pkgs.callPackage <menstruation-telegram> {};
   backendPort = 8000;
 in {
-  services.redis.enable = true;
+  services.redis.servers.menstruation = {
+    enable = true;
+    port = 6379;
+  };
 
   environment.systemPackages = [pkgs.redis];
 
+  niveum.passport.services = [
+    {
+      title = "Tischlein, deck dich!";
+      description = "serves you with Berlin canteen menus via Telegram.";
+      link = "https://t.me/TischleinDeckDichBot";
+    }
+  ];
+
   systemd.services.menstruation-telegram = {
     wants = [
       "network-online.target"
       "menstruation-backend.service"
-      "redis.service"
+      "redis-menstruation.service"
     ];
     wantedBy = ["multi-user.target"];
     environment = {

systems/makanek/moinbot.nix

@@ -12,5 +12,12 @@
     serviceConfig.DynamicUser = true;
   };
 
+  niveum.passport.services = [
+    {
+      title = "moinbot";
+      description = "greets #hsmr:hackint.org daily.";
+    }
+  ];
+
   systemd.timers.moinbot.timerConfig.RandomizedDelaySec = "14h";
 }

systems/makanek/monitoring/default.nix

@@ -22,6 +22,26 @@ in {
     };
   };
 
+  niveum.passport.services = [
+    {
+      title = "Prometheus";
+      description = "collects metrics from devices in the <i>niveum</i> network, blackbox monitors some websites.";
+    }
+    {
+      title = "Loki";
+      description = "aggregates logs of the <i>niveum</i> network.";
+    }
+    {
+      title = "Grafana";
+      link = "http://${config.services.grafana.domain}";
+      description = "displays metrics from devices in the <i>niveum</i> network.";
+    }
+    {
+      title = "Alertmanager bot";
+      description = "notifies me when something goes wrong.";
+    }
+  ];
+
   services.prometheus.rules = let
     diskFreeThreshold = 10;
   in [
@@ -220,7 +240,7 @@ in {
             "tarot.kmein.de"
             "cloud.xn--kiern-0qa.de"
             "grafana.kmein.r"
-            "names.kmein.r"
+            # "names.kmein.r"
             "rrm.r"
             "graph.r"
           ];
@@ -238,16 +258,6 @@ in {
         }
       ];
     }
-    {
-      job_name = "tahina";
-      static_configs = [
-        {
-          targets = [
-            "tahina.r:${toString config.services.prometheus.exporters.node.port}"
-          ];
-        }
-      ];
-    }
   ];
 
   services.prometheus.exporters.blackbox = {

systems/makanek/moodle-dl-borsfaye.nix

@@ -12,6 +12,13 @@
 in {
   imports = [<niveum/modules/moodle-dl.nix>];
 
+  niveum.passport.services = [
+    {
+      title = "MoodleDL";
+      description = "notifies about changes on Moodle.";
+    }
+  ];
+
   services.moodle-dl = {
     enable = true;
     startAt = "hourly";

systems/makanek/names.nix

@@ -4,8 +4,8 @@
   ...
 }: let
   port = 5703;
-  geogen-src = "${<scripts>}/onomastics";
-  geogen = pkgs.callPackage geogen-src {};
+  onomap-src = "${<scripts>}/onomastics-ng";
+  onomap = pkgs.haskellPackages.callCabal2nix "onomap" onomap-src {};
 in {
   systemd.services.names = {
     wants = ["network-online.target"];
@@ -13,12 +13,11 @@ in {
     description = "Better clone of geogen.stoepel.net";
     serviceConfig = {
       DynamicUser = true;
+      ExecStart = "${onomap}/bin/onomap-web";
+      Restart = "on-failure";
+      RestartSec = "15s";
     };
-    script = ''
-      cd $(mktemp -d)
-      ln -s "${geogen-src}/wsgi.py" wsgi.py
-      ${geogen.dependencyEnv}/bin/gunicorn wsgi:app -b :${toString port}
-    '';
+    environment.PORT = toString port;
   };
 
   services.nginx = {
@@ -29,6 +28,14 @@ in {
     recommendedTlsSettings = true;
   };
 
+  niveum.passport.services = [
+    {
+      link = "http://names.kmein.r";
+      title = "Onomap";
+      description = "maps surnames within Germany.";
+    }
+  ];
+
   services.nginx.virtualHosts."names.kmein.r" = {
     locations."/".proxyPass = "http://127.0.0.1:${toString port}";
   };

systems/makanek/nextcloud.nix

@@ -1,5 +1,6 @@
 {
   pkgs,
+  config,
   lib,
   ...
 }: let
@@ -8,7 +9,7 @@
 in {
   services.nextcloud = {
     enable = true;
-    package = pkgs.nextcloud22;
+    package = pkgs.nextcloud24;
 
     https = true;
 
@@ -33,6 +34,14 @@ in {
     };
   };
 
+  niveum.passport.services = [
+    {
+      title = "Nextcloud";
+      link = "https://${config.services.nextcloud.hostName}";
+      description = "manages calendars, to-do lists, files, and recipes.";
+    }
+  ];
+
   services.postgresql = {
     enable = true;
     ensureDatabases = ["nextcloud"];

systems/makanek/radio-news.nix

@@ -8,8 +8,16 @@
 in {
   services.nginx.virtualHosts."redaktion.r".locations."/".extraConfig = serveHtml <niveum/lib/radio-news.html> pkgs;
 
+  niveum.passport.services = [
+    {
+      title = "Retiolum Radio News";
+      link = "http://redaktion.r";
+      description = "supplies git history news to radio lassulus and lets you enter your own.";
+    }
+  ];
+
   systemd.services.stockholm-history = {
-    startAt = "hourly";
+    startAt = "*:58:00";
     script = ''
       stockholm=$(mktemp -d)
       trap clean EXIT
@@ -17,9 +25,9 @@ in {
         rm -rf "$stockholm"
       }
       ${pkgs.git}/bin/git clone ${remote} "$stockholm"
-      ${pkgs.git}/bin/git --git-dir "$stockholm"/.git log --pretty='"%s" by %an, %ar' --since "$(${pkgs.coreutils}/bin/date -I -d "yesterday")" \
+      ${pkgs.git}/bin/git --git-dir "$stockholm"/.git log --pretty='"%s" by %an, %ar.' --since "$(${pkgs.coreutils}/bin/date -I -d "yesterday")" \
         | ${pkgs.jq}/bin/jq -R '{text: ., from: now | todateiso8601, to: (now + (60 * 60)) | todateiso8601}' \
-        | ${pkgs.curl}/bin/curl -Ssfd @- http://prism.r:7999/
+        | ${pkgs.curl}/bin/curl -Ssfd @- http://radio-news.r/
     '';
   };
 }

systems/makanek/radio.nix

@@ -126,4 +126,12 @@ in {
     forceSSL = true;
     locations."/".proxyPass = "http://127.0.0.1:${toString config.services.icecast.listen.port}";
   };
+
+  niveum.passport.services = [
+    {
+      title = "Radio";
+      link = "https://radio.kmein.de";
+      description = "broadcasts a few little (and mostly useless) web-radio stations.";
+    }
+  ];
 }

systems/makanek/retiolum-map.nix

@@ -44,6 +44,19 @@ in {
     };
   };
 
+  niveum.passport.services = [
+    {
+      link = "http://graph.r";
+      title = "Retiolum Realtime Map";
+      description = "displays geographical information about the retiolum network. <a href=\"http://graph.r/graph.html\">Graph</a> info also available.";
+    }
+    {
+      link = "http://c.r/${geo-ip-database}";
+      title = "GeoIP";
+      description = "shares MaxMind's GeoIP database with the krebs world. Updated weekly.";
+    }
+  ];
+
   services.nginx = {
     enable = true;
     recommendedGzipSettings = true;
@@ -57,6 +70,7 @@ in {
 
   systemd.services.geoip-share = {
     after = ["geoipupdate.service"];
+    wantedBy = ["geoipupdate.service"];
     script = let
       cyberlocker-tools = pkgs.callPackage <stockholm/krebs/5pkgs/simple/cyberlocker-tools> {};
     in "${cyberlocker-tools}/bin/cput ${geo-ip-database} < ${geo-ip-database-path}";

systems/makanek/tarot.nix

@@ -48,6 +48,14 @@ in {
       }'';
   };
 
+  niveum.passport.services = [
+    rec {
+      link = "https://tarot.kmein.de";
+      title = "Tarot";
+      description = "draws Tarot cards for you. See <a href=\"${link}/files/key.pdf\">here</a> for information on how to interpret them.";
+    }
+  ];
+
   services.nginx.virtualHosts."tarot.kmein.de" = {
     enableACME = true;
     forceSSL = true;

systems/makanek/urlwatch.nix

@@ -204,4 +204,11 @@ in {
       Type = "oneshot";
     };
   };
+
+  niveum.passport.services = [
+    {
+      description = "keeps me up-to-date on sites that have no RSS feed (shame be upon them!).";
+      title = "urlwatch";
+    }
+  ];
 }

systems/makanek/weechat.nix

@@ -55,26 +55,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 +85,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,7 +99,7 @@ in {
               };
               news = {
                 autoconnect = true;
-                address = "news.r";
+                addresses = "news.r";
                 autojoin = ["#cook" "#drachengame" "#oepnv" "#kmeinung" "#memes"];
                 command = "/oper aids balls";
               };
@@ -119,7 +119,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";
             };
@@ -143,9 +143,18 @@ in {
               tags = ["nick_gitlab"];
               regex = "*";
             };
+            people = {
+              buffer = "irc.*.*";
+              tags = map (name: "nick_${name}") ["mod_p[matrix-fli"];
+              regex = "*";
+            };
           };
         };
-        extraCommands = ''/matrix connect nibbana'';
+        extraCommands = ''
+          /save
+          /matrix connect nibbana
+          /connect -all
+        '';
       };
     };
   in {
@@ -180,4 +189,11 @@ in {
     isSystemUser = true;
     packages = [pkgs.tmux];
   };
+
+  niveum.passport.services = [
+    {
+      title = "weechat bouncer";
+      description = "keeps me logged in on IRC.";
+    }
+  ];
 }

systems/manakish/hardware-configuration.nix

@@ -21,6 +21,7 @@
       efiSupport = true;
       efiInstallAsRemovable = true;
       device = "/dev/sda";
+      configurationLimit = 5;
     };
   };
 

systems/tahina/configuration.nix

@@ -1,5 +1,4 @@
 {
-  lib,
   config,
   pkgs,
   ...
@@ -8,22 +7,61 @@
 in {
   imports = [
     ./hardware-configuration.nix
-    <niveum/configs/monitoring.nix>
-    <niveum/configs/nix.nix>
-    <niveum/configs/save-space.nix>
     <niveum/configs/spacetime.nix>
-    <niveum/configs/sshd.nix>
     <niveum/modules/retiolum.nix>
+    <niveum/configs/sshd.nix>
   ];
 
   nix.nixPath = ["/var/src"];
 
-  networking = {
-    hostName = "tahina";
-    retiolum = retiolumAddresses.tahina;
+  console.keyMap = "de";
+  i18n.defaultLocale = "de_DE.UTF-8";
+  services.xserver = {
+    layout = "de";
+    libinput.enable = true;
   };
 
-  system.stateVersion = "22.05";
+  users.users.xenos = {
+    name = "xenos";
+    password = "xenos";
+    isNormalUser = true;
+    extraGroups = ["networkmanager"];
+  };
 
-  environment.systemPackages = [pkgs.vim pkgs.git pkgs.tmux pkgs.python3];
+  services.xserver = {
+    enable = true;
+    desktopManager.pantheon.enable = true;
+    displayManager = {
+      lightdm = {
+        enable = true;
+        greeters.pantheon.enable = true;
+      };
+      autoLogin = {
+        enable = true;
+        user = "xenos";
+      };
+    };
+  };
+  boot.plymouth.enable = true;
+
+  environment.systemPackages = [
+    pkgs.libreoffice
+    pkgs.gimp
+    pkgs.inkscape
+    pkgs.firefox
+    pkgs.audacity
+    pkgs.pidgin
+  ];
+
+  networking = {
+    useDHCP = false;
+    interfaces = {
+      enp0s25.useDHCP = true;
+      wlo1.useDHCP = true;
+    };
+    retiolum = retiolumAddresses.tahina;
+    hostName = "tahina";
+  };
+
+  system.stateVersion = "21.11";
 }

systems/tahina/hardware-configuration.nix

@@ -6,27 +6,43 @@
   ...
 }: {
   imports = [
-    (modulesPath + "/profiles/qemu-guest.nix")
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
-  boot.loader.grub.device = "/dev/sda";
-
-  boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-amd"];
-  boot.extraModulePackages = [];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/d36baa44-9359-45d1-af5f-dbac52c6d75e";
-    fsType = "ext4";
+  boot = {
+    loader = {
+      systemd-boot = {
+        enable = true;
+        consoleMode = "max";
+      };
+      efi.canTouchEfiVariables = true;
+    };
+    initrd = {
+      availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "firewire_ohci" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci"];
+      kernelModules = ["dm-snapshot"];
+      luks.devices.luksmap.device = "/dev/disk/by-uuid/b7d66981-8cb7-4aad-a595-ee6574b312cf";
+    };
+    kernelModules = ["kvm-intel"];
+    extraModulePackages = [];
   };
 
-  swapDevices = [];
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/e9a8bd34-61eb-4317-888d-bd7d6248a906";
+      fsType = "xfs";
+    };
+    "/boot" = {
+      device = "/dev/disk/by-uuid/9B2F-31E1";
+      fsType = "vfat";
+    };
+  };
 
-  networking.useDHCP = lib.mkDefault false;
-  networking.interfaces.ens3.useDHCP = lib.mkDefault true;
+  swapDevices = [
+    {
+      device = "/swapfile";
+      size = 2048;
+    }
+  ];
 
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

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/moodle-dl-meinhark.nix

@@ -69,6 +69,16 @@ in {
         108283 # Digital Classicist
         109211 # Altlitauisch
         109185 # Etymologie
+
+        # SS 2022
+        112606 # Avestisch
+        111761 # Griechische Wissenschaftsliteratur
+        111515 # H. Furens
+        110914 # Apostelgeschichte
+        112225 # Gr. Paläographie
+        113275 # ALEW
+        112783 # Akzent und Silbenstruktur
+        113493 # Papyrologie
       ];
       download_submissions = true;
       download_descriptions = true;

systems/zaatar/pulseaudio.nix

@@ -1,7 +1,8 @@
-{
+{pkgs, ...}: {
   sound.enable = true;
 
   hardware.pulseaudio = {
+    package = pkgs.pulseaudioFull;
     enable = true;
     systemWide = true;
     tcp = {

systems/zaatar/tuna.nix

@@ -5,6 +5,7 @@
   ...
 }: let
   firewall = (import <niveum/lib>).firewall lib;
+  inherit (import <niveum/lib>) tmpfilesConfig;
 
   streams = import <niveum/lib/streams.nix> {
     di-fm-key = lib.strings.fileContents <secrets/di.fm/key>;
@@ -71,13 +72,31 @@ in {
     extraStopCommands = firewall.removeRules rules;
   };
 
-  system.activationScripts.mpd-playlists = let
-    playlistFile = pkgs.writeText "radio.m3u" (lib.concatMapStringsSep "\n" (lib.getAttr "stream") streams);
-  in ''
-    rm -rf /var/lib/mpd/playlists
-    install -d /var/lib/mpd/playlists
-    ln -sfn "${toString playlistFile}" "/var/lib/mpd/playlists/radio.m3u"
-  '';
+  systemd.tmpfiles.rules = let
+    tags = lib.lists.unique (lib.concatMap ({tags ? [], ...}: tags) streams);
+    tagStreams = tag: lib.filter ({tags ? [], ...}: lib.elem tag tags) streams;
+    makePlaylist = name: streams: pkgs.writeText "${name}.m3u" (lib.concatMapStringsSep "\n" (lib.getAttr "stream") streams);
+  in
+    map (tag:
+      tmpfilesConfig {
+        type = "L+";
+        path = "/var/lib/mpd/playlists/${tag}.m3u";
+        mode = "0644";
+        user = "mpd";
+        group = "mpd";
+        argument = makePlaylist tag (tagStreams tag);
+      })
+    tags
+    ++ [
+      (tmpfilesConfig {
+        type = "L+";
+        mode = "0644";
+        user = "mpd";
+        group = "mpd";
+        path = "/var/lib/mpd/playlist/all.m3u";
+        argument = makePlaylist "all" streams;
+      })
+    ];
 
   services.tuna = {
     enable = true;
@@ -87,33 +106,15 @@ in {
       logo ? "https://picsum.photos/seed/${builtins.hashString "md5" stream}/300",
       stream,
       station,
+      ...
     }: {inherit id desc logo stream station;})
     streams;
-    webPort = 8080;
+    webPort = 7044;
   };
 
-  systemd.services.tuna-stations = let
-    stations = lib.lists.imap0 (id: {
-      desc ? "",
-      logo ? "https://picsum.photos/seed/${builtins.hashString "md5" stream}/300",
-      stream,
-      station,
-    }: {inherit id desc logo stream station;})
-    streams;
-    stationsJson = (pkgs.formats.json {}).generate "stations.json" stations;
-  in {
-    enable = false;
-    wantedBy = ["tuna.service"];
-    startAt = "hourly";
-    script = ''
-      mkdir -p /etc/tuna
-      antenne_asb_url=$(
-        ${pkgs.curl}/bin/curl -sS 'https://www.caster.fm/widgets/em_player.php?jsinit=true&uid=529295&t=blue&c=' \
-          | grep streamUrl \
-          | sed ${lib.escapeShellArg "s/^.*'\\([^']*\\)'.*/\\1/"}
-      )
-      ${pkgs.jq}/bin/jq "map(if .station == \"Antenne ASB\" then .stream |= \"$antenne_asb_url\" else . end)" < ${stationsJson} > /etc/tuna/stations.json
-    '';
+  services.ympd = {
+    enable = true;
+    mpd.port = config.services.mpd.network.port;
   };
 
   services.nginx = {
@@ -125,7 +126,7 @@ in {
     virtualHosts."radio.kmein.r" = {
       basicAuth.dj = password;
       locations."/" = {
-        proxyPass = "http://127.0.0.1:${toString config.services.tuna.webPort}";
+        proxyPass = "http://127.0.0.1:${config.services.ympd.webPort}";
         proxyWebsockets = true;
       };
     };