feat(prometheus): scrape home assistant

This reverts commit b9d0258132.

.bin/unicode

@@ -0,0 +1,8 @@
+import sys
+import unicodedata
+
+for index, character in enumerate(sys.stdin.read().strip()):
+  try:
+    print(index, character, hex(ord(character)), unicodedata.category(character), unicodedata.name(character))
+  except:
+    print(index, character, hex(ord(character)))

.github/workflows/niveum.yml

@@ -9,6 +9,29 @@ jobs:
       matrix:
         system: [makanek,manakish,kabsa,zaatar,ful]
     steps:
-    - uses: actions/checkout@v2
-    - uses: cachix/install-nix-action@v16
-    - run: nix run .#build-${{matrix.system}}
+    - uses: actions/checkout@v3
+    - name: Install QEMU (ARM)
+      run: sudo apt-get install -y qemu-user-static
+      if: ${{ matrix.system == 'ful' }}
+    - name: Install Nix (ARM)
+      uses: cachix/install-nix-action@v16
+      if: ${{ matrix.system == 'ful' }}
+      with:
+        extra_nix_config: |
+          system = aarch64-linux
+    - name: Install Nix (x86_64)
+      uses: cachix/install-nix-action@v16
+      if: ${{ matrix.system != 'ful' }}
+    - name: nixos-rebuild dry-build
+      run: |
+        # remove secrets: ref https://stackoverflow.com/questions/1260748/how-do-i-remove-a-submodule/36593218
+        git submodule deinit -f secrets
+        rm -rf .git/modules/secrets
+        git rm -f secrets
+
+        # recreate secrets
+        mkdir secrets
+        cat secrets.txt | while read -r path; do touch $path; done
+        git add secrets
+
+        nix run nixpkgs#nixos-rebuild -- dry-build  --flake $GITHUB_WORKSPACE#${{matrix.system}}

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "secrets"]
+	path = secrets
+	url = ssh://gitea@code.kmein.de:22022/kfm/niveum-secrets.git

ci.nix

@@ -1,99 +0,0 @@
-{
-  inputs,
-  system,
-  name,
-}: let
-  nixpkgs = inputs.nixos-stable;
-  pkgs = nixpkgs.legacyPackages.${system};
-  ensureFiles = paths:
-    pkgs.runCommand "directory" {} ''
-      set -efu
-      mkdir $out
-      cd $out
-      ${
-        nixpkgs.lib.concatMapStringsSep "\n" (path: ''
-          mkdir -p "$(dirname ${nixpkgs.lib.escapeShellArg path})"
-          echo foo > ${nixpkgs.lib.escapeShellArg path}
-        '')
-        paths
-      }
-    '';
-  nixPath = nixpkgs.lib.concatStringsSep ":" ([
-      "niveum=${toString ./.}"
-      "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$//'
-  sharedSecrets = ensureFiles [
-    "di.fm/key"
-    "eduroam/identity"
-    "eduroam/password"
-    "github/notification.token"
-    "hass/token"
-    "mail/cock"
-    "mail/fastmail"
-    "mail/gmail/amroplay"
-    "mail/gmail/kieran.meinhardt"
-    "mail/meinhaki"
-    "mail/dslalewa"
-    "mail/fsklassp"
-    "mail/posteo"
-    "mega/password"
-    "nextcloud-fysi/password"
-    "nextcloud/password"
-    "openweathermap.key"
-    "restic/password"
-    "traadfri.key"
-    "miniflux/password"
-    "wifi/Aether.psk"
-    "spotify/username"
-    "spotify/password"
-  ];
-  systemSecrets = let
-    basic = ["retiolum.ed25519" "retiolum.key" "syncthing/cert.pem" "syncthing/key.pem" "ssh/passphrase"];
-  in
-    {
-      zaatar = ensureFiles (["moodle.token" "telegram/moodle-dl.token" "mpd-web.key"] ++ basic);
-      kabsa = ensureFiles basic;
-      manakish = ensureFiles basic;
-      tahina = ensureFiles basic;
-      tabula = ensureFiles basic;
-      ful = ensureFiles (["root.password"] ++ basic);
-      makanek = ensureFiles ([
-          "grafana/admin"
-          "irc/retiolum"
-          "irc/hackint"
-          "irc/libera"
-          "irc/oftc"
-          "matrix/nibbana"
-          "maxmind/license.key"
-          "moodle-dl/faye.token"
-          "nextcloud/admin"
-          "nextcloud/database"
-          "telegram/nachtischsatan.token"
-          "telegram/reverse.token"
-          "telegram/odyssey.token"
-          "telegram/betacode.token"
-          "telegram/moodle-dl.token"
-          "telegram/proverb.token"
-          "telegram/menstruation.token"
-          "telegram/cool_village.token"
-          "telegram/kmein.token"
-          "telegram/krebs.token"
-          "telegram/prometheus.token"
-          "weechat/relay"
-        ]
-        ++ basic);
-    }
-    .${name};
-in
-  toString (pkgs.writers.writeDash "build" "NIX_PATH=${nixPath} nix-build '<nixpkgs/nixos>' -A system --dry-run")

configs/aerc.nix

@@ -4,142 +4,92 @@
   lib,
   ...
 }: let
-  defaults = {
-    aerc.enable = true;
-    realName = "Kierán Meinhardt";
-    folders.inbox = "INBOX";
-  };
-  hu-defaults = {
-    imap.host = "mailbox.cms.hu-berlin.de";
-    smtp.host = "mailhost.cms.hu-berlin.de";
-  };
-  passwordCommandFrom = path: toString (pkgs.writers.writeDash "email-credentials" "echo ${lib.escapeShellArg (lib.strings.fileContents path)}");
+  inherit (import ../lib/email.nix) defaults;
 in {
+  age.secrets = {
+    email-password-cock = {
+      file = ../secrets/email-password-cock.age;
+      owner = config.users.users.me.name;
+      group = config.users.users.me.group;
+      mode = "400";
+    };
+    email-password-posteo = {
+      file = ../secrets/email-password-posteo.age;
+      owner = config.users.users.me.name;
+      group = config.users.users.me.group;
+      mode = "400";
+    };
+  };
+
   home-manager.users.me = {
-    accounts.email.accounts = rec {
-      hu-student =
-        defaults
-        // hu-defaults
-        // rec {
-          userName = "meinhark";
-          address = "kieran.felix.meinhardt@hu-berlin.de";
-          aliases = ["${userName}@hu-berlin.de"];
-          passwordCommand = passwordCommandFrom <secrets/eduroam/password>;
-        };
-      hu-student-cs =
-        defaults
-        // hu-defaults
-        // rec {
-          userName = "meinhark";
-          address = "kieran.felix.meinhardt@informatik.hu-berlin.de";
-          aliases = ["${userName}@informatik.hu-berlin.de"];
-          imap.host = "mailbox.informatik.hu-berlin.de";
-          smtp.host = "mailhost.informatik.hu-berlin.de";
-          passwordCommand = passwordCommandFrom <secrets/eduroam/password>;
-        };
-      hu-employee =
-        defaults
-        // hu-defaults
-        // rec {
-          userName = "meinhaki";
-          address = "kieran.meinhardt@hu-berlin.de";
-          aliases = ["${userName}@hu-berlin.de"];
-          passwordCommand = passwordCommandFrom <secrets/mail/meinhaki>;
-          signature = {
-            showSignature = "append";
-            text = ''
-              ${defaults.realName}
-              Studentische Hilfskraft / Administrator ALEW
-              Humboldt-Universität zu Berlin
+    services.mbsync = {
+      enable = true;
+      frequency = "daily";
+      preExec = "${pkgs.coreutils}/bin/mkdir -p ${config.home-manager.users.me.accounts.email.maildirBasePath}";
+      postExec = "${pkgs.notmuch}/bin/notmuch new";
+    };
 
-              Telefon: +49 (0)30 2093 9634
-              Raum 3.212, Dorotheenstraße 24, 10117 Berlin-Mitte
-              https://alew.hu-berlin.de
-            '';
-          };
-        };
-      hu-admin =
-        defaults
-        // hu-defaults
-        // rec {
-          userName = "dslalewa";
-          address = "admin.alew.vglsprwi@hu-berlin.de";
-          aliases = ["${userName}@hu-berlin.de"];
-          passwordCommand = passwordCommandFrom <secrets/mail/dslalewa>;
-          inherit (hu-employee) signature;
-        };
-      hu-fsi =
-        defaults
-        // hu-defaults
-        // rec {
-          userName = "fsklassp";
-          passwordCommand = passwordCommandFrom <secrets/mail/fsklassp>;
-          address = "${userName}@hu-berlin.de";
-          realName = "FSI Klassische Philologie";
-          signature = {
-            showSignature = "append";
-            text = ''
-              Fachschafts-Initiative
+    programs.notmuch = {
+      enable = true;
+      extraConfig = {
+        database.path = config.home-manager.users.me.accounts.email.maildirBasePath;
+        new.tags = "";
+        user.name = defaults.realName;
+        user.primary_email = config.home-manager.users.me.accounts.email.accounts.posteo.address;
+      };
+    };
 
-              Humboldt-Universität zu Berlin
-              Sprach- und literaturwissenschaftliche Fakultät
-              Institut für klassische Philologie
-              Unter den Linden 6
-              10099 Berlin
-            '';
-          };
-        };
-      fysi =
-        defaults
-        // rec {
-          address = "kieran@fysi.tech";
-          userName = address;
-          passwordCommand = passwordCommandFrom <secrets/mail/fastmail>;
-          flavor = "fastmail.com";
-        };
+    programs.mbsync = {
+      enable = true;
+      extraConfig = lib.concatStringsSep "\n\n" (lib.mapAttrsToList (name: account: ''
+          IMAPAccount ${name}
+          CertificateFile /etc/ssl/certs/ca-certificates.crt
+          Host ${account.imap.host}
+          PassCmd "${toString account.passwordCommand}"
+          User ${account.userName}
+          SSLType IMAPS
+          ${lib.optionalString (lib.isInt account.imap.port) "Port ${toString account.imap.port}"}
+
+          IMAPStore ${name}-remote
+          Account ${name}
+
+          MaildirStore ${name}-local
+          Path ${config.home-manager.users.me.accounts.email.maildirBasePath}/${name}/
+          SubFolders Verbatim
+
+          Channel ${name}
+          Create Near
+          Expunge None
+          Far :${name}-remote:
+          Near :${name}-local:
+          Patterns *
+          Remove None
+          SyncState *
+        '')
+        config.home-manager.users.me.accounts.email.accounts);
+    };
+
+    accounts.email.accounts = {
       cock =
-        defaults
-        // rec {
+        lib.recursiveUpdate defaults
+        rec {
           address = "2210@cock.li";
           userName = address;
-          passwordCommand = passwordCommandFrom <secrets/mail/cock>;
+          passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-cock.path}";
           realName = "";
           imap.host = "mail.cock.li";
           smtp.host = imap.host;
         };
-      google-amro =
-        defaults
-        // rec {
-          address = "amroplay@gmail.com";
-          userName = address;
-          passwordCommand = passwordCommandFrom <secrets/mail/gmail/amroplay>;
-          flavor = "gmail.com";
-          aerc.enable = false;
-        };
-      google-kieran =
-        defaults
-        // rec {
-          address = "kieran.meinhardt@gmail.com";
-          userName = address;
-          passwordCommand = passwordCommandFrom <secrets/mail/gmail/kieran.meinhardt>;
-          flavor = "gmail.com";
-          aerc.enable = false;
-          folders = {
-            drafts = "[Gmail]/Entwürfe";
-            sent = "[Gmail]/Gesendet";
-            trash = "[Gmail]/Papierkorb";
-          };
-        };
       posteo =
-        defaults
-        // rec {
+        lib.recursiveUpdate defaults
+        rec {
           address = "kieran.meinhardt@posteo.net";
           aliases = ["kmein@posteo.de"];
           userName = address;
           imap.host = "posteo.de";
           smtp.host = imap.host;
           primary = true;
-          passwordCommand = passwordCommandFrom <secrets/mail/posteo>;
+          passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-posteo.path}";
           # himalaya = { enable = true; backend = "imap"; sender = "smtp"; };
         };
     };
