host ical ephemeris MVP

configs/0ad.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = [ pkgs.zeroad ];
+  networking.firewall = {
+    allowedTCPPorts = [ 20595 ];
+    allowedUDPPorts = [ 20595 ];
+  };
+}

configs/admin-essentials.nix

@@ -4,7 +4,7 @@
   lib,
   ...
 }: let
-  darwin = lib.strings.hasSuffix "-darwin" pkgs.stdenv.hostPlatform.system;
+  darwin = lib.strings.hasSuffix "-darwin" pkgs.system;
 in {
   environment.systemPackages =
     [

configs/aerc.nix

@@ -20,6 +20,12 @@ in {
       group = config.users.users.me.group;
       mode = "400";
     };
+    email-password-letos = {
+      file = ../secrets/email-password-letos.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;
@@ -105,6 +111,18 @@ in {
           smtp.port = 587;
           smtp.tls.useStartTls = true;
         };
+      letos =
+        lib.recursiveUpdate defaults
+        {
+          userName = "slfletos";
+          address = "letos.sprachlit@hu-berlin.de";
+          passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-letos.path}";
+          imap.host = "mailbox.cms.hu-berlin.de";
+          imap.port = 993;
+          smtp.host = "mailhost.cms.hu-berlin.de";
+          smtp.port = 25;
+          smtp.tls.useStartTls = true;
+        };
       posteo =
         lib.recursiveUpdate defaults
         rec {

configs/bash.nix

@@ -5,6 +5,6 @@
     interactiveShellInit = ''
       set -o vi
     '';
-    completion.enable = true;
+    enableCompletion = true;
   };
 }

configs/bots/autorenkalender.nix

@@ -1,9 +1,17 @@
 {
+  pkgs,
+  lib,
   config,
-  inputs,
   ...
 }: let
-  autorenkalender = inputs.autorenkalender.packages.x86_64-linux.default;
+  autorenkalender-package = pkgs.fetchFromGitHub {
+    owner = "kmein";
+    repo = "autorenkalender";
+    rev = "cf49a7b057301332d980eb47042a626add93db66";
+    sha256 = "1pa7sjg33vdnjianrqldv445jdzzv3mn231ljk1j58hs0cd505gs";
+  };
+  autorenkalender =
+    pkgs.python3Packages.callPackage autorenkalender-package {};
 in {
   niveum.bots.autorenkalender = {
     enable = true;

configs/bots/default.nix

@@ -17,15 +17,11 @@ in {
     ./hesychius.nix
     ./smyth.nix
     ./nachtischsatan.nix
-    # ./tlg-wotd.nix TODO reenable
+    ./tlg-wotd.nix
     ./celan.nix
     ./nietzsche.nix
   ];
 
-  age.secrets = {
-    telegram-token-kmein.file = ../../secrets/telegram-token-kmein.age;
-  };
-
   systemd.tmpfiles.rules = map (path:
     tmpfilesConfig {
       type = "d";

configs/bots/smyth.nix

@@ -20,31 +20,15 @@
     command = toString (pkgs.writers.writeDash "random-smyth" ''
       set -efu
 
-      good_curl() {
-        ${pkgs.curl}/bin/curl "$@" \
-          --compressed \
-          -H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8' \
-          -H 'Accept-Language: en-US,en;q=0.5' \
-          -H 'DNT: 1' \
-          -H 'Connection: keep-alive' \
-          -H 'Upgrade-Insecure-Requests: 1' \
-          -H 'Sec-Fetch-Dest: document' \
-          -H 'Sec-Fetch-Mode: navigate' \
-          -H 'Sec-Fetch-Site: cross-site' \
-          -H 'Priority: u=0, i' \
-          -H 'Pragma: no-cache' \
-          -H 'Cache-Control: no-cache'
-      }
-
       RANDOM_SECTION=$(
-        good_curl -sSL http://www.perseus.tufts.edu/hopper/xmltoc?doc=Perseus%3Atext%3A1999.04.0007%3Asmythp%3D1 \
+        ${pkgs.curl}/bin/curl -sSL http://www.perseus.tufts.edu/hopper/xmltoc?doc=Perseus%3Atext%3A1999.04.0007%3Asmythp%3D1 \
           | ${pkgs.gnugrep}/bin/grep -o 'ref="[^"]*"' \
           | ${pkgs.coreutils}/bin/shuf -n1 \
           | ${pkgs.gnused}/bin/sed 's/^ref="//;s/"$//'
       )
 
       url="http://www.perseus.tufts.edu/hopper/text?doc=$RANDOM_SECTION"
-      good_curl -sSL "$url"\
+      ${pkgs.curl}/bin/curl -sSL "$url"\
         | ${pkgs.htmlq}/bin/htmlq '#text_main' \
         | ${pkgs.gnused}/bin/sed 's/<\/\?hr>//g' \
         | ${pkgs.pandoc}/bin/pandoc -f html -t plain --wrap=none

configs/bots/tlg-wotd.nix

@@ -3,14 +3,11 @@
   lib,
   config,
   niveumPackages,
-  unstablePackages,
   ...
 }: let
   mastodonEndpoint = "https://social.krebsco.de";
 in {
   systemd.services.bot-tlg-wotd = {
-    # TODO reenable
-    # once https://github.com/NixOS/nixpkgs/pull/462893 is in stable NixOS
     enable = true;
     wants = ["network-online.target"];
     startAt = "9:30";
@@ -45,8 +42,9 @@ in {
 
       #ancientgreek #classics #wotd #wordoftheday
 
-      transliteration=$(${pkgs.writers.writePython3 "translit.py" {
+      transliteration=$(${pkgs.writers.makePythonWriter pkgs.python311 pkgs.python311Packages pkgs.python3Packages "translit.py" {
-        libraries = py: [ py.cltk ];
+        # revert to pkgs.writers.writePython3 once https://github.com/NixOS/nixpkgs/pull/353367 is merged
+        libraries = [ pkgs.python3Packages.cltk ];
       } ''
         import sys
         from cltk.phonology.grc.transcription import Transcriber
@@ -151,6 +149,7 @@ in {
   };
 
   age.secrets = {
+    telegram-token-kmein.file = ../../secrets/telegram-token-kmein.age;
     mastodon-token-tlgwotd.file = ../../secrets/mastodon-token-tlgwotd.age;
   };
 

configs/browser.nix

@@ -6,7 +6,7 @@
 }: {
   environment.systemPackages = [
     niveumPackages.cro
-    pkgs.tor-browser
+    pkgs.tor-browser-bundle-bin
     pkgs.firefox
     pkgs.brave
   ];

configs/default.nix

@@ -3,6 +3,7 @@
   lib,
   config,
   niveumPackages,
+  unstablePackages,
   inputs,
   ...
 }:
@@ -26,6 +27,9 @@ in
             dmenu = pkgs.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
           };
           permittedInsecurePackages = [
+            "qtwebkit-5.212.0-alpha4"
+            "zotero-6.0.26"
+            "electron-25.9.0"
           ];
         };
       };
@@ -135,6 +139,7 @@ in
         };
       };
     }
+    { programs.command-not-found.enable = true; }
     {
       programs.gnupg = {
         agent = {
@@ -210,12 +215,13 @@ in
     ./direnv.nix
     ./docker.nix
     ./dunst.nix
+    ./flix.nix
     ./fonts.nix
     ./fzf.nix
     ./git.nix
     ./hledger.nix
     ./htop.nix
-    ./uni.nix
+    ./fu-berlin.nix
     ./i3.nix
     ./i3status-rust.nix
     ./keyboard.nix
@@ -230,8 +236,8 @@ in
     ./nix.nix
     ./newsboat.nix
     ./flameshot.nix
+    ./fritzbox.nix
     ./packages.nix
-    ./virtualization.nix
     ./picom.nix
     ./stardict.nix
     ./polkit.nix
@@ -256,6 +262,7 @@ in
       '';
     }
     ./tor.nix
+    ./stw-berlin.nix
     ./mastodon-bot.nix
     {
       fileSystems."${remoteDir}/fritz" = {

configs/flameshot.nix

@@ -15,7 +15,7 @@
         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)'';
+        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

@@ -0,0 +1,98 @@
+{
+  config,
+  pkgs,
+  ...
+}: let
+  flixLocation = "/media/flix";
+  flixLocationNew = "/media/flix-new";
+  cacheLocation = "/var/cache/flix";
+  indexFilename = "index";
+  indexFilenameNew = "index-new";
+  flixUser = "flix";
+  flixGroup = "users";
+  inherit (import ../lib) tmpfilesConfig;
+in {
+  fileSystems.${flixLocation} = {
+    device = "prism.r:/export/download";
+    fsType = "nfs";
+    options = [
+      "noauto"
+      "noatime"
+      "nodiratime"
+      "x-systemd.automount"
+      "x-systemd.device-timeout=1"
+      "x-systemd.idle-timeout=1min"
+      "x-systemd.requires=tinc.retiolum.service"
+      "user"
+      "_netdev"
+    ];
+  };
+
+  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";
+      path = cacheLocation;
+      mode = "0750";
+      user = flixUser;
+      group = flixGroup;
+    })
+  ];
+
+  systemd.services.flix-index = {
+    description = "Flix indexing service";
+    wants = ["network-online.target"];
+    script = ''
+      cp ${flixLocation}/index ./${indexFilename}
+      cp ${flixLocationNew}/index ./${indexFilenameNew}
+    '';
+    startAt = "hourly";
+    serviceConfig = {
+      Type = "oneshot";
+      User = flixUser;
+      Group = flixGroup;
+      WorkingDirectory = cacheLocation;
+    };
+  };
+
+  users.extraUsers.${flixUser} = {
+    isSystemUser = true;
+    createHome = true;
+    home = cacheLocation;
+    group = flixGroup;
+  };
+
+  environment.systemPackages = [
+    (pkgs.writers.writeDashBin "mpv-simpsons" ''
+      set -efu
+      cd "${flixLocation}/download"
+      [ -f "${cacheLocation}/${indexFilename}" ] || exit 1
+
+      cat "${cacheLocation}/${indexFilename}" \
+        | ${pkgs.gnugrep}/bin/grep -i 'simpsons.*mkv' \
+        | shuf \
+        | ${pkgs.findutils}/bin/xargs -d '\n' ${pkgs.mpv}/bin/mpv
+    '')
+    (pkgs.writers.writeDashBin "flixmenu" ''
+      set -efu
+      (
+        ${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

@@ -102,12 +102,11 @@ in {
       lmodern
       merriweather
       ocr-a
-      montserrat
       roboto
       roboto-mono
       noto-fonts
       noto-fonts-cjk-sans
-      noto-fonts-color-emoji
+      noto-fonts-emoji
       roboto-slab
       scheherazade-new
       source-code-pro
@@ -115,7 +114,7 @@ in {
       source-serif-pro
       theano
       niveumPackages.tocharian-font
-      vista-fonts
+      vistafonts
       vollkorn
       zilla-slab
     ]; # google-fonts league-of-moveable-type

configs/fritzbox.nix

@@ -0,0 +1,19 @@
+{ config, ... }:
+{
+  networking.firewall.allowedUDPPorts = [ 51820 ];
+  networking.wg-quick.interfaces.aether = {
+    autostart = false;
+    dns = ["192.168.178.1" "fritz.box"];
+    listenPort = 51820;
+    privateKeyFile = config.age.secrets.wireguard-aether-key.path;
+    peers = [
+      {
+        allowedIPs = ["192.168.178.0/24" "0.0.0.0/0"];
+        endpoint = "lng5gx2rmssv8ge1.myfritz.net:58997";
+        persistentKeepalive = 25;
+        presharedKeyFile = config.age.secrets.wireguard-aether-psk.path;
+        publicKey = "8Rr7BueC0CGmycBQFS7YM7VF7Adkdc1ZcLFy8YXyOQk=";
+      }
+    ];
+  };
+}

configs/fu-berlin.nix

@@ -30,19 +30,7 @@ in {
       };
     };
     accounts.email.accounts = {
-      letos =
+      fu-student =
-        lib.recursiveUpdate defaults
-        {
-          userName = "slfletos";
-          address = "letos.sprachlit@hu-berlin.de";
-          passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-letos.path}";
-          imap.host = "mailbox.cms.hu-berlin.de";
-          imap.port = 993;
-          smtp.host = "mailhost.cms.hu-berlin.de";
-          smtp.port = 25;
-          smtp.tls.useStartTls = true;
-        };
-      fu =
         lib.recursiveUpdate defaults
         (lib.recursiveUpdate fu-defaults
           rec {
@@ -50,6 +38,21 @@ in {
             address = "kieran.meinhardt@fu-berlin.de";
             aliases = ["${userName}@fu-berlin.de"];
             passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-meinhak99.path}";
+            aerc.extraAccounts.signature-file = toString (pkgs.writeText "signature" signature.text);
+            signature = {
+              showSignature = "append";
+              text = ''
+                ${defaults.realName}
+                ${pronouns}
+
+                ---
+                Studentische Hilfskraft / ZODIAC
+                Freie Universität Berlin
+
+                Telefon: +49 30 838 58118
+                Arnimallee 10, Raum 106, 14195 Berlin
+              '';
+            };
             himalaya = {
               enable = true;
               settings.backend = "imap";
@@ -65,12 +68,6 @@ in {
       group = config.users.users.me.group;
       mode = "400";
     };
-    email-password-letos = {
-      file = ../secrets/email-password-letos.age;
-      owner = config.users.users.me.name;
-      group = config.users.users.me.group;
-      mode = "400";
-    };
     fu-sftp-key = {
       file = ../secrets/fu-sftp-key.age;
       owner = "root";
@@ -113,31 +110,24 @@ in {
         ];
       };
     };
-  in home-directory-mount "meinhak99";
+  in {
+    "${remoteDir}/fu/zodiac" = {
+      device = "//trove.storage.fu-berlin.de/GESCHKULT";
+      fsType = "cifs";
+      options =
+        fu-berlin-cifs-options
+        ++ [
+          "credentials=${config.age.secrets.cifs-credentials-zodiac.path}"
+        ];
+    };
+  } // home-directory-mount "meinhak99"
+    // home-directory-mount "xm7234fu";
+
+  age.secrets = {
+    cifs-credentials-zodiac.file = ../secrets/cifs-credentials-zodiac.age;
+  };
 
   environment.systemPackages = [
-    (pkgs.writers.writeDashBin "hu-vpn-split" ''
-      ${pkgs.openfortivpn}/bin/openfortivpn \
-        --password="$(cat "${config.age.secrets.email-password-letos.path}")" \
-        --config=${
-        pkgs.writeText "hu-berlin-split.config" ''
-          host = forti-ssl.vpn.hu-berlin.de
-          port = 443
-          username = slfletos@split_tunnel
-        ''
-      }
-    '')
-    (pkgs.writers.writeDashBin "hu-vpn-full" ''
-      ${pkgs.openfortivpn}/bin/openfortivpn \
-        --password="$(cat "${config.age.secrets.email-password-letos.path}")" \
-        --config=${
-        pkgs.writeText "hu-berlin-full.config" ''
-          host = forti-ssl.vpn.hu-berlin.de
-          port = 443
-          username = slfletos@tunnel_all
-        ''
-      }
-    '')
     (pkgs.writers.writeDashBin "fu-vpn" ''
       if ${pkgs.wirelesstools}/bin/iwgetid | ${pkgs.gnugrep}/bin/grep --invert-match eduroam
       then
@@ -148,4 +138,16 @@ in {
       fi
     '')
   ];
+
+  systemd.services.fu-vpn = {
+    enable = false;
+    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/gaming.nix

@@ -1,13 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = [
-    pkgs.zeroad
-    pkgs.mari0
-    pkgs.luanti # fka minetest
-  ];
-  networking.firewall = {
-    # for 0ad multiplayer
-    allowedTCPPorts = [ 20595 ];
-    allowedUDPPorts = [ 20595 ];
-  };
-}

configs/git.nix

@@ -17,6 +17,7 @@ in {
     pkgs.gitstats
     pkgs.patch
     pkgs.patchutils
+    inputs.self.packages.${pkgs.system}.git-preview
   ];
 
   environment.shellAliases = {
@@ -28,7 +29,9 @@ in {
     programs.git = {
       enable = true;
       package = pkgs.gitFull;
-      settings.alias = {
+      userName = kieran.name;
+      userEmail = kieran.email;
+      aliases = {
         br = "branch";
         co = "checkout";
         ci = "commit";
@@ -42,12 +45,19 @@ in {
         graph = "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all";
       };
       ignores = ignorePaths;
-      settings.user.name = kieran.name;
+      extraConfig = {
-      settings.user.email = kieran.email;
+        pull.ff = "only";
-      settings.pull.ff = "only";
+        rebase.autoStash = true;
-      settings.rebase.autoStash = true;
+        merge.autoStash = true;
-      settings.merge.autoStash = true;
+        push.autoSetupRemote = true;
-      settings.push.autoSetupRemove = true;
+
+        # # ref https://github.com/dandavison/delta
+        # core.pager = "${pkgs.delta}/bin/delta";
+        # interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
+        # delta.navigate = true;
+        # merge.conflictStyle = "diff3";
+        # diff.colorMoved = "default";
+      };
     };
   };
 }

configs/i3.nix

@@ -94,7 +94,7 @@ in {
   services.xserver = {
     windowManager.i3 = {
       enable = true;
-      package = pkgs.i3;
+      package = pkgs.i3-gaps;
     };
   };
 
@@ -132,7 +132,7 @@ in {
       border = 1;
     };
     bars = [
-      (config.home-manager.users.me.stylix.targets.i3.exportedBarConfig
+      (config.home-manager.users.me.lib.stylix.i3.bar
         // rec {
           workspaceButtons = true;
           mode = "hide"; # "dock";

configs/mpv.nix

@@ -37,7 +37,7 @@ in {
       };
       scripts = [
         pkgs.mpvScripts.quality-menu
-        pkgs.mpvScripts.visualizer
+        niveumPackages.mpv-visualizer
       ];
     };
   };

configs/neovim.nix

@@ -38,7 +38,7 @@
     (pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
     (niveumPackages.vim.override {
       # stylixColors = config.lib.stylix.colors;
-      colorscheme = "base16-gruvbox-dark-medium";
+      colorscheme = "base16-gruvbox-light-medium";
     })
 
     # language servers
@@ -52,8 +52,8 @@
     pkgs.nodePackages.typescript-language-server
     pkgs.lua-language-server
     pkgs.nodePackages.vscode-langservers-extracted
-    pkgs.lemminx # XML LSP
+    pkgs.lemminx
-    pkgs.jq-lsp
+    niveumPackages.jq-lsp
     pkgs.dhall-lsp-server
   ];
 }

configs/neovim.sync-conflict-20250130-092404-AJVBWR2.nix

@@ -0,0 +1,46 @@
+{ pkgs, niveumPackages, config, ... }: {
+  environment.variables.EDITOR = pkgs.lib.mkForce "nvim";
+  environment.shellAliases.vi = "nvim";
+  environment.shellAliases.vim = "nvim";
+  environment.shellAliases.view = "nvim -R";
+
+  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 "$@"'')
+    (niveumPackages.vim.override {
+      stylixColors = config.lib.stylix.colors;
+      # colorscheme = "base16-gruvbox-dark-medium";
+    })
+
+    # language servers
+    pkgs.pyright
+    pkgs.haskellPackages.haskell-language-server
+    pkgs.texlab
+    pkgs.nil
+    pkgs.rust-analyzer
+    pkgs.nodePackages.typescript-language-server
+    pkgs.lua-language-server
+    pkgs.nodePackages.vscode-langservers-extracted
+    pkgs.lemminx
+    niveumPackages.jq-lsp
+    pkgs.dhall-lsp-server
+  ];
+}

configs/packages.nix

@@ -4,6 +4,7 @@
   lib,
   inputs,
   niveumPackages,
+  unstablePackages,
   ...
 }: let
   worldradio = pkgs.callPackage ../packages/worldradio.nix {};
@@ -65,12 +66,9 @@ in {
     (pkgs.writers.writeDashBin "amfora" ''
       ${pkgs.st}/bin/st -e ${pkgs.amfora}/bin/amfora
     '')
-    (pkgs.writers.writeDashBin "gpodder" ''
-      GPODDER_DOWNLOAD_DIR=${config.users.users.me.home}/mobile/audio/Text/podcasts exec ${pkgs.gpodder}/bin/gpodder "$@"
-    '')
     # INTERNET
     aria2
-    telegram-desktop
+    tdesktop
     whois
     dnsutils
     # FILE MANAGERS
@@ -102,7 +100,7 @@ in {
     wdisplays
     libnotify # for notify-send
     xclip # clipboard CLI
-    dragon-drop # drag and drop
+    xdragon # drag and drop
     xorg.xkill # kill by clicking
     portfolio # personal finance overview
     audacity
@@ -120,13 +118,13 @@ in {
     zoom-us # video conferencing
     (pkgs.writers.writeDashBin "im" ''
       weechat_password=$(${pkgs.pass}/bin/pass weechat)
-      exec ${weechat}/bin/weechat -t -r '/mouse enable; /remote add makanek http://${externalNetwork.makanek}:8002 -password='"$weechat_password"'; /remote connect makanek'
+      exec ${unstablePackages.weechat}/bin/weechat -t -r '/mouse enable; /remote add makanek http://${externalNetwork.makanek}:8002 -password='"$weechat_password"'; /remote connect makanek'
     '')
     alejandra # nix formatter
     pdfgrep # search in pdf
     pdftk # pdf toolkit
     mupdf
-    poppler-utils # pdf toolkit
+    poppler_utils # pdf toolkit
     kdePackages.okular # the word is nucular
     xournalpp # for annotating pdfs
     pdfpc # presenter console for pdf slides
@@ -151,14 +149,18 @@ in {
     niveumPackages.pls
     niveumPackages.mpv-tv
     niveumPackages.mpv-iptv
+    jellyfin-media-player
     niveumPackages.devanagari
     niveumPackages.betacode # ancient greek betacode to unicode converter
-    pkgs.jq-lsp
+    niveumPackages.meteo
+    niveumPackages.jq-lsp
     niveumPackages.swallow # window swallowing
     niveumPackages.literature-quote
     niveumPackages.booksplit
     niveumPackages.dmenu-randr
+    niveumPackages.dmenu-bluetooth
     niveumPackages.manual-sort
+    niveumPackages.dns-sledgehammer
     niveumPackages.wttr
     niveumPackages.unicodmenu
     niveumPackages.emailmenu
@@ -206,7 +208,11 @@ in {
     ncspot
     playerctl
 
+    nix-index
+    niveumPackages.nix-index-update
+
     #krebs
+    niveumPackages.dic
     pkgs.nur.repos.mic92.ircsink
 
     (haskellPackages.ghcWithHoogle (hs: [
@@ -233,6 +239,8 @@ in {
     dhall
 
     html-tidy
+    nodePackages.csslint
+    nodePackages.jsonlint
     deno # better node.js
     go
     texlive.combined.scheme-full

configs/ssh.nix

@@ -4,7 +4,6 @@
 in {
   users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys;
   programs.ssh.startAgent = true;
-  services.gnome.gcr-ssh-agent.enable = false;
 
   home-manager.users.me = {
     # https://discourse.nixos.org/t/gnome-keyring-and-ssh-agent-without-gnome/11663
@@ -41,7 +40,6 @@ in {
 
   home-manager.users.me.programs.ssh = {
     enable = true;
-    enableDefaultConfig = false;
     matchBlocks = {
       "github.com" = {
         hostname = "ssh.github.com";

configs/stw-berlin.nix

@@ -0,0 +1,52 @@
+{
+  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 = config.users.users.me.name;
+      Group = config.users.users.me.group;
+      WorkingDirectory = "/home/kfm/cloud/nextcloud/Uni/Meta/Mensa";
+      LoadCredential = [
+        "password:${config.age.secrets.stw-berlin-card-code.path}"
+      ];
+    };
+    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

@@ -18,7 +18,7 @@ in {
   stylix.enable = true;
   stylix.image = generatedWallpaper;
 
-  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml";
+  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml";
 
   stylix.cursor = {
     name = "capitaine-cursors-white";
@@ -70,7 +70,7 @@ in {
     };
 
     emoji = {
-      package = pkgs.noto-fonts-color-emoji;
+      package = pkgs.noto-fonts-emoji;
       name = "Noto Color Emoji";
     };
 

configs/virtualization.nix

@@ -1,14 +0,0 @@
-{ pkgs, ... }:
-{
-  users.users.me.extraGroups = [ "libvirtd" ];
-  virtualisation.libvirtd.enable = true;
-
-  # Enable TPM support for VMs
-  virtualisation.libvirtd.qemu = {
-    # swtpm.enable = true;
-  };
-
-  environment.systemPackages = with pkgs; [
-    virt-manager
-  ];
-}

flake.nix

@@ -5,131 +5,143 @@
     self.submodules = true;
 
     agenix.url = "github:ryantm/agenix";
-    autorenkalender.url = "github:kmein/autorenkalender";
+    # alew-web.url = "git+ssh://gitea@code.kmein.de:22022/kfm/alew-web.git?ref=refs/heads/master";
     coptic-dictionary.url = "github:kmein/coptic-dictionary";
-    home-manager.url = "github:nix-community/home-manager/release-25.11";
+    flake-utils.url = "github:numtide/flake-utils";
+    home-manager.url = "github:nix-community/home-manager/release-25.05";
     menstruation-backend.url = "github:kmein/menstruation.rs";
     menstruation-telegram.url = "github:kmein/menstruation-telegram";
-    nix-index-database.url = "github:nix-community/nix-index-database";
+    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-25.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
     nur.url = "github:nix-community/NUR";
     recht.url = "github:kmein/recht";
     retiolum.url = "github:krebs/retiolum";
+    rust-overlay.url = "github:oxalica/rust-overlay";
     scripts.url = "github:kmein/scripts";
     stockholm.url = "github:krebs/stockholm";
-    stylix.url = "github:danth/stylix/release-25.11";
+    stylix.url = "github:danth/stylix/release-25.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";
+    ical-ephemeris.url = "git+ssh://gitea@code.kmein.de:22022/kfm/ical-ephemeris";
 
     agenix.inputs.home-manager.follows = "home-manager";
     agenix.inputs.nixpkgs.follows = "nixpkgs";
-    autorenkalender.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-index-database.inputs.nixpkgs.follows = "nixpkgs";
+    nix-on-droid.inputs.home-manager.follows = "home-manager";
+    nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
+    recht.inputs.flake-utils.follows = "flake-utils";
     recht.inputs.nixpkgs.follows = "nixpkgs";
+    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 =
+  nixConfig = {
-    inputs@{
+    extra-substituters = [ "https://kmein.cachix.org" ];
-      self,
+    extra-trusted-public-keys = [ "kmein.cachix.org-1:rsJ2b6++VQHJ1W6rGuDUYsK/qUkFA3bNpO6PyEyJ9Ls=" ];
-      nixpkgs,
+  };
-      nixpkgs-unstable,
+
-      nur,
+  outputs = inputs @ {
-      home-manager,
+    self,
-      agenix,
+    nixpkgs,
-      retiolum,
+    nixpkgs-unstable,
-      nixinate,
+    nur,
-      flake-utils,
+    home-manager,
-      nix-index-database,
+    agenix,
-      stylix,
+    retiolum,
-      ...
+    nixinate,
-    }:
+    flake-utils,
-    let
+    nix-on-droid,
-      lib = nixpkgs.lib;
+    stylix,
-      eachSupportedSystem = lib.genAttrs lib.systems.flakeExposed;
+    ...
-    in
+  }:
     {
       apps = {
-        x86_64-linux =
+        x86_64-darwin = let
-          let
+          pkgs = nixpkgs.legacyPackages.x86_64-darwin;
-            pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        in {
-            lib = nixpkgs.lib;
+          deploy-maakaron = {
-          in
+            type = "app";
+            program = toString (pkgs.writers.writeDash "deploy-maakaron" ''
+              exec $(nix build .#homeConfigurations.maakaron.activationPackage --no-link --print-out-paths)/activate
+            '');
+          };
+        };
+        x86_64-linux = let
+          pkgs = nixpkgs.legacyPackages.x86_64-linux;
+          lib = nixpkgs.lib;
+        in
           nixinate.nixinate.x86_64-linux self
           // {
             mock-secrets = {
               type = "app";
-              program = toString (
+              program = toString (pkgs.writers.writeDash "mock-secrets" ''
-                pkgs.writers.writeDash "mock-secrets" ''
+                ${pkgs.findutils}/bin/find secrets -not -path '*/.*' -type f  | ${pkgs.coreutils}/bin/sort > secrets.txt
-                  ${pkgs.findutils}/bin/find secrets -not -path '*/.*' -type f  | ${pkgs.coreutils}/bin/sort > secrets.txt
+              '');
-                ''
-              );
             };
           }
           # the following error prevents remote building of ful: https://github.com/NixOS/nixpkgs/issues/177873
-          // builtins.listToAttrs (
+          // builtins.listToAttrs (map (hostname: let
-            map (
+            externalNetwork = import ./lib/external-network.nix;
-              hostname:
+            targets = {
-              let
+              ful = "root@ful";
-                targets = {
+              zaatar = "root@zaatar";
-                  ful = "root@ful";
+              makanek = "root@makanek";
-                  zaatar = "root@zaatar";
+              manakish = "root@manakish";
-                  makanek = "root@makanek";
+              tahina = "root@tahina";
-                  manakish = "root@manakish";
+              tabula = "root@tabula";
-                  tahina = "root@tahina";
+              kabsa = "root@kabsa";
-                  tabula = "root@tabula";
+              fatteh = "root@fatteh";
-                  kabsa = "root@kabsa";
+              kibbeh = "root@kibbeh";
-                  fatteh = "root@fatteh";
+            };
-                  kibbeh = "root@kibbeh";
+          in
-                };
+            lib.attrsets.nameValuePair "deploy-${hostname}" {
-              in
+              type = "app";
-              lib.attrsets.nameValuePair "deploy-${hostname}" {
+              program = toString (pkgs.writers.writeDash "deploy-${hostname}" ''
-                type = "app";
+                exec ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch \
-                program = toString (
+                  --max-jobs 2 \
-                  pkgs.writers.writeDash "deploy-${hostname}" ''
+                  --log-format internal-json \
-                    exec ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch \
+                  --flake .#${hostname} \
-                      --max-jobs 2 \
+                  --target-host ${targets.${hostname}} 2>&1 \
-                      --log-format internal-json \
+                  | ${pkgs.nix-output-monitor}/bin/nom --json
-                      --flake .#${hostname} \
+              '');
-                      --target-host ${targets.${hostname}} 2>&1 \
+            }) (builtins.attrNames self.nixosConfigurations))
-                      | ${pkgs.nix-output-monitor}/bin/nom --json
-                  ''
-                );
-              }
-            ) (builtins.attrNames self.nixosConfigurations)
-          )
           // {
             deploy-ful = {
               type = "app";
-              program = toString (
+              program = toString (pkgs.writers.writeDash "deploy-ful" ''
-                pkgs.writers.writeDash "deploy-ful" ''
+                exec ${pkgs.nix}/bin/nix run .#nixinate.ful \
-                  exec ${pkgs.nix}/bin/nix run .#nixinate.ful \
+                  --log-format internal-json 2>&1 \
-                    --log-format internal-json 2>&1 \
+                  | ${pkgs.nix-output-monitor}/bin/nom --json
-                    | ${pkgs.nix-output-monitor}/bin/nom --json
+              '');
-                ''
-              );
             };
           };
       };
 
-      # TODO overlay for packages
-      # TODO remove flake-utils dependency from my own repos
-
       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;
@@ -144,6 +156,37 @@
         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;
+        };
+      };
+
+      homeConfigurations = {
+        maakaron = let
+          system = "x86_64-darwin";
+          pkgs = nixpkgs.legacyPackages.${system};
+        in
+          home-manager.lib.homeManagerConfiguration {
+            inherit pkgs;
+            modules = [./systems/maakaron/home.nix];
+            extraSpecialArgs = {
+              inherit inputs;
+              niveumPackages = inputs.self.packages.${system};
+            };
+          };
+      };
+
       nixosConfigurations = let
         niveumSpecialArgs = system: {
           unstablePackages = import nixpkgs-unstable {
@@ -167,8 +210,10 @@
             systems/ful/configuration.nix
             agenix.nixosModules.default
             inputs.self.nixosModules.passport
+            inputs.ical-ephemeris.nixosModules.default
             inputs.self.nixosModules.panoptikon
             inputs.self.nixosModules.go-webring
+            inputs.self.nixosModules.htgen
             inputs.stockholm.nixosModules.reaktor2
             retiolum.nixosModules.retiolum
             nur.modules.nixos.default
@@ -210,6 +255,7 @@
           modules = [
             systems/makanek/configuration.nix
             inputs.self.nixosModules.telegram-bot
+            inputs.self.nixosModules.htgen
             inputs.self.nixosModules.passport
             agenix.nixosModules.default
             retiolum.nixosModules.retiolum
@@ -242,7 +288,6 @@
             agenix.nixosModules.default
             retiolum.nixosModules.retiolum
             home-manager.nixosModules.home-manager
-            nix-index-database.nixosModules.default
             nur.modules.nixos.default
             stylix.nixosModules.stylix
           ];
@@ -256,7 +301,6 @@
             retiolum.nixosModules.retiolum
             home-manager.nixosModules.home-manager
             nur.modules.nixos.default
-            nix-index-database.nixosModules.default
             stylix.nixosModules.stylix
           ];
         };
@@ -269,134 +313,148 @@
             retiolum.nixosModules.retiolum
             home-manager.nixosModules.home-manager
             nur.modules.nixos.default
-            nix-index-database.nixosModules.default
             stylix.nixosModules.stylix
           ];
         };
       };
-
+    }
-      packages = eachSupportedSystem (system: let
+    // flake-utils.lib.eachSystem [flake-utils.lib.system.x86_64-linux flake-utils.lib.system.x86_64-darwin flake-utils.lib.system.aarch64-linux] (system: let
-        pkgs = import nixpkgs {
+      pkgs = import nixpkgs {
-          inherit system;
+        inherit system;
-          config.allowUnfree = true;
+        config.allowUnfree = true;
-          overlays = [
+        overlays = [
-            nur.overlays.default
+          nur.overlays.default
-            (self: super: {
+          (self: super: {
-              mpv = super.mpv.override {scripts = [super.mpvScripts.visualizer super.mpvScripts.mpris];};
+            mpv = super.mpv.override {scripts = [inputs.self.packages.${system}.mpv-visualizer super.mpvScripts.mpris];};
-              dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
+            dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
-            })
+          })
-          ];
+        ];
-        };
+      };
-        wrapScript = {
+      unstablePackages = import nixpkgs-unstable {
-          packages ? [],
+        inherit system;
-          name,
+      };
-          script,
+      wrapScript = {
-        }:
+        packages ? [],
-          pkgs.writers.writeDashBin name ''PATH=$PATH:${nixpkgs.lib.makeBinPath (packages ++ [pkgs.findutils pkgs.coreutils pkgs.gnused pkgs.gnugrep])} ${script} "$@"'';
+        name,
-      in {
+        script,
-        # linguistics and ancient world
+      }:
+        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 {};
-        brassica = pkgs.callPackage packages/brassica.nix {}; # TODO upstream
-        devanagari = pkgs.callPackage packages/devanagari {};
-        stardict-tools = pkgs.callPackage packages/stardict-tools.nix {};
-        heuretes = pkgs.callPackage packages/heuretes.nix {};
-        ipa = pkgs.writers.writePython3Bin "ipa" {flakeIgnore = ["E501"];} (builtins.readFile packages/ipa.py);
-        jsesh = pkgs.callPackage packages/jsesh.nix {}; # TODO upstream
-        kirciuoklis = pkgs.callPackage packages/kirciuoklis.nix {};
-        polyglot = pkgs.callPackage packages/polyglot.nix {};
-        tocharian-font = pkgs.callPackage packages/tocharian-font.nix {};
-        gfs-fonts = pkgs.callPackage packages/gfs-fonts.nix {};
-        closest = pkgs.callPackage packages/closest {};
-
-        # lit
-        random-zeno = pkgs.callPackage packages/random-zeno.nix {};
-        literature-quote = pkgs.callPackage packages/literature-quote.nix {};
-
-        # krebs
         brainmelter = pkgs.callPackage packages/brainmelter.nix {};
-        cyberlocker-tools = pkgs.callPackage packages/cyberlocker-tools.nix {};
+        brassica = pkgs.callPackage packages/brassica.nix {};
-        hc = pkgs.callPackage packages/hc.nix {};
-        kpaste = pkgs.callPackage packages/kpaste.nix {};
-        pls = pkgs.callPackage packages/pls.nix {};
-        untilport = pkgs.callPackage packages/untilport.nix {};
-        radio-news = pkgs.callPackage packages/radio-news.nix {};
-
-        # window manager
-        swallow = pkgs.callPackage packages/swallow.nix {};
-        devour = pkgs.callPackage packages/devour.nix {};
-
         cheat-sh = pkgs.callPackage packages/cheat-sh.nix {};
-        vimPlugins-cheat-sh-vim = pkgs.callPackage packages/vimPlugins/cheat-sh.nix {}; # TODO upstream
+        closest = pkgs.callPackage packages/closest {};
         cro = pkgs.callPackage packages/cro.nix {};
+        cyberlocker-tools = pkgs.callPackage packages/cyberlocker-tools.nix {};
         default-gateway = pkgs.callPackage packages/default-gateway.nix {};
         depp = pkgs.callPackage packages/depp.nix {};
         dashboard = pkgs.callPackage packages/dashboard {};
+        devanagari = pkgs.callPackage packages/devanagari {};
+        devour = pkgs.callPackage packages/devour.nix {};
+        dic = pkgs.callPackage packages/dic.nix {};
+        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 {};
         gpt35 = pkgs.callPackage packages/gpt.nix {model = "gpt-3.5-turbo";};
         gpt4 = pkgs.callPackage packages/gpt.nix {model = "gpt-4";};
+        hc = pkgs.callPackage packages/hc.nix {};
+        jq-lsp = pkgs.callPackage packages/jq-lsp.nix {};
+        stardict-tools = pkgs.callPackage packages/stardict-tools.nix {};
+        heuretes = pkgs.callPackage packages/heuretes.nix {};
+        htgen = pkgs.callPackage packages/htgen.nix {};
         image-convert-favicon = pkgs.callPackage packages/image-convert-favicon.nix {};
         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 {};
-        man-pandoc = pkgs.callPackage packages/man/pandoc.nix {}; # TODO upstream
+        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 {};
         noise-waves = pkgs.callPackage packages/noise-waves.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-iptv = pkgs.callPackage packages/mpv-iptv.nix {};
+        mpv-visualizer = unstablePackages.mpvScripts.visualizer;
         new-mac = pkgs.callPackage packages/new-mac.nix {};
         nix-git = pkgs.callPackage packages/nix-git.nix {};
+        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 {}; # TODO upstream
+        opustags = pkgs.callPackage packages/opustags.nix {};
+        pls = pkgs.callPackage packages/pls.nix {};
+        polyglot = pkgs.callPackage packages/polyglot.nix {};
         q = pkgs.callPackage packages/q.nix {};
         qrpaste = pkgs.callPackage packages/qrpaste.nix {};
-        go-webring = pkgs.callPackage packages/go-webring.nix {}; # TODO upstream
+        random-zeno = pkgs.callPackage packages/random-zeno.nix {};
+        go-webring = pkgs.callPackage packages/go-webring.nix {};
         rfc = pkgs.callPackage packages/rfc.nix {};
         gimp = pkgs.callPackage packages/gimp.nix {};
         scanned = pkgs.callPackage packages/scanned.nix {};
-        text2pdf = pkgs.callPackage packages/text2pdf.nix {}; # TODO upstream
+        swallow = pkgs.callPackage packages/swallow.nix {};
+        text2pdf = pkgs.callPackage packages/text2pdf.nix {};
         timer = pkgs.callPackage packages/timer.nix {};
-        trans = pkgs.callPackage packages/trans.nix {}; # TODO upstream
+        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 {};
         emailmenu = pkgs.callPackage packages/emailmenu.nix {};
-        stag = pkgs.callPackage packages/stag.nix {}; # TODO upstream
+        stag = pkgs.callPackage packages/stag.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-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix {}; # TODO upstream
+        radio-news = pkgs.callPackage packages/radio-news.nix {};
-        vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix {}; # TODO upstream
+        vimPlugins-cheat-sh-vim = pkgs.callPackage packages/vimPlugins/cheat-sh.nix {};
-        vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix {}; # TODO upstream
+        vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix {};
-        vimPlugins-mdwa-nvim = pkgs.callPackage packages/vimPlugins/mdwa-nvim.nix {}; # TODO upstream
+        vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix {};
-        vimPlugins-vim-ernest = pkgs.callPackage packages/vimPlugins/vim-ernest.nix {}; # TODO upstream
+        vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix {};
-        vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix {}; # TODO upstream
+        vimPlugins-mdwa-nvim = pkgs.callPackage packages/vimPlugins/mdwa-nvim.nix {};
-        vimPlugins-vim-colors-paramount = pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix {}; # TODO upstream
+        vimPlugins-vim-ernest = pkgs.callPackage packages/vimPlugins/vim-ernest.nix {};
-        vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix {}; # TODO upstream
+        vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix {};
-        vimPlugins-vim-fsharp = pkgs.callPackage packages/vimPlugins/vim-fsharp.nix {}; # TODO upstream
+        vimPlugins-vim-colors-paramount = pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix {};
-        vimPlugins-vim-mail = pkgs.callPackage packages/vimPlugins/vim-mail.nix {}; # TODO upstream
+        vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix {};
-        vimPlugins-vim-reason-plus = pkgs.callPackage packages/vimPlugins/vim-reason-plus.nix {}; # TODO upstream
+        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 {}; # TODO upstream
+        weechat-declarative = pkgs.callPackage packages/weechat-declarative.nix {};
-        weechatScripts-hotlist2extern = pkgs.callPackage packages/weechatScripts/hotlist2extern.nix {}; # TODO upstream
+        weechatScripts-hotlist2extern = pkgs.callPackage packages/weechatScripts/hotlist2extern.nix {};
-        dmenu-randr = pkgs.callPackage packages/dmenu-randr.nix {};
+        wttr = pkgs.callPackage packages/wttr.nix {};
-        wttr = pkgs.callPackage packages/wttr.nix {}; # TODO upstream
+
+        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 = pkgs.callPackage packages/dmenu-randr.nix {};
         tag = wrapScript {
           script = inputs.voidrice.outPath + "/.local/bin/tag";
           name = "tag";
           packages = [pkgs.ffmpeg];
         };
-      });
+      };
-    };
+    });
 }

lib/streams.nix

@@ -85,6 +85,9 @@ let
   big-fm-name = name: "${name} | bigFM";
   big-fm = name: "https://streams.bigfm.de/bigfm-${name}-128-aac";
 
+  rautemusik-name = name: "${name} | rm.fm";
+  rautemusik = name: "http://${name}-high.rautemusik.fm/";
+
   rte-name = name: "RTÉ ${name}";
   rte = name: "https://www.rte.ie/manifests/${name}.m3u8";
 
@@ -1204,6 +1207,198 @@ in
       logo = "https://cdn.schlagerparadies.de/images/rsp_setup/logo-radio-schlagerparadies.svg";
       tags = [tags.schlager];
     }
+    {
+      station = rautemusik-name "Volksmusik";
+      desc = "Volksmusik, Blasmusik, Schlager";
+      stream = rautemusik "volksmusik";
+      tags = [tags.schlager];
+    }
+    {
+      station = rautemusik-name "Study";
+      stream = rautemusik "study";
+      desc = "Lo-Fi, Chillout, Easy Listening";
+      tags = [tags.lofi tags.chill];
+    }
+    {
+      station = rautemusik-name "TechHouse";
+      stream = rautemusik "techhouse";
+      desc = "Techhouse, Deephouse, Techno, Minimal";
+      tags = [tags.party];
+    }
+    {
+      station = rautemusik-name "Goldies";
+      stream = rautemusik "goldies";
+      desc = "Oldies, 60s, 70s, 80s";
+      tags = [tags.vintage];
+    }
+    {
+      station = rautemusik-name "90s";
+      stream = rautemusik "90s";
+      desc = "90s, Eurodance, Pop, HipHop";
+      tags = [tags.vintage];
+    }
+    {
+      station = rautemusik-name "Schlager";
+      stream = rautemusik "schlager";
+      desc = "Schlager, Discofox, Deutsch, Pop";
+      tags = [tags.schlager];
+    }
+    {
+      station = rautemusik-name "Country";
+      stream = rautemusik "country";
+      desc = "Country, Western, Americana";
+      tags = [tags.trad tags.american];
+    }
+    {
+      station = rautemusik-name "Sex";
+      stream = rautemusik "sex";
+      desc = "RnB, Pop, Easy Listening";
+      tags = [tags.chill];
+    }
+    {
+      station = rautemusik-name "LoveHits";
+      stream = rautemusik "lovehits";
+      desc = "Lovesongs, Balladen, RnB, Pop";
+      tags = [tags.pop];
+    }
+    {
+      station = rautemusik-name "Klassik";
+      stream = rautemusik "klassik";
+      desc = "Symphonie, Orchester, Klassik";
+      tags = [tags.classical];
+    }
+    {
+      station = rautemusik-name "Traurig";
+      stream = rautemusik "traurig";
+      desc = "Balladen, Pop, Easy Listening";
+      tags = [tags.pop];
+    }
+    {
+      station = rautemusik-name "Happy";
+      stream = rautemusik "happy";
+      desc = "Pop, Dance, Charts";
+      tags = [tags.pop];
+    }
+    {
+      station = rautemusik-name "Solo Piano";
+      stream = rautemusik "solopiano";
+      desc = "Klavier, Instrumental, Easy Listening";
+      tags = [tags.classical];
+    }
+    {
+      station = rautemusik-name "HappyHardcore";
+      stream = rautemusik "happyhardcore";
+      desc = "UK Core, Happy Hardcore, Dance";
+      tags = [tags.party];
+    }
+    {
+      station = rautemusik-name "HardeR";
+      stream = rautemusik "harder";
+      desc = "Hardstyle, Hardcore, Jumpstyle";
+      tags = [tags.party];
+    }
+    {
+      station = rautemusik-name "BigCityBeats";
+      stream = rautemusik "bigcitybeats";
+      desc = "EDM, Dance, House, Electro, Star DJs";
+      tags = [tags.pop tags.party];
+    }
+    {
+      station = rautemusik-name "Lounge";
+      stream = rautemusik "lounge";
+      desc = "Ambient, Jazz, Chillout, Easy Listening";
+      tags = [tags.chill];
+    }
+    {
+      station = rautemusik-name "Oriental";
+      stream = rautemusik "oriental";
+      desc = "Arabisch, Oriental, HipHop";
+      tags = [tags.arabic];
+    }
+    {
+      station = rautemusik-name "Salsa";
+      stream = rautemusik "salsa";
+      desc = "Salsa, Latina, Tropical";
+      tags = [tags.groovy];
+    }
+    {
+      station = rautemusik-name "Christmas";
+      stream = rautemusik "christmas";
+      desc = "Weihnachtslieder, Balladen, Schlager";
+      tags = [tags.xmas];
+    }
+    {
+      station = rautemusik-name "Christmas Chor";
+      stream = rautemusik "christmas-chor";
+      desc = "Chor, Weihnachtslieder, Gesang";
+      tags = [tags.xmas];
+    }
+    {
+      station = rautemusik-name "Christmas Schlager";
+      stream = rautemusik "christmas-schlager";
+      desc = "Schlager, Weihnachtslieder";
+      tags = [tags.xmas tags.schlager];
+    }
+    {
+      station = rautemusik-name "Weihnachten.FM";
+      stream = rautemusik "weihnachten";
+      desc = "Weihnachtslieder, Pop";
+      tags = [tags.xmas];
+    }
+    {
+      station = rautemusik-name "Top40";
+      stream = rautemusik "top40";
+      desc = "Charts, Top40, Dance, Hiphop";
+      tags = [tags.top40];
+    }
+    {
+      station = rautemusik-name "Rock";
+      desc = "Rock, Alternative, Punk";
+      stream = rautemusik "rock";
+      tags = [tags.rock];
+    }
+    {
+      station = rautemusik-name "PartyHits";
+      desc = "Karneval, Mallorca, Après Ski, Schlager";
+      stream = rautemusik "partyhits";
+      tags = [tags.schlager];
+    }
+    {
+      station = rautemusik-name "Deutschrap Charts";
+      stream = rautemusik "deutschrap-charts";
+      desc = "Deutschrap, HipHop, Rap, Charts";
+      tags = [tags.rap];
+    }
+    {
+      station = rautemusik-name "Deutschrap Classic";
+      stream = rautemusik "deutschrap-classic";
+      desc = "Oldschool, Rap, HipHop, Deutschrap";
+      tags = [tags.rap];
+    }
+    {
+      station = rautemusik-name "ChartHits";
+      stream = rautemusik "ChartHits";
+      desc = "House, RnB, Dance, Electro";
+      tags = [tags.top40];
+    }
+    {
+      station = rautemusik-name "BreakZ.FM";
+      stream = rautemusik "breakz";
+      desc = "RnB, House, HipHop, Dance, Mixtapes";
+      tags = [tags.top40];
+    }
+    {
+      station = rautemusik-name "Bass";
+      stream = rautemusik "bass";
+      desc = "DnB, Dubstep, Trap & Bass House";
+      tags = [tags.party];
+    }
+    {
+      station = rautemusik-name "12punks";
+      stream = rautemusik "12punks";
+      desc = "Punk, Punk Rock, Ska, Hardcore";
+      tags = [tags.rock];
+    }
     {
       logo = "https://d3kle7qwymxpcy.cloudfront.net/images/broadcasts/77/a4/13931/1/c175.png";
       station = "Raidió Rírá";
@@ -1211,6 +1406,12 @@ in
       desc = "Is cairt-staisiún ceoil é Raidió Rí-Rá a bhíonn ag craoladh go hiomlán trí Ghaeilge! Bíonn an ceol ar fad ó na cairteacha le cloisteáil ar an stáisiún, mar aon leis an bpopnuacht, an nuacht spóirt agus an nuacht scannánaíochta is déanaí!";
       tags = [tags.top40];
     }
+    {
+      stream = "http://188.247.86.67:8008";
+      station = "Rotana Tarab";
+      logo = "https://liveonlineradio.net/wp-content/uploads/2017/11/Rotana-Tarab-100x47.jpg";
+      tags = [tags.trad tags.arabic];
+    }
     {
       stream = "http://asima.out.airtime.pro:8000/asima_a";
       station = "Asima";
@@ -1353,11 +1554,6 @@ in
       desc = "Ohne Blatt vor dem Mund! Für alle, die aufwachen wollen.";
       tags = [tags.text];
     }
-    {
-      station = "NIUS";
-      stream = "https://nius.stream25.radiohost.de/live_mp3-192";
-      tags = [tags.text];
-    }
     {
       station = "Kontrafunk";
       stream = "https://icecast.multhielemedia.de/listen/kontrafunk/radio.mp3";
@@ -1453,6 +1649,21 @@ in
       station = "ERTU Al Quran Al Kareem";
       tags = [tags.arabic tags.text tags.holy];
     }
+    {
+      stream = "http://149.28.52.216:3344/listen.mp3";
+      station = "Verse 24/7 Holy Quran";
+      tags = [tags.arabic tags.text tags.holy];
+    }
+    {
+      stream = "https://s6.voscast.com:9355/stream";
+      station = "Kilid Herat";
+      tags = [tags.arabic tags.holy]; # nasheeds
+    }
+    {
+      stream = "https://s6.voscast.com:9355/stream";
+      station = "Radio Salam Watandar";
+      tags = [tags.arabic tags.holy];
+    }
     {
       stream = "http://onair15.xdevel.com:7064/1/";
       station = "Radio Mozart Italia";
@@ -1460,6 +1671,12 @@ in
       desc = "Emittente ufficiale delle Associazioni Mozart Italia nel mondo";
       tags = [tags.classical];
     }
+    {
+      stream = "http://onair7.xdevel.com:7126/1/";
+      station = "Opera Radio Budapest";
+      logo = "https://www.opera.hu/static/default/asset/img/common/opera-logo.svg";
+      tags = [tags.classical];
+    }
     {
       stream = "http://peacefulpiano.stream.publicradio.org/peacefulpiano.mp3";
       station = "Peaceful Piano";
@@ -1629,6 +1846,11 @@ in
       stream = "https://playerservices.streamtheworld.com/api/livestream-redirect/KAN_88.mp3";
       tags = [tags.hebrew];
     }
+    {
+      station = "Digital Impulse – Classical Channel";
+      stream = "http://orion.shoutca.st:8978/stream";
+      tags = [tags.classical];
+    }
     {
       station = "Старое радио (детское)";
       stream = "http://195.91.237.50:8000/detskoe128";
@@ -1699,23 +1921,18 @@ in
       stream = "http://cw.dimebank.com:8080/CNNfast";
       tags = [tags.text];
     }
-    {
-      station = "80s80s | Dark Wave";
-      stream = "https://streams.80s80s.de/darkwave/mp3-192/homepage/";
-      tags = [tags.wave];
-    }
-    {
-      station = "80s80s | Wave";
-      stream = "https://streams.80s80s.de/wave/mp3-192/homepage/";
-      tags = [tags.wave];
-    }
     {
       station = "XXX orchestral";
       stream = "http://orion.shoutca.st:8978/stream";
       tags = [tags.classical];
     }
     {
-      station = "Kral FM Xanthi";
+      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];
     }
@@ -1769,6 +1986,11 @@ in
       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];
       stream = "http://tijaniyyah.asuscomm.com:8000/stream/2/";
@@ -1779,6 +2001,16 @@ in
       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";
@@ -1793,25 +2025,9 @@ in
       stream = "http://mp3.ffh.de/radioffh/hqlivestream.mp3";
       station = "Hitradio FFH";
     }
-    {
-      stream = "https://mp3.planetradio.de/planetradio/hqlivestream.aac";
-      station = "planet radio";
-    }
     { # Lex Fridman's favourite
       stream = "av://lavfi:anoisesrc=color=brown";
-      station = "Brown noise";
+      station = "Brownian noise";
-    }
-    {
-      stream = "av://lavfi:anoisesrc=color=pink";
-      station = "Pink noise";
-    }
-    {
-      stream = "https://st03.sslstream.dlf.de/dlf/03/high/aac/stream.aac";
-      station = "Deutschlandfunk Nova";
-    }
-    {
-      stream = "https://samaaisb107-itelservices.radioca.st/stream";
-      station = "Samaa FM 107.4 Pakistan";
     }
   ]
   ++ map (name: {

lib/vim/init.lua

@@ -155,11 +155,10 @@ local language_servers = {
 }
 
 for server, settings in pairs(language_servers) do
-  vim.lsp.config(server, {
+  require('lspconfig')[server].setup{
     on_attach = on_attach,
     flags = lsp_flags,
     settings = settings,
     capabilities = capabilities
-  })
+  }
-  vim.lsp.enable(server)
 end

lib/vim/init.vim

@@ -102,7 +102,6 @@ augroup filetypes
   autocmd bufnewfile,bufread urls,config set filetype=conf
   autocmd bufnewfile,bufread *.elm packadd elm-vim | set filetype=elm shiftwidth=4
   autocmd bufnewfile,bufread *.md packadd vim-pandoc | packadd vim-pandoc-syntax | set filetype=pandoc
-  autocmd bufnewfile,bufread *.ex,*.exs packadd vim-elixir | set filetype=elixir
   autocmd filetype haskell packadd haskell-vim | set keywordprg=hoogle\ -i
   autocmd filetype javascript packadd vim-javascript
   autocmd filetype make setlocal noexpandtab
@@ -130,7 +129,9 @@ autocmd! User GoyoEnter Limelight
 autocmd! User GoyoLeave Limelight!
 
 
-" Disable Copilot by default
+" Disable Copilot for files larger than 100kb
-let b:copilot_enabled = v:false
+autocmd BufReadPre *
-" keymap to toggle it enabled
+    \ let f=getfsize(expand("<afile>"))
-nnoremap <leader>gc :let b:copilot_enabled = !b:copilot_enabled<CR>
+    \ | if f > 100000 || f == -2
+    \ | let b:copilot_enabled = v:false
+    \ | endif

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

@@ -29,7 +29,7 @@
             default = "daily";
           };
           loadCredential = lib.mkOption {
-            type = lib.types.listOf lib.types.str;
+            type = lib.types.listOf lib.types.string;
             description = ''
               This can be used to pass secrets to the systemd service without adding them to the nix store.
             '';

packages/cheat-sh.nix

@@ -3,7 +3,7 @@
   writers,
   curl,
 }:
-writers.writeDashBin "cht.sh" ''
+writers.writeDashBin "so" ''
   IFS=+
   ${curl}/bin/curl -sSL http://cht.sh/"$*"
 ''

packages/cro.nix

@@ -1,10 +1,10 @@
-{ coreutils, chromium }:
+{ writers, chromium }:
-chromium.override {
+writers.writeDashBin "cro" ''
-  commandLineArgs = [
+  ${chromium}/bin/chromium \
-    "--disable-sync"
+    --disable-sync \
-    "--no-default-browser-check"
+    --no-default-browser-check \
-    "--no-first-run"
+    --no-first-run \
-    "--user-data-dir=$(${coreutils}/bin/mktemp -d)"
+    --user-data-dir="$(mktemp -d)" \
-    "--incognito"
+    --incognito \
-  ];
+    "$@"
-}
+''

packages/dic.nix

@@ -0,0 +1,43 @@
+{
+  fetchgit,
+  lib,
+  stdenv,
+  coreutils,
+  curl,
+  gnugrep,
+  gnused,
+  util-linux,
+}:
+stdenv.mkDerivation {
+  name = "dic";
+
+  src = fetchgit {
+    url = https://cgit.ni.krebsco.de/dic;
+    rev = "refs/tags/v1.1.1";
+    sha256 = "1gbj967a5hj53fdkkxijqgwnl9hb8kskz0cmpjq7v65ffz3v6vag";
+  };
+
+  phases = [
+    "unpackPhase"
+    "installPhase"
+  ];
+
+  installPhase = let
+    path = lib.makeBinPath [
+      coreutils
+      curl
+      gnused
+      gnugrep
+      util-linux
+    ];
+  in ''
+    mkdir -p $out/bin
+
+    sed \
+      's,^main() {$,&\n  PATH=${path}; export PATH,' \
+      < ./dic \
+      > $out/bin/dic
+
+    chmod +x $out/bin/dic
+  '';
+}

packages/dirmir.nix

@@ -0,0 +1,24 @@
+{writers}:
+writers.writeDashBin "dirmir" ''
+  SOURCE="$1"
+  TARGET="$2"
+
+  if [ ! -d "$SOURCE" ] || [ $# -ne 2 ]; then
+    echo >/dev/stderr "Usage: dirmir SOURCE TARGET"
+    exit 1
+  fi
+
+  if [ -e "$TARGET" ]; then
+    echo >/dev/stderr "$TARGET" already exists. Please use a different name.
+    exit 1
+  fi
+
+  find "$SOURCE" | while read -r entry; do
+    if [ -d "$entry" ]; then
+      mkdir -p "$TARGET/$entry"
+    else
+      # create a file with the same permissions as $entry
+      install -m "$(stat -c %a "$entry")" /dev/null "$TARGET/$entry"
+    fi
+  done
+''

packages/dmenu-bluetooth.nix

@@ -0,0 +1,64 @@
+{
+  writers,
+  libnotify,
+  dmenu,
+  bluez5,
+  lib,
+}:
+writers.writeDashBin "dmenu-bluetooth" ''
+  # UI for connecting to bluetooth devices
+  set -efu
+  PATH=$PATH=${lib.makeBinPath [libnotify dmenu bluez5]}
+
+  bluetooth_notify() {
+    notify-send --app-name=" Bluetooth" "$@"
+  }
+
+  chose_device() {
+    # the output from `bluetoothctl {paired-,}devices` has a first column which always contains `Device` followed by a MAC address and the device name
+    cut -d ' ' -f2- | dmenu -i -l 5 -p "Bluetooth device"
+  }
+
+  bluetoothctl scan on &
+
+  case "$(printf "pair\nconnect\ndisconnect" | dmenu -i)" in
+    pair)
+      chosen="$(bluetoothctl devices | chose_device)"
+      chosen_name="$(echo "$chosen" | cut -d ' ' -f2-)"
+
+      bluetooth_notify "$chosen_name" "Pairing ..."
+
+      if bluetoothctl pair "$(echo "$chosen" | cut -d ' ' -f1)"; then
+        bluetooth_notify "✔ $chosen_name" "Paired with device."
+      else
+        test "$chosen" && bluetooth_notify "❌ $chosen_name" "Failed to pair with device."
+      fi
+    ;;
+
+    connect)
+      chosen="$(bluetoothctl paired-devices | chose_device)"
+      chosen_name="$(echo "$chosen" | cut -d ' ' -f2-)"
+
+      bluetooth_notify "$chosen_name" "Trying to connect ..."
+
+      if bluetoothctl connect "$(echo "$chosen" | cut -d ' ' -f1)"; then
+        bluetooth_notify "✔ $chosen_name" "Connected to device."
+      else # something was selected but it didn't work
+        test "$chosen" && bluetooth_notify "❌ $chosen_name" "Failed to connect to device."
+      fi
+    ;;
+
+    disconnect)
+      chosen="$(bluetoothctl paired-devices | chose_device)"
+      chosen_name="$(echo "$chosen" | cut -d ' ' -f2-)"
+
+      bluetooth_notify "$chosen_name" "Disconnecting ..."
+
+      if bluetoothctl disconnect "$(echo "$chosen" | cut -d ' ' -f1)"; then
+        bluetooth_notify "✔ $chosen_name" "Disconnected from device."
+      else # something was selected but it didn't work
+        test "$chosen" && bluetooth_notify "❌ $chosen_name" "Failed to disconnect from device."
+      fi
+    ;;
+  esac
+''

packages/dmenu-scrot.nix

@@ -0,0 +1,42 @@
+{
+  writers,
+  lib,
+  dmenu,
+  scrot,
+  libnotify,
+  xclip,
+  screenshotsDirectory ? "/tmp",
+}:
+writers.writeDashBin "dmenu-scrot" ''
+  # ref https://gitlab.com/dwt1/dotfiles/-/blob/master/.dmenu/dmenu-scrot.sh
+  PATH=$PATH:${lib.makeBinPath [dmenu scrot libnotify xclip]}
+
+  APP_NAME="📸 Scrot"
+  IMG_PATH="${screenshotsDirectory}"
+  TIME=3000 #Miliseconds notification should remain visible
+
+  cmd=$(printf "fullscreen\nsection\nupload_fullscreen\nupload_section\n" | dmenu -p 'Screenshot')
+
+  cd "$IMG_PATH" || exit
+  case ''${cmd%% *} in
+    fullscreen)
+      scrot -d 1 \
+        && notify-send -u low -t $TIME -a "$APP_NAME" 'Screenshot (full screen) saved.'
+      ;;
+
+    section)
+      scrot -s \
+        && notify-send -u low -t $TIME -a "$APP_NAME" 'Screenshot (section) saved.'
+      ;;
+
+    upload_fullscreen)
+      scrot -d 1 -e "kpaste < \$f" | tail --lines=1 | xclip -selection clipboard -in \
+        && notify-send -u low -t $TIME -a "$APP_NAME" "Screenshot (full screen) uploaded: $(xclip -selection clipboard -out)"
+      ;;
+
+    upload_section)
+      scrot -s -e "kpaste < \$f" | tail --lines=1 | xclip -selection clipboard -in \
+        &&  notify-send -u low -t $TIME -a "$APP_NAME" "Screenshot (section) uploaded: $(xclip -selection clipboard -out)"
+      ;;
+  esac
+''

packages/dns-sledgehammer.nix

@@ -0,0 +1,7 @@
+{
+  writers,
+  coreutils,
+}:
+writers.writeDashBin "dns-sledgehammer" ''
+  ${coreutils}/bin/printf '%s\n' 'nameserver 1.1.1.1' 'options edns0' > /etc/resolv.conf
+''

packages/genius.nix

@@ -0,0 +1,28 @@
+{
+  writers,
+  curl,
+  coreutils,
+  gnused,
+  pandoc,
+}:
+writers.writeDashBin "genius" ''
+  ${coreutils}/bin/test "$#" -eq 2 || (
+    echo "usage: $0 <artist> <song>"
+    exit 1
+  )
+
+  normalize() {
+    ${coreutils}/bin/tr -d -c '0-9A-Za-z ' | ${coreutils}/bin/tr ' ' - | ${coreutils}/bin/tr '[:upper:]' '[:lower:]'
+  }
+
+  ARTIST=$(echo "$1" | normalize | ${gnused}/bin/sed 's/./\U&/')
+  TITLE=$(echo "$2" | normalize)
+  GENIUS_URL="https://genius.com/$ARTIST-$TITLE-lyrics"
+
+  ${curl}/bin/curl -s "$GENIUS_URL" \
+    | ${gnused}/bin/sed -ne '/class="lyrics"/,/<\/p>/p' \
+    | ${pandoc}/bin/pandoc -f html -s -t plain \
+    | ${gnused}/bin/sed 's/^_/\x1b[3m/g;s/_$/\x1b[0m/g;s/^\[/\n\x1b\[1m\[/g;s/\]$/\]\x1b[0m/g'
+
+  printf "\n%s\n" "$GENIUS_URL" >/dev/stderr
+''

packages/git-preview.nix

@@ -0,0 +1,23 @@
+{
+  coreutils,
+  git,
+  writers,
+}:
+writers.writeDashBin "git-preview" ''
+  set -efu
+  head_commit=$(${git}/bin/git log -1 --format=%H)
+  merge_commit=$1; shift
+  merge_message='Merge for git-preview'
+  preview_dir=$(${coreutils}/bin/mktemp --tmpdir -d git-preview.XXXXXXXX)
+  preview_name=$(${coreutils}/bin/basename "$preview_dir")
+  ${git}/bin/git worktree add --detach -f "$preview_dir" 2>/dev/null
+  ${git}/bin/git -C "$preview_dir" checkout -q "$head_commit"
+  ${git}/bin/git -C "$preview_dir" merge \
+      ''${GIT_PREVIEW_MERGE_STRATEGY+-s "$GIT_PREVIEW_MERGE_STRATEGY"} \
+      -m "$merge_message" \
+      -q \
+      "$merge_commit"
+  ${git}/bin/git -C "$preview_dir" diff "$head_commit.." "$@"
+  ${coreutils}/bin/rm -fR "$preview_dir"
+  ${coreutils}/bin/rm -R .git/worktrees/"$preview_name"
+''

packages/hc.nix

@@ -9,7 +9,7 @@
   gnugrep,
   qrencode,
   texlive,
-  util-linux,
+  utillinux,
   zbar,
 }:
 stdenv.mkDerivation rec {
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
       gnugrep
       qrencode
       texlive.combined.scheme-full
-      util-linux
+      utillinux
       zbar
     ]}
   '';

packages/heuretes.nix

@@ -2,7 +2,6 @@
   writers,
   fetchurl,
   xan,
-  util-linux,
 }: let
   database = fetchurl {
     url = "http://c.krebsco.de/greek.csv";
@@ -10,5 +9,5 @@
   };
 in
   writers.writeDashBin "heuretes" ''
-    ${xan}/bin/xan search -s simple "$*" ${database} | ${util-linux}/bin/column -s, -t
+    ${xan}/bin/xan search -s simple "^$*$" ${database} | ${xan}/bin/xan table
   ''

packages/htgen.nix

@@ -0,0 +1,31 @@
+{
+  fetchgit,
+  lib,
+  pkgs,
+  stdenv,
+}:
+stdenv.mkDerivation rec {
+  pname = "htgen";
+  version = "1.3.1";
+
+  src = fetchgit {
+    url = "http://cgit.krebsco.de/htgen";
+    rev = "refs/tags/${version}";
+    sha256 = "0ml8kp89bwkrwy6iqclzyhxgv2qn9dcpwaafbmsr4mgcl70zx22r";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    {
+      echo '#! ${pkgs.dash}/bin/dash'
+      echo 'export PATH=${lib.makeBinPath [
+      pkgs.coreutils
+      pkgs.jq
+      pkgs.ucspi-tcp
+    ]}''${PATH+":$PATH"}'
+      sed 's:^Server=htgen$:&/${version}:' htgen
+    } > $out/bin/htgen
+    chmod +x $out/bin/htgen
+    cp -r examples $out
+  '';
+}

packages/infschmv.nix

@@ -0,0 +1,13 @@
+{
+  writers,
+  pup,
+  curl,
+  pandoc,
+  man,
+}:
+writers.writeDashBin "InfSchMV" ''
+  ${curl}/bin/curl -sSL https://www.berlin.de/corona/massnahmen/verordnung/ \
+    | ${pup}/bin/pup .textile \
+    | ${pandoc}/bin/pandoc -f html -t man -s \
+    | ${man}/bin/man -l -
+''

packages/iolanguage.nix

@@ -0,0 +1,29 @@
+{
+  lib,
+  stdenv,
+  cmake,
+  python3,
+  fetchFromGitHub,
+}:
+stdenv.mkDerivation rec {
+  version = "2017.09.06";
+  name = "iolanguage-${version}";
+  src = fetchFromGitHub {
+    owner = "IoLanguage";
+    repo = "io";
+    rev = "${version}";
+    sha256 = "07rg1zrz6i6ghp11cm14w7bbaaa1s8sb0y5i7gr2sds0ijlpq223";
+    fetchSubmodules = true;
+  };
+  buildInputs = [cmake python3];
+  preBuild = "mkdir -p build && cd build";
+  buildPhase = ''
+    cmake -DCMAKE_INSTALL_PREFIX=$out/ ..
+    make all
+  '';
+  meta = with lib; {
+    homepage = "https://iolanguage.org/";
+    description = "Io programming language. Inspired by Self, Smalltalk and LISP.";
+    license = licenses.bsd3;
+  };
+}

packages/ix.nix

@@ -0,0 +1,16 @@
+{
+  stdenv,
+  fetchurl,
+}:
+stdenv.mkDerivation {
+  name = "ix";
+  src = fetchurl {
+    url = "https://ix.io/client";
+    sha256 = "0xc2s4s1aq143zz8lgkq5k25dpf049dw253qxiav5k7d7qvzzy57";
+  };
+  phases = ["installPhase"];
+  installPhase = ''
+    mkdir -p $out/bin
+    install $src $out/bin/ix
+  '';
+}

packages/jq-lsp.nix

@@ -0,0 +1,16 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+}:
+buildGoModule {
+  name = "jq-lsp";
+  version = "unstable-2023-09-08";
+  src = fetchFromGitHub {
+    owner = "wader";
+    repo = "jq-lsp";
+    rev = "85edf1adbe5e6c91b37c67b6a4bf85eda1e49f2f";
+    hash = "sha256-ItLKRSbGZ8UqFEHCoh96KwhSpuKZ3l+2ZXnBkHEZL0M=";
+  };
+  vendorHash = "sha256-ppQ81uERHBgOr/bm/CoDSWcK+IqHwvcL6RFi0DgoLuw=";
+}

packages/mahlzeit.nix

@@ -0,0 +1,63 @@
+{
+  lib,
+  fetchFromGitHub,
+  mkDerivation,
+  ansi-terminal,
+  base,
+  directory,
+  doctest,
+  filepath,
+  megaparsec,
+  optparse-applicative,
+  prettyprinter,
+  process,
+  raw-strings-qq,
+  stdenv,
+  tasty,
+  tasty-hunit,
+  text,
+  yaml,
+}:
+mkDerivation {
+  pname = "mahlzeit";
+  version = "0.1.0";
+  src = fetchFromGitHub {
+    owner = "kmein";
+    repo = "mahlzeit";
+    rev = "954c0fb3f45815999bc65d003794af6a850b069c";
+    sha256 = "046yrr40hjmxkjmwzcvmwb39fxx2v2i6hgdxrjfiwilzvhikarrg";
+  };
+  isLibrary = true;
+  isExecutable = true;
+  libraryHaskellDepends = [
+    ansi-terminal
+    base
+    directory
+    filepath
+    megaparsec
+    prettyprinter
+    text
+    yaml
+  ];
+  executableHaskellDepends = [
+    ansi-terminal
+    base
+    directory
+    filepath
+    optparse-applicative
+    process
+    text
+    yaml
+  ];
+  testHaskellDepends = [
+    base
+    doctest
+    megaparsec
+    raw-strings-qq
+    tasty
+    tasty-hunit
+  ];
+  homepage = "https://github.com/kmein/mahlzeit";
+  description = "Recipe toolkit";
+  license = lib.licenses.mit;
+}

packages/meteo.nix

@@ -0,0 +1,89 @@
+{
+  writers,
+  lib,
+  jq,
+  curl,
+  xdotool,
+  nsxiv,
+  gnused,
+  defaultStation ? 103840,
+}:
+writers.writeDashBin "meteo" ''
+    # usage: meteo --list
+    # usage: meteo --update
+    # usage: meteo STATION
+    set -efu
+
+    PATH=$PATH:${lib.makeBinPath [jq curl xdotool nsxiv gnused]}
+
+    # TODO XDG
+    CONFIG_DIR=$HOME/.config/wetter
+    STATIONS_FILE=$CONFIG_DIR/stations.json
+
+    case ''${1-} in
+      --list)
+        sed -n 's/^\s*\(--[^)]\+\))$/\1/p' "$0"
+        jq -r -n \
+        --slurpfile stations_file "$STATIONS_FILE" \
+        '
+          $stations_file[0] as $known_stations |
+
+          $known_stations | keys[]
+        '
+        exit
+      ;;
+      --update)
+        mkdir -p "$(dirname "$STATIONS_FILE")"
+        exec >"$STATIONS_FILE"
+
+        curl -fsSL http://wetterstationen.meteomedia.de/ |
+        jq -Rrs '
+          def decodeHTML:
+            gsub("ä";"ä") |
+            gsub("ö";"ö") |
+            gsub("ü";"ü") |
+            gsub("Ä";"Ä") |
+            gsub("Ö";"Ö") |
+            gsub("Ü";"Ü") |
+            gsub("ß";"ß")
+            ;
+          [
+            match(".*<option value=\"/\\?map=Deutschland&station=(?<station>[0-9]+)\">(?<name>[^<]+)</option>";"g")
+            .captures |
+            map({"\(.name)":(.string)}) |
+            add |
+            {"\(.name|decodeHTML)":(.station|tonumber)}
+          ] |
+          add
+        '
+        exit
+      ;;
+    esac
+
+  # set -x
+
+    station=''${1-${toString defaultStation}}
+    station=$(jq -e -n \
+    --arg station "$station" \
+    --slurpfile stations_file "$STATIONS_FILE" \
+    '
+      $stations_file[0] as $known_stations |
+
+      $station |
+      if test("^[0-9]+$") then
+        tonumber
+      else
+        $known_stations[.]
+      end
+    ')
+    cache="/tmp/''${LOGNAME}_wetter_$station.png"
+    curl -sSL \
+        "http://wetterstationen.meteomedia.de/messnetz/vorhersagegrafik/$station.png" \
+        -o "$cache"
+
+    if window_id=$(xdotool search --name "^nsxiv - $cache$"); then
+      xdotool key --window "$window_id" r
+    else
+      nsxiv "$cache" &
+    fi
+''

packages/nix-index-update.nix

@@ -0,0 +1,13 @@
+{
+  writers,
+  wget,
+  system,
+}:
+writers.writeDashBin "nix-index-update" ''
+  filename="index-${system}"
+  mkdir -p ~/.cache/nix-index
+  cd ~/.cache/nix-index
+  # -N will only download a new version if there is an update.
+  ${wget}/bin/wget -q -N https://github.com/Mic92/nix-index-database/releases/latest/download/$filename
+  ln -f $filename files
+''

packages/pls.nix

@@ -1,7 +1,6 @@
 {
   lib,
   writers,
-  yt-dlp,
   miller,
   gnused,
   curl,
@@ -96,10 +95,6 @@
     "ich kann damit leben"
     "es ist was es ist"
   ];
-
-  download = writers.writeDash "download" ''
-    ${yt-dlp}/bin/yt-dlp --add-metadata --audio-format mp3 --audio-quality 0 -xic "$@"
-  '';
 in
   writers.writeDashBin "pls" ''
     case "$1" in

packages/rfc.nix

@@ -1,8 +1,10 @@
 {
   writers,
   curl,
+  pup,
   gawk,
   gnused,
+  gnugrep,
   less,
   fzf,
 }:

packages/vim.nix

@@ -81,7 +81,6 @@
         dhall-vim
         elm-vim
         emmet-vim
-        vim-elixir
         haskell-vim
         niveumPackages.vimPlugins-icalendar-vim
         niveumPackages.vimPlugins-jq-vim

packages/vimPlugins/cheat-sh.nix

@@ -1,7 +1,7 @@
 {
   vimUtils,
   fetchFromGitHub,
-}: (vimUtils.buildVimPlugin {
+}: (vimUtils.buildVimPluginFrom2Nix {
   pname = "cheat.sh-vim";
   version = "826219d1";
   src = fetchFromGitHub {

packages/vimPlugins/icalendar-vim.nix

@@ -1,7 +1,7 @@
 {
   vimUtils,
   fetchFromGitHub,
-}: (vimUtils.buildVimPlugin {
+}: (vimUtils.buildVimPluginFrom2Nix {
   pname = "icalendar.vim";
   version = "542fff45";
   src = fetchFromGitHub {

packages/vimPlugins/jq-vim.nix

@@ -2,7 +2,7 @@
   vimUtils,
   fetchFromGitHub,
 }:
-vimUtils.buildVimPlugin {
+vimUtils.buildVimPluginFrom2Nix {
   pname = "jq.vim";
   version = "5baf8ed1";
   src = fetchFromGitHub {

packages/vimPlugins/mdwa-nvim.nix

@@ -1,7 +1,8 @@
 {
   vimUtils,
   fetchFromGitHub,
-}: (vimUtils.buildVimPlugin {
+  lib,
+}: (vimUtils.buildVimPluginFrom2Nix {
   pname = "mdwa.nvim";
   version = "9f37270";
   src = fetchFromGitHub {

packages/vimPlugins/typst-vim.nix

@@ -2,7 +2,7 @@
   vimUtils,
   fetchFromGitHub,
 }:
-vimUtils.buildVimPlugin {
+vimUtils.buildVimPluginFrom2Nix {
   pname = "typst.vim";
   version = "2882f21";
   src = fetchFromGitHub {

packages/vimPlugins/vim-256noir.nix

@@ -2,7 +2,7 @@
   vimUtils,
   fetchFromGitHub,
 }:
-vimUtils.buildVimPlugin {
+vimUtils.buildVimPluginFrom2Nix {
   pname = "vim-256noir";
   version = "e8668a18";
   src = fetchFromGitHub {

packages/vimPlugins/vim-colors-paramount.nix

@@ -2,7 +2,7 @@
   vimUtils,
   fetchFromGitHub,
 }:
-vimUtils.buildVimPlugin {
+vimUtils.buildVimPluginFrom2Nix rec {
   pname = "vim-colors-paramount";
   version = "a5601d36";
   src = fetchFromGitHub {

packages/vimPlugins/vim-ernest.nix

@@ -2,7 +2,7 @@
   vimUtils,
   fetchFromGitHub,
   lib,
-}: (vimUtils.buildVimPlugin {
+}: (vimUtils.buildVimPluginFrom2Nix {
   pname = "vim-ernest";
   version = "4b99bc3";
   src = fetchFromGitHub {

packages/vimPlugins/vim-fetch.nix

@@ -1,7 +1,7 @@
 {
   vimUtils,
   fetchFromGitHub,
-}: (vimUtils.buildVimPlugin {
+}: (vimUtils.buildVimPluginFrom2Nix rec {
   pname = "vim-fetch";
   version = "76c08586";
   src = fetchFromGitHub {

packages/vimPlugins/vim-fsharp.nix

@@ -2,7 +2,7 @@
   vimUtils,
   fetchFromGitHub,
 }:
-vimUtils.buildVimPlugin {
+vimUtils.buildVimPluginFrom2Nix {
   pname = "vim-fsharp";
   version = "627db7d7";
   src = fetchFromGitHub {

packages/vimPlugins/vim-mail.nix

@@ -2,7 +2,7 @@
   vimUtils,
   fetchFromGitHub,
 }:
-vimUtils.buildVimPlugin {
+vimUtils.buildVimPluginFrom2Nix {
   pname = "vim-mail";
   version = "acdbb5bd";
   src = fetchFromGitHub {

packages/vimPlugins/vim-reason-plus.nix

@@ -1,7 +1,7 @@
 {
   vimUtils,
   fetchFromGitHub,
-}: (vimUtils.buildVimPlugin {
+}: (vimUtils.buildVimPluginFrom2Nix {
   pname = "vim-reason-plus";
   version = "c11a2940";
   src = fetchFromGitHub {

packages/weechat-declarative.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   lib,
+  unstablePackages,
   ...
 } @ args: let
   # config cannot be declared in the input attribute set because that would
@@ -136,7 +137,7 @@
     ))
   );
 
-  weechatPkg = pkgs.weechat.override {
+  weechat = unstablePackages.weechat.override {
     configure = _: {
       init = "/exec -oc cat ${setFile}";
 
@@ -162,14 +163,14 @@
         cfg.files
       )
     }
-    exec ${weechatPkg}/bin/weechat "$@"
+    exec ${weechat}/bin/weechat "$@"
   '';
 in
   pkgs.symlinkJoin {
     name = "weechat-configured";
     paths = [
       wrapper
-      weechatPkg
+      unstablePackages.weechat
     ];
     postBuild = ''
       ln -s ${setFile} $out/weechat.set

secrets.txt

@@ -1,7 +1,6 @@
 secrets/alertmanager-token-reporters.age
 secrets/brevo-key.age
 secrets/cifs-credentials-zodiac.age
-secrets/copecart-ipn.age
 secrets/di-fm-key.age
 secrets/email-password-cock.age
 secrets/email-password-fysi.age

systems/fatteh/configuration.nix

@@ -9,7 +9,7 @@ in {
     ./hardware-configuration.nix
     ../../configs/networkmanager.nix
     ../../configs/default.nix
-    ../../configs/gaming.nix
+    ../../configs/0ad.nix
     # ../../configs/gnome.nix
   ];
 
@@ -41,6 +41,8 @@ in {
     wireguard-aether-psk.file = ../../secrets/fatteh-wireguard-aether-psk.age;
   };
 
+  networking.wg-quick.interfaces.aether.address = ["192.168.178.202/24"];
+
   networking.hostName = "fatteh";
   networking.retiolum = retiolumAddresses.fatteh;
 

systems/ful/configuration.nix

@@ -2,6 +2,7 @@
   config,
   pkgs,
   lib,
+  inputs,
   ...
 }: let
   inherit (import ../../lib) kieran retiolumAddresses restic;
@@ -14,8 +15,8 @@ in {
     ./hledger.nix
     ./go-webring.nix
     ./gemini.nix
+    ./ical-ephemeris.nix
     ./wallabag.nix
-    ./nethack.nix
     ../../configs/monitoring.nix
     ../../configs/mycelium.nix
     ../../configs/tor.nix
@@ -71,6 +72,64 @@ in {
     ];
   };
 
+  users.users.servant = {
+    isSystemUser = true;
+    group = "servant";
+  };
+  users.groups.servant = {};
+  systemd.services.servant = {
+    enable = true;
+    environment.PORT = toString 18987;
+    environment.VIRTUAL_HOST = "https://openapiaiapi.kmein.de";
+    serviceConfig.ExecStart = pkgs.writers.writeHaskell "server" {
+      libraries = with pkgs.haskellPackages; [
+        servant
+        servant-server
+        servant-openapi3
+        servant-swagger-ui
+        servant-client
+        aeson
+        text
+        warp
+        uuid
+        lens
+      ];
+      ghcArgs = ["-O3" "-threaded"];
+    } ./servant-openapi.hs;
+    serviceConfig.User = "servant";
+    serviceConfig.Group = "servant";
+  };
+
+  services.htgen.openapi-conversion = {
+    port = 18988;
+    script = ''. ${pkgs.writers.writeDash "openapi-conversion" ''
+      case "$Method $Request_URI" in
+        "GET /openapi-3.1.json")
+          schema=$(mktemp -d)
+          trap 'rm -rf $schema' EXIT
+          ${pkgs.wget}/bin/wget http://127.0.0.1:${toString 18987}/openapi.json -O "$schema"/openapi.json
+          cat  "$schema"/openapi.json >&2
+          PATH=${lib.makeBinPath [pkgs.bashInteractive pkgs.nodejs]} ${pkgs.nodejs}/bin/npx --yes openapi-format "$schema"/openapi.json --convertTo "3.1" -o "$schema"/openapi-new.json
+          printf 'HTTP/1.1 200 OK\r\n'
+          printf 'Content-Type: %s\r\n' "$(${pkgs.file}/bin/file -ib "$schema"/openapi-new.json)"
+          printf 'Server: %s\r\n' "$Server"
+          printf 'Connection: close\r\n'
+          printf 'Content-Length: %d\r\n' $(${pkgs.coreutils}/bin/wc -c < "$schema"/openapi-new.json)
+          printf '\r\n'
+          cat "$schema"/openapi-new.json
+          exit
+        ;;
+      esac
+    ''}'';
+  };
+
+  services.nginx.virtualHosts."openapiaiapi.kmein.de" = {
+    enableACME = true;
+    forceSSL = true;
+    locations."/openapi-3.1.json".proxyPass = "http://127.0.0.1:${toString 18988}";
+    locations."/".proxyPass = "http://127.0.0.1:${toString 18987}";
+  };
+
   networking = {
     firewall.allowedTCPPorts = [80 443];
     hostName = "ful";

systems/ful/ical-ephemeris.nix

@@ -0,0 +1,24 @@
+{ config, pkgs, ... }:
+{
+  services.nginx.virtualHosts."ical-ephemeris.kmein.de" = {
+    forceSSL = true;
+    enableACME = true;
+    locations."/" = {
+      proxyPass = "http://localhost:9090";
+    };
+  };
+
+  services.ical-ephemeris = {
+    enable = true;
+    port = 9090;
+    brevoApiKeyFile = config.age.secrets.brevo-key.path;
+    baseUrl = "https://ical-ephemeris.kmein.de";
+  };
+
+  age.secrets.brevo-key = {
+    file = ../../secrets/brevo-key.age;
+    owner = "ical-ephemeris";
+    group = "ical-ephemeris";
+    mode = "0400";
+  };
+}

systems/ful/matomo.nix

@@ -21,7 +21,7 @@ in {
     nginx = {
       serverName = "matomo.kmein.de";
     };
-    package = pkgs.matomo;
+    package = pkgs.matomo_5;
   };
 
   services.mysql = {

systems/ful/nethack.nix

@@ -1,60 +0,0 @@
-{
-  networking.firewall.allowedTCPPorts = [ 22 ];
-
-  containers.nethack = {
-    autoStart = true;
-
-    forwardPorts = [
-      {
-        containerPort = 22;
-        hostPort = 22;
-      }
-    ];
-
-    config =
-      { pkgs, ... }:
-      {
-        system.stateVersion = "25.11";
-
-        networking.hostName = "nethack";
-        services.openssh.enable = true;
-
-        environment.systemPackages = [ pkgs.nethack ];
-
-        programs.tmux.enable = true;
-        programs.tmux.extraConfig = ''
-          set -g mouse on
-          set -g allow-rename off
-          set -g detach-on-destroy off
-
-          unbind-key C-b
-          set -g prefix None
-        '';
-
-        users.users.nethack = {
-          isNormalUser = true;
-          home = "/home/nethack";
-          createHome = true;
-          shell = pkgs.bash;
-          openssh.authorizedKeys.keys = [
-            "ssh-ed25519 AAAA...yourkey"
-            "ssh-ed25519 AAAA...friendkey"
-          ];
-        };
-
-        services.openssh.settings = {
-          PasswordAuthentication = false;
-          PermitRootLogin = "no";
-        };
-
-        services.openssh.extraConfig = ''
-          Match User nethack
-            ForceCommand ${pkgs.tmux}/bin/tmux attach -t nethack || \
-                         ${pkgs.tmux}/bin/tmux new -s nethack ${pkgs.nethack}/bin/nethack
-            AllowTcpForwarding no
-            X11Forwarding no
-            PermitTTY yes
-        '';
-      };
-  };
-}

systems/ful/servant-openapi.hs

@@ -0,0 +1,119 @@
+
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Main where
+
+import Data.Aeson (ToJSON, FromJSON)
+import GHC.Generics (Generic)
+import Data.String (IsString(..))
+import Network.Wai (Application)
+import Network.Wai.Handler.Warp (run)
+import Servant
+import Servant.Client (HasClient (..))
+import Servant.OpenApi (HasOpenApi(..), toOpenApi)
+import qualified Data.Version as Version
+import Servant.Swagger.UI (SwaggerSchemaUI, swaggerSchemaUIServer)
+import Data.OpenApi (ToSchema, servers, license, info, description, version, title)
+import qualified Data.OpenApi as OpenApi
+import Control.Concurrent.MVar (MVar, newMVar, modifyMVar, readMVar)
+import System.Environment (getEnv)
+import Control.Monad.IO.Class (liftIO)
+import Control.Lens
+import qualified Data.Text as T
+import GHC.Generics
+import GHC.TypeLits
+import Data.UUID (UUID)
+import Data.UUID.V4 (nextRandom)
+import qualified Data.UUID as UUID
+
+-- Define a simple data type
+data User = User
+  { userId :: UUID
+  , name   :: String
+  , age    :: Int
+  } deriving (Generic, Show)
+
+instance ToJSON User
+instance FromJSON User
+instance ToSchema User
+
+-- Define the API type
+type API = "users" :> OperationId "getUsers" :> Get '[JSON] [User]
+      :<|> "users" :> OperationId "insertUser" :> ReqBody '[JSON] User :> Post '[JSON] User
+      :<|> "users" :> OperationId "updateUser" :> Capture "id" UUID :> ReqBody '[JSON] User :> Put '[JSON] User
+      :<|> "users" :> OperationId "deleteUser" :> Capture "id" UUID :> Delete '[JSON] NoContent
+
+-- Define the API with Swagger endpoints
+type APIWithSwagger = API
+      :<|> SwaggerSchemaUI "swagger-ui" "openapi.json"
+
+
+data OperationId (name :: Symbol)
+
+instance HasServer subApi ctx => HasServer (OperationId name :> subApi) ctx where
+  type ServerT (OperationId name :> subApi) m = ServerT subApi m
+  route _ = route (Proxy @subApi)
+  hoistServerWithContext _ = hoistServerWithContext (Proxy @subApi)
+
+instance (HasOpenApi subApi, KnownSymbol name) => HasOpenApi (OperationId name :> subApi) where
+  toOpenApi _ = toOpenApi (Proxy @subApi) & OpenApi.allOperations . OpenApi.operationId ?~ apiName
+    where
+      apiName = T.pack $ symbolVal (Proxy @name)
+
+instance HasClient m api => HasClient m (OperationId name :> api) where
+  type Client m (OperationId name :> api) = Client m api
+  clientWithRoute pm Proxy = clientWithRoute pm (Proxy :: Proxy api)
+  hoistClientMonad pm _ = hoistClientMonad pm (Proxy :: Proxy api)
+
+-- Handlers for the API
+getUsers :: MVar [User] -> Handler [User]
+getUsers usersVar = liftIO $ readMVar usersVar
+
+addUser :: MVar [User] -> User -> Handler User
+addUser usersVar newUser = liftIO $ do
+    newId <- nextRandom
+    let userWithId = newUser { userId = newId }
+    modifyMVar usersVar $ \users -> return (userWithId : users, userWithId)
+
+updateUser :: MVar [User] -> UUID -> User -> Handler User
+updateUser usersVar uid updatedUser = liftIO $ do
+    modifyMVar usersVar $ \users ->
+        let newUsers = map (\user -> if userId user == uid then updatedUser { userId = uid } else user) users
+        in return (newUsers, updatedUser { userId = uid })
+
+deleteUser :: MVar [User] -> UUID -> Handler NoContent
+deleteUser usersVar uid = liftIO $ do
+    modifyMVar usersVar $ \users ->
+        let newUsers = filter (\user -> userId user /= uid) users
+        in return (newUsers, NoContent)
+
+-- Implement the server
+server :: OpenApi.Server -> MVar [User] -> Server APIWithSwagger
+server virtualHost usersVar = (getUsers usersVar
+              :<|> addUser usersVar
+              :<|> updateUser usersVar
+              :<|> deleteUser usersVar)
+              :<|> swaggerSchemaUIServer (toOpenApi (Proxy :: Proxy API)
+                  & info.title        .~ "OpenAPI AI API"
+                  & info.version      .~ "1.0"
+                  & info.description  ?~ "This is an API for AI with OpenAPI"
+                  & info.license      ?~ "MIT"
+                  & servers           .~ [virtualHost])
+
+-- Create the application
+app :: OpenApi.Server -> MVar [User] -> Application
+app virtualHost usersVar = serve (Proxy :: Proxy APIWithSwagger) (server virtualHost usersVar)
+
+-- Main entry point
+main :: IO ()
+main = do
+    initialUsers <- mapM (\(name, age) -> nextRandom >>= \uid -> return (User uid name age)) [("Alice", 30), ("Bob", 25)]
+    usersVar <- newMVar initialUsers
+    virtualHost <- getEnv "VIRTUAL_HOST"
+    port <- read <$> getEnv "PORT"  -- Assuming PORT is a number
+    run port (app (fromString virtualHost) usersVar)
+

systems/kabsa/configuration.nix

@@ -45,6 +45,8 @@ in {
     wireguard-aether-psk.file = ../../secrets/kabsa-wireguard-aether-psk.age;
   };
 
+  networking.wg-quick.interfaces.aether.address = ["192.168.178.203/24"];
+
   environment.systemPackages = [pkgs.zeroad];
 
   networking = {

systems/kibbeh/configuration.nix

@@ -14,6 +14,7 @@
     ../../configs/sound.nix
     ../../configs/printing.nix
     ../../configs/nix.nix
+    ../../configs/flix.nix
     ../../configs/fonts.nix
     ../../configs/mycelium.nix
     ../../configs/retiolum.nix
@@ -79,6 +80,7 @@
       niveumPackages.mpv-tv
       telegram-desktop
       (niveumPackages.mpv-radio.override { di-fm-key-file = config.age.secrets.di-fm-key.path; })
+      niveumPackages.meteo
       spotify
     ];
   };

systems/maakaron/home.nix

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

systems/makanek/configuration.nix

@@ -13,7 +13,7 @@ in {
     ./menstruation.nix
     ./moinbot.nix
     ./monitoring
-    # ./names.nix
+    ./names.nix
     ./nextcloud.nix
     ../../configs/mycelium.nix
     ./radio-news.nix

systems/makanek/gitea.nix

@@ -7,10 +7,8 @@ in {
     defaultOptions.settings = {
       USER_DEFINED_DEFAULT = true;
     };
-    instances = let instance = "gitea"; in {
+    instances = {
-      ${instance}.settings = {
+      "gitea".settings = {
-        BIND = "/run/anubis/anubis-${instance}/anubis.sock";
-        METRICS_BIND = "/run/anubis/anubis-${instance}/anubis-metrics.sock";
         TARGET = "http://localhost:${toString config.services.gitea.settings.server.HTTP_PORT}";
         USER_DEFINED_INSTANCE = true;
         OG_PASSTHROUGH = true;

systems/makanek/monitoring/default.nix

@@ -187,7 +187,7 @@ in
               }
               {
                 alert = "Mastodon";
-                expr = ''probe_success{instance="https://social.krebsco.de"} == 0'';
+                expr = ''probe_success{instance="https://social.krebsco.de"}'';
                 for = "5m";
                 annotations.description = "Mastodon instance {{$labels.instance}} is down";
               }

systems/makanek/tarot.nix

@@ -3,8 +3,7 @@
   pkgs,
   lib,
   ...
-}:
+}: let
-let
   tarotPort = 7407;
   tarotFiles = pkgs.fetchzip {
     url = "https://c.krebsco.de/tarot.zip";
@@ -15,45 +14,33 @@ let
     url = "http://c.krebsco.de/tarot.pdf";
     sha256 = "1n2m53kjg2vj9dbr70b9jrsbqwdfrcb48l4wswn21549fi24g6dx";
   };
-in
+in {
-{
+  services.htgen.tarot = {
-  systemd.services.tarot = {
+    port = tarotPort;
-    enable = true;
+    script = ''. ${pkgs.writers.writeDash "tarot" ''
-    serviceConfig.Type = "simple";
+        case "$Method $Request_URI" in
-    wantedBy = [ "multi-user.target" ];
+          "GET /")
-    serviceConfig.ExecStart = pkgs.writers.writePython3 "tarot-server" {
+            if item=$(${pkgs.findutils}/bin/find ${toString tarotFiles} -type f | ${pkgs.coreutils}/bin/shuf -n1); then
-      libraries = py: [ py.pillow py.flask ];
+              card=$(mktemp --tmpdir tarot.XXX)
-    } ''
+              trap 'rm $card' EXIT
-      from flask import Flask, send_file
+              reverse=$(${pkgs.coreutils}/bin/shuf -i0-1 -n1)
-      from pathlib import Path
+              if [ "$reverse" -eq 1 ]; then
-      from random import choice, randint
+                ${pkgs.imagemagick}/bin/convert -rotate 180 "$item" "$card"
-      from io import BytesIO
+              else
-      from PIL import Image
+                ${pkgs.coreutils}/bin/cp "$item" "$card"
-
+              fi
-      app = Flask(__name__)
+              printf 'HTTP/1.1 200 OK\r\n'
-      TAROT_DIR = Path("${tarotFiles}")
+              printf 'Content-Type: %s\r\n' "$(${pkgs.file}/bin/file -ib "$card")"
-
+              printf 'Server: %s\r\n' "$Server"
-
+              printf 'Connection: close\r\n'
-      @app.route("/")
+              printf 'Content-Length: %d\r\n' $(${pkgs.coreutils}/bin/wc -c < "$card")
-      def tarot():
+              printf '\r\n'
-          card_path = choice(list(TAROT_DIR.glob("*")))
+              cat "$card"
-
+              exit
-          with Image.open(card_path) as img:
+            fi
-              if randint(0, 1):
+          ;;
-                  img = img.rotate(180)
+        esac
-              buf = BytesIO()
+      ''}'';
-              img.save(buf, format="JPEG")
-              buf.seek(0)
-              return send_file(
-                  buf,
-                  mimetype='image/jpeg',
-                  as_attachment=False
-              )
-
-
-      if __name__ == "__main__":
-          app.run(port=${toString tarotPort})
-    '';
   };
 
   niveum.passport.services = [
@@ -68,7 +55,7 @@ in
     enableACME = true;
     forceSSL = true;
     locations = {
-      "/".proxyPass = "http://127.0.0.1:${toString tarotPort}/";
+      "/".proxyPass = "http://127.0.0.1:${toString tarotPort}";
       "/files/" = {
         root = pkgs.linkFarm "tarot" [
           {

systems/makanek/weechat.nix

@@ -1,11 +1,15 @@
 {
   lib,
   pkgs,
+  config,
+  unstablePackages,
   ...
 }: let
   inherit (import ../../lib) kieran;
   weechatHome = "/var/lib/weechat";
-  weechat-declarative = pkgs.callPackage ../../packages/weechat-declarative.nix {};
+  weechat-declarative = pkgs.callPackage ../../packages/weechat-declarative.nix {
+    inherit unstablePackages;
+  };
 in {
   systemd.services.weechat = let
     tmux = pkgs.writers.writeDash "tmux" ''

systems/manakish/configuration.nix

@@ -36,6 +36,8 @@ in {
     wireguard-aether-psk.file = ../../secrets/manakish-wireguard-aether-psk.age;
   };
 
+  networking.wg-quick.interfaces.aether.address = ["192.168.178.204/24"];
+
   niveum = {
     batteryName = "BAT0";
     wirelessInterface = "wlp3s0";

systems/moto/configuration.nix

@@ -0,0 +1,71 @@
+{
+  pkgs,
+  niveumPackages,
+  inputs,
+  ...
+}: let
+  sshPort = 8022;
+in {
+  environment.packages = with pkgs; [
+    nil
+    bzip2
+    coreutils
+    curl
+    diffutils
+    findutils
+    git
+    gnugrep
+    gnupg
+    gnused
+    gnutar
+    gzip
+    hostname
+    iproute2
+    man
+    openssh
+    procps
+    tzdata
+    unzip
+    utillinux
+    vim
+    which
+    xz
+    zip
+    hledger
+    hledger-ui
+    niveumPackages.vim
+    gitAndTools.gh
+    ripgrep
+    (pkgs.writers.writeDashBin "start-ssh" ''
+      ${pkgs.openssh}/bin/sshd -f ${pkgs.writeText "sshd_config" ''
+        HostKey /data/data/com.termux.nix/files/home/.ssh/ssh_host_rsa_key
+        Port ${toString sshPort}
+      ''}
+    '')
+  ];
+
+  nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
+
+  home-manager = {
+    useGlobalPkgs = true;
+    backupFileExtension = "hm-bak";
+    config = {pkgs, ...}: {
+      home.stateVersion = "23.05";
+      programs.tmux.enable = true;
+    };
+  };
+
+  environment.sessionVariables = {
+    LEDGER_FILE = "/data/data/com.termux.nix/files/home/src/ledger/privat.journal";
+  };
+
+  user.shell = "${pkgs.fish}/bin/fish";
+
+  environment.etcBackupExtension = ".bak";
+
+  system.stateVersion = "23.05";
+
+  nix.extraOptions = ''
+    experimental-features = nix-command flakes
+  '';
+}

systems/zaatar/home-assistant.nix

@@ -74,40 +74,6 @@ in {
 
   hardware.bluetooth.enable = true;
 
-  systemd.services.update-containers = {
-    startAt = "Mon 02:00";
-    script = ''
-      images=$(${pkgs.podman}/bin/podman ps -a --format="{{.Image}}" | sort -u)
-
-      for image in $images; do
-        ${pkgs.podman}/bin/podman pull "$image"
-      done
-    '';
-    serviceConfig = {
-      Type = "oneshot";
-      Restart = "on-failure";
-      RestartSec = "1h";
-    };
-  };
-
-  systemd.services.restart-homeassistant = {
-    startAt = "Tue 02:00";
-    script = ''
-      ${pkgs.systemd}/bin/systemctl try-restart podman-homeassistant.service
-    '';
-    serviceConfig = {
-      Type = "oneshot";
-    };
-  };
-
-  virtualisation.podman = {
-    enable = true;
-    autoPrune = {
-      enable = true;
-      flags = ["--all"];
-    };
-  };
-
   virtualisation.oci-containers = {
     backend = "podman";
     containers.homeassistant = {
@@ -116,9 +82,6 @@ in {
         "${playlistDirectoryPath}:/media"
         "/run/dbus:/run/dbus:ro"
       ];
-      # needed for bluetooth
-      capabilities.NET_ADMIN = true;
-      capabilities.NET_RAW = true;
       environment.TZ = "Europe/Berlin";
       image = "ghcr.io/home-assistant/home-assistant:stable";
       extraOptions = [