@@ -177,7 +127,7 @@ in {
           K = ":prev-folder<Enter>";
           H = ":collapse-folder<Enter>";
           L = ":expand-folder<Enter>";
-          "<space>" = ":read -t<Enter>";
+          "<space>" = ":read -t<Enter>:next<Enter>";
           v = ":mark -t<Enter>";
           V = ":mark -v<Enter>";
           F = ":flag -t<Enter>";
@@ -277,7 +227,7 @@ in {
         general.pgp-provider = "gpg";
         viewer = {pager = "${pkgs.less}/bin/less -R";};
         compose = {
-          address-book-cmd = "khard email --parsable '%s'";
+          address-book-cmd = "khard email --remove-first-line --parsable '%s'";
           no-attachment-warning = "(attach|attached|attachments?|anbei|Anhang|angehängt)";
         };
         filters = {
@@ -287,7 +237,7 @@ in {
           # "text/html" =
           #   "${pkgs.aerc}/share/aerc/filters/html | ${pkgs.aerc}/share/aerc/filters/colorize";
           # "text/*" =
-          #   ''${pkgs.bat}/bin/bat -fP --file-name="$AERC_FILENAME "'';
+          #   ''${pkgs.bat}/bin/bat -fP --theme=ansi --file-name="$AERC_FILENAME "'';
           "message/delivery-status" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
           "message/rfc822" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
           "application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";

configs/alacritty.nix

@@ -6,7 +6,6 @@
 }: let
   alacritty-cfg = theme:
     (pkgs.formats.yaml {}).generate "alacritty.yml" {
-      window.opacity = 0.99;
       bell = {
         animation = "EaseOut";
         duration = 100;
@@ -47,7 +46,7 @@
   alacritty-pkg = pkgs.symlinkJoin {
     name = "alacritty";
     paths = [
-      (pkgs.writeDashBin "alacritty" ''
+      (pkgs.writers.writeDashBin "alacritty" ''
         ${pkgs.alacritty}/bin/alacritty --config-file /var/theme/config/alacritty.yml msg create-window "$@" ||
         ${pkgs.alacritty}/bin/alacritty --config-file /var/theme/config/alacritty.yml "$@"
       '')
@@ -57,12 +56,28 @@
 in {
   environment.variables.TERMINAL = "alacritty";
 
-  environment.systemPackages = [
-    alacritty-pkg
-  ];
-
-  environment.etc = {
-    "themes/dark/alacritty.yml".source = alacritty-cfg (import <niveum/lib/colours/papercolor-dark.nix>);
-    "themes/light/alacritty.yml".source = alacritty-cfg (import <niveum/lib/colours/papercolor-light.nix>);
+  home-manager.users.me = {
+    programs.alacritty = {
+      enable = true;
+      settings = {
+        key_bindings = [
+          {
+            key = "Plus";
+            mods = "Control";
+            action = "IncreaseFontSize";
+          }
+          {
+            key = "Minus";
+            mods = "Control";
+            action = "DecreaseFontSize";
+          }
+          {
+            key = "Key0";
+            mods = "Control";
+            action = "ResetFontSize";
+          }
+        ];
+      };
+    };
   };
 }

configs/android.nix

@@ -0,0 +1,5 @@
+{
+  programs.adb.enable = true;
+
+  users.users.me.extraGroups = ["adbusers"];
+}

configs/backup.nix

@@ -3,7 +3,7 @@
   config,
   ...
 }: let
-  inherit (import <niveum/lib>) restic;
+  inherit (import ../lib) restic;
 in {
   services.restic.backups.niveum = {
     initialize = true;
@@ -12,15 +12,18 @@ in {
       OnCalendar = "8:00";
       RandomizedDelaySec = "1h";
     };
-    passwordFile = toString <secrets/restic/password>;
+    passwordFile = config.age.secrets.restic.path;
     extraBackupArgs = [
       "--exclude=/home/kfm/projects/nixpkgs/.git"
       "--exclude=node_modules"
+      "--exclude=.parcel-cache"
     ];
     paths = [
       "/home/kfm/work"
       "/home/kfm/projects"
+      "/home/kfm/Zotero"
       "/home/kfm/notes"
+      "/home/kfm/Maildir"
       "/home/kfm/cloud"
       "/home/kfm/.gnupg"
       "/home/kfm/.ssh"
@@ -38,7 +41,7 @@ in {
 
   environment.systemPackages = [
     (pkgs.writers.writeDashBin "restic-niveum" ''
-      ${pkgs.restic}/bin/restic -r ${restic.repository} -p ${<secrets/restic/password>} "$@"
+      ${pkgs.restic}/bin/restic -r ${restic.repository} -p ${config.age.secrets.restic.path} "$@"
     '')
     (pkgs.writers.writeDashBin "restic-mount" ''
       mountdir=$(mktemp -d)
@@ -46,7 +49,7 @@ in {
       clean() {
         rm -r "$mountdir"
       }
-      ${pkgs.restic}/bin/restic -r ${restic.repository} -p ${<secrets/restic/password>} mount "$mountdir"
+      ${pkgs.restic}/bin/restic -r ${restic.repository} -p ${config.age.secrets.restic.path} mount "$mountdir"
     '')
   ];
 }

configs/bash.nix

@@ -1,7 +1,7 @@
-{
+{pkgs, ...}: {
   programs.bash = {
     promptInit = ''
-      PS1="$(tput bold)\w \$([[ \$? == 0 ]] && echo \"\[\033[1;32m\]\" || echo \"\[\033[1;31m\]\")\$$(tput sgr0) "'';
+      PS1="$(${pkgs.ncurses}/bin/tput bold)\w \$([[ \$? == 0 ]] && echo \"\[\033[1;32m\]\" || echo \"\[\033[1;31m\]\")\$$(${pkgs.ncurses}/bin/tput sgr0) "'';
     interactiveShellInit = ''
       set -o vi
     '';

configs/cloud.nix

@@ -4,39 +4,23 @@
   pkgs,
   ...
 }: let
-  inherit (import <niveum/lib>) tmpfilesConfig;
+  inherit (import ../lib) tmpfilesConfig;
 in {
-  imports = [
-    <niveum/modules/dropbox.nix>
-  ];
-
-  niveum = {
-    dropbox.enable = false;
-  };
-
   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/Uni";
+      argument = "${config.users.users.me.home}/cloud/nextcloud/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 = false;
+    services.gnome-keyring.enable = true;
     services.nextcloud-client = {
-      enable = false;
+      enable = true;
       startInBackground = true;
     };
     systemd.user.services.nextcloud-client = {
@@ -48,20 +32,20 @@ in {
   };
 
   systemd.user.services.nextcloud-syncer = {
-    enable = true;
+    enable = false;
     wants = ["network-online.target"];
     wantedBy = ["default.target"];
     startAt = "*:00/10";
     script = let
       kieran = {
         user = "kieran";
-        password = lib.fileContents <secrets/nextcloud/password>;
-        endpoint = "https://cloud.xn--kiern-0qa.de";
+        passwordFile = config.age.secrets.nextcloud-password-kieran.path;
+        endpoint = "https://cloud.kmein.de";
         target = "${config.users.users.me.home}/notes";
       };
     in ''
       mkdir -p ${lib.escapeShellArg kieran.target}
-      ${pkgs.nextcloud-client}/bin/nextcloudcmd --non-interactive --user ${kieran.user} --password ${lib.escapeShellArg kieran.password} --path /Notes ${lib.escapeShellArg kieran.target} ${kieran.endpoint}
+      ${pkgs.nextcloud-client}/bin/nextcloudcmd --non-interactive --user ${kieran.user} --password "$(cat ${kieran.passwordFile})" --path /Notes ${lib.escapeShellArg kieran.target} ${kieran.endpoint}
     '';
     serviceConfig = {
       Type = "oneshot";
@@ -74,16 +58,16 @@ in {
       set -efu
       book="$({
         ${pkgs.findutils}/bin/find ${config.users.users.me.home}/cloud/syncthing/library -type f
-        ${pkgs.findutils}/bin/find ${config.users.users.me.home}/cloud/Seafile/Books -type f
+        ${pkgs.findutils}/bin/find ${config.users.users.me.home}/cloud/nextcloud/Books -type f
       } | ${pkgs.fzf}/bin/fzf)"
       exec ${pkgs.zathura}/bin/zathura "$book"
     '')
     (let
       kieran = {
         user = "kieran.meinhardt@gmail.com";
-        password = lib.fileContents <secrets/mega/password>;
+        passwordFile = config.age.secrets.mega-password.path;
       };
-      megatools = command: "${pkgs.megatools}/bin/megatools ${command} --username ${lib.escapeShellArg kieran.user} --password ${lib.escapeShellArg kieran.password}";
+      megatools = command: ''${pkgs.megatools}/bin/megatools ${command} --username ${lib.escapeShellArg kieran.user} --password "$(cat ${kieran.passwordFile})"'';
     in
       pkgs.writers.writeDashBin "book-mega" ''
         set -efu
@@ -104,14 +88,11 @@ in {
       '')
   ];
 
-  fileSystems."/media/moodle" = {
-    device = "zaatar.r:/moodle";
-    fsType = "nfs";
-    options = [
-      "x-systemd.idle-timeout=600"
-      "noauto"
-      "x-systemd.automount"
-    ];
+  age.secrets.mega-password = {
+    file = ../secrets/mega-password.age;
+    owner = config.users.users.me.name;
+    group = config.users.users.me.group;
+    mode = "400";
   };
 
   services.syncthing = rec {
@@ -120,15 +101,20 @@ in {
     openDefaultPorts = true;
     configDir = "/home/kfm/.config/syncthing";
     dataDir = "/home/kfm/.config/syncthing";
-    cert = toString <system-secrets/syncthing/cert.pem>;
-    key = toString <system-secrets/syncthing/key.pem>;
-    inherit ((import <niveum/lib>).syncthing) devices;
+    cert = config.age.secrets.syncthing-cert.path;
+    key = config.age.secrets.syncthing-key.path;
+    inherit ((import ../lib).syncthing) devices;
     folders = let
       cloud-dir = "${config.users.users.me.home}/cloud";
     in {
+      "${cloud-dir}/syncthing/zotero".devices = ["kabsa" "manakish"];
       "${cloud-dir}/syncthing/common".devices = ["kabsa" "manakish"];
       "${cloud-dir}/syncthing/library".devices = ["kabsa" "manakish" "heym"];
       "${cloud-dir}/syncthing/mundoiu".devices = ["kabsa" "manakish" "heym"];
+      "${cloud-dir}/syncthing/obsidian" = {
+        devices = ["kabsa" "manakish" "heym"];
+        id = "3r1hu-3barr";
+      };
       "${cloud-dir}/syncthing/music" = {
         devices = ["kabsa" "manakish" "heym" "zaatar"];
         id = "music";

configs/default.nix

@@ -2,36 +2,26 @@
   pkgs,
   lib,
   config,
-  options,
+  niveumPackages,
+  inputs,
   ...
 }: let
   inherit (lib.strings) makeBinPath;
-  inherit (import <niveum/lib>) localAddresses kieran;
-  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
-  defaultApplications = (import <niveum/lib>).defaultApplications {inherit pkgs;};
+  inherit (import ../lib) localAddresses kieran;
+  defaultApplications = (import ../lib).defaultApplications {inherit pkgs;};
 in {
   imports = [
-    <home-manager/nixos>
-    <niveum/modules/system-dependent.nix>
+    inputs.self.nixosModules.system-dependent
+    inputs.self.nixosModules.power-action
     {
       boot.supportedFilesystems = ["ntfs"];
     }
-    {
-      nix.nixPath = [
-        "/var/src"
-        "nixpkgs-overlays=${toString ../overlays}"
-      ];
-    }
     {
       nixpkgs = {
         config = {
           allowUnfree = true;
           packageOverrides = pkgs: {
             dmenu = pkgs.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
-            gfs-fonts = pkgs.callPackage <niveum/packages/gfs-fonts.nix> {};
-            tocharian-font = pkgs.callPackage <niveum/packages/tocharian-font.nix> {};
-            iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> {};
-            ix = pkgs.callPackage <niveum/packages/ix.nix> {};
           };
           permittedInsecurePackages = [
             "qtwebkit-5.212.0-alpha4"
@@ -40,21 +30,49 @@ in {
       };
     }
     {
-      boot.cleanTmpDir = true;
+      boot.tmp.cleanOnBoot = true;
       boot.loader.timeout = 1;
     }
+    {
+      age.secrets = {
+        di-fm-key = {
+          file = ../secrets/di-fm-key.age;
+          owner = config.users.users.me.name;
+          group = config.users.users.me.group;
+          mode = "400";
+        };
+        restic = {
+          file = ../secrets/restic.age;
+          owner = config.users.users.me.name;
+          group = config.users.users.me.group;
+          mode = "400";
+        };
+      };
+    }
     {
       home-manager.users.me = {
         programs.zathura = {
           enable = true;
           options = {
             selection-clipboard = "clipboard";
-            recolor-keephue = true;
             # first-page-column = "1:1"; # makes side-by-side mode start on the left side
           };
         };
       };
     }
+    {
+      environment.systemPackages = [
+        pkgs.capitaine-cursors
+      ];
+
+      home-manager.users.me = {
+        home.pointerCursor = {
+          name = "capitaine-cursors-white";
+          package = pkgs.capitaine-cursors;
+          size = 12;
+        };
+      };
+    }
     {
       users.mutableUsers = false;
 
@@ -63,11 +81,15 @@ in {
       users.users.me = {
         name = "kfm";
         description = kieran.name;
-        hashedPassword = "$6$w9hXyGFl/.IZBXk$5OiWzS1G.5hImhh1YQmZiCXYNAJhi3X6Y3uSLupJNYYXPLMsQpx2fwF4Xr2uYzGMV8Foqh8TgUavx1APD9rcb/";
+        passwordFile = config.age.secrets.kfm-password.path;
         isNormalUser = true;
         uid = 1000;
       };
 
+      age.secrets = {
+        kfm-password.file = ../secrets/kfm-password.age;
+      };
+
       home-manager.users.me.xdg.enable = true;
     }
     {
@@ -86,10 +108,10 @@ in {
           cd "$(mktemp -d)"
           pwd
         '';
-        swallow = command: "${scripts.swallow}/bin/swallow ${command}";
+        swallow = command: "${niveumPackages.swallow}/bin/swallow ${command}";
       in {
         "ß" = "${pkgs.util-linux}/bin/setsid";
-        cat = "${pkgs.bat}/bin/bat --style=plain";
+        cat = "${pkgs.bat}/bin/bat --theme=ansi --style=plain";
         chromium-incognito = "chromium --user-data-dir=$(mktemp -d /tmp/chr.XXXXXX) --no-first-run --incognito";
         cp = "cp --interactive";
         ip = "${pkgs.iproute2}/bin/ip -c";
@@ -214,10 +236,11 @@ in {
         };
       };
     }
+    ./android.nix
+    ./stylix.nix
     ./alacritty.nix
     ./backup.nix
     ./bash.nix
-    ./beets.nix
     ./bluetooth.nix
     ./aerc.nix
     ./ccc.nix
@@ -226,7 +249,6 @@ in {
     ./clipboard.nix
     ./cloud.nix
     ./direnv.nix
-    ./distrobump.nix
     ./docker.nix
     ./dunst.nix
     ./flix.nix
@@ -236,7 +258,10 @@ in {
     ./hledger.nix
     ./htop.nix
     ./hu-berlin.nix
+    ./fu-berlin.nix
+    ./fysi.nix
     ./i3.nix
+    ./i3status-rust.nix
     ./keyboard.nix
     ./lb.nix
     ./mpv.nix
@@ -244,33 +269,28 @@ in {
     ./neovim.nix
     ./nix.nix
     ./newsboat.nix
-    ./flameshot-once.nix
+    ./flameshot.nix
     ./packages.nix
     ./picom.nix
     ./stardict.nix
     ./polkit.nix
     ./power-action.nix
     ./printing.nix
-    # ./openweathermap.nix
-    ./wallpaper.nix
     ./redshift.nix
     ./retiolum.nix
     ./rofi.nix
     ./spacetime.nix
-    ./seafile.nix
     ./ssh.nix
     ./sshd.nix
     ./sound.nix
     ./sudo.nix
-    ./nsxiv.nix
-    ./themes.nix
     ./tmux.nix
-    # ./traadfri.nix
     ./unclutter.nix
     ./vscode.nix
     ./watson.nix
     ./zsh.nix
     ./tor.nix
+    ./stw-berlin.nix
     ./mastodon-bot.nix
   ];
 }

configs/dunst.nix

@@ -3,7 +3,7 @@
   pkgs,
   ...
 }: let
-  inherit (import <niveum/lib>) defaultApplications colours theme;
+  inherit (import ../lib) defaultApplications theme;
 in {
   home-manager.users.me.services.dunst = {
     enable = true;
@@ -11,16 +11,13 @@ in {
     settings = {
       global = {
         transparency = 10;
-        font = "Monospace 8";
         geometry = "200x5-30+20";
-        frame_color = colours.foreground;
         follow = "mouse";
         indicate_hidden = true;
         notification_height = 0;
         separator_height = 2;
         padding = 8;
         horizontal_padding = 8;
-        separator_color = "auto";
         sort = true;
         markup = "full";
         format = "%a\\n<b>%s</b>\\n%b";
@@ -43,22 +40,13 @@ in {
         mouse_right_click = "close_current";
         mouse_middle_click = "close_all";
       };
-      urgency_low = rec {
-        frame_color = background;
-        background = colours.foreground;
-        foreground = colours.background;
+      urgency_low = {
         timeout = 5;
       };
-      urgency_normal = rec {
-        frame_color = background;
-        background = colours.foreground;
-        foreground = colours.background;
+      urgency_normal = {
         timeout = 10;
       };
-      urgency_critical = rec {
-        frame_color = background;
-        background = colours.red.dark;
-        foreground = colours.background;
+      urgency_critical = {
         timeout = 0;
       };
     };

configs/flameshot-once.nix

@@ -1,52 +0,0 @@
-{
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (import <niveum/lib>) defaultApplications;
-  flameshot-once = pkgs.callPackage <stockholm/krebs/5pkgs/simple/flameshot-once> {};
-in {
-  environment.systemPackages = [
-    (flameshot-once.override {
-      name = "flameshot-once-kmein";
-      config = {
-        imgur = {
-          enable = true;
-          createUrl = "http://p.r/image";
-          deleteUrl = "http://p.r/image/delete/%1";
-          xdg-open.browser = (defaultApplications pkgs).browser;
-        };
-        settings.General = {
-          autoCloseIdleDaemon = true;
-          drawColor = "#ff0000";
-          drawThickness = 2;
-          checkForUpdates = false;
-          showDesktopNotification = true;
-          disabledTrayIcon = true;
-          showHelp = false;
-          squareMagnifier = true;
-          uploadWithoutConfirmation = true;
-          buttons = [
-            "TYPE_ARROW"
-            "TYPE_CIRCLE"
-            "TYPE_CIRCLECOUNT"
-            "TYPE_COPY"
-            "TYPE_DRAWER"
-            "TYPE_EXIT"
-            "TYPE_IMAGEUPLOADER"
-            "TYPE_MARKER"
-            "TYPE_MOVESELECTION"
-            "TYPE_PENCIL"
-            "TYPE_PIXELATE"
-            "TYPE_RECTANGLE"
-            "TYPE_SAVE"
-            "TYPE_SELECTION"
-            # "TYPE_SELECTIONINDICATOR"
-            "TYPE_TEXT"
-            "TYPE_UNDO"
-          ];
-        };
-      };
-    })
-  ];
-}

configs/flameshot.nix

@@ -0,0 +1,23 @@
+{
+  lib,
+  pkgs,
+  ...
+}: {
+  home-manager.users.me = {
+    services.flameshot = {
+      enable = true;
+      settings.General = {
+        autoCloseIdleDaemon = true;
+        drawColor = "#ff0000";
+        drawThickness = 2;
+        checkForUpdates = false;
+        showDesktopNotification = true;
+        disabledTrayIcon = true;
+        showHelp = false;
+        squareMagnifier = true;
+        uploadWithoutConfirmation = true;
+        buttons = ''@Variant(\0\0\0\x7f\0\0\0\vQList<int>\0\0\0\0\x10\0\0\0\x2\0\0\0\x5\0\0\0\x13\0\0\0\xa\0\0\0\x1\0\0\0\xc\0\0\0\xd\0\0\0\x6\0\0\0\x8\0\0\0\0\0\0\0\xf\0\0\0\x4\0\0\0\xb\0\0\0\x3\0\0\0\x12\0\0\0\x9)'';
+      };
+    };
+  };
+}

configs/flix.nix

@@ -4,14 +4,16 @@
   ...
 }: let
   flixLocation = "/media/flix";
+  flixLocationNew = "/media/flix-new";
   cacheLocation = "/var/cache/flix";
   indexFilename = "index";
+  indexFilenameNew = "index-new";
   flixUser = "flix";
   flixGroup = "users";
-  inherit (import <niveum/lib>) tmpfilesConfig;
+  inherit (import ../lib) tmpfilesConfig;
 in {
   fileSystems.${flixLocation} = {
-    device = "prism.r:/export";
+    device = "prism.r:/export/download";
     fsType = "nfs";
     options = [
       "noauto"
@@ -26,6 +28,20 @@ in {
     ];
   };
 
+  fileSystems.${flixLocationNew} = {
+    device = "//yellow.r/public";
+    fsType = "cifs";
+    options = [
+      "guest"
+      "nofail"
+      "noauto"
+      "ro"
+      "x-systemd.automount"
+      "x-systemd.device-timeout=1"
+      "x-systemd.idle-timeout=1min"
+    ];
+  };
+
   systemd.tmpfiles.rules = [
     (tmpfilesConfig {
       type = "d";
@@ -39,7 +55,10 @@ in {
   systemd.services.flix-index = {
     description = "Flix indexing service";
     wants = ["network-online.target"];
-    script = "cp ${flixLocation}/download/index ./${indexFilename}";
+    script = ''
+      cp ${flixLocation}/index ./${indexFilename}
+      cp ${flixLocationNew}/index ./${indexFilenameNew}
+    '';
     startAt = "hourly";
     serviceConfig = {
       Type = "oneshot";
@@ -69,11 +88,10 @@ in {
     '')
     (pkgs.writers.writeDashBin "flixmenu" ''
       set -efu
-      cd "${flixLocation}/download"
-
-      [ -f "${cacheLocation}/${indexFilename}" ] || exit 1
-
-      ${pkgs.dmenu}/bin/dmenu -i -p flix -l 5 "$@" < ${cacheLocation}/${indexFilename} \
+      (
+        ${pkgs.gnused}/bin/sed 's#^\.#${flixLocation}#' ${cacheLocation}/${indexFilename}
+        ${pkgs.gnused}/bin/sed 's#^\.#${flixLocationNew}#' ${cacheLocation}/${indexFilenameNew}
+      ) | ${pkgs.dmenu}/bin/dmenu -i -p flix -l 5 "$@" \
         | ${pkgs.findutils}/bin/xargs -I '{}' ${pkgs.util-linux}/bin/setsid ${pkgs.xdg-utils}/bin/xdg-open '{}'
     '')
   ];

configs/fonts.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}: let
+{
+  pkgs,
+  niveumPackages,
+  ...
+}: let
   zip-font = name: arguments: let
     directory = pkgs.fetchzip arguments;
   in
@@ -27,7 +31,7 @@
   };
   newGardiner = zip-font "NewGardiner" {
     url = "https://mjn.host.cs.st-andrews.ac.uk/egyptian/fonts/NewGardiner.zip";
-    sha256 = "1jd0qa6shh9pqqyig2w43m9l9rv1i50l73jzkhb6g6mqxbhb1mip";
+    hash = "sha256-i7ZBN28no/884fYMA7ZJ47WpkwZXzY//TK0bDz21pE0=";
     stripRoot = false;
   };
   junicode2 = zip-font "JunicodeTwo" {
@@ -64,6 +68,7 @@ in {
       corefonts
       crimson
       eb-garamond
+      ipaexfont
       jsesh
       egyptianHiero
       egyptianText
@@ -76,7 +81,7 @@ in {
       font-awesome
       galatia-sil
       gentium
-      gfs-fonts
+      niveumPackages.gfs-fonts
       gyre-fonts
       ibm-plex
       jetbrains-mono
@@ -96,7 +101,7 @@ in {
       source-sans-pro
       source-serif-pro
       theano
-      tocharian-font
+      niveumPackages.tocharian-font
       vistafonts
       vollkorn
       zilla-slab
@@ -104,7 +109,7 @@ in {
     fontconfig.defaultFonts = rec {
       monospace = ["Noto Sans Mono"] ++ emoji;
       serif = ["Noto Serif" "Noto Naskh Arabic" "Noto Serif Devanagari"];
-      sansSerif = ["Noto Sans Display" "Noto Kufi Arabic" "Noto Sans Devanagari" "Noto Sans CJK JP"];
+      sansSerif = ["Noto Sans Display" "Noto Naskh Arabic" "Noto Sans Devanagari" "Noto Sans CJK JP" "Noto Sans Coptic"];
       emoji = ["Noto Color Emoji"];
     };
     # xelatex fails with woff files

configs/fu-berlin.nix

@@ -0,0 +1,80 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  username = "meinhak99";
+  inherit (import ../lib/email.nix) defaults;
+  fu-defaults = rec {
+    imap.host = "mail.zedat.fu-berlin.de";
+    smtp.host = imap.host;
+    folders.drafts = "Entwürfe";
+    folders.sent = "Gesendet";
+    folders.trash = "Papierkorb";
+  };
+in {
+  home-manager.users.me = {
+    programs.ssh = {
+      matchBlocks = {
+        fu-berlin = {
+          user = username;
+          hostname = "login.zedat.fu-berlin.de";
+          setEnv.TERM = "xterm";
+        };
+      };
+    };
+    accounts.email.accounts = {
+      fu-student =
+        lib.recursiveUpdate defaults
+        (lib.recursiveUpdate fu-defaults
+          rec {
+            userName = "meinhak99";
+            address = "kieran.meinhardt@fu-berlin.de";
+            aliases = ["${userName}@fu-berlin.de"];
+            passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-meinhak99.path}";
+          });
+    };
+  };
+
+  systemd.user.services.fu-blackboard-calendar = {
+    enable = true;
+    # startAt = "*:00/10";
+    after = ["vdirsyncer.service"];
+    wantedBy = ["default.target"];
+    script = ''
+      ${pkgs.curl}/bin/curl $(cat ${config.age.secrets.blackboard-calendar-ics.path}) | ${pkgs.khal}/bin/khal import -
+    '';
+    serviceConfig = {
+      Type = "oneshot";
+      Restart = "on-failure";
+    };
+  };
+
+  age.secrets = {
+    email-password-meinhak99 = {
+      file = ../secrets/email-password-meinhak99.age;
+      owner = config.users.users.me.name;
+      group = config.users.users.me.group;
+      mode = "400";
+    };
+    blackboard-calendar-ics = {
+      file = ../secrets/blackboard-calendar-ics.age;
+      owner = config.users.users.me.name;
+      group = config.users.users.me.group;
+      mode = "400";
+    };
+  };
+
+  systemd.services.fu-vpn = {
+    enable = true;
+    wants = ["network-online.target"];
+    serviceConfig.LoadCredential = "password:${config.age.secrets.email-password-meinhak99.path}";
+    script = ''
+      if ${pkgs.wirelesstools}/bin/iwgetid | ${pkgs.gnugrep}/bin/grep --invert-match eduroam
+      then
+        cat "$CREDENTIALS_DIRECTORY/password" | ${pkgs.openconnect}/bin/openconnect vpn.fu-berlin.de --user ${username} --passwd-on-stdin
+      fi
+    '';
+  };
+}

configs/fysi.nix

@@ -0,0 +1,55 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (import ../lib/email.nix) defaults;
+  sshIdentity = name: "${config.users.users.me.home}/.ssh/${name}";
+in {
+  age.secrets = {
+    email-password-fysi = {
+      file = ../secrets/email-password-fysi.age;
+      owner = config.users.users.me.name;
+      group = config.users.users.me.group;
+      mode = "400";
+    };
+  };
+
+  home-manager.users.me = {
+    accounts.email.accounts = {
+      fysi =
+        lib.recursiveUpdate defaults
+        rec {
+          address = "kieran@fysi.tech";
+          userName = address;
+          passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-fysi.path}";
+          flavor = "fastmail.com";
+        };
+    };
+
+    programs.ssh.matchBlocks = rec {
+      "nextcloud.fysi.dev" = {
+        hostname = "116.203.82.203";
+        user = "root";
+      };
+      "lingua.miaengiadina.ch" = {
+        hostname = "135.181.85.233";
+        user = "root";
+      };
+      "cms-dev.woc2023.app".identityFile = sshIdentity "fysiweb";
+      "cms-master.woc2023.app".identityFile = sshIdentity "fysiweb";
+      "fysi-dev1" = {
+        hostname = "94.130.229.139";
+        user = "root";
+        identityFile = sshIdentity "fysiweb";
+      };
+      ${fysi-dev1.hostname} = fysi-dev1;
+      "fysi-shared0" = {
+        hostname = "49.12.205.235";
+        user = "root";
+        identityFile = sshIdentity "fysiweb";
+      };
+    };
+  };
+}

configs/fzf.nix

@@ -1,37 +1,22 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  environment = {
-    systemPackages = [pkgs.fzf];
-    variables = rec {
-      FZF_DEFAULT_COMMAND = "${pkgs.fd}/bin/fd --type f --strip-cwd-prefix --follow --no-ignore-vcs --exclude .git";
-      FZF_DEFAULT_OPTS =
-        lib.escapeShellArgs ["--height=40%"];
-      FZF_ALT_C_COMMAND = "${pkgs.fd}/bin/fd --type d";
-      FZF_ALT_C_OPTS = lib.escapeShellArgs [
-        "--preview='${pkgs.tree}/bin/tree -L 1 \"{}\"'"
+{pkgs, ...}: {
+  programs.fzf = {
+    fuzzyCompletion = true;
+    keybindings = true;
+  };
+
+  home-manager.users.me = {
+    programs.fzf = rec {
+      enable = true;
+      defaultCommand = "${pkgs.fd}/bin/fd --type f --strip-cwd-prefix --follow --no-ignore-vcs --exclude .git";
+      defaultOptions = ["--height=40%"];
+      changeDirWidgetCommand = "${pkgs.fd}/bin/fd --type d";
+      changeDirWidgetOptions = [
+        "--preview='${pkgs.tree}/bin/tree -L 1 {}'"
         "--bind=space:toggle-preview"
         "--preview-window=hidden"
       ];
-      FZF_CTRL_T_COMMAND = FZF_DEFAULT_COMMAND;
-      FZF_CTRL_T_OPTS =
-        lib.escapeShellArgs ["--preview='head -$LINES {}'"];
+      fileWidgetCommand = defaultCommand;
+      fileWidgetOptions = ["--preview='head -$LINES {}'"];
     };
   };
-
-  programs.zsh.interactiveShellInit = ''
-    if [[ $options[zle] = on ]]; then
-      . ${pkgs.fzf}/share/fzf/completion.zsh
-      . ${pkgs.fzf}/share/fzf/key-bindings.zsh
-    fi
-  '';
-
-  programs.bash.interactiveShellInit = ''
-    if [[ :$SHELLOPTS: =~ :(vi|emacs): ]]; then
-      . ${pkgs.fzf}/share/fzf/completion.bash
-      . ${pkgs.fzf}/share/fzf/key-bindings.bash
-    fi
-  '';
 }

configs/git.nix

@@ -2,9 +2,10 @@
   pkgs,
   config,
   lib,
+  inputs,
   ...
 }: let
-  inherit (import <niveum/lib>) kieran ignorePaths;
+  inherit (import ../lib) kieran ignorePaths;
 in {
   environment.systemPackages = [
     pkgs.mr
@@ -18,7 +19,7 @@ in {
     pkgs.gitstats
     pkgs.patch
     pkgs.patchutils
-    pkgs.git-preview
+    inputs.self.packages.x86_64-linux.git-preview
   ];
 
   environment.shellAliases = {
@@ -50,6 +51,7 @@ in {
         pull.ff = "only";
         rebase.autoStash = true;
         merge.autoStash = true;
+        push.autoSetupRemote = true;
 
         # # ref https://github.com/dandavison/delta
         # core.pager = "${pkgs.delta}/bin/delta";

configs/hledger.nix

@@ -3,11 +3,12 @@
   pkgs,
   ...
 }: {
-  imports = [<niveum/modules/hledger.nix>];
-
   environment.systemPackages = let
-    timeLedger = "$HOME/projects/ledger/time.timeclock";
+    ledgerDirectory = "$HOME/projects/ledger";
+    timeLedger = "${ledgerDirectory}/time.timeclock";
+    git = "${pkgs.git}/bin/git -C ${ledgerDirectory}";
   in [
+    pkgs.hledger
     (pkgs.writers.writeDashBin "hora-edit" ''
       $EDITOR + "${timeLedger}" && ${pkgs.git}/bin/git -C "$(${pkgs.coreutils}/bin/dirname ${timeLedger})" commit --all --message "$(${pkgs.coreutils}/bin/date -Im)"
     '')
@@ -16,21 +17,23 @@
     '')
     (pkgs.writers.writeDashBin "hora-filli" ''
       ${pkgs.hledger}/bin/hledger -f "${timeLedger}" register fillidefilla -O csv \
-        -b "$(date -d "$(date +%Y-%m)-20 last month" +%Y-%m-%d)" \
-        -e "$(date -d "$(date +%Y-%m)-20" +%Y-%m-%d)" \
+        -b "$(date -d "$(date +%Y-%m)-01 last month" +%Y-%m-%d)" \
+        -e "$(date -d "$(date +%Y-%m)-01" +%Y-%m-%d)" \
         | sed 's/(fillidefilla:\(.*\))/\1/g' \
         | xsv select date,amount,total,account,description
     '')
-  ];
 
-  niveum.hledger = {
-    enable = true;
-    ledgerFile = "$HOME/projects/ledger/all.journal";
-    server = {
-      enable = false;
-      user = config.users.users.me;
-      package = pkgs.hledger-web;
-    };
-    package = pkgs.hledger;
-  };
+    (pkgs.writers.writeDashBin "hledger-git" ''
+      if [ "$1" = entry ]; then
+        ${pkgs.hledger}/bin/hledger balance -V > "${ledgerDirectory}/balance.txt"
+        ${git} add balance.txt
+        ${git} commit --all --message="$(date -Im)"
+      else
+        ${git} $*
+      fi
+    '')
+    (pkgs.writers.writeDashBin "hledger-edit" ''
+      $EDITOR ${ledgerDirectory}/current.journal
+    '')
+  ];
 }

configs/htop.nix

@@ -20,7 +20,7 @@
         show_thread_names = false;
         sort_descending = true;
         sort_key = "PERCENT_CPU";
-        tree_view = true;
+        tree_view = false;
         update_process_names = false;
         right_meters = ["Uptime" "Tasks" "LoadAverage" "Battery"];
         left_meters = ["LeftCPUs2" "RightCPUs2" "Memory" "Swap"];

configs/hu-berlin.nix

@@ -4,21 +4,21 @@
   lib,
   ...
 }: let
-  inherit (lib.strings) fileContents;
-  inherit (import <niveum/lib>) sshPort;
-  eduroam = {
-    identity = fileContents <secrets/eduroam/identity>;
-    password = fileContents <secrets/eduroam/password>;
+  inherit (import ../lib/email.nix) defaults;
+  hu-defaults = {
+    imap.host = "mailbox.cms.hu-berlin.de";
+    imap.port = 993;
+    smtp.host = "mailhost.cms.hu-berlin.de";
+    smtp.port = 25;
+    smtp.tls.useStartTls = true;
   };
   hu-berlin-cifs-options = [
     "uid=${toString config.users.users.me.uid}"
     "gid=${toString config.users.groups.users.gid}"
     "sec=ntlmv2"
     "workgroup=german"
-    "username=meinhaki"
-    "password=${lib.strings.fileContents <secrets/mail/meinhaki>}"
+    "credentials=${config.age.secrets.cifs-credentials-hu-berlin.path}"
     "noauto"
-    "x-systemd.requires=hu-vpn.service"
     "x-systemd.automount"
     "x-systemd.device-timeout=1"
     "x-systemd.idle-timeout=1min"
@@ -36,13 +36,126 @@ in {
     options = hu-berlin-cifs-options;
   };
 
-  home-manager.users.me.programs.ssh = {
-    matchBlocks = {
-      "alew.hu-berlin.de" = {
-        user = "centos";
-        hostname = "141.20.187.219";
+  age.secrets = {
+    cifs-credentials-hu-berlin.file = ../secrets/cifs-credentials-hu-berlin.age;
+    email-password-meinhark = {
+      file = ../secrets/email-password-meinhark.age;
+      owner = config.users.users.me.name;
+      group = config.users.users.me.group;
+      mode = "400";
+    };
+    email-password-meinhaki = {
+      file = ../secrets/email-password-meinhaki.age;
+      owner = config.users.users.me.name;
+      group = config.users.users.me.group;
+      mode = "400";
+    };
+    email-password-dslalewa = {
+      file = ../secrets/email-password-dslalewa.age;
+      owner = config.users.users.me.name;
+      group = config.users.users.me.group;
+      mode = "400";
+    };
+    email-password-fsklassp = {
+      file = ../secrets/email-password-fsklassp.age;
+      owner = config.users.users.me.name;
+      group = config.users.users.me.group;
+      mode = "400";
+    };
+  };
+
+  home-manager.users.me = {
+    programs.ssh = {
+      matchBlocks = {
+        "gruenau6.informatik.hu-berlin.de" = {
+          hostname = "gruenau6.informatik.hu-berlin.de";
+          user = "meinhark";
+          setEnv.TERM = "xterm";
+        };
+        "alew.hu-berlin.de" = {
+          user = "centos";
+          hostname = "141.20.187.219";
+        };
       };
     };
+
+    accounts.email.accounts = rec {
+      hu-student =
+        lib.recursiveUpdate defaults
+        (lib.recursiveUpdate hu-defaults
+          rec {
+            userName = "meinhark";
+            address = "kieran.felix.meinhardt@hu-berlin.de";
+            aliases = ["${userName}@hu-berlin.de"];
+            passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-meinhark.path}";
+          });
+      hu-student-cs =
+        lib.recursiveUpdate defaults
+        (lib.recursiveUpdate hu-defaults
+          rec {
+            userName = "meinhark";
+            address = "kieran.felix.meinhardt@informatik.hu-berlin.de";
+            aliases = ["${userName}@informatik.hu-berlin.de"];
+            imap.host = "mailbox.informatik.hu-berlin.de";
+            smtp.host = "mailhost.informatik.hu-berlin.de";
+            passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-meinhark.path}";
+          });
+      hu-employee =
+        lib.recursiveUpdate defaults
+        (lib.recursiveUpdate hu-defaults
+          rec {
+            userName = "meinhaki";
+            address = "kieran.meinhardt@hu-berlin.de";
+            aliases = ["${userName}@hu-berlin.de"];
+            passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-meinhaki.path}";
+            aerc.extraAccounts.signature-file = toString (pkgs.writeText "signature" signature.text);
+            signature = {
+              showSignature = "append";
+              text = ''
+                ${defaults.realName}
+                Studentische Hilfskraft / Administrator ALEW
+                Humboldt-Universität zu Berlin
+
+                Telefon: +49 (0)30 2093 9634
+                Raum 3.212, Dorotheenstraße 24, 10117 Berlin-Mitte
+                https://alew.hu-berlin.de
+              '';
+            };
+          });
+      hu-admin =
+        lib.recursiveUpdate defaults
+        (lib.recursiveUpdate hu-defaults
+          rec {
+            userName = "dslalewa";
+            address = "admin.alew.vglsprwi@hu-berlin.de";
+            aliases = ["${userName}@hu-berlin.de"];
+            passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-dslalewa.path}";
+            inherit (hu-employee) signature;
+            aerc.extraAccounts.signature-file = toString (pkgs.writeText "signature" signature.text);
+          });
+      hu-fsi =
+        lib.recursiveUpdate defaults
+        (lib.recursiveUpdate hu-defaults
+          rec {
+            userName = "fsklassp";
+            passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-fsklassp.path}";
+            address = "${userName}@hu-berlin.de";
+            realName = "FSI Klassische Philologie";
+            aerc.extraAccounts.signature-file = toString (pkgs.writeText "signature" signature.text);
+            signature = {
+              showSignature = "append";
+              text = ''
+                Fachschafts-Initiative
+
+                Humboldt-Universität zu Berlin
+                Sprach- und literaturwissenschaftliche Fakultät
+                Institut für klassische Philologie
+                Unter den Linden 6
+                10099 Berlin
+              '';
+            };
+          });
+    };
   };
 
   environment.systemPackages = [
@@ -62,19 +175,26 @@ in {
     )
   ];
 
+  # ref https://github.com/NixOS/nixpkgs/issues/231038#issuecomment-1591888919
+  environment.etc."ppp/options".text = "ipcp-accept-remote";
+
   systemd.services.hu-vpn = {
     enable = true;
     wants = ["network-online.target"];
+    serviceConfig.LoadCredential = "password:${config.age.secrets.email-password-meinhark.path}";
     script = ''
-      ${pkgs.openfortivpn}/bin/openfortivpn -c ${
+      if ${pkgs.wirelesstools}/bin/iwgetid | ${pkgs.gnugrep}/bin/grep --invert-match eduroam
+      then
+        ${pkgs.openfortivpn}/bin/openfortivpn \
+          --password="$(cat "$CREDENTIALS_DIRECTORY/password")" \
+          --config=${
         pkgs.writeText "hu-berlin.config" ''
           host = forti-ssl.vpn.hu-berlin.de
           port = 443
-          trusted-cert = 42193a913d276d9eb86217612956e1e6464d6f07bed5393a4787c87adc4bd359
-          username = ${eduroam.identity}
-          password = ${eduroam.password}
+          username = meinhark
         ''
       }
+      fi
     '';
   };
 }

configs/i3.nix

@@ -2,12 +2,12 @@
   config,
   pkgs,
   lib,
+  niveumPackages,
   ...
 }: let
-  inherit (import <niveum/lib>) defaultApplications colours;
-  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
-  klem = import <niveum/packages/scripts/klem.nix> {
-    inherit pkgs lib;
+  inherit (import ../lib) defaultApplications;
+  klem = niveumPackages.klem.override {
+    config.dmenu = "${pkgs.dmenu}/bin/dmenu -i -p klem";
     config.scripts = {
       "p.r" = pkgs.writers.writeDash "p.r" ''
         ${pkgs.curl}/bin/curl -fSs http://p.r --data-binary @- \
@@ -36,10 +36,10 @@
         ${pkgs.coreutils}/bin/tr '[A-Za-z]' '[N-ZA-Mn-za-m]'
       '';
       "ipa" = pkgs.writers.writeDash "ipa" ''
-        ${scripts.ipa}/bin/ipa
+        ${niveumPackages.ipa}/bin/ipa
       '';
       "betacode" = pkgs.writers.writeDash "betacode" ''
-        ${scripts.betacode}/bin/betacode
+        ${niveumPackages.betacode}/bin/betacode
       '';
       "curl" = pkgs.writers.writeDash "curl" ''
         ${pkgs.curl}/bin/curl -fSs "$(${pkgs.coreutils}/bin/cat)"
@@ -47,6 +47,12 @@
       ocr = pkgs.writers.writeDash "ocr" ''
         ${pkgs.tesseract4}/bin/tesseract -l eng+deu - stdout
       '';
+      emojai = pkgs.writers.writeDash "emojai" ''
+        ${pkgs.curl}/bin/curl https://www.emojai.app/api/generate -X POST -H 'Content-Type: application/json' --data-raw "$(${pkgs.jq}/bin/jq -sR '{emoji:.}')" | ${pkgs.jq}/bin/jq -r .result
+      '';
+      gpt = pkgs.writers.writeDash "gpt" ''
+        ${niveumPackages.gpt}/bin/gpt
+      '';
     };
   };
 
@@ -57,10 +63,28 @@
     i3-msg move container to workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
   '';
 in {
+  age.secrets = {
+    github-token-i3status-rust = {
+      file = ../secrets/github-token-i3status-rust.age;
+      owner = config.users.users.me.name;
+      group = config.users.users.me.group;
+      mode = "400";
+    };
+    openweathermap-api-key = {
+      file = ../secrets/openweathermap-api-key.age;
+      owner = config.users.users.me.name;
+      group = config.users.users.me.group;
+      mode = "400";
+    };
+  };
+
+  programs.slock.enable = true;
+
   services.xserver = {
     displayManager.defaultSession = "none+i3";
     windowManager.i3 = {
       enable = true;
+      package = pkgs.i3-gaps;
     };
   };
 
@@ -79,17 +103,18 @@ in {
     '';
   };
 
-  home-manager.users.me.xsession.windowManager.i3 = {
+  home-manager.users.me.xsession.windowManager.i3 = let
+    modifier = "Mod4";
+  in {
     enable = true;
+    extraConfig = ''
+      bindsym --release ${modifier}+Shift+w exec /run/wrappers/bin/slock
+    '';
     config = rec {
-      fonts = {
-        names = ["Sans"];
-        size = 10.0;
-      };
-      modifier = "Mod4";
+      inherit modifier;
       window = {
         titlebar = false;
-        border = 1;
+        border = 2;
         hideEdgeBorders = "smart";
         commands = [
           {
@@ -116,74 +141,36 @@ in {
           }
         ];
       };
+      gaps.inner = 4;
       floating = {
         titlebar = false;
         border = 1;
       };
-      colors = let
-        scheme = {
-          background = colours.background;
-          text = colours.foreground;
-        };
-      in rec {
-        focused =
-          scheme
-          // {
-            border = colours.blue.bright;
-            indicator = colours.blue.bright;
-            childBorder = colours.blue.bright;
-          };
-        unfocused =
-          scheme
-          // {
-            border = colours.background;
-            indicator = colours.background;
-            childBorder = colours.background;
-          };
-        focusedInactive = unfocused;
-        urgent =
-          scheme
-          // {
-            border = colours.red.bright;
-            indicator = colours.red.bright;
-            childBorder = colours.red.bright;
-          };
-        placeholder =
-          scheme
-          // {
-            border = colours.green.bright;
-            indicator = colours.green.bright;
-            childBorder = colours.green.bright;
-          };
-      };
       bars = [
-        {
-          workspaceButtons = false;
-          fonts = {
-            names = ["Monospace" "Font Awesome 6 Free"];
-            size = 8.0;
-          };
-          mode = "dock"; # "hide";
-          position = "bottom";
-          colors = rec {
-            background = colours.background;
-            separator = background;
-            statusline = colours.foreground;
-            bindingMode = {
-              background = colours.red.bright;
-              border = colours.background;
-              text = colours.foreground;
+        (config.home-manager.users.me.lib.stylix.i3.bar
+          // rec {
+            workspaceButtons = false;
+            mode = "dock"; # "hide";
+            position = "bottom";
+            statusCommand = toString (pkgs.writers.writeDash "i3status-rust" ''
+              export I3RS_GITHUB_TOKEN="$(cat ${config.age.secrets.github-token-i3status-rust.path})"
+              export OPENWEATHERMAP_API_KEY="$(cat ${config.age.secrets.openweathermap-api-key.path})"
+              ${config.home-manager.users.me.programs.i3status-rust.package}/bin/i3status-rs ${config.home-manager.users.me.home.homeDirectory}/.config/i3status-rust/config-${position}.toml
+            '');
+            fonts = {
+              names = ["${config.stylix.fonts.sansSerif.name}" "FontAwesome 6 Free"];
+              size = config.stylix.fonts.sizes.desktop * 0.8;
             };
-          };
-          statusCommand = "env I3RS_GITHUB_TOKEN=${lib.strings.fileContents <secrets/github/notification.token>} ${pkgs.i3status-rust}/bin/i3status-rs ${
-            (pkgs.formats.toml {}).generate "i3status-rust.toml" (import <niveum/lib/i3status-rust.nix> {
-              inherit (config.niveum) batteryName wirelessInterface;
-              inherit colours;
-              inherit pkgs;
-            })
-          }";
-        }
+          })
       ];
+      colors = let
+        background = config.lib.stylix.colors.withHashtag.base00;
+      in {
+        unfocused = {
+          border = lib.mkForce background;
+          childBorder = lib.mkForce background;
+        };
+      };
       modes.resize = {
         "Escape" = ''mode "default"'';
         "Return" = ''mode "default"'';
@@ -225,51 +212,33 @@ in {
         "${modifier}+r" = "mode resize";
         "${modifier}+v" = "split v";
         "${modifier}+w" = "layout tabbed";
-        "${modifier}+q" = "exec ${pkgs.writers.writeDash "newsboat-sync" ''
-          notify-send --app-name="newsboat" "Updating ..."
-          newsboat -x reload
-          notify-send --app-name="newsboat" "Finished updating."
-        ''}";
+        "${modifier}+q" = "exec ${config.services.clipmenu.package}/bin/clipmenu";
 
-        # "${modifier}+Shift+y" = "exec ${pkgs.qutebrowser}/bin/qutebrowser";
         "${modifier}+Return" = "exec ${(defaultApplications pkgs).terminal}";
         "${modifier}+t" = "exec ${(defaultApplications pkgs).fileManager}";
         "${modifier}+y" = "exec ${(defaultApplications pkgs).browser}";
-        "${modifier}+0" = "exec ${scripts.menu-calc}/bin/=";
+        "${modifier}+0" = "exec ${niveumPackages.menu-calc}/bin/=";
 
-        "${modifier}+Shift+w" = "exec ${scripts.k-lock}/bin/k-lock";
         "${modifier}+d" = "exec ${pkgs.writers.writeDash "run" ''exec rofi -modi run,ssh,window -show run''}";
-        "${modifier}+Shift+d" = "exec ${
-          pkgs.writers.writeDash "notemenu" ''
-            set -efu
-            PATH=$PATH:${
-              lib.makeBinPath [pkgs.rofi pkgs.findutils pkgs.coreutils]
-            }
-
-            cd ~/notes
-            note_file=$({
-              echo diary/$(date -I).md
-              echo diary/$(date -I -d yesterday).md
-              find . ! -name '.*' -type f -printf "%T@ %p\n" | sort --reverse --numeric-sort | cut --delimiter=" " --fields=2-
-            } | rofi -dmenu -i -p 'notes')
-            if test "$note_file"
-            then
-              alacritty --working-directory ~/notes -e "$EDITOR" "$note_file"
-            fi
-          ''
-        }";
+        "${modifier}+Shift+d" = "exec ${niveumPackages.notemenu}/bin/notemenu";
         "${modifier}+p" = "exec rofi-pass";
         "${modifier}+Shift+p" = "exec rofi-pass --insert";
-        "${modifier}+u" = "exec ${scripts.unicodmenu}/bin/unicodmenu";
+        "${modifier}+u" = "exec ${niveumPackages.unicodmenu}/bin/unicodmenu";
 
         "${modifier}+F6" = "exec ${pkgs.xorg.xkill}/bin/xkill";
-        "${modifier}+F7" = "exec ${scripts.showkeys-toggle}/bin/showkeys-toggle";
+        "${modifier}+F7" = "exec ${pkgs.writers.writeDash "showkeys-toggle" ''
+          if ${pkgs.procps}/bin/pgrep screenkey; then
+            exec ${pkgs.procps}/bin/pkill screenkey
+          else
+            exec ${pkgs.screenkey}/bin/screenkey
+          fi
+        ''}";
         "${modifier}+F8" = "exec switch-theme toggle";
         "${modifier}+F9" = "exec ${pkgs.redshift}/bin/redshift -O 4000 -b 0.85";
         "${modifier}+F10" = "exec ${pkgs.redshift}/bin/redshift -x";
         "${modifier}+F11" = "exec ${pkgs.xcalib}/bin/xcalib -invert -alter";
         "${modifier}+F12" = "exec ${klem}/bin/klem";
-        "Print" = "exec flameshot-once";
+        "Print" = "exec flameshot gui";
         "XF86AudioLowerVolume" = "exec ${pkgs.pamixer}/bin/pamixer -d 5";
         "XF86AudioMute" = "exec ${pkgs.pamixer}/bin/pamixer -t";
         "XF86AudioRaiseVolume" = "exec ${pkgs.pamixer}/bin/pamixer -i 5";
@@ -279,9 +248,9 @@ in {
         "XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
         "XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
         "XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl stop";
-        "XF86ScreenSaver" = "exec ${scripts.k-lock}/bin/k-lock";
+        "XF86ScreenSaver" = "exec ${niveumPackages.k-lock}/bin/k-lock";
 
-        "XF86Display" = "exec ${scripts.dmenurandr}/bin/dmenurandr";
+        "XF86Display" = "exec ${niveumPackages.dmenu-randr}/bin/dmenu-randr";
 
         # key names detected with xorg.xev:
         # XF86WakeUp (fn twice)

configs/i3status-rust.nix

@@ -0,0 +1,175 @@
+{
+  pkgs,
+  config,
+  ...
+}: {
+  home-manager.users.me = {
+    programs.i3status-rust = {
+      enable = true;
+      bars.bottom = {
+        icons = "awesome6";
+        settings = {
+          theme.overrides = let
+            colours = config.lib.stylix.colors.withHashtag;
+          in {
+            idle_bg = colours.base00;
+            idle_fg = colours.base05;
+            good_bg = colours.base00;
+            good_fg = colours.base0B;
+            warning_bg = colours.base00;
+            warning_fg = colours.base0A;
+            critical_bg = colours.base00;
+            critical_fg = colours.base09;
+            info_bg = colours.base00;
+            info_fg = colours.base04;
+            separator_bg = colours.base00;
+            separator = " ";
+          };
+        };
+        blocks = [
+          {
+            block = "weather";
+            autolocate = true;
+            format = "$icon $location: $temp";
+            service = {
+              name = "openweathermap";
+              city_id = "2950159";
+              units = "metric";
+            };
+          }
+          {
+            block = "custom";
+            interval = 60 * 5;
+            command = let
+              spacetime = import ../configs/spacetime.nix;
+            in
+              pkgs.writers.writePython3 "sun.py" {
+                libraries = [pkgs.python3Packages.astral];
+                flakeIgnore = ["E121" "E501"];
+              }
+              ''
+                import astral
+                import astral.moon
+                import astral.sun
+
+                current_phase = astral.moon.phase()
+
+                city = astral.LocationInfo("Berlin", "Germany", "${spacetime.time.timeZone}", ${toString spacetime.location.latitude}, ${toString spacetime.location.longitude})
+                sun = astral.sun.sun(city.observer, date=astral.today(), tzinfo=city.timezone)
+
+                print("↑{} ↓{} {}{}".format(sun["sunrise"].strftime("%R"), sun["sunset"].strftime("%R"), "☽" if current_phase < 14 else "☾", round(current_phase, 1)))
+              '';
+          }
+          {
+            block = "github";
+            info = ["total"];
+            warning = ["mention" "review_requested" "team_mention" "manual" "invitation" "assign" "subscribed"];
+          }
+          {
+            block = "custom";
+            interval = 10;
+            command = pkgs.writers.writeDash "todo" ''
+              ${pkgs.todoman}/bin/todo --porcelain | ${pkgs.jq}/bin/jq -r '
+                map(select(.due != null))
+                | (map(select(.due < now)) | length) as $overdue
+                | (map(select(.due >= now and .due < now + (60 * 60 * 24))) | length) as $dueToday
+                | {
+                  icon: "tasks",
+                  text: (($overdue + $dueToday) as $sum | if $sum > 0 then $sum | tostring else "" end),
+                  state: (
+                    if $overdue > 0 then
+                      "Critical"
+                    elif $dueToday > 0 then
+                      "Warning"
+                    else
+                      "Idle"
+                    end
+                  )
+                }
+              '
+            '';
+            json = true;
+            hide_when_empty = true;
+          }
+          {
+            block = "custom";
+            interval = 60;
+            command = pkgs.writers.writeDash "weechat" ''
+              ssh -o ConnectTimeout=1 makanek cat /var/lib/weechat/hotlist.txt | sed 's/,/\n/g' | wc -l | jq '{
+                text: (if . > 0 then . | tostring else "" end),
+                state: (if . > 0 then "Info" else "Idle" end),
+                icon: "bell"
+              }'
+            '';
+            json = true;
+            hide_when_empty = true;
+          }
+          {
+            block = "net";
+            format = " $icon HU";
+            missing_format = "";
+            device = "ppp0";
+          }
+          {
+            block = "net";
+            format = " $icon FU";
+            missing_format = "";
+            device = "tun0";
+          }
+          {
+            block = "net";
+            device = config.niveum.wirelessInterface;
+            format = "$icon $ssid $signal_strength";
+          }
+          {
+            block = "battery";
+            device = config.niveum.batteryName;
+          }
+          {
+            block = "sound";
+          }
+          {
+            block = "disk_space";
+            format = "$icon $available";
+          }
+          {
+            block = "memory";
+            format = "$icon $mem_used.eng(prefix:G)";
+          }
+          {block = "load";}
+          {
+            block = "custom";
+            interval = 10;
+            json = true;
+            command = pkgs.writers.writeDash "time" ''
+              ${pkgs.jq}/bin/jq -n \
+                --arg now "$(${pkgs.coreutils}/bin/date +'%Y-%m-%d (%W %a) %H:%M')" \
+                --argjson nextEvent "$(
+                  ${pkgs.khal}/bin/khal list --format "{start}" --day-format "" $(${pkgs.coreutils}/bin/date +'%Y-%m-%d %H:%M') 2>/dev/null \
+                  | ${pkgs.gnugrep}/bin/grep -E '[0-9]{2}:[0-9]{2}' \
+                  | ${pkgs.coreutils}/bin/head -1 \
+                  | ${pkgs.coreutils}/bin/date --date="$(cat)" +%s
+                )" \
+                '{
+                  text: $now,
+                  icon: "time",
+                  state: (
+                    ($nextEvent - now) as $deltaT
+                    | if $deltaT < (5 * 60) then
+                      "Critical"
+                    elif $deltaT < (15 * 60) then
+                      "Warning"
+                    elif $deltaT < (60 * 60) then
+                      "Info"
+                    else
+                      "Idle"
+                    end
+                  )
+                }'
+            '';
+          }
+        ];
+      };
+    };
+  };
+}

configs/keyboard.nix

@@ -12,6 +12,7 @@
     ara = "buckwalter";
     cop = "";
     ave = "";
+    got = "";
     "in" = "san-kagapa";
     il = "phonetic";
   };
@@ -37,6 +38,13 @@ in {
               sha256 = "1l0h6aq536hyinrh0i0ia355y229bjrlibii0sya5bmqh46vycia";
             };
           }
+          {
+            name = "symbols/got";
+            path = pkgs.fetchurl {
+              url = "https://c.krebsco.de/got";
+              sha256 = "1i0jxghxi3rldlijw6gm2xawrv7f0pmm7a5cqbzzgjrg7ldk46gd";
+            };
+          }
           {
             name = "symbols/ave";
             path = pkgs.fetchurl {

configs/khal.nix

@@ -6,16 +6,31 @@
 }: let
   davHome = "~/.local/share/dav";
   kmeinCloud = {
-    davEndpoint = "https://cloud.xn--kiern-0qa.de/remote.php/dav";
+    davEndpoint = "https://cloud.kmein.de/remote.php/dav";
     username = "kieran";
-    password = lib.fileContents <secrets/nextcloud/password>;
+    passwordFile = config.age.secrets.nextcloud-password-kieran.path;
   };
   fysiCloud = {
     davEndpoint = "https://nextcloud.fysi.dev/remote.php/dav";
     username = "kmein";
-    password = lib.fileContents <secrets/nextcloud-fysi/password>;
+    passwordFile = config.age.secrets.nextcloud-password-fysi.path;
   };
 in {
+  age.secrets = {
+    nextcloud-password-kieran = {
+      file = ../secrets/nextcloud-password-kieran.age;
+      owner = config.users.users.me.name;
+      group = config.users.users.me.group;
+      mode = "400";
+    };
+    nextcloud-password-fysi = {
+      file = ../secrets/nextcloud-password-fysi.age;
+      owner = config.users.users.me.name;
+      group = config.users.users.me.group;
+      mode = "400";
+    };
+  };
+
   environment.systemPackages = [
     pkgs.khal
     pkgs.vdirsyncer
@@ -39,8 +54,7 @@ in {
     wantedBy = ["default.target"];
     startAt = "*:00/10";
     script = ''
-      ${pkgs.vdirsyncer}/bin/vdirsyncer sync
-      ${pkgs.khal}/bin/khal printcalendars # https://lostpackets.de/khal/configure.html#syncing
+      ${pkgs.vdirsyncer}/bin/vdirsyncer sync && ${pkgs.khal}/bin/khal printcalendars # https://lostpackets.de/khal/configure.html#syncing
     '';
     serviceConfig = {
       Type = "oneshot";
@@ -97,6 +111,10 @@ in {
         path = ${davHome}/calendar/personal
         color = "light cyan"
 
+        [[krebs]]
+        path = ${davHome}/calendar/krebs
+        color = "light red"
+
         [[uni]]
         path = ${davHome}/calendar/uni-1
         color = "yellow"
@@ -147,6 +165,12 @@ in {
         collections = ["personal", "alew", "uni-1"]
         conflict_resolution = "b wins"
 
+        [pair krebs]
+        a = "kalender_local"
+        b = "krebs_cloud"
+        collections = ["3edef929-d509-7944-2440-000a54f2d054"]
+        conflict_resolution = "b wins"
+
         [pair fysi]
         a = "kalender_local"
         b = "fysi_cloud"
@@ -167,19 +191,25 @@ in {
         type = "carddav"
         url = "${kmeinCloud.davEndpoint}/addressbooks/users/${kmeinCloud.username}/"
         username = "${kmeinCloud.username}"
-        password = "${kmeinCloud.password}"
+        password.fetch = ["command", "cat", "${kmeinCloud.passwordFile}"]
 
         [storage kalender_cloud]
         type = "caldav"
         url = "${kmeinCloud.davEndpoint}/calendars/${kmeinCloud.username}/"
         username = "${kmeinCloud.username}"
-        password = "${kmeinCloud.password}"
+        password.fetch = ["command", "cat", "${kmeinCloud.passwordFile}"]
+
+        [storage krebs_cloud]
+        type = "caldav"
+        url = "http://calendar.r/krebs/"
+        username = "krebs"
+        password = "krebs"
 
         [storage fysi_cloud]
         type = "caldav"
         url = "${fysiCloud.davEndpoint}/calendars/${fysiCloud.username}/"
         username = "${fysiCloud.username}"
-        password = "${fysiCloud.password}"
+        password.fetch = ["command", "cat", "${fysiCloud.passwordFile}"]
       '';
     };
   };

configs/lb.nix

@@ -9,7 +9,7 @@
     startAt = "weekly";
     serviceConfig = {
       user = "kfm";
-      WorkingDirectory = "/home/kfm/cloud/Seafile/Books/Germanistik/LB";
+      WorkingDirectory = "/home/kfm/cloud/nextcloud/Books/Germanistik/LB";
     };
     script = ''
       first_year=2019

configs/mpv.nix

@@ -2,10 +2,10 @@
   pkgs,
   lib,
   config,
+  niveumPackages,
   ...
 }: let
-  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
-  swallow = command: "${scripts.swallow}/bin/swallow ${command}";
+  swallow = command: "${niveumPackages.swallow}/bin/swallow ${command}";
 in {
   environment.shellAliases.smpv = swallow "mpv";
 
@@ -37,7 +37,7 @@ in {
       };
       scripts = [
         pkgs.mpvScripts.youtube-quality
-        (pkgs.callPackage <niveum/packages/mpv-visualizer.nix> {})
+        niveumPackages.mpv-visualizer
       ];
     };
   };

configs/neovim.nix

@@ -1,80 +1,40 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  niveumPackages,
+  ...
+}: {
   environment.variables.EDITOR = pkgs.lib.mkForce "nvim";
   environment.shellAliases.vi = "nvim";
   environment.shellAliases.vim = "nvim";
   environment.shellAliases.view = "nvim -R";
 
-  nixpkgs.config.packageOverrides = pkgs: {
-    vimPlugins =
-      pkgs.vimPlugins
-      // {
-        cheat-sh-vim = pkgs.callPackage <niveum/packages/vimPlugins/cheat-sh.nix> {};
-        vim-fetch = pkgs.callPackage <niveum/packages/vimPlugins/vim-fetch.nix> {};
-        vim-colors-paramount = pkgs.callPackage <niveum/packages/vimPlugins/vim-colors-paramount.nix> {};
-        vim-256noir = pkgs.callPackage <niveum/packages/vimPlugins/vim-256noir.nix> {};
-        icalendar-vim = pkgs.callPackage <niveum/packages/vimPlugins/icalendar-vim.nix> {};
-        jq-vim = pkgs.callPackage <niveum/packages/vimPlugins/jq-vim.nix> {};
-        vim-fsharp = pkgs.callPackage <niveum/packages/vimPlugins/vim-fsharp.nix> {};
-        vim-reason-plus = pkgs.callPackage <niveum/packages/vimPlugins/vim-reason-plus.nix> {};
-        vim-mail = pkgs.callPackage <niveum/packages/vimPlugins/vim-mail.nix> {};
+  home-manager.users.me = {
+    editorconfig = {
+      enable = true;
+      settings = {
+        "*" = {
+          charset = "utf-8";
+          end_of_line = "lf";
+          trim_trailing_whitespace = true;
+          insert_final_newline = true;
+          indent_style = "space";
+          indent_size = 2;
+        };
+        "*.py" = {
+          indent_size = 4;
+        };
+        Makefile = {
+          indent_style = "tab";
+        };
+        "*.md" = {
+          trim_trailing_whitespace = false;
+        };
       };
+    };
   };
 
   environment.systemPackages = [
     (pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
-    (pkgs.neovim.override {
-      configure = {
-        customRC = builtins.readFile <niveum/lib/vim/init.vim>;
-        packages.nvim = with pkgs.vimPlugins; {
-          start = [
-            ale
-            fzf-vim
-            fzfWrapper
-            supertab
-            undotree
-            tabular
-            # vimwiki
-            vim-colors-paramount
-            vim-commentary
-            vim-css-color
-            vim-eunuch
-            vim-fetch
-            vim-fugitive
-            vim-gitgutter
-            vim-repeat
-            vim-sensible
-            vim-surround
-            (pkgs.vimUtils.buildVimPlugin rec {
-              pname = "vim-dim";
-              version = "1.1.0";
-              name = "${pname}-${version}";
-              src = pkgs.fetchFromGitHub {
-                owner = "jeffkreeftmeijer";
-                repo = pname;
-                rev = version;
-                sha256 = "sha256-lyTZUgqUEEJRrzGo1FD8/t8KBioPrtB3MmGvPeEVI/g=";
-              };
-            })
-          ];
-          opt = [
-            csv
-            elm-vim
-            emmet-vim
-            haskell-vim
-            icalendar-vim
-            jq-vim
-            rust-vim
-            typescript-vim
-            vim-javascript
-            vim-ledger
-            vim-nix
-            vimtex
-            vim-pandoc
-            vim-pandoc-syntax
-            vim-256noir
-          ];
-        };
-      };
-    })
+    niveumPackages.vim
   ];
 }

configs/networkmanager.nix

@@ -42,8 +42,6 @@
     };
   };
 in {
-  imports = [<niveum/modules/networkmanager-declarative.nix>];
-
   programs.nm-applet.enable = true;
 
   networking.networkmanager = {
@@ -55,39 +53,6 @@ in {
     wifi.macAddress = "random";
     ethernet.macAddress = "random";
     unmanaged = ["docker*"];
-    profiles = lib.mapAttrs profile {
-      Aether = {
-        connection.uuid = "7138bb0f-1aeb-4905-890e-a6628427aa21";
-        ipv6.addr-gen-mode = "stable";
-        wifi.cloned-mac-address = "stable";
-        wifi-security = {
-          psk = lib.strings.fileContents <secrets/wifi/Aether.psk>;
-          auth-alg = "open";
-          key-mgmt = "wpa-psk";
-        };
-      };
-      FactoryCommunityGuest = {
-        connection.uuid = "fb1f2e52-651e-48b5-a72c-1accddf31afb";
-        connection.timestamp = "1631885129";
-        wifi.seen-bssids = "54:EC:2F:19:30:DC;54:EC:2F:19:5C:9C;54:EC:2F:58:E4:3C;";
-        wifi-security = {
-          psk = "Factory4ever";
-          auth-alg = "open";
-          key-mgmt = "wpa-psk";
-        };
-      };
-      o2-WLAN66 = {
-        connection.uuid = "c563aec3-f344-4ffb-8d1c-60a6cdac8fe0";
-        wifi-security = {
-          psk = "PK3468KV488T934U";
-          auth-alg = "open";
-          key-mgmt = "wpa-psk";
-        };
-      };
-      "WIFI@DB".connection.uuid = "4eff4e94-8850-4e9f-a338-1787d0d90479";
-      eduroam = eduroamProfile;
-      eduroam_5GHz = eduroamProfile;
-    };
   };
 
   users.users.me.extraGroups = ["networkmanager"];

configs/newsboat.nix

@@ -4,8 +4,6 @@
   lib,
   ...
 }: let
-  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
-
   ytdl-format = "'bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best'";
 
   youtube-download = "${pkgs.ts}/bin/ts ${pkgs.yt-dlp}/bin/yt-dlp -f ${ytdl-format} --add-metadata";

configs/nix.nix

@@ -1,13 +1,14 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  inputs,
+  ...
+}: {
   nixpkgs = {
     config.allowUnfree = true;
-    overlays = [
-      (import <nix-writers/pkgs>)
-      (import <stockholm/krebs/5pkgs>)
-    ];
   };
   nix = {
-    package = pkgs.nixUnstable;
+    package = pkgs.nixFlakes;
     extraOptions = "experimental-features = nix-command flakes";
+    nixPath = ["nixpkgs=${inputs.nixpkgs}"];
   };
 }

configs/nsxiv.nix

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

configs/packages.nix

@@ -1,14 +1,13 @@
 {
+  config,
   pkgs,
   lib,
+  inputs,
+  niveumPackages,
+  unstablePackages,
   ...
 }: let
-  hc = pkgs.callPackage <stockholm/tv/5pkgs/simple/hc.nix> {utillinux = pkgs.util-linux;};
-  worldradio = pkgs.callPackage <niveum/packages/worldradio.nix> {};
-  menstruation = pkgs.callPackage <menstruation-backend> {};
-  pandoc-doc = pkgs.callPackage <niveum/packages/man/pandoc.nix> {};
-
-  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
+  worldradio = pkgs.callPackage ../packages/worldradio.nix {};
 
   zoteroStyle = {
     name,
@@ -55,8 +54,6 @@
         ' $out/astrolog/astrolog.as
       '';
     });
-
-  recht = pkgs.callPackage <recht> {};
 in {
   home-manager.users.me.home.file = {
     ".csl".source = cslDirectory;
@@ -79,6 +76,7 @@ in {
     ffmpeg
     imagemagick
     exiftool
+    nsxiv
     # ARCHIVE TOOLS
     unzip
     unrar
@@ -98,6 +96,7 @@ in {
     genpass # generate passwords
     gdu # ncurses disk usage (ncdu is broken)
     rmlint # remove duplicate files
+    gcc
     python3Packages.jsonschema # json validation
     jq # json toolkit
     pup # html toolkit
@@ -126,6 +125,7 @@ in {
     electrum
     inkscape
     astrolog
+    obsidian
     anki-bin # flashcards
     jbofihe # lojbanic software
     zoom-us # video conferencing
@@ -137,68 +137,68 @@ in {
     okular # the word is nucular
     xournalpp # for annotating pdfs
     pdfpc # presenter console for pdf slides
-    hc # print files as qr codes
+    niveumPackages.hc # print files as qr codes
     yt-dlp
     espeak
     bc # calculator
     pari # gp -- better calculator
     rink # unit converter
-    scripts.auc
-    scripts.stackoverflow
-    scripts.infschmv
-    scripts.qrpaste
-    scripts.ttspaste
-    scripts.new-mac # get a new mac address
-    scripts.scanned
-    scripts.default-gateway
-    scripts.showkeys-toggle
-    scripts.kirciuoklis
-    scripts.favicon
-    scripts.heuretes
-    scripts.ipa # XSAMPA to IPA converter
-    scripts.playlist
-    scripts.mpv-tv
-    scripts.devanagari
-    scripts.betacode # ancient greek betacode to unicode converter
-    scripts.meteo
-    scripts.mahlzeit
-    recht
-    scripts.vimv
-    scripts.swallow # window swallowing
-    scripts.literature-quote
+    niveumPackages.auc
+    niveumPackages.cheat-sh
+    niveumPackages.infschmv
+    niveumPackages.qrpaste
+    niveumPackages.ttspaste
+    niveumPackages.new-mac # get a new mac address
+    niveumPackages.scanned
+    niveumPackages.default-gateway
+    niveumPackages.kirciuoklis
+    niveumPackages.image-convert-favicon
+    niveumPackages.heuretes
+    niveumPackages.ipa # XSAMPA to IPA converter
+    niveumPackages.pls
+    niveumPackages.mpv-tv
+    niveumPackages.devanagari
+    niveumPackages.betacode # ancient greek betacode to unicode converter
+    niveumPackages.meteo
+    niveumPackages.mahlzeit
+    niveumPackages.vimv
+    niveumPackages.swallow # window swallowing
+    niveumPackages.literature-quote
     jless # less(1) for json
-    scripts.notetags
-    scripts.booksplit
-    scripts.dmenurandr
-    scripts.interdimensional-cable
-    scripts.dmenubluetooth
-    scripts.manual-sort
-    scripts.much-scripts
-    scripts.dns-sledgehammer
+    niveumPackages.booksplit
+    niveumPackages.dmenu-randr
+    niveumPackages.dmenu-bluetooth
+    niveumPackages.manual-sort
+    niveumPackages.dns-sledgehammer
     ts
-    scripts.vg
-    scripts.fkill
-    scripts.wttr
-    scripts.unicodmenu
-    scripts.closest
-    scripts.trans
-    scripts.mpv-radio
+    niveumPackages.vg
+    niveumPackages.fkill
+    niveumPackages.wttr
+    niveumPackages.unicodmenu
+    niveumPackages.closest
+    niveumPackages.trans
+    (niveumPackages.mpv-radio.override {
+      di-fm-key-file = config.age.secrets.di-fm-key.path;
+    })
+    (niveumPackages.mpv-tuner.override {
+      di-fm-key-file = config.age.secrets.di-fm-key.path;
+    })
     # kmein.slide
     termdown
-    scripts.alarm
-    scripts.tolino-screensaver
-    scripts.rfc
-    scripts.tag
-    scripts.timer
-    python3Packages.eyeD3
-    scripts.menu-calc
+    niveumPackages.image-convert-tolino
+    niveumPackages.rfc
+    niveumPackages.tag
+    niveumPackages.timer
+    niveumPackages.menu-calc
     nix-prefetch-git
-    scripts.nix-git
+    niveumPackages.nix-git
     nixfmt
     par
     qrencode
 
-    menstruation
+    inputs.menstruation-backend.defaultPackage.x86_64-linux
+    inputs.agenix.packages.x86_64-linux.default
+    inputs.recht.defaultPackage.x86_64-linux
 
     (pkgs.writers.writeDashBin "worldradio" ''
       shuf ${worldradio} | ${pkgs.findutils}/bin/xargs ${pkgs.mpv}/bin/mpv --no-video
@@ -208,24 +208,30 @@ in {
       ${pkgs.openssh}/bin/ssh makanek "cd /var/lib/weechat/logs && grep --ignore-case --color=always --recursive $@" | ${pkgs.less}/bin/less --raw-control-chars
     '')
 
-    (pkgs.writers.writeDashBin "ncmpcpp-zaatar" ''MPD_HOST=${(import <niveum/lib/local-network.nix>).zaatar} exec ${pkgs.ncmpcpp}/bin/ncmpcpp "$@"'')
-    (pkgs.writers.writeDashBin "mpc-zaatar" ''MPD_HOST=${(import <niveum/lib/local-network.nix>).zaatar} exec ${pkgs.mpc_cli}/bin/mpc "$@"'')
+    (pkgs.writers.writeDashBin "ncmpcpp-zaatar" ''MPD_HOST=${(import ../lib/local-network.nix).zaatar} exec ${pkgs.ncmpcpp}/bin/ncmpcpp "$@"'')
+    (pkgs.writers.writeDashBin "mpc-zaatar" ''MPD_HOST=${(import ../lib/local-network.nix).zaatar} exec ${pkgs.mpc_cli}/bin/mpc "$@"'')
+
+    inputs.scripts.packages.x86_64-linux.alarm
 
     spotify
     ncspot
     playerctl
 
     nix-index
-    scripts.nix-index-update
+    niveumPackages.nix-index-update
 
     #krebs
-    dic
-    cyberlocker-tools
-    untilport
-    kpaste
-    irc-announce
-    git-preview
-    ircaids
+    niveumPackages.dic
+    niveumPackages.cyberlocker-tools
+    niveumPackages.untilport
+    niveumPackages.kpaste
+    config.nur.repos.mic92.ircsink
+
+    (haskellPackages.ghcWithHoogle (hs: [
+      hs.text
+      hs.lens
+      hs.bytestring
+    ]))
 
     (python3.withPackages (py: [
       py.black
@@ -239,27 +245,39 @@ in {
     ]))
     # python3Packages.poetry
 
+    # language servers
+    pyright
+    haskell-language-server
+    texlab
+    nil
+    rust-analyzer
+    elmPackages.elm-language-server
+    nodePackages.typescript-language-server
+    lua-language-server
+    nodePackages.vscode-langservers-extracted
+
     html-tidy
     nodePackages.csslint
     nodePackages.jsonlint
     nodePackages.prettier
     nodePackages.typescript
+    nodePackages.eslint
     nodePackages.yarn
     deno # better node.js
     nodejs
-    nodePackages.javascript-typescript-langserver
     texlive.combined.scheme-full
     latexrun
     (aspellWithDicts (dict: [dict.de dict.en dict.en-computers]))
     # haskellPackages.pandoc-citeproc
-    scripts.text2pdf
+    niveumPackages.text2pdf
     lowdown
     glow # markdown to term
     libreoffice
     # gnumeric
     dia
-    pandoc
-    pandoc-doc
+    unstablePackages.pandoc
+    niveumPackages.man-pandoc
+    typst
     # proselint
     asciidoctor
     wordnet
@@ -270,11 +288,22 @@ in {
     shellcheck
 
     (pkgs.writers.writeDashBin "hass-cli" ''
-      HASS_SERVER=http://zaatar.r:8123 HASS_TOKEN=${lib.strings.fileContents <secrets/hass/token>} exec ${pkgs.home-assistant-cli}/bin/hass-cli "$@"
+      HASS_SERVER=http://zaatar.r:8123 HASS_TOKEN="$(cat ${config.age.secrets.home-assistant-token.path})"  exec ${pkgs.home-assistant-cli}/bin/hass-cli "$@"
     '')
-    scripts.rofi-hass
+
+    # xml
+    saxonb_9_1
+    libxml2
+    zotero
   ];
 
+  age.secrets.home-assistant-token = {
+    file = ../secrets/home-assistant-token.age;
+    owner = config.users.users.me.name;
+    group = config.users.users.me.group;
+    mode = "400";
+  };
+
   home-manager.users.me.xdg.configFile."pycodestyle".text = ''
     [pycodestyle]
     max-line-length = 110

configs/picom.nix

@@ -1,12 +1,25 @@
 {
   services.picom = {
     enable = true;
-    activeOpacity = 1;
+    # activeOpacity = 1;
     fade = true;
-    fadeDelta = 5;
-    inactiveOpacity = 0.9;
-    shadow = true;
-    menuOpacity = 0.9;
-    shadowOpacity = 0.3;
+    fadeDelta = 1;
+    # inactiveOpacity = 0.9;
+    # shadow = true;
+    # menuOpacity = 0.9;
+    # shadowOpacity = 0.3;
+    fadeExclude = [
+      "class_g = 'slock'" # don't want a transparent lock screen!
+      "name *?= 'slock'"
+      "focused = 1"
+    ];
+    opacityRules = [
+      # opacity-rule overrides both inactive and active opacity
+
+      # video in browser tabs
+      # substring /regex match of title bar text
+      "99:name *?= 'Youtube'"
+      "99:WM_CLASS@:s *= 'mpv$'"
+    ];
   };
 }

configs/power-action.nix

@@ -5,15 +5,13 @@
 }: let
   suspend = pkgs.writers.writeDash "suspend" "${pkgs.systemd}/bin/systemctl suspend";
 in {
-  imports = [<stockholm/krebs/3modules/power-action.nix>];
-
-  krebs.power-action = {
+  services.power-action = {
     enable = true;
     plans.suspend = {
       upperLimit = 7;
       lowerLimit = 0;
       charging = false;
-      action = pkgs.writeDash "suspend-wrapper" ''
+      action = pkgs.writers.writeDash "suspend-wrapper" ''
         /run/wrappers/bin/sudo ${suspend}
       '';
     };
@@ -21,6 +19,6 @@ in {
   };
 
   security.sudo.extraConfig = ''
-    ${config.krebs.power-action.user} ALL= (root) NOPASSWD: ${suspend}
+    ${config.services.power-action.user} ALL= (root) NOPASSWD: ${suspend}
   '';
 }

configs/printing.nix

@@ -1,5 +1,5 @@
 {pkgs, ...}: let
-  inherit (import <niveum/lib>) localAddresses;
+  inherit (import ../lib) localAddresses;
   hp-driver = pkgs.hplip;
 in {
   services.printing = {

configs/retiolum.nix

@@ -3,14 +3,10 @@
   pkgs,
   ...
 }: {
-  imports = [
-    <retiolum/modules/retiolum>
-  ];
-
   networking.hosts = {"42:0:ca48:f98f:63d7:31ce:922b:245d" = ["go"];};
 
   services.tinc.networks.retiolum = {
-    rsaPrivateKeyFile = toString <system-secrets/retiolum.key>;
-    ed25519PrivateKeyFile = toString <system-secrets/retiolum.ed25519>;
+    rsaPrivateKeyFile = config.age.secrets.retiolum-rsa.path;
+    ed25519PrivateKeyFile = config.age.secrets.retiolum-ed25519.path;
   };
 }

configs/rofi.nix

@@ -1,14 +1,6 @@
-{
-  config,
-  pkgs,
-  ...
-}: let
-  inherit (import <niveum/lib>) colours;
-in {
+{pkgs, ...}: {
   home-manager.users.me.programs.rofi = {
     enable = true;
-    font = "Monospace 10";
-    theme = "${pkgs.rofi}/share/rofi/themes/Arc.rasi";
     pass = {
       enable = true;
       extraConfig = ''

configs/ssh.nix

@@ -1,30 +1,40 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  inherit (import <niveum/lib>) sshPort kieran;
-  externalNetwork = import <niveum/lib/external-network.nix>;
-  sshIdentity = name: "${config.users.users.me.home}/.ssh/${name}";
-  ssh-passphrase = lib.strings.fileContents <system-secrets/ssh/passphrase>;
+{pkgs, ...}: let
+  inherit (import ../lib) sshPort kieran;
+  externalNetwork = import ../lib/external-network.nix;
 in {
-  services.xserver.displayManager.sessionCommands = toString (pkgs.writeScript "ssh-add" ''
-    #!${pkgs.expect}/bin/expect -f
-    spawn ${pkgs.openssh}/bin/ssh-add
-    expect "Enter passphrase for *:"
-    send "${ssh-passphrase}\n";
-    expect "Identity added: *"
-    interact
-  '');
-
-  programs.ssh.startAgent = true;
-
   users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys pkgs;
 
+  home-manager.users.me = {
+    services.gpg-agent = rec {
+      enable = true;
+      enableSshSupport = true;
+      defaultCacheTtlSsh = 2 * 60 * 60;
+      maxCacheTtlSsh = 4 * defaultCacheTtlSsh;
+      sshKeys = [
+        "568047C91DE03A23883E340F15A9C24D313E847C"
+        "BB3EE102DB8CD45540A78A6B18B511B67061F6B4" # kfm@manakish ed25519
+        "3F8986755818B5762A096BE212777EAAC441DD9D" # fysiweb rsa
+        "0E4ABD229432486CC432639BB0986B2CDE365105" # agenix ed25519
+        "A1E8D32CBFCDBD2DE798E2298D795CCFD785AE06" # kfm@kabsa ed25519
+      ];
+    };
+  };
+
+  environment.extraInit = ''
+    if [[ -z "$SSH_AUTH_SOCK" ]]; then
+      export SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)"
+    fi
+  '';
+
+  environment.interactiveShellInit = ''
+    GPG_TTY="$(tty)"
+    export GPG_TTY
+    ${pkgs.gnupg}/bin/gpg-connect-agent updatestartuptty /bye > /dev/null
+  '';
+
   home-manager.users.me.programs.ssh = {
     enable = true;
-    matchBlocks = rec {
+    matchBlocks = {
       "github.com" = {
         hostname = "ssh.github.com";
         port = 443;
@@ -64,27 +74,6 @@ in {
         user = "kfm";
         port = sshPort;
       };
-      "nextcloud.fysi.dev" = {
-        hostname = "116.203.82.203";
-        user = "root";
-      };
-      "lingua.miaengiadina.ch" = {
-        hostname = "135.181.85.233";
-        user = "root";
-      };
-      "cms-dev.woc2023.app".identityFile = sshIdentity "fysiweb";
-      "cms-master.woc2023.app".identityFile = sshIdentity "fysiweb";
-      "fysi-dev1" = {
-        hostname = "94.130.229.139";
-        user = "root";
-        identityFile = sshIdentity "fysiweb";
-      };
-      ${fysi-dev1.hostname} = fysi-dev1;
-      "fysi-shared0" = {
-        hostname = "49.12.205.235";
-        user = "root";
-        identityFile = sshIdentity "fysiweb";
-      };
     };
   };
 }

configs/sshd.nix

@@ -4,15 +4,17 @@
   pkgs,
   ...
 }: let
-  inherit (import <niveum/lib>) sshPort kieran;
+  inherit (import ../lib) sshPort kieran;
 in {
   users.motd = "Welcome to ${config.networking.hostName}!";
 
   services.openssh = {
     enable = true;
     ports = [sshPort];
-    passwordAuthentication = false;
-    forwardX11 = true;
+    settings = {
+      PasswordAuthentication = false;
+      X11Forwarding = true;
+    };
   };
 
   users.users.root.openssh.authorizedKeys.keys = kieran.sshKeys pkgs;

configs/stardict.nix

@@ -2,6 +2,7 @@
   config,
   pkgs,
   lib,
+  inputs,
   ...
 }: let
   dictionaries = {
@@ -148,6 +149,7 @@
         sha256 = "1pk234pbq4pk55d8sjk0pp9j5sajm82f8804kf2xm2x5p387q1rg";
       };
     };
+    coptic.dictionary = inputs.coptic-dictionary.packages.x86_64-linux.coptic-stardict;
     russian = {
       LingvoGermanRussian = pkgs.fetchzip {
         url = "http://download.huzheng.org/lingvo/stardict-GR-LingvoUniversal-2.4.2.tar.bz2";
@@ -158,6 +160,16 @@
         sha256 = "03f9wdmkgpjifpms7dyh10ma29wf3ka1j3zlp1av0cybhdldk2a8";
       };
     };
+    turkish = {
+      BabylonTurkishEnglish = pkgs.fetchzip {
+        url = "http://download.huzheng.org/babylon/bidirectional/stardict-babylon-Babylon_Turkish_English-2.4.2.tar.bz2";
+        sha256 = "1zpzgk3w0536gww31bj58cmn3imnkndyjwbcr7bay8ibq2kzv44z";
+      };
+      BabylonEnglishTurkish = pkgs.fetchzip {
+        url = "http://download.huzheng.org/babylon/bidirectional/stardict-babylon-Babylon_English_Turkish-2.4.2.tar.bz2";
+        sha256 = "0myx31xzb7nrn5m657h0bwdgm5xp93ccwp6lcpbxgjxdjm3q0hc5";
+      };
+    };
   };
 
   makeStardictDataDir = dicts: pkgs.linkFarm "dictionaries" (lib.mapAttrsToList (name: path: {inherit name path;}) dicts);
@@ -169,7 +181,7 @@
       exec ${pkgs.sdcv}/bin/sdcv --color --only-data-dir --data-dir ${makeStardictDataDir dicts} "$@"
     '';
 
-  sdcvPager = pkgs.writeDash "sdcvPager" ''
+  sdcvPager = pkgs.writers.writeDash "sdcvPager" ''
     export PATH=${lib.makeBinPath [pkgs.gnused pkgs.ncurses pkgs.less]}
     sed "
       s!<sup>1</sup>!¹!gI
@@ -292,7 +304,8 @@ in {
     // dictionaries.sanskrit
     // dictionaries.oed
     // dictionaries.russian
-    // dictionaries.englishGerman));
+    // dictionaries.englishGerman
+    // dictionaries.turkish));
 
   environment.systemPackages = [
     # pkgs.goldendict
@@ -302,6 +315,8 @@ in {
     (makeStardict "sd-russian" dictionaries.russian)
     (makeStardict "sd" dictionaries.englishGerman)
     (makeStardict "jbo" dictionaries.lojban)
+    (makeStardict "cop" dictionaries.coptic)
+    (makeStardict "sd-turkish" dictionaries.turkish)
   ];
 }
 /*

configs/stw-berlin.nix

@@ -0,0 +1,51 @@
+{
+  pkgs,
+  config,
+  ...
+}: {
+  age.secrets.stw-berlin-card-code.file = ../secrets/stw-berlin-card-code.age;
+
+  systemd.services.stw-berlin = {
+    enable = true;
+    wants = ["network-online.target"];
+    startAt = "weekly";
+    serviceConfig = {
+      user = "kfm";
+      WorkingDirectory = "/home/kfm/cloud/nextcloud/Uni/Meta/Mensa";
+      LoadCredential = [
+        "password:${config.age.secrets.stw-berlin-card-code.path}"
+      ];
+    };
+    script = ''
+      KARTEN_ID=8071859
+      PASSWORT=$(cat "$CREDENTIALS_DIRECTORY"/password)
+
+      endpoint=https://ks.stw.berlin:4433/TL1/TLM/KASVC
+      authorization_header='Authorization: Basic S0FTVkM6ekt2NXlFMUxaVW12VzI5SQ=='
+
+      get_auth_token() {
+        ${pkgs.curl}/bin/curl -sSL "$endpoint/LOGIN?karteNr=$KARTEN_ID&format=JSON&datenformat=JSON" \
+          -X POST \
+          -H "$authorization_header" \
+          --data-raw '{"BenutzerID":"'$KARTEN_ID'","Passwort":"'$PASSWORT'"}' \
+          | ${pkgs.jq}/bin/jq -r '.[0].authToken|@uri'
+      }
+
+
+      get_transactions() {
+        ${pkgs.curl}/bin/curl -sSL "$endpoint/TRANS?format=JSON&authToken=$(get_auth_token)&karteNr=$KARTEN_ID&datumVon=12.02.2018&datumBis=$(date -d tomorrow +%d.%m.%Y)" \
+          -H "$authorization_header" \
+          | ${pkgs.jq}/bin/jq
+      }
+
+      get_items() {
+        ${pkgs.curl}/bin/curl -sSL "$endpoint/TRANSPOS?format=JSON&authToken=$(get_auth_token)&karteNr=$KARTEN_ID&datumVon=12.02.2018&datumBis=$(date -d tomorrow +%d.%m.%Y)" \
+          -H "$authorization_header" \
+          | ${pkgs.jq}/bin/jq
+      }
+
+      get_transactions > transactions-$(date -I).json
+      get_items > items-$(date -I).json
+    '';
+  };
+}

configs/stylix.nix

@@ -0,0 +1,71 @@
+{
+  pkgs,
+  config,
+  lib,
+  inputs,
+  ...
+}: let
+  generatedWallpaper = pkgs.runCommand "wallpaper.png" {} ''
+    ${inputs.wallpaper-generator.packages.x86_64-linux.wp-gen}/bin/wallpaper-generator lines \
+      --output $out \
+      ${lib.concatMapStringsSep " "
+      (n: "--base0${lib.toHexString n}=${config.lib.stylix.colors.withHashtag."base0${lib.toHexString n}"}")
+      (lib.range 0 15)}
+  '';
+in {
+  # https://danth.github.io/stylix/tricks.html
+  # stylix.image = inputs.wallpapers.outPath + "/meteora/rodrigo-soares-250630.jpg";
+  stylix.image = generatedWallpaper;
+
+  environment.etc."stylix/wallpaper.png".source = generatedWallpaper;
+
+  # stylix.polarity = "either";
+  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/${
+    {
+      "0" = "synth-midnight-dark";
+      "1" = "apprentice"; # https://romainl.github.io/Apprentice/
+      "2" = "one-light";
+      "3" = "one-dark";
+      "4" = "material"; # https://github.com/ntpeters/base16-materialtheme-scheme
+      "5" = "material-palenight";
+      "6" = "material-lighter";
+      "7" = "tomorrow"; # https://github.com/chriskempson/tomorrow-theme
+      "8" = "tomorrow-night";
+      "9" = "gruvbox-light-medium"; # https://github.com/dawikur/base16-gruvbox-scheme
+      "a" = "gruvbox-dark-medium";
+      "b" = "selenized-light"; # https://github.com/jan-warchol/selenized
+      "c" = "selenized-dark";
+      "d" = "papercolor-light";
+      "e" = "papercolor-dark";
+      "f" = "dracula"; # https://draculatheme.com/
+    }
+    .${builtins.head (lib.stringToCharacters inputs.nixpkgs.rev)}
+  }.yaml";
+
+  stylix.fonts = {
+    serif = {
+      package = pkgs.noto-fonts;
+      name = "Noto Serif";
+    };
+
+    sansSerif = {
+      package = pkgs.noto-fonts;
+      name = "Noto Sans";
+    };
+
+    monospace = {
+      package = pkgs.noto-fonts;
+      name = "Noto Sans Mono";
+    };
+
+    emoji = {
+      package = pkgs.noto-fonts-emoji;
+      name = "Noto Color Emoji";
+    };
+
+    sizes = {
+      terminal = 6;
+      applications = 10;
+    };
+  };
+}

configs/telegram-bots/astrology.nix

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

configs/telegram-bots/autorenkalender.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   lib,
+  config,
   ...
 }: let
   autorenkalender-package = pkgs.fetchFromGitHub {
@@ -15,12 +16,14 @@ in {
   niveum.telegramBots.autorenkalender = {
     enable = true;
     time = "07:00";
-    token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
+    tokenFile = config.age.secrets.telegram-token-kmein.path;
     chatIds = ["@autorenkalender"];
     parseMode = "Markdown";
     command = "${autorenkalender}/bin/autorenkalender";
   };
 
+  age.secrets.telegram-token-kmein.file = ../../secrets/telegram-token-kmein.age;
+
   niveum.passport.services = [
     {
       title = "Autorenkalender";

configs/telegram-bots/celan.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   lib,
+  config,
   ...
 }: let
   celan = pkgs.fetchzip {
@@ -11,7 +12,7 @@ in {
   niveum.telegramBots.celan = {
     enable = true;
     time = "08:00";
-    token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
+    tokenFile = config.age.secrets.telegram-token-kmein.path;
     chatIds = ["@PaulCelan"];
     command = toString (pkgs.writers.writeDash "random-celan" ''
       cd ${celan}

configs/telegram-bots/default.nix

@@ -2,17 +2,13 @@
   config,
   pkgs,
   lib,
+  inputs,
   ...
 }: let
-  nixpkgs-21-11 = import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixos-21.11.tar.gz") {
-    config.permittedInsecurePackages = [
-      "python3.9-poetry-1.1.12"
-    ];
-  };
-  telebots = nixpkgs-21-11.callPackage <telebots> {};
+  telebots = inputs.telebots.defaultPackage.x86_64-linux;
   reverseDirectory = "/run/telegram-reverse";
   proverbDirectory = "/run/telegram-proverb";
-  inherit (import <niveum/lib>) tmpfilesConfig;
+  inherit (import ../../lib) tmpfilesConfig;
 in {
   imports = [
     ./literature-quote.nix
@@ -23,7 +19,6 @@ in {
     ./nachtischsatan.nix
     ./tlg-wotd.nix
     ./celan.nix
-    <niveum/modules/telegram-bot.nix>
   ];
 
   systemd.tmpfiles.rules = map (path:
@@ -52,33 +47,45 @@ in {
     }
   ];
 
+  age.secrets = {
+    telegram-token-reverse.file = ../../secrets/telegram-token-reverse.age;
+    telegram-token-betacode.file = ../../secrets/telegram-token-betacode.age;
+    telegram-token-proverb.file = ../../secrets/telegram-token-proverb.age;
+  };
+
   systemd.services.telegram-reverse = {
     wantedBy = ["multi-user.target"];
     description = "Telegram reverse bot";
     path = [pkgs.ffmpeg];
-    environment.TELEGRAM_BOT_TOKEN = lib.strings.fileContents <system-secrets/telegram/reverse.token>;
     enable = true;
-    script = "${telebots}/bin/telegram-reverse";
+    script = ''
+      TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${telebots}/bin/telegram-reverse
+    '';
     serviceConfig.Restart = "always";
     serviceConfig.WorkingDirectory = reverseDirectory;
+    serviceConfig.LoadCredential = "token:${config.age.secrets.telegram-token-reverse.path}";
   };
 
   systemd.services.telegram-betacode = {
     wantedBy = ["multi-user.target"];
     description = "Telegram beta code bot";
-    environment.TELEGRAM_BOT_TOKEN = lib.strings.fileContents <system-secrets/telegram/betacode.token>;
     enable = true;
-    script = "${telebots}/bin/telegram-betacode";
+    script = ''
+      TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${telebots}/bin/telegram-betacode
+    '';
     serviceConfig.Restart = "always";
+    serviceConfig.LoadCredential = "token:${config.age.secrets.telegram-token-betacode.path}";
   };
 
   systemd.services.telegram-proverb = {
     wantedBy = ["multi-user.target"];
     description = "Telegram proverb bot";
-    environment.TELEGRAM_BOT_TOKEN = lib.strings.fileContents <system-secrets/telegram/proverb.token>;
     enable = true;
-    script = "${telebots}/bin/telegram-proverb";
+    script = ''
+      TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${telebots}/bin/telegram-proverb
+    '';
     serviceConfig.Restart = "always";
     serviceConfig.WorkingDirectory = proverbDirectory;
+    serviceConfig.LoadCredential = "token:${config.age.secrets.telegram-token-proverb.path}";
   };
 }

configs/telegram-bots/hesychius.nix

@@ -1,14 +1,16 @@
 {
   pkgs,
+  config,
+  inputs,
   lib,
   ...
 }: let
-  hesychius = <scripts> + "/hesychius/hesychius.txt";
+  hesychius = inputs.scripts.outPath + "/hesychius/hesychius.txt";
 in {
   niveum.telegramBots.hesychius = {
     enable = true;
     time = "08:00";
-    token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
+    tokenFile = config.age.secrets.telegram-token-kmein.path;
     chatIds = ["@HesychiosAlexandreus"];
     command = "${pkgs.coreutils}/bin/shuf -n1 ${hesychius}";
   };

configs/telegram-bots/literature-quote.nix

@@ -1,17 +1,16 @@
 {
   pkgs,
+  config,
   lib,
+  niveumPackages,
   ...
-}: let
-  scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
-  inherit (scripts) literature-quote;
-in {
+}: {
   niveum.telegramBots.quotebot = {
     enable = true;
     time = "08/6:00";
-    token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
+    tokenFile = config.age.secrets.telegram-token-kmein.path;
     chatIds = ["-1001760262519"];
-    command = "${literature-quote}/bin/literature-quote";
+    command = "${niveumPackages.literature-quote}/bin/literature-quote";
     parseMode = "Markdown";
   };
 

configs/telegram-bots/nachtischsatan.nix

@@ -1,28 +1,29 @@
 {
   pkgs,
+  config,
   lib,
   ...
 }: let
-  nachtischsatan-bot = {token}:
+  nachtischsatan-bot = {tokenFile}:
     pkgs.writers.writePython3 "nachtischsatan-bot" {
       libraries = [pkgs.python3Packages.python-telegram-bot];
     } ''
-      from telegram.ext import Updater, MessageHandler
-      from telegram.ext.filters import Filters
+      from telegram.ext import Application, ContextTypes, MessageHandler, filters
+      from telegram import Update
       import random
       import time
 
 
-      def flubber(update, context):
+      async def flubber(update: Update, context: ContextTypes.DEFAULT_TYPE):
           time.sleep(random.randrange(4000) / 1000)
-          update.message.reply_text("*flubberflubber*")
+          await update.message.reply_text("*flubberflubber*")
 
 
-      updater = Updater('${token}')
-
-      updater.dispatcher.add_handler(MessageHandler(Filters.all, flubber))
-      updater.start_polling()
-      updater.idle()
+      with open('${tokenFile}', 'r') as tokenFile:
+          token = tokenFile.read().strip()
+          application = Application.builder().token(token).build()
+          application.add_handler(MessageHandler(filters.ALL, flubber))
+          application.run_polling()
     '';
 in {
   systemd.services.telegram-nachtischsatan = {
@@ -30,11 +31,13 @@ in {
     description = "*flubberflubber*";
     enable = true;
     script = toString (nachtischsatan-bot {
-      token = lib.strings.fileContents <system-secrets/telegram/nachtischsatan.token>;
+      tokenFile = config.age.secrets.telegram-token-nachtischsatan.path;
     });
     serviceConfig.Restart = "always";
   };
 
+  age.secrets.telegram-token-nachtischsatan.file = ../../secrets/telegram-token-nachtischsatan.age;
+
   niveum.passport.services = [
     {
       title = "Nachtischsatan-Bot";

configs/telegram-bots/smyth.nix

@@ -1,4 +1,5 @@
 {
+  config,
   pkgs,
   lib,
   ...
@@ -6,7 +7,7 @@
   niveum.telegramBots.smyth = {
     enable = true;
     time = "08:00";
-    token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
+    tokenFile = config.age.secrets.telegram-token-kmein.path;
     chatIds = ["@HerbertWeirSmyth"];
     command = toString (pkgs.writers.writeDash "random-smyth" ''
       set -efu

configs/telegram-bots/tlg-wotd.nix

@@ -1,13 +1,14 @@
 {
   pkgs,
   lib,
+  config,
   ...
 }: {
   niveum.telegramBots.tlg-wotd = {
     enable = true;
     time = "9:30";
-    token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
     chatIds = ["@tlgwotd"];
+    tokenFile = config.age.secrets.telegram-token-kmein.path;
     command = toString (pkgs.writers.writeDash "tlg-wotd" ''
       ${pkgs.curl}/bin/curl -sSL http://stephanus.tlg.uci.edu/Iris/Wotd \
       | ${pkgs.recode}/bin/recode html..utf8 \

configs/themes.nix

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

configs/theming.nix

@@ -1,33 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: let
-  theme = (import <niveum/lib>).theme pkgs;
-in {
-  environment.systemPackages = [theme.gtk.package theme.icon.package theme.cursor.package];
-
-  services.xserver.displayManager.lightdm.greeters.gtk = {
-    theme = {inherit (theme.gtk) name package;};
-    iconTheme = {inherit (theme.icon) name package;};
-  };
-
-  home-manager.users.me = {
-    gtk = {
-      enable = true;
-      iconTheme = theme.icon;
-      theme = theme.gtk;
-    };
-    qt = {
-      enable = true;
-      platformTheme = "gtk";
-    };
-    home.pointerCursor =
-      theme.cursor
-      // {
-        size = 16;
-        x11.enable = true;
-      };
-  };
-}

configs/tor.nix

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

configs/traadfri.nix

@@ -1,37 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: let
-  inherit (import <niveum/lib>) localAddresses;
-  living-room-id = 131090;
-in {
-  imports = [<niveum/modules/traadfri.nix>];
-
-  environment.systemPackages = [
-    (pkgs.writers.writeDashBin "traadfri-party" ''
-      while true; do
-        for color in $(traadfri colours | shuf); do
-          echo "$color"
-          traadfri group "''${2:-${toString living-room-id}}" --on --colour="$color"
-          sleep "''${1:-2}"
-        done
-      done
-    '')
-  ];
-
-  niveum.traadfri = {
-    enable = true;
-    user = "kmein";
-    host = localAddresses.tradfri;
-    key = lib.strings.fileContents <secrets/traadfri.key>;
-    rooms = {
-      corridor = 131080;
-      kitchen = 131081;
-      bedroom = 131082;
-      living-room = living-room-id;
-      bedside = 131087;
-      chain = 131089;
-    };
-  };
-}

configs/wallpaper.nix

@@ -2,18 +2,27 @@
   pkgs,
   lib,
   ...
-}: {
-  imports = [<stockholm/krebs/3modules/fetchWallpaper.nix>];
+}: let
+  url = "http://wallpaper.r/realwallpaper-krebs-stars-berlin.png";
+  stateDir = "~/.cache/wallpaper";
+in {
+  systemd.user.services.wallpaper = {
+    wantedBy = ["graphical-session.target"];
+    after = ["network.target"];
+    script = ''
+      set -euf
 
-  krebs.fetchWallpaper = {
-    enable = true;
-    url = "http://prism.r/realwallpaper-krebs-stars-berlin.png";
-  };
-
-  users.users.fetchWallpaper.isSystemUser = true;
-
-  services.xserver = {
-    display = lib.mkForce 0; # needed for fetchWallpaper to find the X display
-    displayManager.sessionCommands = "${pkgs.xorg.xhost}/bin/xhost +LOCAL:";
+      mkdir -p ${stateDir}
+      chmod o+rx ${stateDir}
+      cd ${stateDir}
+      (${pkgs.curl}/bin/curl -s -o wallpaper.tmp -z wallpaper.tmp ${lib.escapeShellArg url} && cp wallpaper.tmp wallpaper) || :
+      ${pkgs.feh}/bin/feh --no-fehbg --bg-scale wallpaper
+    '';
+    startAt = "*:00,10,20,30,40,50";
+    serviceConfig = {
+      Restart = "always";
+      RestartSec = "15s";
+      StartLimitBurst = 0;
+    };
   };
 }

configs/zsh.nix

@@ -77,7 +77,11 @@
 
       precmd () {
         vcs_info
-        RPROMPT="$vcs_info_msg_0_"
+        if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ] || [ -n "$SSH_CONNECTION" ]; then
+          RPROMPT="$(hostname)"
+        else
+          RPROMPT="$vcs_info_msg_0_"
+        fi
         if [[ -n $IN_NIX_SHELL ]]; then
           PROMPT='%B%~%b %(?.%F{${promptColours.success}}.%F{${promptColours.failure}})λ%f '
         else

flake.lock

@@ -1,6 +1,141 @@
 {
   "nodes": {
+    "agenix": {
+      "inputs": {
+        "darwin": "darwin",
+        "home-manager": [
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1690228878,
+        "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=",
+        "owner": "ryantm",
+        "repo": "agenix",
+        "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ryantm",
+        "repo": "agenix",
+        "type": "github"
+      }
+    },
+    "base16": {
+      "inputs": {
+        "fromYaml": "fromYaml"
+      },
+      "locked": {
+        "lastModified": 1689633990,
+        "narHash": "sha256-iwvQg2Vx0IIDWZaKo8Xmzxlv1YPHg+Kp/QSv8dRv0RY=",
+        "owner": "SenchoPens",
+        "repo": "base16.nix",
+        "rev": "dddf2e1c04845d43c89a8e9e37d574519649a404",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "repo": "base16.nix",
+        "type": "github"
+      }
+    },
+    "blessings": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1549397368,
+        "narHash": "sha256-YVIGRG+/ey4nFEZl1ZPHj7Hx/Of3rsUGnkLK4V4zZd0=",
+        "ref": "refs/heads/master",
+        "rev": "d94712a015636efe7ec79bc0a2eec6739d0be779",
+        "revCount": 18,
+        "type": "git",
+        "url": "https://cgit.krebsco.de/blessings"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://cgit.krebsco.de/blessings"
+      }
+    },
+    "coptic-dictionary": {
+      "inputs": {
+        "kellia-dictionary": "kellia-dictionary",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1691406669,
+        "narHash": "sha256-8QKnoDfdQuy2ODnCi6NNUv+wewONseGEH1QAvzA7io0=",
+        "owner": "kmein",
+        "repo": "coptic-dictionary",
+        "rev": "7316ef7a4264afa65c96a2e089845c79fa25f19c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kmein",
+        "repo": "coptic-dictionary",
+        "type": "github"
+      }
+    },
+    "darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "agenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1673295039,
+        "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lnl7",
+        "ref": "master",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1692799911,
+        "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
       "locked": {
         "lastModified": 1676283394,
         "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
@@ -15,59 +150,77 @@
         "type": "github"
       }
     },
+    "fromYaml": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1689549921,
+        "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=",
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
-          "nixos-unstable"
-        ],
-        "utils": "utils"
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1676367705,
-        "narHash": "sha256-un5UbRat9TwruyImtwUGcKF823rCEp4fQxnsaLFL7CM=",
+        "lastModified": 1692099905,
+        "narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "da72e6fc6b7dc0c3f94edbd310aae7cd95c678b5",
+        "rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "master",
+        "ref": "release-23.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
-    "krops": {
+    "kellia-dictionary": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1660946774,
+        "narHash": "sha256-7C+vE1hvo9OfonmBVT1as6c8rZeLf8f4nEsELwnUPXc=",
+        "owner": "KELLIA",
+        "repo": "dictionary",
+        "rev": "4fe62847e93b8a87ad7ca5de19190b34ff9e0c99",
+        "type": "github"
+      },
+      "original": {
+        "owner": "KELLIA",
+        "repo": "dictionary",
+        "type": "github"
+      }
+    },
+    "menstruation-backend": {
       "inputs": {
         "flake-utils": [
           "flake-utils"
         ],
         "nixpkgs": [
-          "nixos-stable"
+          "nixpkgs"
+        ],
+        "rust-overlay": [
+          "rust-overlay"
         ]
       },
       "locked": {
-        "lastModified": 1661273257,
-        "narHash": "sha256-cywpSH3D291AwdO/ecJxHeN2Vuuz0cIy/NEXMsFT+Og=",
-        "owner": "kmein",
-        "repo": "krops",
-        "rev": "542bc544ec8b0b807933a812d098e601683b0956",
-        "type": "github"
-      },
-      "original": {
-        "owner": "kmein",
-        "repo": "krops",
-        "type": "github"
-      }
-    },
-    "menstruation-backend": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1667816906,
-        "narHash": "sha256-VdckYVSQZfqThPb06Y5TGSI+kkibgM/G9pH5SQHIybI=",
+        "lastModified": 1677075142,
+        "narHash": "sha256-0RXVZcK2YtPckd/3+jb+yLpeXZ6jnQe25w9idztDXi8=",
         "owner": "kmein",
         "repo": "menstruation.rs",
-        "rev": "95c495d453c35f20a6a5641a88a862c668404acf",
+        "rev": "e34af4393963cdbadb456b7b9ae2e95e6db7b8a3",
         "type": "github"
       },
       "original": {
@@ -77,13 +230,23 @@
       }
     },
     "menstruation-telegram": {
-      "flake": false,
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "menstruation-backend": [
+          "menstruation-backend"
+        ],
+        "nixpkgs": [
+          "nixpkgs-old"
+        ]
+      },
       "locked": {
-        "lastModified": 1667816918,
-        "narHash": "sha256-yQSl0iKqHm7qFLELY8e7OzRRdnqSBbzJmQIYgkXlJpQ=",
+        "lastModified": 1677075205,
+        "narHash": "sha256-2+xuAhsS3y2qB0ObVPCHXrmnTsIZ8uI5HFI4+Ash8PY=",
         "owner": "kmein",
         "repo": "menstruation-telegram",
-        "rev": "828872cf9c425442705a95019eceee397bc1c03f",
+        "rev": "f7ddb6d9610aacb50ec66a3ce1bdc49fe4664a49",
         "type": "github"
       },
       "original": {
@@ -92,62 +255,248 @@
         "type": "github"
       }
     },
-    "nix-writers": {
+    "nix-formatter-pack": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-on-droid",
+          "nixpkgs"
+        ],
+        "nmd": "nmd",
+        "nmt": "nmt"
+      },
+      "locked": {
+        "lastModified": 1666720474,
+        "narHash": "sha256-iWojjDS1D19zpeZXbBdjWb9MiKmVVFQCqtJmtTXgPx8=",
+        "owner": "Gerschtli",
+        "repo": "nix-formatter-pack",
+        "rev": "14876cc8fe94a3d329964ecb073b4c988c7b61f5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerschtli",
+        "repo": "nix-formatter-pack",
+        "type": "github"
+      }
+    },
+    "nix-on-droid": {
+      "inputs": {
+        "home-manager": [
+          "home-manager"
+        ],
+        "nix-formatter-pack": "nix-formatter-pack",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap",
+        "nmd": "nmd_2"
+      },
+      "locked": {
+        "lastModified": 1688144254,
+        "narHash": "sha256-8KL1l/7eP2Zm1aJjdVaSOk0W5kTnJo9kcgW03gqWuiI=",
+        "owner": "t184256",
+        "repo": "nix-on-droid",
+        "rev": "2301e01d48c90b60751005317de7a84a51a87eb6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "t184256",
+        "ref": "release-23.05",
+        "repo": "nix-on-droid",
+        "type": "github"
+      }
+    },
+    "nixinate": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1688141737,
+        "narHash": "sha256-qHrNMYWukOKmKVf6wXOGKj1xxUnOGjvTRbt/PLLXuBE=",
+        "owner": "matthewcroughan",
+        "repo": "nixinate",
+        "rev": "7902ae845e6cc5bd450e510cdf5e009a6e4a44d9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "matthewcroughan",
+        "repo": "nixinate",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1692986144,
+        "narHash": "sha256-M4VFpy7Av9j+33HF5nIGm0k2+DXXW4qSSKdidIKg5jY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "74e5bdc5478ebbe7ba5849f0d765f92757bb9dbf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-for-bootstrap": {
+      "locked": {
+        "lastModified": 1686921029,
+        "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04",
+        "type": "github"
+      }
+    },
+    "nixpkgs-old": {
+      "locked": {
+        "lastModified": 1682600000,
+        "narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1693094031,
+        "narHash": "sha256-PyPWn5/WzryKDKuuiJJ8cd1BJCenhjbaicYQbwRM9Ao=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "38b9aaf6682015f1d2fc7b7f48da96992c30cfa3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1659446231,
+        "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-21.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1615532953,
+        "narHash": "sha256-SWpaGjrp/INzorEqMz3HLi6Uuk9I0KAn4YS8B4n3q5g=",
+        "path": "/nix/store/vw365chp87kvfczxm26qiq7z2pq3jk5z-source",
+        "rev": "916ee862e87ac5ee2439f2fb7856386b4dc906ae",
+        "type": "path"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nmd": {
       "flake": false,
       "locked": {
-        "lastModified": 1675197881,
-        "narHash": "sha256-gYtduNF59yqv4BgW4fC+tZHKE7cpOkZf+Y34psyFO5U=",
-        "ref": "refs/heads/master",
-        "rev": "d1424777b5f2e12cbd80efd1b55335dcba7c32bd",
-        "revCount": 38,
-        "type": "git",
-        "url": "https://cgit.krebsco.de/nix-writers"
+        "lastModified": 1666190571,
+        "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=",
+        "owner": "rycee",
+        "repo": "nmd",
+        "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169",
+        "type": "gitlab"
       },
       "original": {
-        "type": "git",
-        "url": "https://cgit.krebsco.de/nix-writers"
+        "owner": "rycee",
+        "repo": "nmd",
+        "type": "gitlab"
       }
     },
-    "nixos-stable": {
+    "nmd_2": {
+      "flake": false,
       "locked": {
-        "lastModified": 1676375384,
-        "narHash": "sha256-6HI3jZiuJX+KLz05cocYy2mBAWlISEKHU84ftYfxHZ8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c43f676c938662072772339be6269226c77b51b8",
-        "type": "github"
+        "lastModified": 1666190571,
+        "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=",
+        "owner": "rycee",
+        "repo": "nmd",
+        "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169",
+        "type": "gitlab"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-22.11",
-        "repo": "nixpkgs",
-        "type": "github"
+        "owner": "rycee",
+        "repo": "nmd",
+        "type": "gitlab"
       }
     },
-    "nixos-unstable": {
+    "nmt": {
+      "flake": false,
       "locked": {
-        "lastModified": 1676300157,
-        "narHash": "sha256-1HjRzfp6LOLfcj/HJHdVKWAkX9QRAouoh6AjzJiIerU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "545c7a31e5dedea4a6d372712a18e00ce097d462",
+        "lastModified": 1648075362,
+        "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
+        "owner": "rycee",
+        "repo": "nmt",
+        "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "rycee",
+        "repo": "nmt",
+        "type": "gitlab"
+      }
+    },
+    "nur": {
+      "locked": {
+        "lastModified": 1693082793,
+        "narHash": "sha256-di/x+vrMYmjSHabbiuPi6EZ0m6HoPXOVtA7ugU3rVZM=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "0f81f016eecec153a26099beb25b0c8bac87bd23",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
+        "owner": "nix-community",
+        "repo": "NUR",
         "type": "github"
       }
     },
     "recht": {
-      "flake": false,
+      "inputs": {
+        "blessings": "blessings",
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1669719044,
-        "narHash": "sha256-WsLWlTM2Hrurj9kVajybIOavV9QPYiJweMCOQR6h+YI=",
+        "lastModified": 1677165419,
+        "narHash": "sha256-pjYpXg+09rayon6uhSNd30ryrT2zYLOlDLBHQ9pnGZg=",
         "owner": "kmein",
         "repo": "recht",
-        "rev": "7c15b13328fb5cee01012c488ff235ee730cac70",
+        "rev": "5fa158ce21de797bd95a934dab8d4403b7531d20",
         "type": "github"
       },
       "original": {
@@ -158,11 +507,11 @@
     },
     "retiolum": {
       "locked": {
-        "lastModified": 1676473689,
-        "narHash": "sha256-TGQbsiIojBj4DvGhhkI3i2dq9NmU2Vkt+i7Rw2U/BEg=",
+        "lastModified": 1691992809,
+        "narHash": "sha256-qUTsMDSV2L5t6Oj+L60n0KQKbvOhak3+d6++h9AZJPg=",
         "ref": "refs/heads/master",
-        "rev": "30152917194d6e54ce68e45b499323356db3ae7c",
-        "revCount": 283,
+        "rev": "6216c30551876303dac5373e92690a7f05fd0f6f",
+        "revCount": 315,
         "type": "git",
         "url": "https://git.thalheim.io/Mic92/retiolum"
       },
@@ -173,32 +522,71 @@
     },
     "root": {
       "inputs": {
+        "agenix": "agenix",
+        "coptic-dictionary": "coptic-dictionary",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
-        "krops": "krops",
         "menstruation-backend": "menstruation-backend",
         "menstruation-telegram": "menstruation-telegram",
-        "nix-writers": "nix-writers",
-        "nixos-stable": "nixos-stable",
-        "nixos-unstable": "nixos-unstable",
+        "nix-on-droid": "nix-on-droid",
+        "nixinate": "nixinate",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-old": "nixpkgs-old",
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "nur": "nur",
         "recht": "recht",
         "retiolum": "retiolum",
+        "rust-overlay": "rust-overlay",
         "scripts": "scripts",
-        "stockholm": "stockholm",
+        "stylix": "stylix",
         "telebots": "telebots",
         "tinc-graph": "tinc-graph",
-        "traadfri": "traadfri",
-        "tuna": "tuna"
+        "voidrice": "voidrice",
+        "wallpaper-generator": "wallpaper-generator",
+        "wallpapers": "wallpapers"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1693015707,
+        "narHash": "sha256-SFr93DYn502sVT9nB5U8/cKg1INyEk/jCeq8tHioz7Y=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "e90223633068a44f0fb62374e0fa360ccc987292",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
       }
     },
     "scripts": {
-      "flake": false,
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": [
+          "rust-overlay"
+        ]
+      },
       "locked": {
-        "lastModified": 1675238486,
-        "narHash": "sha256-Hs9NKK0UFaNqrui2VauBnMnV/14U3eNWaI12EmVYXWY=",
+        "lastModified": 1689276466,
+        "narHash": "sha256-T+1f2GsTDzfiEasSPntbaSsJvpJxZ78a5g6CL4NyAK0=",
         "owner": "kmein",
         "repo": "scripts",
-        "rev": "5cefa5f112e7fe54e0302b7bc33bc06e1f762002",
+        "rev": "55dff522684f342f4e970116ab374ba999539288",
         "type": "github"
       },
       "original": {
@@ -207,30 +595,58 @@
         "type": "github"
       }
     },
-    "stockholm": {
-      "flake": false,
+    "stylix": {
+      "inputs": {
+        "base16": "base16",
+        "flake-compat": "flake-compat",
+        "home-manager": [
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1676206058,
-        "narHash": "sha256-httLH/By88YYpnfYAEnke2gnLiayMlcznia0aDNqK28=",
-        "ref": "refs/heads/master",
-        "rev": "5234e1c7eaf478bc4ebd0edb48547168e91eba02",
-        "revCount": 11364,
-        "type": "git",
-        "url": "https://cgit.krebsco.de/stockholm"
+        "lastModified": 1690463825,
+        "narHash": "sha256-LILKFcKNVxYcYmzCB2+Gswyob5XrPJAF1YBExFR2yak=",
+        "owner": "danth",
+        "repo": "stylix",
+        "rev": "5c829554280f3139ddbfce8561d7430efbf2abfb",
+        "type": "github"
       },
       "original": {
-        "type": "git",
-        "url": "https://cgit.krebsco.de/stockholm"
+        "owner": "danth",
+        "ref": "release-23.05",
+        "repo": "stylix",
+        "type": "github"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
       }
     },
     "telebots": {
-      "flake": false,
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs_2"
+      },
       "locked": {
-        "lastModified": 1623510321,
-        "narHash": "sha256-MxYNNL81RXZkYLd4IgiNTSo1X80kTuDzsdGNSA0f1y8=",
+        "lastModified": 1677156381,
+        "narHash": "sha256-OMhqYJO2bWtL6osTMpQhA4ySUl4gvJTI13m1agipHJ0=",
         "owner": "kmein",
         "repo": "telebots",
-        "rev": "22931c9457e092c4e413555dbe61819d77844246",
+        "rev": "5527e359e8394f2f66067de7f61587eb65055209",
         "type": "github"
       },
       "original": {
@@ -240,13 +656,23 @@
       }
     },
     "tinc-graph": {
-      "flake": false,
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": [
+          "rust-overlay"
+        ]
+      },
       "locked": {
-        "lastModified": 1666162569,
-        "narHash": "sha256-7ebWs/ryDebUMONkn6dPckNnUGrEuPQScoY+O/+vo+Q=",
+        "lastModified": 1687504941,
+        "narHash": "sha256-wnCRcQn8izEHE8MfBpPkLezxAMIg7SVTq8CZsgkar54=",
         "owner": "kmein",
         "repo": "tinc-graph",
-        "rev": "72a4b305fcb49cfd6d456103cda45888a6b34bbe",
+        "rev": "91a3a85beaaec4ec43ea5a41322c3a5a6e04edc4",
         "type": "github"
       },
       "original": {
@@ -255,50 +681,57 @@
         "type": "github"
       }
     },
-    "traadfri": {
+    "voidrice": {
       "flake": false,
       "locked": {
-        "lastModified": 1640451803,
-        "narHash": "sha256-zS/b93uFpPM9basNP7ngmm+YjYV0IUQAmNghetHA6Ss=",
-        "owner": "kmein",
-        "repo": "traadfri",
-        "rev": "cf46bd09cd3263b90a09b0ca979aa705a4c3671c",
+        "lastModified": 1692950210,
+        "narHash": "sha256-0RHvrinkg8LEV/aGnT2n9MNOwaf2ke/YAXRIipZiT2w=",
+        "owner": "Lukesmithxyz",
+        "repo": "voidrice",
+        "rev": "86f05abcce1fd270032975775adb40040c746cfe",
         "type": "github"
       },
       "original": {
-        "owner": "kmein",
-        "repo": "traadfri",
+        "owner": "Lukesmithxyz",
+        "repo": "voidrice",
         "type": "github"
       }
     },
-    "tuna": {
-      "flake": false,
+    "wallpaper-generator": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": "nixpkgs_3"
+      },
       "locked": {
-        "lastModified": 1627117248,
-        "narHash": "sha256-OfqbWLblJY4BJlrCpn8EkHoP3baNJSDTbw45SPaX+0Q=",
-        "owner": "kmein",
-        "repo": "tuna",
-        "rev": "1cbed44069a3009738afdafecefe0a05316039a6",
+        "lastModified": 1615819231,
+        "narHash": "sha256-vZzc1ViF/3rCm81+x+pyneuOzoWd0przy9ULgwhGSj4=",
+        "owner": "pinpox",
+        "repo": "wallpaper-generator",
+        "rev": "a2223b9b0c51e0eee0d0b23a5e87228e370bdd5c",
         "type": "github"
       },
       "original": {
-        "owner": "kmein",
-        "repo": "tuna",
+        "owner": "pinpox",
+        "ref": "v1.1",
+        "repo": "wallpaper-generator",
         "type": "github"
       }
     },
-    "utils": {
+    "wallpapers": {
+      "flake": false,
       "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "lastModified": 1589319718,
+        "narHash": "sha256-2NruGq3z37vY3uAH8S4sLqHvFAGi8gaDJAgEzMIvM/4=",
+        "owner": "kmein",
+        "repo": "wallpapers",
+        "rev": "7c553bc6bd78afa6dbf2824691466bbad0d8e6e9",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
+        "owner": "kmein",
+        "repo": "wallpapers",
         "type": "github"
       }
     }

flake.nix

@@ -2,193 +2,391 @@
   description = "niveum: packages, modules, systems";
 
   inputs = {
-    nixos-stable.url = "github:NixOS/nixpkgs/nixos-22.11";
-    nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
-
+    agenix.url = "github:ryantm/agenix";
+    coptic-dictionary.url = "github:kmein/coptic-dictionary";
     flake-utils.url = "github:numtide/flake-utils";
-    home-manager = {
-      url = "github:nix-community/home-manager/master";
-      inputs.nixpkgs.follows = "nixos-unstable";
-    };
-    krops = {
-      url = "github:kmein/krops";
-      inputs.nixpkgs.follows = "nixos-stable";
-      inputs.flake-utils.follows = "flake-utils";
-    };
+    home-manager.url = "github:nix-community/home-manager/release-23.05";
+    menstruation-backend.url = "github:kmein/menstruation.rs";
+    menstruation-telegram.url = "github:kmein/menstruation-telegram";
+    nix-on-droid.url = "github:t184256/nix-on-droid/release-23.05";
+    nixinate.url = "github:matthewcroughan/nixinate";
+    nixpkgs-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0";
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    nur.url = "github:nix-community/NUR";
+    recht.url = "github:kmein/recht";
     retiolum.url = "git+https://git.thalheim.io/Mic92/retiolum";
+    rust-overlay.url = "github:oxalica/rust-overlay";
+    scripts.url = "github:kmein/scripts";
+    stylix.url = "github:danth/stylix/release-23.05";
+    telebots.url = "github:kmein/telebots";
+    tinc-graph.url = "github:kmein/tinc-graph";
+    voidrice.url = "github:Lukesmithxyz/voidrice";
+    wallpaper-generator.url = "github:pinpox/wallpaper-generator/v1.1";
+    wallpapers.url = "github:kmein/wallpapers";
 
-    # legacy
-    menstruation-backend = {
-      url = "github:kmein/menstruation.rs";
-      flake = false;
-    };
-    menstruation-telegram = {
-      url = "github:kmein/menstruation-telegram";
-      flake = false;
-    };
-    nix-writers = {
-      url = "git+https://cgit.krebsco.de/nix-writers";
-      flake = false;
-    };
-    recht = {
-      url = "github:kmein/recht";
-      flake = false;
-    };
-    scripts = {
-      url = "github:kmein/scripts";
-      flake = false;
-    };
-    stockholm = {
-      url = "git+https://cgit.krebsco.de/stockholm";
-      flake = false;
-    };
-    telebots = {
-      url = "github:kmein/telebots";
-      flake = false;
-    };
-    tinc-graph = {
-      url = "github:kmein/tinc-graph";
-      flake = false;
-    };
-    traadfri = {
-      url = "github:kmein/traadfri";
-      flake = false;
-    };
-    tuna = {
-      url = "github:kmein/tuna";
-      flake = false;
-    };
+    agenix.inputs.home-manager.follows = "home-manager";
+    agenix.inputs.nixpkgs.follows = "nixpkgs";
+    coptic-dictionary.inputs.nixpkgs.follows = "nixpkgs";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    menstruation-backend.inputs.flake-utils.follows = "flake-utils";
+    menstruation-backend.inputs.nixpkgs.follows = "nixpkgs";
+    menstruation-backend.inputs.rust-overlay.follows = "rust-overlay";
+    menstruation-telegram.inputs.flake-utils.follows = "flake-utils";
+    menstruation-telegram.inputs.menstruation-backend.follows = "menstruation-backend";
+    menstruation-telegram.inputs.nixpkgs.follows = "nixpkgs-old";
+    nix-on-droid.inputs.home-manager.follows = "home-manager";
+    nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
+    nixinate.inputs.nixpkgs.follows = "nixpkgs";
+    recht.inputs.flake-utils.follows = "flake-utils";
+    recht.inputs.nixpkgs.follows = "nixpkgs";
+    rust-overlay.inputs.flake-utils.follows = "flake-utils";
+    rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
+    scripts.inputs.flake-utils.follows = "flake-utils";
+    scripts.inputs.nixpkgs.follows = "nixpkgs";
+    scripts.inputs.rust-overlay.follows = "rust-overlay";
+    stylix.inputs.home-manager.follows = "home-manager";
+    stylix.inputs.nixpkgs.follows = "nixpkgs";
+    tinc-graph.inputs.flake-utils.follows = "flake-utils";
+    tinc-graph.inputs.nixpkgs.follows = "nixpkgs";
+    tinc-graph.inputs.rust-overlay.follows = "rust-overlay";
+    voidrice.flake = false;
+    wallpaper-generator.inputs.flake-utils.follows = "flake-utils";
+    wallpapers.flake = false;
   };
 
-  outputs = {
+  outputs = inputs @ {
     self,
-    flake-utils,
+    nixpkgs,
+    nixpkgs-unstable,
+    nur,
     home-manager,
-    krops,
-    menstruation-backend,
-    menstruation-telegram,
-    nix-writers,
-    nixos-unstable,
-    nixos-stable,
-    recht,
+    nixinate,
+    agenix,
     retiolum,
-    scripts,
-    stockholm,
-    telebots,
-    tinc-graph,
-    traadfri,
-    tuna,
-  } @ inputs: let
-    system = "x86_64-linux";
-    pkgs = nixos-stable.legacyPackages.${system};
-    home =
-      if nixos-stable.lib.inPureEvalMode or false
-      then _: /nonexistent
-      else import lib/home.nix;
-    source = {
-      sources,
-      unstable,
-      name,
-    }:
-      {
-        niveum.file = toString ./.;
-        nixos-config.symlink = "niveum/systems/${name}/configuration.nix";
-        system-secrets.pass = {
-          dir = toString (home /.password-store);
-          name = "systems/${name}";
-        };
-        secrets.pass = {
-          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;
-        };
-      }
-      // nixos-stable.lib.mapAttrs' (name: value: {
-        inherit name;
-        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 = "https://git.thalheim.io/Mic92/retiolum";
-              stockholm = "https://cgit.krebsco.de/stockholm";
-              scripts = github "kmein/scripts";
-              telebots = github "kmein/telebots";
-              tinc-graph = github "kmein/tinc-graph";
-              traadfri = github "kmein/traadfri";
-            }
-            .${name};
-          ref = value.rev;
-          shallow = true;
-        };
-      }) (nixos-stable.lib.filterAttrs (name: _: builtins.elem name sources) inputs);
-    deployScriptFor = {
-      name,
-      user ? "root",
-      host,
-      unstable ? false,
-      sshPort ? (import ./lib/default.nix).sshPort,
-      sources,
-    }:
-      toString (krops.packages.${system}.writeDeploy "deploy-${name}" {
-        source = krops.lib.evalSource [(source {inherit sources unstable name;})];
-        target = "${user}@${host}:${toString sshPort}";
-        useNixOutputMonitor = true;
-      });
-  in {
-    apps.${system} = let
-      forSystems = f: builtins.listToAttrs (map f (builtins.attrNames (builtins.readDir ./systems)));
-      externalNetwork = import ./lib/external-network.nix;
-      deployScripts = forSystems (name: {
-        name = "deploy-${name}";
-        value = {
-          type = "app";
-          program = deployScriptFor {
-            inherit name;
-            host =
-              if externalNetwork ? name
-              then externalNetwork.${name}
-              else "${name}.r";
-            unstable = false; # name == "kabsa" || name == "manakish";
-            sources =
-              ["nix-writers" "nixpkgs" "retiolum" "stockholm"]
-              ++ {
-                zaatar = ["traadfri" "nixos-unstable"];
-                ful = [];
-                tahina = [];
-                tabula = [];
-                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};
+    flake-utils,
+    nix-on-droid,
+    stylix,
+    ...
+  }:
+    {
+      apps =
+        nixinate.nixinate.x86_64-linux self
+        // {
+          x86_64-linux = let
+            pkgs = nixpkgs.legacyPackages.x86_64-linux;
+          in {
+            mock-secrets = {
+              type = "app";
+              program = toString (pkgs.writers.writeDash "mock-secrets" ''
+                ${pkgs.findutils}/bin/find secrets -not -path '*/.*' -type f  | ${pkgs.coreutils}/bin/sort > secrets.txt
+              '');
+            };
+            deploy = {
+              type = "app";
+              program = toString (pkgs.writers.writeDash "deploy" ''
+                if [ $# -eq 0 ]
+                then
+                  systems='${toString (builtins.attrNames self.nixosConfigurations)}'
+                else
+                  systems=$*
+                fi
+                ${pkgs.parallel}/bin/parallel --line-buffer --tagstring '{}' 'nix run .\?submodules=1\#apps.nixinate.{}' ::: $systems
+              '');
+            };
           };
         };
-      });
-      ciScripts = forSystems (name: {
-        name = "build-${name}";
-        value = {
-          type = "app";
-          program = import ./ci.nix {inherit name system inputs;};
+
+      nixosModules = {
+        htgen = import modules/htgen.nix;
+        moodle-dl = import modules/moodle-dl.nix;
+        networkmanager-declarative = import modules/networkmanager-declarative.nix;
+        passport = import modules/passport.nix;
+        panoptikon = import modules/panoptikon.nix;
+        power-action = import modules/power-action.nix;
+        system-dependent = import modules/system-dependent.nix;
+        telegram-bot = import modules/telegram-bot.nix;
+      };
+
+      lib = {
+        panoptikon = import lib/panoptikon.nix;
+      };
+
+      nixOnDroidConfigurations = {
+        moto = nix-on-droid.lib.nixOnDroidConfiguration {
+          modules = [systems/moto/configuration.nix];
+          pkgs = import nixpkgs {
+            system = "aarch64-linux";
+            overlays = [nix-on-droid.overlays.default];
+          };
+          extraSpecialArgs = {
+            niveumPackages = inputs.self.packages.aarch64-linux;
+            niveumLib = inputs.self.lib;
+            inherit inputs;
+          };
+          home-manager-path = home-manager.outPath;
         };
-      });
-    in
-      deployScripts // ciScripts;
-  };
+      };
+
+      nixosConfigurations = let
+        niveumSpecialArgs = system: {
+          unstablePackages = import nixpkgs-unstable {
+            inherit system;
+            config.allowUnfreePredicate = pkg:
+              builtins.elem (nixpkgs-unstable.lib.getName pkg) [
+                "obsidian"
+              ];
+          };
+
+          niveumPackages = inputs.self.packages.${system};
+          niveumLib = inputs.self.lib;
+          inherit inputs;
+        };
+      in {
+        ful = nixpkgs.lib.nixosSystem rec {
+          system = "aarch64-linux";
+          specialArgs = niveumSpecialArgs system;
+          modules = [
+            {
+              _module.args.nixinate = {
+                host = "ful";
+                sshUser = "root";
+                buildOn = "remote";
+                substituteOnTarget = true;
+                hermetic = false;
+              };
+            }
+            systems/ful/configuration.nix
+            agenix.nixosModules.default
+            inputs.self.nixosModules.passport
+            inputs.self.nixosModules.panoptikon
+            retiolum.nixosModules.retiolum
+            nur.nixosModules.nur
+          ];
+        };
+        zaatar = nixpkgs.lib.nixosSystem rec {
+          system = "x86_64-linux";
+          specialArgs = niveumSpecialArgs system;
+          modules = [
+            {
+              _module.args.nixinate = {
+                host = "zaatar";
+                sshUser = "root";
+                buildOn = "remote";
+                substituteOnTarget = true;
+                hermetic = false;
+              };
+            }
+            systems/zaatar/configuration.nix
+            inputs.self.nixosModules.moodle-dl
+            agenix.nixosModules.default
+            retiolum.nixosModules.retiolum
+          ];
+        };
+        makanek = nixpkgs.lib.nixosSystem rec {
+          system = "x86_64-linux";
+          # for using inputs in other config files
+          specialArgs = niveumSpecialArgs system;
+          modules = [
+            {
+              _module.args.nixinate = {
+                host = "makanek";
+                sshUser = "root";
+                buildOn = "local";
+                substituteOnTarget = true;
+                hermetic = false;
+              };
+            }
+            systems/makanek/configuration.nix
+            inputs.self.nixosModules.telegram-bot
+            inputs.self.nixosModules.htgen
+            inputs.self.nixosModules.passport
+            agenix.nixosModules.default
+            retiolum.nixosModules.retiolum
+            nur.nixosModules.nur
+          ];
+        };
+        tahina = nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          modules = [
+            systems/tahina/configuration.nix
+            agenix.nixosModules.default
+            retiolum.nixosModules.retiolum
+          ];
+        };
+        tabula = nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          modules = [
+            systems/tabula/configuration.nix
+            agenix.nixosModules.default
+            retiolum.nixosModules.retiolum
+          ];
+        };
+        manakish = nixpkgs.lib.nixosSystem rec {
+          system = "x86_64-linux";
+          specialArgs = niveumSpecialArgs system;
+          modules = [
+            {
+              _module.args.nixinate = {
+                host = "manakish";
+                sshUser = "root";
+                buildOn = "local";
+                substituteOnTarget = true;
+                hermetic = false;
+              };
+            }
+            systems/manakish/configuration.nix
+            agenix.nixosModules.default
+            retiolum.nixosModules.retiolum
+            home-manager.nixosModules.home-manager
+            nur.nixosModules.nur
+            stylix.nixosModules.stylix
+          ];
+        };
+        kabsa = nixpkgs.lib.nixosSystem rec {
+          system = "x86_64-linux";
+          specialArgs = niveumSpecialArgs system;
+          modules = [
+            {
+              _module.args.nixinate = {
+                host = "kabsa";
+                sshUser = "root";
+                buildOn = "remote";
+                substituteOnTarget = true;
+                hermetic = false;
+              };
+            }
+            systems/kabsa/configuration.nix
+            agenix.nixosModules.default
+            retiolum.nixosModules.retiolum
+            home-manager.nixosModules.home-manager
+            nur.nixosModules.nur
+            stylix.nixosModules.stylix
+          ];
+        };
+      };
+    }
+    // flake-utils.lib.eachSystem [flake-utils.lib.system.x86_64-linux flake-utils.lib.system.aarch64-linux] (system: let
+      pkgs = import nixpkgs {
+        inherit system;
+        overlays = [
+          nur.overlay
+          (self: super: {
+            mpv = super.mpv.override {scripts = [inputs.self.packages.${system}.mpv-visualizer];};
+            dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
+          })
+        ];
+      };
+      unstablePackages = import nixpkgs-unstable {
+        inherit system;
+      };
+      wrapScript = {
+        packages ? [],
+        name,
+        script,
+      }:
+        pkgs.writers.writeDashBin name ''PATH=$PATH:${nixpkgs.lib.makeBinPath (packages ++ [pkgs.findutils pkgs.coreutils pkgs.gnused pkgs.gnugrep])} ${script} "$@"'';
+    in {
+      packages = rec {
+        auc = pkgs.callPackage packages/auc.nix {};
+        betacode = pkgs.callPackage packages/betacode.nix {};
+        cheat-sh = pkgs.callPackage packages/cheat-sh.nix {};
+        closest = pkgs.callPackage packages/closest {};
+        cyberlocker-tools = pkgs.callPackage packages/cyberlocker-tools.nix {};
+        default-gateway = pkgs.callPackage packages/default-gateway.nix {};
+        depp = pkgs.callPackage packages/depp.nix {};
+        devanagari = pkgs.callPackage packages/devanagari {};
+        devour = pkgs.callPackage packages/devour.nix {};
+        dic = pkgs.callPackage packages/dic.nix {};
+        dirmir = pkgs.callPackage packages/dirmir.nix {};
+        dmenu-bluetooth = pkgs.callPackage packages/dmenu-bluetooth.nix {};
+        dmenu-scrot = pkgs.callPackage packages/dmenu-scrot.nix {};
+        dns-sledgehammer = pkgs.callPackage packages/dns-sledgehammer.nix {};
+        fkill = pkgs.callPackage packages/fkill.nix {};
+        fzfmenu = pkgs.callPackage packages/fzfmenu.nix {};
+        genius = pkgs.callPackage packages/genius.nix {};
+        gfs-fonts = pkgs.callPackage packages/gfs-fonts.nix {};
+        git-preview = pkgs.callPackage packages/git-preview.nix {};
+        gpt = pkgs.callPackage packages/gpt.nix {};
+        hc = pkgs.callPackage packages/hc.nix {};
+        heuretes = pkgs.callPackage packages/heuretes.nix {};
+        htgen = pkgs.callPackage packages/htgen.nix {};
+        image-convert-favicon = pkgs.callPackage packages/image-convert-favicon.nix {};
+        image-convert-tolino = pkgs.callPackage packages/image-convert-tolino.nix {};
+        infschmv = pkgs.callPackage packages/infschmv.nix {};
+        iolanguage = pkgs.callPackage packages/iolanguage.nix {};
+        ipa = pkgs.writers.writePython3Bin "ipa" {flakeIgnore = ["E501"];} (builtins.readFile packages/ipa.py);
+        ix = pkgs.callPackage packages/ix.nix {};
+        jsesh = pkgs.callPackage packages/jsesh.nix {};
+        k-lock = pkgs.callPackage packages/k-lock.nix {};
+        kirciuoklis = pkgs.callPackage packages/kirciuoklis.nix {};
+        klem = pkgs.callPackage packages/klem.nix {};
+        kpaste = pkgs.callPackage packages/kpaste.nix {};
+        literature-quote = pkgs.callPackage packages/literature-quote.nix {};
+        mahlzeit = pkgs.haskellPackages.callPackage packages/mahlzeit.nix {};
+        man-pandoc = pkgs.callPackage packages/man/pandoc.nix {};
+        man-pdf = pkgs.callPackage packages/man-pdf.nix {};
+        mansplain = pkgs.callPackage packages/mansplain.nix {};
+        manual-sort = pkgs.callPackage packages/manual-sort.nix {};
+        menu-calc = pkgs.callPackage packages/menu-calc.nix {};
+        meteo = pkgs.callPackage packages/meteo.nix {};
+        mpv-radio = pkgs.callPackage packages/mpv-radio.nix {di-fm-key-file = "/dev/null";};
+        mpv-tuner = pkgs.callPackage packages/mpv-tuner.nix {di-fm-key-file = "/dev/null";};
+        mpv-tv = pkgs.callPackage packages/mpv-tv.nix {};
+        mpv-visualizer = unstablePackages.mpvScripts.visualizer;
+        new-mac = pkgs.callPackage packages/new-mac.nix {};
+        nix-git = pkgs.callPackage packages/nix-git.nix {};
+        nix-index-update = pkgs.callPackage packages/nix-index-update.nix {inherit system;};
+        notemenu = pkgs.callPackage packages/notemenu.nix {niveumPackages = self.packages.${system};};
+        opustags = pkgs.callPackage packages/opustags.nix {};
+        pls = pkgs.callPackage packages/pls.nix {};
+        qrpaste = pkgs.callPackage packages/qrpaste.nix {};
+        rfc = pkgs.callPackage packages/rfc.nix {};
+        scanned = pkgs.callPackage packages/scanned.nix {};
+        swallow = pkgs.callPackage packages/swallow.nix {};
+        text2pdf = pkgs.callPackage packages/text2pdf.nix {};
+        timer = pkgs.callPackage packages/timer.nix {};
+        tocharian-font = pkgs.callPackage packages/tocharian-font.nix {};
+        trans = pkgs.callPackage packages/trans.nix {};
+        ttspaste = pkgs.callPackage packages/ttspaste.nix {};
+        unicodmenu = pkgs.callPackage packages/unicodmenu.nix {};
+        untilport = pkgs.callPackage packages/untilport.nix {};
+        vg = pkgs.callPackage packages/vg.nix {};
+        vim = pkgs.callPackage packages/vim.nix {niveumPackages = self.packages.${system};};
+        obsidian-vim = pkgs.callPackage packages/obsidian-vim.nix {};
+        vimPlugins-cheat-sh-vim = pkgs.callPackage packages/vimPlugins/cheat-sh.nix {};
+        vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix {};
+        vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix {};
+        vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix {};
+        vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix {};
+        vimPlugins-vim-colors-paramount = pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix {};
+        vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix {};
+        vimPlugins-vim-fsharp = pkgs.callPackage packages/vimPlugins/vim-fsharp.nix {};
+        vimPlugins-vim-mail = pkgs.callPackage packages/vimPlugins/vim-mail.nix {};
+        vimPlugins-vim-reason-plus = pkgs.callPackage packages/vimPlugins/vim-reason-plus.nix {};
+        vimv = pkgs.callPackage packages/vimv.nix {};
+        weechat-declarative = pkgs.callPackage packages/weechat-declarative.nix {};
+        weechatScripts-hotlist2extern = pkgs.callPackage packages/weechatScripts/hotlist2extern.nix {};
+        wttr = pkgs.callPackage packages/wttr.nix {};
+
+        itl = pkgs.callPackage packages/itl.nix {};
+        itools = pkgs.callPackage packages/itools.nix {itl = itl;};
+
+        booksplit = wrapScript {
+          script = inputs.voidrice.outPath + "/.local/bin/booksplit";
+          name = "booksplit";
+          packages = [pkgs.ffmpeg pkgs.glibc.bin];
+        };
+        dmenu-randr = wrapScript {
+          script = inputs.voidrice.outPath + "/.local/bin/displayselect";
+          name = "dmenu-randr";
+          packages = [pkgs.dmenu pkgs.bc pkgs.psmisc pkgs.util-linux pkgs.xorg.xrandr pkgs.gawk pkgs.libnotify pkgs.arandr (pkgs.writers.writeDashBin "setbg" "")];
+        };
+        tag = wrapScript {
+          script = inputs.voidrice.outPath + "/.local/bin/tag";
+          name = "tag";
+          packages = [pkgs.ffmpeg];
+        };
+      };
+    });
 }

lib/colours/antares.nix

@@ -1,37 +0,0 @@
-rec {
-  black = {
-    bright = "#151515";
-    dark = "#000000";
-  };
-  red = {
-    bright = "#de575c";
-    dark = "#de575c";
-  };
-  yellow = {
-    bright = "#ebe971";
-    dark = "#ebe971";
-  };
-  green = {
-    bright = "#00b853";
-    dark = "#00b853";
-  };
-  blue = {
-    bright = "#90d0f0";
-    dark = "#7fc6f0";
-  };
-  magenta = {
-    bright = "#cf9ffa";
-    dark = "#cf9ffa";
-  };
-  cyan = {
-    bright = "#4ae5e8";
-    dark = "#4ae5e8";
-  };
-  white = {
-    bright = "#ffffff";
-    dark = "#bbbbbb";
-  };
-  background = black.dark;
-  foreground = white.dark;
-  cursor = green.bright;
-}

lib/colours/apprentice.nix

@@ -1,37 +0,0 @@
-{
-  black = {
-    bright = "#444444";
-    dark = "#1c1c1c";
-  };
-  red = {
-    bright = "#ff8700";
-    dark = "#af5f5f";
-  };
-  green = {
-    bright = "#87af87";
-    dark = "#5f875f";
-  };
-  yellow = {
-    bright = "#ffffaf";
-    dark = "#87875f";
-  };
-  blue = {
-    bright = "#8fafd7";
-    dark = "#5f87af";
-  };
-  magenta = {
-    bright = "#8787af";
-    dark = "#5f5f87";
-  };
-  cyan = {
-    bright = "#5fafaf";
-    dark = "#5f8787";
-  };
-  white = {
-    bright = "#999999";
-    dark = "#6c6c6c";
-  };
-  background = "#262626";
-  foreground = "#bcbcbc";
-  cursor = "#bcbcbc";
-}

lib/colours/ayu-dark.nix

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

lib/colours/ayu-light.nix

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

lib/colours/connermcd.nix

@@ -1,37 +0,0 @@
-rec {
-  black = {
-    bright = "#454545";
-    dark = "#222222";
-  };
-  red = {
-    bright = "#FA8072";
-    dark = "#B22222";
-  };
-  green = {
-    bright = "#779A3E";
-    dark = "#556B2F";
-  };
-  yellow = {
-    bright = "#DAA520";
-    dark = "#B8860B";
-  };
-  blue = {
-    bright = "#6495ED";
-    dark = "#4682B4";
-  };
-  magenta = {
-    bright = "#DA70D6";
-    dark = "#9932CC";
-  };
-  cyan = {
-    bright = "#B0E0E6";
-    dark = "#87CEEB";
-  };
-  white = {
-    bright = "#FFFFFF";
-    dark = "#C0C0C0";
-  };
-  background = "#000000";
-  foreground = "#AAAAAA";
-  cursor = green.bright;
-}

lib/colours/ibm-3270.nix

@@ -1,37 +0,0 @@
-rec {
-  black = {
-    bright = "#888888";
-    dark = "#222222";
-  };
-  red = {
-    bright = "#ef8383";
-    dark = "#f01818";
-  };
-  yellow = {
-    bright = "#efe28b";
-    dark = "#f8d824";
-  };
-  green = {
-    bright = "#23d830";
-    dark = "#7ed684";
-  };
-  blue = {
-    bright = "#b3bfef";
-    dark = "#7890f0";
-  };
-  magenta = {
-    bright = "#efb3e3";
-    dark = "#f078d8";
-  };
-  cyan = {
-    bright = "#9ce2e2";
-    dark = "#54e4e4";
-  };
-  white = {
-    bright = "#ffffff";
-    dark = "#a5a5a5";
-  };
-  background = "#000000";
-  foreground = "#bbbbbb";
-  cursor = green.bright;
-}

lib/colours/mac-os.nix

@@ -1,37 +0,0 @@
-rec {
-  black = {
-    bright = "#818383";
-    dark = "#000000";
-  };
-  red = {
-    bright = "#fc391f";
-    dark = "#c23621";
-  };
-  yellow = {
-    bright = "#eaec23";
-    dark = "#adad27";
-  };
-  green = {
-    bright = "#31e722";
-    dark = "#25bc24";
-  };
-  blue = {
-    bright = "#5833ff";
-    dark = "#492ee1";
-  };
-  magenta = {
-    bright = "#f935f8";
-    dark = "#d338d3";
-  };
-  cyan = {
-    bright = "#14f0f0";
-    dark = "#33bbc8";
-  };
-  white = {
-    bright = "#e9ebeb";
-    dark = "#cbcccd";
-  };
-  background = black.dark;
-  foreground = white.dark;
-  cursor = green.bright;
-}

lib/colours/owickstrom-dark.nix

@@ -1,37 +0,0 @@
-rec {
-  black = {
-    bright = "#282c34";
-    dark = "#282c34";
-  };
-  red = {
-    bright = "#e06c75";
-    dark = "#e06c75";
-  };
-  green = {
-    bright = "#98c379";
-    dark = "#98c379";
-  };
-  yellow = {
-    bright = "#e5c07b";
-    dark = "#e5c07b";
-  };
-  blue = {
-    bright = "#61afef";
-    dark = "#61afef";
-  };
-  magenta = {
-    bright = "#c678dd";
-    dark = "#c678dd";
-  };
-  cyan = {
-    bright = "#56b6c2";
-    dark = "#56b6c2";
-  };
-  white = {
-    bright = "#dcdfe4";
-    dark = "#dcdfe4";
-  };
-  background = black.dark;
-  foreground = white.bright;
-  cursor = "#a3b3cc";
-}

lib/colours/owickstrom-light.nix

@@ -1,37 +0,0 @@
-rec {
-  black = {
-    bright = "#4b4b4b";
-    dark = "#242424";
-  };
-  red = {
-    bright = "#fc1c18";
-    dark = "#d71c15";
-  };
-  green = {
-    bright = "#6bc219";
-    dark = "#5aa513";
-  };
-  yellow = {
-    bright = "#fec80e";
-    dark = "#fdb40c";
-  };
-  blue = {
-    bright = "#0955ff";
-    dark = "#063b8c";
-  };
-  magenta = {
-    bright = "#fb0050";
-    dark = "#e40038";
-  };
-  cyan = {
-    bright = "#3ea8fc";
-    dark = "#2595e1";
-  };
-  white = {
-    bright = "#8c00ec";
-    dark = "#efefef";
-  };
-  background = white.dark;
-  foreground = "#181818";
-  cursor = "#bbbbbb";
-}

lib/colours/papercolor-dark.nix

@@ -1,37 +0,0 @@
-rec {
-  black = {
-    dark = "#1c1c1c";
-    bright = "#585858";
-  };
-  red = {
-    dark = "#af005f";
-    bright = "#5faf5f";
-  };
-  green = {
-    bright = "#afd700";
-    dark = "#5faf00";
-  };
-  yellow = {
-    bright = "#af87d7";
-    dark = "#d7af5f";
-  };
-  blue = {
-    dark = "#5fafd7";
-    bright = "#ffaf00";
-  };
-  magenta = {
-    bright = "#ff5faf";
-    dark = "#808080";
-  };
-  cyan = {
-    dark = "#d7875f";
-    bright = "#00afaf";
-  };
-  white = {
-    dark = "#d0d0d0";
-    bright = "#5f8787";
-  };
-  background = black.dark;
-  foreground = white.dark;
-  cursor = blue.bright;
-}

lib/colours/papercolor-light.nix

@@ -1,37 +0,0 @@
-rec {
-  black = {
-    dark = "#eeeeee";
-    bright = "#bcbcbc";
-  };
-  red = {
-    dark = "#af0000";
-    bright = "#d70000";
-  };
-  green = {
-    dark = "#008700";
-    bright = "#d70087";
-  };
-  yellow = {
-    dark = "#5f8700";
-    bright = "#8700af";
-  };
-  blue = {
-    dark = "#0087af";
-    bright = "#d75f00";
-  };
-  magenta = {
-    bright = "#878787";
-    dark = "#d75f00";
-  };
-  cyan = {
-    dark = "#005f87";
-    bright = "#005faf";
-  };
-  white = {
-    dark = "#444444";
-    bright = "#005f87";
-  };
-  background = black.dark;
-  foreground = white.dark;
-  cursor = blue.bright;
-}

lib/colours/solarized-dark.nix

@@ -1,37 +0,0 @@
-rec {
-  black = {
-    dark = "#073642";
-    bright = "#002b36";
-  };
-  red = {
-    dark = "#dc322f";
-    bright = "#cb4b16";
-  };
-  yellow = {
-    dark = "#b58900";
-    bright = "#657b83";
-  };
-  green = {
-    dark = "#859900";
-    bright = "#586e75";
-  };
-  blue = {
-    dark = "#268bd2";
-    bright = "#839496";
-  };
-  magenta = {
-    dark = "#d33682";
-    bright = "#6c71c4";
-  };
-  cyan = {
-    dark = "#2aa198";
-    bright = "#93a1a1";
-  };
-  white = {
-    dark = "#eee8d5";
-    bright = "#fdf6e3";
-  };
-  background = black.bright;
-  foreground = blue.bright;
-  cursor = cyan.bright;
-}

lib/colours/solarized-light.nix

@@ -1,37 +0,0 @@
-rec {
-  black = {
-    dark = "#073642";
-    bright = "#002b36";
-  };
-  red = {
-    dark = "#dc322f";
-    bright = "#cb4b16";
-  };
-  yellow = {
-    dark = "#b58900";
-    bright = "#657b83";
-  };
-  green = {
-    dark = "#859900";
-    bright = "#586e75";
-  };
-  blue = {
-    dark = "#268bd2";
-    bright = "#839496";
-  };
-  magenta = {
-    dark = "#d33682";
-    bright = "#6c71c4";
-  };
-  cyan = {
-    dark = "#2aa198";
-    bright = "#93a1a1";
-  };
-  white = {
-    dark = "#eee8d5";
-    bright = "#fdf6e3";
-  };
-  background = white.bright;
-  foreground = yellow.bright;
-  cursor = green.bright;
-}

lib/default.nix

@@ -1,4 +1,4 @@
-rec {
+{
   tmpfilesConfig = {
     type,
     path,
@@ -40,8 +40,6 @@ rec {
 
   sshPort = 22022;
 
-  colours = import ./colours/papercolor-dark.nix;
-
   theme = pkgs: {
     gtk = {
       name = "Adwaita-dark";
@@ -72,7 +70,7 @@ rec {
     sshKeys = pkgs:
       pkgs.lib.strings.splitString "\n" (pkgs.lib.strings.fileContents (pkgs.fetchurl {
         url = "https://github.com/kmein.keys";
-        sha256 = "09c6ny0rmpid1m0pc1wsmb3wyy9g721lf4kv55i4lrp42b3i2d5b";
+        hash = "sha256-TvvPwplrH9cw7NE4GKqbE5ga+oBHM+TkjxYQ3b1fpLI=";
       }));
   };
 

lib/email.nix

@@ -1,15 +1,7 @@
-{lib, ...}: {
-  cock = rec {
-    user = "2210@cock.li";
-    address = user;
-    password = lib.strings.fileContents <secrets/mail/cock>;
-    imap = "mail.cock.li";
-    smtp = imap;
-    smtpSettings = smtp: "smtp://${smtp}:587";
-    folders = {
-      drafts = "Drafts";
-      sent = "Sent";
-      trash = "Trash";
-    };
+{
+  defaults = {
+    aerc.enable = true;
+    realName = "Kierán Meinhardt";
+    folders.inbox = "INBOX";
   };
 }

lib/i3status-rust.nix

@@ -1,227 +0,0 @@
-{
-  pkgs,
-  wirelessInterface,
-  colours,
-  batteryName,
-}: let
-  inherit (pkgs) lib;
-
-  setsid = script:
-    pkgs.writers.writeDash "setsid-command" ''
-      ${pkgs.util-linux}/bin/setsid ${script}
-    '';
-
-  accounts = import <niveum/lib/email.nix> {inherit lib;};
-in {
-  theme = {
-    name = "plain";
-    overrides = {
-      critical_fg = colours.red.bright;
-      good_fg = colours.green.bright;
-      idle_fg = colours.foreground;
-      info_fg = colours.cyan.bright;
-      warning_fg = colours.yellow.bright;
-      warning_bg = colours.background;
-      alternating_tint_bg = colours.background;
-      alternating_tint_fg = colours.foreground;
-      critical_bg = colours.background;
-      good_bg = colours.background;
-      idle_bg = colours.background;
-      info_bg = colours.background;
-      separator = "";
-      separator_bg = "auto";
-      separator_fg = colours.black.bright;
-    };
-  };
-  icons.name = "awesome6";
-  icons.overrides.rss = "";
-  icons.overrides.vpn = "";
-  icons.overrides.irc = "";
-  block = [
-    {
-      block = "weather";
-      autolocate = true;
-      format = "{location}: {temp}C";
-      service = {
-        name = "openweathermap";
-        api_key = lib.strings.fileContents <secrets/openweathermap.key>;
-        city_id = "2950159";
-        units = "metric";
-      };
-    }
-    {
-      block = "custom";
-      interval = 60 * 5;
-      command = let
-        spacetime = import <niveum/configs/spacetime.nix>;
-      in
-        pkgs.writers.writePython3 "sun.py" {
-          libraries = [pkgs.python3Packages.astral];
-          flakeIgnore = ["E121" "E501"];
-        }
-        ''
-          import astral
-          import astral.moon
-          import astral.sun
-
-          current_phase = astral.moon.phase()
-
-          city = astral.LocationInfo("Berlin", "Germany", "${spacetime.time.timeZone}", ${toString spacetime.location.latitude}, ${toString spacetime.location.longitude})
-          sun = astral.sun.sun(city.observer, date=astral.today(), tzinfo=city.timezone)
-
-          print("↑{} ↓{} {}{}".format(sun["sunrise"].strftime("%R"), sun["sunset"].strftime("%R"), "☽" if current_phase < 14 else "☾", round(current_phase, 1)))
-        '';
-    }
-    {
-      block = "github";
-      info = ["total"];
-      warning = ["mention" "review_requested" "team_mention" "manual" "invitation" "assign" "subscribed"];
-    }
-    {
-      block = "custom";
-      interval = 10;
-      command = "newsboat-unread-count";
-      json = true;
-    }
-    {
-      block = "custom";
-      interval = 10;
-      command = pkgs.writers.writeDash "todo" ''
-        ${pkgs.todoman}/bin/todo --porcelain | ${pkgs.jq}/bin/jq -r '
-          map(select(.due != null))
-          | (map(select(.due < now)) | length) as $overdue
-          | (map(select(.due >= now and .due < now + (60 * 60 * 24))) | length) as $dueToday
-          | {
-            icon: "tasks",
-            text: (($overdue + $dueToday) as $sum | if $sum > 0 then $sum | tostring else "" end),
-            state: (
-              if $overdue > 0 then
-                "Critical"
-              elif $dueToday > 0 then
-                "Warning"
-              else
-                "Idle"
-              end
-            )
-          }
-        '
-      '';
-      json = true;
-      hide_when_empty = true;
-    }
-    {
-      block = "custom";
-      interval = 60 * 5;
-      command = let
-        query-account = name: account: "${pkgs.writers.writeDash "query-imap-${name}" ''
-          ${pkgs.coreutils}/bin/timeout 1 ${pkgs.curl}/bin/curl -sSL -u ${lib.escapeShellArg "${account.user}:${account.password}"} imaps://${account.imap} -X 'STATUS INBOX (UNSEEN)' \
-            | ${pkgs.gnugrep}/bin/grep -Eo '[0-9]+' \
-            | sed 's/^/{"${name}":/;s/$/}/'
-        ''} &";
-      in
-        pkgs.writers.writeDash "unread-mail" ''
-          {
-            ${lib.concatStringsSep "\n" (lib.mapAttrsToList query-account accounts)}
-            wait
-          } | jq -s 'if length == 0 then {text: "", icon: "mail", state: "Idle"} else
-            add
-            | (values | add) as $sum
-            | {
-              text: (if $sum > 0 then $sum | tostring else "" end),
-              icon: "mail",
-              state: (
-                if .uni > 0 or .["work-uni"] > 0 or .posteo > 0 then
-                  "Warning"
-                elif $sum > 0 then
-                  "Info"
-                else
-                  "Idle"
-                end
-              )
-            } end'
-        '';
-      json = true;
-      hide_when_empty = true;
-    }
-    {
-      block = "custom";
-      interval = 60;
-      command = pkgs.writers.writeDash "weechat" ''
-        ssh -o ConnectTimeout=1 makanek cat /var/lib/weechat/hotlist.txt | sed 's/,/\n/g' | wc -l | jq '{
-          text: (if . > 0 then . | tostring else "" end),
-          state: (if . > 0 then "Info" else "Idle" end),
-          icon: "irc"
-        }'
-      '';
-      json = true;
-      hide_when_empty = true;
-    }
-    {
-      block = "custom";
-      interval = 5;
-      command = pkgs.writers.writeDash "hu-berlin-vpn" ''
-        PATH=${lib.makeBinPath [pkgs.systemd]}
-        (systemctl is-active --quiet openvpn-hu-berlin.service && echo '{"state": "Good", "text": "OpenVPN", "icon": "vpn"}') \
-          || (systemctl is-active --quiet hu-vpn.service && echo '{"state": "Good", "text": "PPP+SSL", "icon": "vpn"}') \
-          || echo '{"state": "Idle", "icon": "vpn", "text": ""}'
-      '';
-      json = true;
-      hide_when_empty = true;
-    }
-    {
-      block = "net";
-      device = wirelessInterface;
-      format = "{ssid} {signal_strength}";
-    }
-    {
-      block = "battery";
-      device = batteryName;
-    }
-    {
-      block = "sound";
-      on_click = "pavucontrol";
-    }
-    {
-      block = "disk_space";
-      format = "{icon} {available}";
-    }
-    {
-      block = "memory";
-      display_type = "memory";
-      format_mem = "{mem_used;G}";
-      clickable = false;
-    }
-    {block = "load";}
-    {
-      block = "custom";
-      interval = 1;
-      json = true;
-      command = pkgs.writers.writeDash "time" ''
-        ${pkgs.jq}/bin/jq -n \
-          --arg now "$(${pkgs.coreutils}/bin/date +'%Y-%m-%d (%W %a) %H:%M')" \
-          --argjson nextEvent "$(
-            ${pkgs.khal}/bin/khal list --format "{start}" --day-format "" $(${pkgs.coreutils}/bin/date +'%Y-%m-%d %H:%M') 2>/dev/null \
-            | ${pkgs.gnugrep}/bin/grep -E '[0-9]{2}:[0-9]{2}' \
-            | ${pkgs.coreutils}/bin/head -1 \
-            | ${pkgs.coreutils}/bin/date --date="$(cat)" +%s
-          )" \
-          '{
-            text: $now,
-            icon: "time",
-            state: (
-              ($nextEvent - now) as $deltaT
-              | if $deltaT < (5 * 60) then
-                "Critical"
-              elif $deltaT < (15 * 60) then
-                "Warning"
-              elif $deltaT < (60 * 60) then
-                "Info"
-              else
-                "Idle"
-              end
-            )
-          }'
-      '';
-    }
-  ];
-}

lib/local-network.nix

@@ -5,7 +5,6 @@
   android = "192.168.178.35";
   manakish = "192.168.178.29";
 
-  tradfri = "192.168.178.28";
   officejet = "192.168.178.27";
   fritzbox = "192.168.178.1";
 }

lib/panoptikon.nix

@@ -0,0 +1,45 @@
+{
+  pkgs,
+  lib,
+  niveumPackages,
+  config,
+  ...
+}: {
+  # watcher scripts
+  url = address:
+    pkgs.writers.writeDash "watch-url" ''
+      ${pkgs.curl}/bin/curl -sSL ${lib.escapeShellArg address} \
+        | ${pkgs.python3Packages.html2text}/bin/html2text --decode-errors=ignore
+    '';
+  urlSelector = selector: address:
+    pkgs.writers.writeDash "watch-url-selector" ''
+      ${pkgs.curl}/bin/curl -sSL ${lib.escapeShellArg address} \
+        | ${pkgs.htmlq}/bin/htmlq ${lib.escapeShellArg selector} \
+        | ${pkgs.python3Packages.html2text}/bin/html2text
+    '';
+  urlJSON = {jqScript ? "."}: address:
+    pkgs.writers.writeDash "watch-url-json" ''
+      ${pkgs.curl}/bin/curl -sSL ${lib.escapeShellArg address} | ${pkgs.jq}/bin/jq -f ${pkgs.writeText "script.jq" jqScript}
+    '';
+
+  # reporter scripts
+  kpaste-irc = {
+    target,
+    retiolumLink ? false,
+    server ? "irc.r",
+    messagePrefix ? "change detected: ",
+    nick ? ''"$PANOPTIKON_WATCHER"-watcher'',
+  }:
+    pkgs.writers.writeDash "kpaste-irc-reporter" ''
+      KPASTE_CONTENT_TYPE=text/plain ${niveumPackages.kpaste}/bin/kpaste \
+        | ${pkgs.gnused}/bin/sed -n "${
+        if retiolumLink
+        then "2"
+        else "3"
+      }s/^/${messagePrefix}/p" \
+        | ${config.nur.repos.mic92.ircsink}/bin/ircsink \
+          --nick ${nick} \
+          --server ${server} \
+          --target ${target}
+    '';
+}

lib/streams.nix

@@ -34,6 +34,7 @@ let
     radiorecord = "radiorecord";
     rap = "rap";
     rock = "rock";
+    rekt = "rekt";
     russian = "russia";
     schlager = "schlager";
     soma = "soma";
@@ -54,6 +55,26 @@ let
   di-fm-name = name: "${name} | DI.FM";
   di-fm = name: "http://prem3.di.fm/${name}_hi?${di-fm-key}";
 
+  classicalradio-name = name: "${name} | ClassicalRadio";
+  classicalradio = name: "http://prem2.classicalradio.com:80/${name}?${di-fm-key}";
+  classicalradio-channels = ["20thcentury" "21stcentury" "adagios" "bach" "ballets" "baroqueperiod" "beethoven" "brahms" "celloworks" "chamberworks" "chopin" "choralworks" "classicalguitarworks" "classicalperiod" "classicalpianotrios" "classicalrelaxation" "concertos" "contemporaryperiod" "debussy" "easyclassical" "fluteworks" "gregorianchant" "grieg" "handel" "harpsichordworks" "haydn" "liszt" "medievalperiod" "mozart" "nocturnes" "operahighlights" "operas" "orchestralworks" "organworks" "overtures" "pianoworks" "relaxingflute" "relaxingpiano" "renaissanceperiod" "romanticperiod" "sacredworks" "schubert" "shostakovich" "soloinstruments" "solopiano" "sonatas" "songsnlieders" "stringworks" "symphonies" "tchaikovsky" "telemann" "trumpetworks" "violinworks" "vivaldi" "waltzespolkasnmarches" "windworks"];
+
+  rockradio-name = name: "${name} | RockRadio";
+  rockradio = name: "http://prem2.rockradio.com:80/${name}?${di-fm-key}";
+  rockradio-channels = ["00srock" "60srock" "70srock" "80srock" "90srock" "alternative80s" "alternative90s" "alternativerock" "blackmetal" "bluesrock" "classicfolkrock" "classichardrock" "classicmetal" "classicrock" "deathmetal" "grunge" "hairbands" "hardrock" "heavymetal" "indierock" "industrial" "melodicdeathmetal" "metal" "metalcore" "modernfolkrock" "modernrock" "numetal" "poprock" "powermetal" "progressiverock" "punkrock" "rockballads" "screamoemo" "softrock" "symphonicmetal" "thrashmetal" "yachtrock"];
+
+  jazzradio-name = name: "${name} | JazzRadio";
+  jazzradio = name: "http://prem2.jazzradio.com:80/${name}?${di-fm-key}";
+  jazzradio-channels = ["afrojazz" "bassjazz" "bebop" "blues" "bluesrock" "bossanova" "classicjazz" "cocktailjazz" "coffeejazz" "cooljazz" "currentjazz" "davekoz" "fusionlounge" "guitarjazz" "gypsyjazz" "hardbop" "jazzballads" "jazzhop" "latenightjazz" "latinjazz" "lovesmoothjazz" "mellowjazz" "mellowpianojazz" "mellowsmoothjazz" "modernbigband" "pariscafe" "pianojazz" "pianotrios" "saxophonejazz" "sinatrastyle" "smoothbossanova" "smoothjazz" "smoothjazz247" "smoothlounge" "smoothuptempo" "smoothvocals" "straightahead" "swingnbigband" "timelessclassics" "trumpetjazz" "vibraphonejazz" "vocaljazz" "vocallegends"];
+
+  zenradio-name = name: "${name} | ZenRadio";
+  zenradio = name: "http://prem4.zenradio.com:80/zr${name}?${di-fm-key}";
+  zenradio-channels = ["acousticvocalchillout" "ambient" "atmosphericdreams" "babysleep" "chillout" "chilloutdreams" "deepconcentration" "deepfocus" "downtempolounge" "eastasianmeditation" "lovenrelaxation" "meditation" "nativeamericanflute" "nature" "newage" "oceansounds" "peacefulhealing" "perfectsunsets" "pregnancyrelaxation" "reiki" "relaxation" "relaxingclassical" "relaxingflute" "relaxingguitar" "relaxingpiano" "relaxingspanmassage" "shamanicmusic" "sleeprelaxation" "soundsofrain" "spacedreams" "stressrelief" "studymusic" "tibetanmusic" "tibetansingingbowls" "tranquilitynhealing" "vocalchillout" "vocalnewage" "yoga" "zen"];
+
+  radiotunes-name = name: "${name} | RadioTunes";
+  radiotunes = name: "http://prem1.radiotunes.com:80/${name}_hi?${di-fm-key}";
+  radiotunes-channels = ["00scountry" "00sdance" "00srnb" "00srock" "60srock" "70srock" "80saltnnewwave" "80sdance" "80srock" "90scountry" "90sdance" "90srnb" "90srock" "altrock" "ambient" "americansongbook" "baroque" "bebop" "bluesrock" "bossanova" "cafedeparis" "chillntropicalhouse" "chillout" "christian" "classical" "classicalperiod" "classicalpianotrios" "classicmotown" "classicrap" "classicrock" "clubbollywood" "coffeejazz" "country" "cubanlounge" "dancehits" "datempolounge" "davekoz" "discoparty" "downtempolounge" "dreamscapes" "easylistening" "edmfest" "epicmusic" "eurodance" "guitar" "hardrock" "hit00s" "hit60s" "hit70s" "hit90s" "indiedance" "indierock" "jazzclassics" "jpop" "latinpophits" "lounge" "lovemusic" "meditation" "mellowjazz" "mellowsmoothjazz" "metal" "modernblues" "modernrock" "mozart" "nature" "newage" "oldies" "oldschoolfunknsoul" "pianojazz" "poprock" "reggaeton" "relaxation" "relaxingambientpiano" "romantic" "romantica" "romanticalatina" "rootsreggae" "salsa" "sleeprelaxation" "slowjams" "smoothbeats" "smoothbossanova" "smoothjazz" "smoothjazz247" "smoothlounge" "softrock" "solopiano" "soundtracks" "the80s" "tophits" "uptemposmoothjazz" "urbanjamz" "urbanpophits" "vocalchillout" "vocallounge" "vocalnewage" "vocalsmoothjazz" "world"];
+
   soma-fm-name = name: "${name} | soma.fm";
   soma-fm = name: "http://ice1.somafm.com/${name}-128-aac";
 
@@ -69,6 +90,9 @@ let
   rte-name = name: "RTÉ ${name}";
   rte = name: "https://www.rte.ie/manifests/${name}.m3u8";
 
+  rekt-name = name: "Rekt ${name}";
+  rekt = name: "https://stream.rekt.network/${name}.m4a";
+
   royal-name = name: "${name} | RoyalRadio";
   royal = name: "http://193.33.170.218:8000/${name}";
 
@@ -956,6 +980,11 @@ in
       stream = soma-fm "scanner";
       tags = [tags.soma tags.text];
     }
+    {
+      station = "Al Jazeera Arabic";
+      stream = "https://live-hls-audio-web-aja.getaj.net/VOICE-AJA/01.m3u8";
+      tags = [tags.text tags.arabic];
+    }
     {
       desc = "Celebrating NASA and Space Explorers everywhere.";
       logo = "http://soma.fm/img/missioncontrol120.jpg";
@@ -1842,71 +1871,169 @@ in
       stream = dr "p8jazz";
       tags = [tags.jazz tags.danish];
     }
+    {
+      station = "CNN morse code slow";
+      stream = "http://cw.dimebank.com:8080/CNNslow";
+      tags = [tags.text];
+    }
+    {
+      station = "CNN morse code fast";
+      stream = "http://cw.dimebank.com:8080/CNNfast";
+      tags = [tags.text];
+    }
+    {
+      station = "XXX orchestral";
+      stream = "http://orion.shoutca.st:8978/stream";
+      tags = [tags.classical];
+    }
+    {
+      station = "XXX greek";
+      stream = "http://radio.hostchefs.net:8046/stream?1520818130148";
+      tags = [tags.greek];
+    }
+    {
+      station = "XXX turkish or greek";
+      stream = "https://onairmediagroup.live24.gr/kralfm100xanthi";
+      tags = [tags.greek tags.turkish];
+    }
+    {
+      station = "Hard Rock Hell Radio";
+      tags = [tags.rock];
+      stream = "http://andromeda.shoutca.st:9254/stream";
+    }
+    {
+      station = "Divyavani";
+      tags = [tags.trad tags.indian];
+      stream = "https://divyavani.radioca.st/stream";
+    }
+    {
+      station = "XXX sanskrit radio";
+      tags = [tags.text tags.indian];
+      stream = "https://stream-23.zeno.fm/m08mkwsyw8quv?zs=0w7MJFPdRfavhR_zPt0M2g";
+    }
+    {
+      station = "Radio Mariam Arabic";
+      stream = "http://www.dreamsiteradiocp4.com:8014/stream";
+      tags = [tags.text tags.arabic];
+    }
+    {
+      station = "Kamchatka Live Rock";
+      stream = "https://radio.kamchatkalive.ru:8103/rock";
+      tags = [tags.rock];
+    }
+    {
+      station = "Kamchatka Live Chillout";
+      stream = "https://radio.kamchatkalive.ru:8103/chillout";
+      tags = [tags.chill];
+    }
+    {
+      station = "Kamchatka Live Dance";
+      stream = "https://radio.kamchatkalive.ru:8103/dance";
+      tags = [tags.party];
+    }
+    {
+      tags = [tags.arabic tags.text];
+      stream = "http://n02.radiojar.com/sxfbks1vfy8uv.mp3";
+      station = "Bahrain Radio 102.3 FM (Arabic Stories)";
+    }
+    {
+      tags = [tags.arabic tags.text tags.holy];
+      stream = "http://s2.voscast.com:12312/;";
+      station = "Bahrain Quran Radio";
+    }
+    {
+      tags = [tags.arabic tags.text tags.holy];
+      stream = "http://162.244.81.30:8224/;";
+      station = "Quran Radio Lebanon";
+    }
+    {
+      tags = [tags.arabic tags.text tags.holy];
+      station = "Coptic for God";
+      stream = "http://66.70.249.70:5832/stream";
+    }
+    {
+      stream = "http://stream-025.zeno.fm/5y95pu36sm0uv?";
+      station = "Hayat FM";
+      tags = [tags.arabic tags.text tags.holy];
+    }
+    {
+      stream = "http://uk2.internet-radio.com:8151/stream";
+      station = "The Quran Radio";
+      tags = [tags.arabic tags.text tags.holy];
+    }
+    {
+      stream = "http://www.radioeins.de/livemp3";
+      station = "radioeins | RBB";
+      tags = [tags.top40 tags.pop];
+    }
   ]
+  ++ map (name: {
+    stream = "https://${name}.stream.publicradio.org/${name}.aac";
+    station = "${name} | Your Classical";
+    tags = [tags.classical];
+  }) ["ycradio" "guitar" "cms" "relax" "lullabies" "choral" "favorites" "chambermusic" "concertband" "holiday"]
+  ++ map (name: {
+    stream = "https://stream.rekt.network/${name}.m4a";
+    station = "${name} | Rekt Network";
+    tags = [tags.rekt];
+  }) ["rekt" "rektory" "nightride" "chillsynth" "datawave" "spacesynth" "darksynth" "horrorsynth" "ebsm"]
+  ++ map (name: {
+    stream = radiotunes name;
+    station = radiotunes-name name;
+  })
+  radiotunes-channels
+  ++ map (name: {
+    stream = rockradio name;
+    station = rockradio-name name;
+    tags = [tags.rock];
+  })
+  rockradio-channels
+  ++ map (name: {
+    stream = jazzradio name;
+    station = jazzradio-name name;
+    tags = [tags.jazz];
+  })
+  jazzradio-channels
+  ++ map (name: {
+    stream = zenradio name;
+    station = zenradio-name name;
+    tags = [tags.chill];
+  })
+  zenradio-channels
+  ++ map (name: {
+    stream = classicalradio name;
+    station = classicalradio-name name;
+    tags = [tags.classical];
+  })
+  classicalradio-channels
 /*
       (caster-fm "TODO" "noasrv" 10182) # https://github.com/cccruzr/albumsyoumusthear/blob/7e00baf575e4d357cd275d54d1aeb717321141a8/HLS/IBERO_90_1.m3u
       (caster-fm "TODO" "shaincast" 20866) # https://github.com/cccruzr/albumsyoumusthear/blob/7e00baf575e4d357cd275d54d1aeb717321141a8/HLS/IBERO_90_1.m3u
 
-CNN news in morse code
-http://cw.dimebank.com:8080/CNNslow
-http://cw.dimebank.com:8080/CNNfast
-
-Orchestral
-http://orion.shoutca.st:8978/stream
 
 LoFi / Chill
 http://ice55.securenetsystems.net/DASH76
 
-News background music
-https://c13014-l-hls.u.core.cdn.streamfarm.net/1000153copo/hk2.m3u8
-
-?
-http://94.23.221.158:9163/stream
-
-Greek radio
-http://radio.hostchefs.net:8046/stream?1520818130148
 
 : http://audiokrishna.com/stations/japa2.mp3
-http://185.105.4.53:2339//;stream.mp3
-http://cast5.servcast.net:1390/;stream.mp3
-
-Hard rock
-http://andromeda.shoutca.st:9254/stream
 
 Rock alternative
 http://icy.unitedradio.it/VirginRockAlternative.mp3
 
-American nautical weather news
-http://ca.radioboss.fm:8149/stream
 
 Christian radio in all languages
 https://jesuscomingfm.com/#
 tamazight http://live.jesuscomingfm.com:8462/;
 
-supposedly good Greek radio
-https://onairmediagroup.live24.gr/kralfm100xanthi
 
 Somali Radio
 http://n0b.radiojar.com/1pu7hhf8kfhvv
 
-Sanskrit
-https://stream-23.zeno.fm/m08mkwsyw8quv?zs=0w7MJFPdRfavhR_zPt0M2g
-https://divyavani.radioca.st/stream
 
 Chillout from kassel
 https://server4.streamserver24.com:2199/tunein/ejanowsk.pls
 
-Radio Mariam Arabic (Rome)
-http://www.dreamsiteradiocp4.com:8014/stream
-
-https://radio.kamchatkalive.ru:8103/rock
-https://radio.kamchatkalive.ru:8103/chillout
-https://radio.kamchatkalive.ru:8103/dance
-
-Fuṣḥā Stories (Bahrain Radio 102.3 FM)
-http://n02.radiojar.com/sxfbks1vfy8uv.mp3
-
-Bahrain Quran Radio
-http://s2.voscast.com:12312/;
+Jazz
+ http://37.251.146.169:7800/stream
 */
 

lib/vim/init.lua

@@ -0,0 +1,155 @@
+local cmp = require("cmp")
+local luasnip = require("luasnip")
+
+if vim.g.snippet_directory then
+  require("luasnip.loaders.from_vscode").lazy_load({
+    paths = { vim.g.snippet_directory }
+  })
+end
+
+luasnip.config.set_config({
+  history = true,
+  updateevents = "TextChanged,TextChangedI",
+  enable_autosnippets = true
+})
+
+cmp.setup({
+  snippet = {
+    expand = function(args)
+      luasnip.lsp_expand(args.body)
+    end,
+  },
+  mapping = {
+    -- https://github.com/hrsh7th/nvim-cmp/wiki/Example-mappings#super-tab-like-mapping
+    ['<Tab>'] = cmp.mapping(function(fallback)
+      if cmp.visible() then
+        cmp.select_next_item()
+      elseif luasnip.expand_or_jumpable() then
+        luasnip.expand_or_jump()
+      else
+        fallback()
+      end
+    end, {"i", "s"}),
+    ["<S-Tab>"] = cmp.mapping(function(fallback)
+      if cmp.visible() then
+        cmp.select_prev_item()
+      elseif luasnip.jumpable(-1) then
+        luasnip.jump(-1)
+      else
+        fallback()
+      end
+    end, { "i", "s" }),
+  },
+  sources = cmp.config.sources({
+    { name = 'nvim_lsp' },
+    { name = 'luasnip' },
+  })
+})
+
+local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
+
+local opts = { noremap=true, silent=true }
+vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, opts)
+vim.keymap.set('n', '<space>dn', vim.diagnostic.goto_prev, opts)
+vim.keymap.set('n', '<space>dp', vim.diagnostic.goto_next, opts)
+vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
+
+-- Use an on_attach function to only map the following keys
+-- after the language server attaches to the current buffer
+local on_attach = function(client, bufnr)
+  -- Enable completion triggered by <c-x><c-o>
+  -- vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
+  -- Mappings.
+  -- See `:help vim.lsp.*` for documentation on any of the below functions
+  local bufopts = { noremap=true, silent=true, buffer=bufnr }
+  vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
+  vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
+  vim.keymap.set('n', 'gt', vim.lsp.buf.type_definition, bufopts)
+  vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
+  vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
+  vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
+  vim.keymap.set('n', '<space>f', vim.lsp.buf.format, bufopts)
+  vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, bufopts)
+  vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
+  vim.keymap.set('n', '<space>wl', function()
+    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+  end, bufopts)
+  vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
+  vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
+  vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
+  vim.keymap.set('n', '<space>f', function() vim.lsp.buf.format { async = true } end, bufopts)
+end
+
+local lsp_flags = {
+  -- This is the default in Nvim 0.7+
+  debounce_text_changes = 150,
+}
+
+local language_servers = {
+  clangd = {},
+  pyright = {}, -- pyright
+  tsserver = {}, -- typescript-language-server
+  cssls = {},
+  elmls = {}, -- elm-language-server
+  -- denols = {}, -- deno built in
+  bashls = {}, -- bash-language-server
+  lua_ls = {
+    Lua = {
+      runtime = {
+        version = 'LuaJIT',
+      },
+      diagnostics = {
+        globals = {'vim'},
+      },
+      workspace = {
+        library = vim.api.nvim_get_runtime_file("", true)
+      },
+      telemetry = {
+        enable = false,
+      }
+    },
+  },
+  hls = {}, -- haskell-language-server
+  html = {}, -- vscode-langservers-extracted
+  jsonls = {}, -- vscode-langservers-extracted
+  nil_ls = {}, -- github:oxalica/nil
+  -- rnix = {}, -- rnix-lsp
+  jqls = {}, -- jq-lsp
+  rust_analyzer = { ["rust-analyzer"] = {} },
+  eslint = {},
+  -- volar? vls?
+  texlab = {
+    texlab = {
+      auxDirectory = ".",
+      bibtexFormatter = "texlab",
+      build = {
+        args = { "-pdf", "-interaction=nonstopmode", "-synctex=1", "%f" },
+        executable = "latexmk",
+        forwardSearchAfter = false,
+        onSave = false
+      },
+      chktex = {
+        onEdit = false,
+        onOpenAndSave = false
+      },
+      diagnosticsDelay = 300,
+      formatterLineLength = 80,
+      forwardSearch = {
+        args = {}
+      },
+      latexFormatter = "latexindent",
+      latexindent = {
+        modifyLineBreaks = false
+      }
+    }
+  }
+}
+
+for server, settings in pairs(language_servers) do
+  require('lspconfig')[server].setup{
+    on_attach = on_attach,
+    flags = lsp_flags,
+    settings = settings,
+    capabilities = capabilities
+  }
+end

lib/vim/init.vim

@@ -3,26 +3,12 @@ vnoremap a= :Tabularize /=<CR>
 vnoremap a; :Tabularize /::<CR>
 vnoremap a- :Tabularize /-><CR>
 
-nnoremap <C-p> :FZF<CR>
-nnoremap <C-l> :Rg<CR>
-let g:fzf_layout = { 'down': '~15%' }
-
 colorscheme dim
-" transparent background
-hi Normal guibg=NONE ctermbg=NONE
-
-let mapleader = ","
-let maplocalleader="\\"
 
 " noremap <Leader>h :<C-u>split<CR>
 " noremap <Leader>v :<C-u>vsplit<CR>
 noremap <Leader>gs :Git<CR>
 noremap <Leader>gc :Git commit<CR>
-noremap <leader>n :bn<CR>
-noremap <leader>p :bp<CR>
-noremap <leader>c :bd<CR>
-noremap <leader>b :Buffers<CR>
-noremap <leader>t :Tags<CR>
 
 " reindent whole file
 noremap <leader>i mzgg=G`z
@@ -30,18 +16,11 @@ noremap <leader>i mzgg=G`z
 " replace all
 nnoremap S :%s//g<Left><Left>
 
-nnoremap <Leader>a <Plug>(ale_hover)
-nnoremap <Leader>d <Plug>(ale_go_to_definition_in_tab)
-nnoremap <Leader>rf <Plug>(ale_find_references)
-
 " Hit `%` on `if` to jump to `else`.
 runtime macros/matchit.vim
 
-filetype plugin indent on
-set autoindent
 set notitle
 set nospell
-set smartcase ignorecase " you need these two
 set backspace=indent,eol,start
 set hidden
 set ruler
@@ -51,21 +30,13 @@ set number
 set path+=**
 set splitbelow splitright
 set wildmenu wildmode=longest,list,full
-set shortmess+=aI
-set nowritebackup noswapfile
-set mouse=a
+set shortmess+=ac
 set showmatch
-set encoding=utf8 ffs=unix,dos,mac
 set smartindent
-set wrap
-set nohlsearch
-set clipboard=unnamedplus
-set nopaste
-set list listchars=tab:⇥\ ,extends:❯,precedes:❮,nbsp:␣,trail:· showbreak=¬
+set hlsearch
 set foldlevelstart=30
 
-iabbrev ddate <C-R>=strftime("%F")<CR>
-iabbrev dtime <C-R>=strftime("%F %T")<CR>
+nnoremap <C-H> <CMD>set nohlsearch<CR>
 
 let g:netrw_banner=0
 let g:netrw_browse_split=4
@@ -126,6 +97,7 @@ augroup filetypes
   autocmd bufnewfile,bufread *.rust packadd rust-vim
   autocmd bufnewfile,bufread *.csv packadd csv.vim | set filetype=csv
   autocmd bufnewfile,bufread *.tex packadd vimtex | set filetype=tex
+  autocmd bufnewfile,bufread *.typ packadd typst.vim | set filetype=typst
   autocmd bufnewfile,bufread *.ics packadd icalendar.vim | set filetype=icalendar
   autocmd bufnewfile,bufread *.ts packadd typescript-vim | set filetype=typescript
   autocmd bufnewfile,bufread *.jq packadd jq.vim
@@ -148,47 +120,9 @@ autocmd bufreadpost *
       \ endif
 autocmd bufreadpre * setlocal foldmethod=indent
 
-set completeopt=noinsert,menuone,noselect
+set completeopt=menu,menuone,noselect
 set complete+=kspell
 
-let g:SuperTabDefaultCompletionType = 'context'
-
-let g:haskell_enable_quantification = 1
-let g:haskell_enable_recursivedo = 1
-let g:haskell_enable_arrowsyntax = 1
-let g:haskell_enable_pattern_synonyms = 1
-
 let g:pandoc#syntax#conceal#use = 0
 let g:pandoc#modules#disabled = []
 let g:pandoc#spell#default_langs = ['en', 'de']
-
-let g:ale_linters = {
-      \ 'css': ['csslint'],
-      \ 'haskell': ['ghc', 'cabal-ghc', 'hlint', 'ormolu'],
-      \ 'html': ['tidy', 'proselint'],
-      \ 'latex': ['lacheck', 'chktex', 'proselint'],
-      \ 'pandoc': ['proselint'],
-      \ 'ruby': ['rubocop'],
-      \ 'json': ['jsonlint'],
-      \ 'rust': ['cargo'],
-      \ 'python': ['pyls'],
-      \}
-let g:ale_fixers = {
-      \ '*': ['remove_trailing_lines', 'trim_whitespace'],
-      \ 'javascript': ['prettier'],
-      \ 'typescript': ['prettier'],
-      \ 'css': ['prettier'],
-      \ 'html': ['prettier'],
-      \ 'json': ['jq'],
-      \ 'python': ['black'],
-      \ 'rust': ['rustfmt']
-      \}
-let g:ale_set_quickfix = 1
-
-let g:ale_fix_on_save = 1
-autocmd bufnewfile,bufread elm.json let g:ale_fix_on_save = 0
-
-let g:ale_completion_enabled = 1
-
-let g:vimwiki_list = [{'path': '~/notes/',
-      \ 'syntax': 'markdown', 'ext': '.md'}]

lib/vim/shared.vim

@@ -0,0 +1,30 @@
+nnoremap <C-p> :FZF<CR>
+nnoremap <C-l> :Rg<CR>
+let g:fzf_layout = { 'down': '~15%' }
+
+" transparent background
+hi Normal guibg=NONE ctermbg=NONE
+
+let mapleader = ","
+let maplocalleader="\\"
+noremap <leader>n :bn<CR>
+noremap <leader>p :bp<CR>
+noremap <leader>c :bd<CR>
+noremap <leader>b :Buffers<CR>
+noremap <leader>t :Tags<CR>
+
+set nocompatible
+syntax on
+filetype plugin indent on
+set autoindent
+set smartcase ignorecase " you need these two
+set nowritebackup noswapfile
+set mouse=a
+set encoding=utf8 ffs=unix,dos,mac
+set wrap
+set list listchars=tab:⇥\ ,extends:❯,precedes:❮,nbsp:␣,trail:· showbreak=¬
+set clipboard=unnamedplus
+set nopaste
+
+iabbrev ddate <C-R>=strftime("%F")<CR>
+iabbrev dtime <C-R>=strftime("%F %T")<CR>

modules/dropbox.nix

@@ -1,34 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-with lib; let
-  cfg = config.niveum.dropbox;
-in {
-  options.niveum.dropbox = {enable = mkEnableOption "Dropbox";};
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [pkgs.dropbox-cli];
-
-    networking.firewall = {
-      allowedTCPPorts = [17500];
-      allowedUDPPorts = [17500];
-    };
-
-    systemd.user.services.dropbox = {
-      description = "Dropbox synchronisation service";
-      wantedBy = ["graphical-session.target"];
-      serviceConfig = {
-        ExecStart = "${pkgs.dropbox.out}/bin/dropbox";
-        ExecReload = "${pkgs.coreutils.out}/bin/kill -HUP $MAINPID";
-        KillMode = "control-group"; # upstream recommends process
-        Restart = "on-failure";
-        PrivateTmp = true;
-        ProtectSystem = "full";
-        Nice = 10;
-      };
-    };
-  };
-}

modules/hledger.nix

@@ -1,86 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.niveum.hledger;
-  hledger-git = pkgs.writers.writeDashBin "hledger-git" ''
-    LEDGER_DIR="$(dirname $LEDGER_FILE)"
-    GIT="${pkgs.git}/bin/git -C ''${LEDGER_DIR}"
-    if [ "$1" = entry ]; then
-      ${cfg.package}/bin/hledger balance -V > "$LEDGER_DIR/balance.txt"
-      $GIT add balance.txt
-      $GIT commit --all --message="$(date -Im)"
-    else
-      $GIT $*
-    fi
-  '';
-  hledger-edit = pkgs.writers.writeDashBin "hledger-edit" ''
-    LEDGER_DIR="$(dirname $LEDGER_FILE)"
-    $EDITOR ''${LEDGER_DIR}/current.journal
-  '';
-in {
-  options.niveum.hledger = {
-    enable = mkEnableOption "hledger";
-    package = mkOption {
-      type = types.package;
-      default = pkgs.hledger;
-    };
-    ledgerFile = mkOption {
-      type = types.str;
-      default = null;
-    };
-    server = {
-      enable = mkEnableOption "hledger server";
-      port = mkOption {
-        type = types.port;
-        default = 5000;
-      };
-      host = mkOption {
-        type = types.str;
-        default = "127.0.0.1";
-      };
-      capabilities = mkOption {
-        type = types.listOf (types.enum ["view" "add" "manage"]);
-        default = ["view" "add"];
-      };
-      flags = mkOption {
-        type = types.listOf types.str;
-        default = [];
-      };
-      user = mkOption {type = types.attrs;};
-      package = mkOption {
-        type = types.package;
-        default = pkgs.hledger-web;
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [cfg.package hledger-git hledger-edit];
-
-    environment.variables.LEDGER_FILE =
-      mkIf (cfg.ledgerFile != null) cfg.ledgerFile;
-
-    systemd.services.hledger-web = mkIf cfg.server.enable {
-      description = "hledger server";
-      wantedBy = ["multi-user.target"];
-      serviceConfig = {
-        Restart = "always";
-        ExecStart = ''
-          ${cfg.server.package}/bin/hledger-web \
-          --port=${toString cfg.server.port} \
-          --host=${cfg.server.host} \
-          --capabilities=${concatStringsSep "," cfg.server.capabilities} \
-          ${concatStringsSep " " cfg.server.flags}
-        '';
-        User = cfg.server.user.name;
-        PrivateTemp = true;
-        RuntimeDirectory = "hledger-web";
-        WorkingDirectory = "%t/hledger-web";
-      };
-    };
-  };
-}

modules/htgen.nix

@@ -0,0 +1,47 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  htgen = pkgs.callPackage ../packages/htgen.nix {};
+in {
+  options.services.htgen = lib.mkOption {
+    default = {};
+    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
+      options = {
+        enable = lib.mkEnableOption "htgen-${config._module.args.name}";
+        port = lib.mkOption {
+          type = lib.types.int;
+        };
+        script = lib.mkOption {
+          type = lib.types.str;
+        };
+      };
+    }));
+  };
+  config = {
+    systemd.services =
+      lib.mapAttrs' (
+        name: cfg:
+          lib.nameValuePair "htgen-${name}" {
+            wantedBy = ["multi-user.target"];
+            after = ["network.target"];
+            environment = {
+              HOME = "/var/lib/htgen-${name}";
+              HTGEN_PORT = toString cfg.port;
+              HTGEN_SCRIPT = cfg.script;
+            };
+            serviceConfig = {
+              SyslogIdentifier = "htgen-${name}";
+              DynamicUser = true;
+              StateDirectory = "htgen-${name}";
+              PrivateTmp = true;
+              Restart = "always";
+              ExecStart = "${htgen}/bin/htgen --serve";
+            };
+          }
+      )
+      config.services.htgen;
+  };
+}

modules/minecraft.nix

@@ -1,13 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-with lib; let
-  cfg = config.niveum.minecraft;
-in {
-  options.niveum.minecraft = {enable = mkEnableOption "Minecraft";};
-
-  config = mkIf cfg.enable {environment.systemPackages = [pkgs.minecraft];};
-}

modules/moodle-dl.nix

@@ -23,6 +23,13 @@ in {
         '';
       };
 
+      tokensFile = mkOption {
+        type = types.path;
+        description = ''
+          Path to a JSON file containing a "token" key and, optionally, a "telegram"."token" key.
+        '';
+      };
+
       notifyOnly = mkOption {
         default = false;
         type = types.bool;
@@ -74,7 +81,7 @@ in {
           Group = config.users.groups.moodle-dl.name;
           WorkingDirectory = cfg.directory;
           ExecStart = "${cfg.package}/bin/moodle-dl ${lib.optionalString cfg.notifyOnly "--without-downloading-files"}";
-          ExecStartPre = "${pkgs.coreutils}/bin/ln -sfn ${toString moodle-dl-json} ${cfg.directory}/config.json";
+          ExecStartPre = pkgs.writers.writeDash "moodle-dl-config" "${pkgs.jq}/bin/jq -s '.[0] * .[1]' ${toString moodle-dl-json} ${toString cfg.tokensFile} > ${cfg.directory}/config.json";
         }
         (mkIf (cfg.directory == stateDirectoryDefault) {StateDirectory = "moodle-dl";})
       ];

modules/panoptikon.nix

@@ -0,0 +1,131 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  options.services.panoptikon = {
+    enable = lib.mkEnableOption "Generic command output / website watcher";
+    watchers = lib.mkOption {
+      type = lib.types.attrsOf (lib.types.submodule (watcher: {
+        options = {
+          script = lib.mkOption {
+            type = lib.types.path;
+            description = ''
+              A script whose stdout is to be watched.
+            '';
+            example = ''
+              pkgs.writers.writeDash "github-meta" '''
+                ''${pkgs.curl}/bin/curl -sSL https://api.github.com/meta | ''${pkgs.jq}/bin/jq
+              '''
+            '';
+          };
+          frequency = lib.mkOption {
+            type = lib.types.str;
+            description = ''
+              How often to run the script. See systemd.time(7) for more information about the format.
+            '';
+            example = "*:0/3";
+            default = "daily";
+          };
+          reporters = lib.mkOption {
+            type = lib.types.listOf lib.types.path;
+            description = ''
+              A list of scripts that take the diff (if any) via stdin and report it (e.g. to IRC, Telegram or Prometheus). The name of the watcher will be in the $PANOPTIKON_WATCHER environment variable.
+            '';
+            example = ''
+              [
+                (pkgs.writers.writeDash "telegram-reporter" '''
+                  ''${pkgs.curl}/bin/curl -X POST https://api.telegram.org/bot''${TOKEN}/sendMessage \
+                    -d chat_id=123456 \
+                    -d text="$(cat)"
+                ''')
+                (pkgs.writers.writeDash "notify" '''
+                  ''${pkgs.libnotify}/bin/notify-send "$PANOPTIKON_WATCHER has changed."
+                ''')
+              ]
+            '';
+          };
+        };
+        config = {};
+      }));
+    };
+  };
+
+  config = let
+    cfg = config.services.panoptikon;
+  in
+    lib.mkIf cfg.enable {
+      users.extraUsers.panoptikon = {
+        isSystemUser = true;
+        createHome = true;
+        home = "/var/lib/panoptikon";
+        group = "panoptikon";
+      };
+
+      users.extraGroups.panoptikon = {};
+
+      systemd.timers = lib.attrsets.mapAttrs' (watcherName: _:
+        lib.nameValuePair "panoptikon-${watcherName}" {
+          timerConfig.RandomizedDelaySec = toString (60 * 60);
+        })
+      cfg.watchers;
+
+      systemd.services =
+        {
+          setup-panoptikon = {
+            enable = true;
+            wantedBy = ["multi-user.target"];
+            serviceConfig = {
+              Type = "oneshot";
+              User = "panoptikon";
+              Group = "panoptikon";
+              WorkingDirectory = "/var/lib/panoptikon";
+              Restart = "on-failure";
+            };
+            script = ''
+              ${pkgs.git}/bin/git init --quiet
+              ${pkgs.git}/bin/git config user.email "panoptikon@${config.networking.hostName}"
+              ${pkgs.git}/bin/git config user.name Panoptikon
+            '';
+          };
+        }
+        // lib.attrsets.mapAttrs' (watcherName: watcherOptions:
+          lib.nameValuePair "panoptikon-${watcherName}" {
+            enable = true;
+            after = ["setup-panoptikon.service"];
+            startAt = watcherOptions.frequency;
+            serviceConfig = {
+              Type = "oneshot";
+              User = "panoptikon";
+              Group = "panoptikon";
+              WorkingDirectory = "/var/lib/panoptikon";
+              RestartSec = "60";
+              Restart = "on-failure";
+            };
+            unitConfig = {
+              StartLimitIntervalSec = "300";
+              StartLimitBurst = "5";
+            };
+            environment.PANOPTIKON_WATCHER = watcherName;
+            wants = ["network-online.target"];
+            script = ''
+              set -efu
+
+              ${watcherOptions.script} > ${watcherName}
+
+              if [ -n "$(${pkgs.git}/bin/git diff -- ${watcherName})" ]; then
+                ${lib.strings.concatMapStringsSep "\n" (reporter: ''
+                  ${pkgs.git}/bin/git diff HEAD^ -- ${watcherName} | ${reporter}
+                '')
+                watcherOptions.reporters}
+                :
+              fi
+
+              ${pkgs.git}/bin/git add ${watcherName}
+              ${pkgs.git}/bin/git commit --message "${watcherName} / $(${pkgs.coreutils}/bin/date -Is)" || :
+            '';
+          })
+        cfg.watchers;
+    };
+}

modules/power-action.nix

@@ -0,0 +1,94 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.services.power-action;
+
+  out = {
+    options.services.power-action = api;
+    config = lib.mkIf cfg.enable imp;
+  };
+
+  api = {
+    enable = mkEnableOption "power-action";
+    battery = mkOption {
+      type = types.str;
+      default = "BAT0";
+    };
+    user = mkOption {
+      type = types.str;
+      default = "power-action";
+    };
+    startAt = mkOption {
+      type = types.str;
+      default = "*:0/1";
+    };
+    plans = mkOption {
+      type = with types;
+        attrsOf (submodule {
+          options = {
+            charging = mkOption {
+              type = nullOr bool;
+              default = null;
+              description = ''
+                check for charging status.
+                null = don't care
+                true = only if system is charging or unknown
+                false = only if system is discharging
+              '';
+            };
+            upperLimit = mkOption {
+              type = int;
+            };
+            lowerLimit = mkOption {
+              type = int;
+            };
+            action = mkOption {
+              type = path;
+            };
+          };
+        });
+    };
+  };
+
+  imp = {
+    systemd.services.power-action = {
+      serviceConfig = rec {
+        ExecStart = startScript;
+        User = cfg.user;
+      };
+      startAt = cfg.startAt;
+    };
+  };
+
+  startScript = pkgs.writers.writeDash "power-action" ''
+    set -euf
+
+    power="$(${powerlvl})"
+    state="$(${state})"
+    ${concatStringsSep "\n" (mapAttrsToList writeRule cfg.plans)}
+  '';
+  charging_check = plan:
+    if (plan.charging == null)
+    then ""
+    else if plan.charging
+    then ''&& [ "$state" = "true" ]''
+    else ''&& ! [ "$state" = "true" ]'';
+
+  writeRule = _: plan: "if [ $power -ge ${toString plan.lowerLimit} ] && [ $power -le ${toString plan.upperLimit} ] ${charging_check plan}; then ${plan.action}; fi";
+
+  powerlvl = pkgs.writers.writeDash "powerlvl" ''
+    cat /sys/class/power_supply/${cfg.battery}/capacity
+  '';
+
+  state = pkgs.writers.writeDash "state" ''
+    if [ "$(cat /sys/class/power_supply/${cfg.battery}/status)" = "Discharging" ]
+      then echo "false"
+      else echo "true"
+    fi
+  '';
+in
+  out

modules/spotifyd.nix

@@ -1,64 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.services.spotifyd;
-  toml = pkgs.formats.toml {};
-  spotifydConf =
-    if cfg.settings != {}
-    then toml.generate "spotify.conf" cfg.settings
-    else pkgs.writeText "spotifyd.conf" cfg.config;
-in {
-  options = {
-    services.spotifyd = {
-      enable = mkEnableOption "spotifyd, a Spotify playing daemon";
-
-      config = mkOption {
-        default = "";
-        type = types.lines;
-        description = ''
-          (Deprecated) Configuration for Spotifyd. For syntax and directives, see
-          <link xlink:href="https://github.com/Spotifyd/spotifyd#Configuration"/>.
-        '';
-      };
-
-      settings = mkOption {
-        default = {};
-        type = toml.type;
-        description = ''
-          Configuration for Spotifyd. For syntax and directives, see
-          <link xlink:href="https://github.com/Spotifyd/spotifyd#Configuration"/>.
-        '';
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    assertions = [
-      {
-        assertion = (cfg.config == "" && cfg.settings != {}) || (cfg.config != "" && cfg.settings == {});
-        message = "Using the stringly typed .config attribute is discouraged. Use the TOML typed .settings attribute instead.";
-      }
-    ];
-
-    systemd.services.spotifyd = {
-      wantedBy = ["multi-user.target"];
-      after = ["network-online.target" "sound.target"];
-      description = "spotifyd, a Spotify playing daemon";
-      environment.SHELL = "/bin/sh";
-      serviceConfig = {
-        ExecStart = "${pkgs.spotifyd}/bin/spotifyd --no-daemon --cache-path /var/cache/spotifyd --config-path ${spotifydConf}";
-        Restart = "always";
-        RestartSec = 12;
-        DynamicUser = true;
-        CacheDirectory = "spotifyd";
-        SupplementaryGroups = ["audio"];
-      };
-    };
-  };
-
-  meta.maintainers = [maintainers.anderslundstedt];
-}

modules/telegram-bot.nix

@@ -11,19 +11,27 @@ with lib; let
     nameValuePair "telegram-bot-${name}" {
       enable = bot.enable;
       startAt = bot.time;
-      serviceConfig.Type = "oneshot";
+      serviceConfig = {
+        Type = "oneshot";
+        LoadCredential = "token:${bot.tokenFile}";
+      };
       wants = ["network-online.target"];
-      script = strings.concatStringsSep "\n" (["QUOTE=$(${bot.command})" "if [ -n \"$QUOTE\" ]; then" "echo $QUOTE >&2"]
-        ++ map (chatId: ''
-          ${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"]);
+      script = ''
+        export TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")"
+        QUOTE=$(${bot.command})
+        if [ -n "$QUOTE" ]; then
+          echo $QUOTE >&2
+          ${strings.concatStringsSep "\n" (map (chatId: ''
+            ${pkgs.curl}/bin/curl -X POST "https://api.telegram.org/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
+      '';
     };
 in {
   options.niveum.telegramBots = mkOption {
@@ -31,7 +39,7 @@ in {
       options = {
         enable = mkEnableOption "Telegram bot";
         time = mkOption {type = types.str;};
-        token = mkOption {type = types.strMatching "[0-9A-Za-z:-]+";};
+        tokenFile = mkOption {type = types.path;};
         chatIds = mkOption {
           type = types.listOf (types.strMatching "-?[0-9]+|@[A-Za-z0-9]+");
         };

modules/traadfri.nix

@@ -1,49 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-with lib; let
-  cfg = config.niveum.traadfri;
-  traadfri = pkgs.callPackage <traadfri> {
-    libcoap = pkgs.callPackage <niveum/packages/libcoap.nix> {tls = true;};
-  };
-in {
-  options.niveum.traadfri = {
-    enable = mkEnableOption "Trådfri CLI";
-    user = mkOption {type = types.str;};
-    host = mkOption {type = types.str;};
-    key = mkOption {type = types.str;};
-    rooms = mkOption {
-      type = types.attrsOf types.int;
-      default = {};
-    };
-    bulbs = mkOption {
-      type = types.attrsOf types.int;
-      default = {};
-    };
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages =
-      [
-        (pkgs.writers.writeDashBin "traadfri" ''
-          TRAADFRI_USER="${cfg.user}" \
-          TRAADFRI_KEY="${cfg.key}" \
-          TRAADFRI_HUB="${cfg.host}" \
-          ${traadfri}/bin/traadfri $@
-        '')
-      ]
-      ++ lib.mapAttrsToList (name: value:
-        pkgs.writers.writeDashBin "traadfri-${name}" ''
-          exec traadfri --target Room ${toString value} "$@"
-        '')
-      cfg.rooms
-      ++ lib.mapAttrsToList (name: value:
-        pkgs.writers.writeDashBin "traadfri-${name}" ''
-          exec traadfri --target Bulb ${toString value} "$@"
-        '')
-      cfg.bulbs;
-  };
-}

modules/tuna.nix

@@ -1,103 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  tuna = pkgs.callPackage <tuna> {};
-  cfg = config.services.tuna;
-in {
-  imports = [];
-
-  options.services.tuna = {
-    enable = mkEnableOption "Tuna, an MPD web UI for radio streams";
-
-    webPort = mkOption {
-      type = types.port;
-      default = 4200;
-    };
-
-    stations = mkOption {
-      default = [];
-      type = types.listOf (types.submodule {
-        options = {
-          id = mkOption {
-            type = types.int;
-            description = "A unique identifier of the station";
-          };
-          station = mkOption {
-            type = types.str;
-            description = "Name of the station that should be displayed";
-          };
-          desc = mkOption {
-            type = types.nullOr types.str;
-            description = "Short description of the station (optional)";
-          };
-          logo = mkOption {
-            type = types.str;
-            description = "URL to a logo of the station (any size)";
-          };
-          stream = mkOption {
-            type = types.str;
-            description = "URL to the stream of the radio station (in a format supported by MPD such as MP3, OGG, ...)";
-          };
-        };
-      });
-    };
-
-    stationsFile = mkOption {
-      type = types.path;
-      default = (pkgs.formats.json {}).generate "stations.json" cfg.stations;
-    };
-
-    package = mkOption {
-      type = types.package;
-      default = tuna;
-    };
-
-    mpd = {
-      host = mkOption {
-        type = types.str;
-        default = "localhost";
-        description = "The host where MPD is listening.";
-        example = "localhost";
-      };
-
-      port = mkOption {
-        type = types.port;
-        default = config.services.mpd.network.port;
-        description = "The port where MPD is listening.";
-        example = 6600;
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    users.users.tuna = {
-      isSystemUser = true;
-      group = "tuna";
-    };
-    users.groups.tuna = {};
-    # ref https://github.com/florianheinemann/MPD.FM/blob/9d037cf87597b26ae2f10ba9feea48946ad6cc68/service/MPD.FM.service
-    systemd.services.tuna = {
-      wantedBy = ["multi-user.target"];
-      after = ["mpd.service"];
-      script = "${cfg.package}/bin/tuna";
-      environment = {
-        NODE_ENV = "production";
-        MPD_HOST = cfg.mpd.host;
-        MPD_PORT = toString cfg.mpd.port;
-        PORT = toString cfg.webPort;
-        STATION_FILE = cfg.stationsFile;
-      };
-      serviceConfig = {
-        Restart = "always";
-        StandardOutput = "syslog";
-        StandardError = "syslog";
-        SyslogIdentifier = "tuna";
-        User = "tuna";
-      };
-    };
-  };
-}