nethack container

Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/e1680d594a9281651cbf7d126941a8c8e2396183?narHash=sha256-d%2B5CGloq7Lo1u2SkzhF8oiOdUc6Z5emh22nTXUB9CFA%3D' (2025-12-03)
  → 'github:nix-community/home-manager/20561be440a11ec57a89715480717baf19fe6343?narHash=sha256-O8VTGey1xxiRW%2BFpb%2BPs9zU7ShmxUA1a7cMTcENCVNg%3D' (2025-12-08)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/1aab89277eb2d87823d5b69bae631a2496cff57a?narHash=sha256-H3lC7knbXOBrHI9hITQ7modLuX20mYJVhZORL5ioms0%3D' (2025-12-02)
  → 'github:NixOS/nixpkgs/d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454?narHash=sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o%3D' (2025-12-06)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/152586a6a98226db20aab6e6e1c9a37c535acfbc?narHash=sha256-p7ihpz21BB%2BNhuT3qVL3clzWz%2BUyZlt7S3RRXxZGPls%3D' (2025-12-04)
  → 'github:NixOS/nixpkgs/aaa6c85f51f9333738c170ccc55b5fe5f55938f4?narHash=sha256-VPyShT4DyGtXH2wsD8yAVvvvi9OILUHTqNxWQd/6yZA%3D' (2025-12-10)
• Updated input 'nur':
    'github:nix-community/NUR/5e8ec1167d3a375e2857fbe915b3d8658d3e6472?narHash=sha256-bp7B5alQk7nDLtFLKaOHhSPBNVCcwIxMXjcc/VzY0hg%3D' (2025-12-04)
  → 'github:nix-community/NUR/6af054d2762ef52fad9943d490708f937008cca4?narHash=sha256-JyVUlh5wINjw29Ops7ZjRrzw%2B55r5GpCHjO0TCsoowc%3D' (2025-12-10)
• Updated input 'nur/nixpkgs':
    'github:nixos/nixpkgs/418468ac9527e799809c900eda37cbff999199b6?narHash=sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y%3D' (2025-12-02)
  → 'github:nixos/nixpkgs/addf7cf5f383a3101ecfba091b98d0a1263dc9b8?narHash=sha256-hM20uyap1a0M9d344I692r%2Bik4gTMyj60cQWO%2BhAYP8%3D' (2025-12-08)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/74d9abb7c5c030469f90d97a67d127cc5d76c238?narHash=sha256-F0IQSmSj4t2ThkbWZooAhkCTO%2BYpZSd2Pqiv2uoYEHo%3D' (2025-12-04)
  → 'github:oxalica/rust-overlay/db61f666aea93b28f644861fbddd37f235cc5983?narHash=sha256-jTof2%2Bir9UPmv4lWksYO6WbaXCC0nsDExrB9KZj7Dz4%3D' (2025-12-10)
• Updated input 'stylix':
    'github:danth/stylix/6f3b50c8fa9c468fc787e211b700e46592bf9d56?narHash=sha256-J2jgYyXiXctr91MSuBQ6dwB1YaC7DpzKp%2BRkj6pqS8o%3D' (2025-12-04)
  → 'github:danth/stylix/84d9d55885d463d461234f3aac07b2389a2577d8?narHash=sha256-abrrONk8vzRtY6fHEkjZOyRJpKHjPlFqMBE0%2B/DxfAU%3D' (2025-12-06)

.github/workflows/niveum.yml

@@ -11,7 +11,9 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Install QEMU (ARM)
-      run: sudo apt-get install -y qemu-user-static
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y qemu-user-static
       if: ${{ matrix.system == 'ful' }}
     - name: Install Nix (ARM)
       uses: cachix/install-nix-action@v16

README.md

@@ -1,5 +1,7 @@
 # niveum
 
+> I must Create a System, or be enslav'd by another Man's. —William Blake
+
 > [nĭvĕus](https://logeion.uchicago.edu/niveus), a, um, adj. [nix], _of_ or _from snow, snowy, snow-_ (poet.)
 >
 > 1. Lit.: aggeribus niveis informis, Verg. G. 3, 354: aqua, _cooled with snow_, Mart. 12, 17, 6; cf. id. 14, 104 and 117: mons, _covered with snow_, Cat. 64, 240.—

configs/admin-essentials.nix

@@ -4,7 +4,7 @@
   lib,
   ...
 }: let
-  darwin = lib.strings.hasSuffix "-darwin" pkgs.system;
+  darwin = lib.strings.hasSuffix "-darwin" pkgs.stdenv.hostPlatform.system;
 in {
   environment.systemPackages =
     [
@@ -15,6 +15,7 @@ in {
       pkgs.unzip
       pkgs.unrar
       pkgs.p7zip
+      pkgs.sshuttle
       pkgs.zip
       # MONITORS
       pkgs.iftop # interface bandwidth monitor
@@ -52,6 +53,22 @@ in {
       pkgs.psmisc # for killall, pstree
     ];
 
+
+    security.wrappers = {
+      pmount = {
+        setuid = true;
+        owner = "root";
+        group = "root";
+        source = "${pkgs.pmount}/bin/pmount";
+      };
+      pumount = {
+        setuid = true;
+        owner = "root";
+        group = "root";
+        source = "${pkgs.pmount}/bin/pumount";
+      };
+    };
+
   environment.shellAliases = let
     take = pkgs.writers.writeDash "take" ''
       mkdir "$1" && cd "$1"

configs/aerc.nix

@@ -8,6 +8,12 @@
   inherit (import ../lib/email.nix) defaults thunderbirdProfile;
 in {
   age.secrets = {
+    email-password-ical-ephemeris = {
+      file = ../secrets/email-password-ical-ephemeris.age;
+      owner = config.users.users.me.name;
+      group = config.users.users.me.group;
+      mode = "400";
+    };
     email-password-cock = {
       file = ../secrets/email-password-cock.age;
       owner = config.users.users.me.name;
@@ -79,9 +85,25 @@ in {
           address = "2210@cock.li";
           userName = address;
           passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-cock.path}";
-          realName = "";
+          realName = "2210";
           imap.host = "mail.cock.li";
+          imap.port = 993;
           smtp.host = imap.host;
+          smtp.port = 25;
+          smtp.tls.useStartTls = true;
+        };
+      ical-ephemeris =
+        lib.recursiveUpdate defaults
+        rec {
+          userName = "ical.ephemeris@web.de";
+          realName = "Kieran from iCal Ephemeris";
+          address = userName;
+          passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-ical-ephemeris.path}";
+          imap.host = "imap.web.de";
+          imap.port = 993;
+          smtp.host = "smtp.web.de";
+          smtp.port = 587;
+          smtp.tls.useStartTls = true;
         };
       posteo =
         lib.recursiveUpdate defaults

configs/alacritty.nix

@@ -1,58 +1,8 @@
 {
   pkgs,
   lib,
-  config,
   ...
 }: let
-  alacritty-cfg = theme:
-    (pkgs.formats.yaml {}).generate "alacritty.yml" {
-      bell = {
-        animation = "EaseOut";
-        duration = 100;
-        color = "#ffffff";
-      };
-      font = {
-        normal.family = "Monospace";
-        size = 6;
-      };
-      live_config_reload = true;
-      key_bindings = [
-        {
-          key = "Plus";
-          mods = "Control";
-          action = "IncreaseFontSize";
-        }
-        {
-          key = "Minus";
-          mods = "Control";
-          action = "DecreaseFontSize";
-        }
-        {
-          key = "Key0";
-          mods = "Control";
-          action = "ResetFontSize";
-        }
-      ];
-      colors = let
-        colourNames = ["black" "red" "green" "yellow" "blue" "magenta" "cyan" "white"];
-        colourPairs = lib.getAttrs colourNames theme;
-      in {
-        primary = {inherit (theme) background foreground;};
-        cursor = {inherit (theme) cursor;};
-        normal = lib.mapAttrs (_: colour: colour.dark) colourPairs;
-        bright = lib.mapAttrs (_: colour: colour.bright) colourPairs;
-      };
-    };
-  alacritty-pkg = pkgs.symlinkJoin {
-    name = "alacritty";
-    paths = [
-      (pkgs.writers.writeDashBin "alacritty" ''
-        ${pkgs.alacritty}/bin/alacritty --config-file /var/theme/config/alacritty.yml msg create-window "$@" ||
-        ${pkgs.alacritty}/bin/alacritty --config-file /var/theme/config/alacritty.yml "$@"
-      '')
-      pkgs.alacritty
-    ];
-  };
 in {
   environment.variables.TERMINAL = "alacritty";
 

configs/backup.nix

@@ -24,6 +24,7 @@ in {
       "/home/kfm/cloud"
       "/home/kfm/mobile"
       "/home/kfm/.gnupg"
+      "/home/kfm/.electrum"
       "/home/kfm/.ssh"
     ];
   };

configs/bash.nix

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

configs/bluetooth.nix

@@ -6,9 +6,5 @@
     };
   };
 
-  services.blueman.enable = true;
-
-  # environment.systemPackages = [pkgs.blueman];
-
-  home-manager.users.me = {services.blueman-applet.enable = true;};
+  environment.systemPackages = [ pkgs.bluetuith ];
 }

configs/bots/autorenkalender.nix

@@ -1,26 +1,13 @@
 {
-  pkgs,
-  lib,
   config,
+  inputs,
   ...
 }: let
-  autorenkalender-package = pkgs.fetchFromGitHub {
-    owner = "kmein";
-    repo = "autorenkalender";
-    rev = "cf49a7b057301332d980eb47042a626add93db66";
-    sha256 = "1pa7sjg33vdnjianrqldv445jdzzv3mn231ljk1j58hs0cd505gs";
-  };
-  autorenkalender =
-    pkgs.python3Packages.callPackage autorenkalender-package {};
+  autorenkalender = inputs.autorenkalender.packages.x86_64-linux.default;
 in {
   niveum.bots.autorenkalender = {
     enable = true;
     time = "07:00";
-    mastodon = {
-      enable = false;
-      language = "de";
-      tokenFile = config.age.secrets.mastodon-token-autorenkalender.path;
-    };
     telegram = {
       enable = true;
       tokenFile = config.age.secrets.telegram-token-kmein.path;
@@ -30,10 +17,6 @@ in {
     command = "${autorenkalender}/bin/autorenkalender";
   };
 
-  age.secrets = {
-    mastodon-token-autorenkalender.file = ../../secrets/mastodon-token-autorenkalender.age;
-  };
-
   niveum.passport.services = [
     {
       title = "Autorenkalender";

configs/bots/celan.nix

@@ -3,12 +3,7 @@
   lib,
   config,
   ...
-}: let
-  celan = pkgs.fetchzip {
-    url = "http://c.krebsco.de/celan.tar.gz";
-    sha256 = "sha256-nA+EwAH2vkeolsy9AoPLEMt1uGKDZe/aPrS95CZvuus=";
-  };
-in {
+}: {
   niveum.bots.celan = {
     enable = true;
     time = "08:00";
@@ -22,28 +17,49 @@ in {
       tokenFile = config.age.secrets.mastodon-token-celan.path;
       language = "de";
     };
-    command = toString (pkgs.writers.writeDash "random-celan" ''
-      cd ${celan}
-      poem="$(${pkgs.findutils}/bin/find . -type f | ${pkgs.coreutils}/bin/shuf -n1)"
-      source="$(${pkgs.coreutils}/bin/dirname "$poem" \
-        | ${pkgs.gnused}/bin/sed 's#^\./##;s/[-_]/ /g;s!/! › !g;s/0\([0-9]\+\)/\1/g' \
-        | ${pkgs.gnused}/bin/sed 's/Der Sand aus den Urnen/#Der_Sand_aus_den_Urnen (1948)/g' \
-        | ${pkgs.gnused}/bin/sed 's/Mohn und Gedächtnis/#Mohn_und_Gedächtnis (1952)/g' \
-        | ${pkgs.gnused}/bin/sed 's/Von Schwelle zu Schwelle/#Von_Schwelle_zu_Schwelle (1955)/g' \
-        | ${pkgs.gnused}/bin/sed 's/Sprachgitter/#& (1959)/g' \
-        | ${pkgs.gnused}/bin/sed 's/Niemandsrose/#& (1963)/g' \
-        | ${pkgs.gnused}/bin/sed 's/Atemwende/#& (1967)/g' \
-        | ${pkgs.gnused}/bin/sed 's/Fadensonnen/#& (1968)/g' \
-        | ${pkgs.gnused}/bin/sed 's/Lichtzwang/#& (1970)/g' \
-        | ${pkgs.gnused}/bin/sed 's/Schneepart/#& (1971)/g' \
-        | ${pkgs.gnused}/bin/sed 's/Zeitgehöft/#& (1976)/g' \
-        | ${pkgs.gnused}/bin/sed 's/Frühwerk/#& (1989)/g' \
-        | ${pkgs.gnused}/bin/sed 's/Eingedunkelt/#& (1991)/g' \
-        | ${pkgs.gnused}/bin/sed 's/Nachlaß/#& (1997)/g'
-      )"
-      cat "$poem"
-      echo
-      printf "Aus: %s\n\n#PaulCelan #Celan #Lyrik #poetry" "$source"
+    command = toString (pkgs.writers.writePython3 "random-celan.py" { libraries = [pkgs.python3Packages.lxml]; } ''
+      from lxml import etree
+      import random
+
+
+      def xml_text(elements):
+          return "".join("".join(t.itertext()) for t in elements).strip()
+
+
+      tree = etree.parse('${pkgs.fetchurl {
+        url = "http://c.krebsco.de/celan.tei.xml";
+        hash = "sha256-HgNmJYfhuwyfm+FcNtnnYWpJpIIU1ElHLeLiIFjF9mE=";
+      }}')
+      root = tree.getroot()
+
+      tei = {"tei": "http://www.tei-c.org/ns/1.0"}
+
+      poems = root.xpath(".//tei:lg[@type='poem']", namespaces=tei)
+
+      poem = random.choice(poems)
+
+      for stanza in poem.xpath("./tei:lg[@type='stanza']", namespaces=tei):
+          for line in stanza.xpath('./tei:l', namespaces=tei):
+              if line.text:
+                  print(line.text.strip())
+          print()
+
+      current_element = poem
+      while current_element is not None:
+          if current_element.tag == "{http://www.tei-c.org/ns/1.0}text":
+              text_element = current_element
+
+              title = xml_text(text_element.xpath("./tei:front/tei:docTitle",
+                               namespaces=tei))
+              print(f"Aus: #{title.replace(" ", "_")}", end=" ")
+
+              if date := xml_text(text_element.xpath("./tei:front/tei:docDate",
+                                  namespaces=tei)):
+                  print(f"({date})")
+              break
+          current_element = current_element.getparent()
+
+      print("\n\n#PaulCelan #Celan #Lyrik #poetry")
     '');
   };
 

configs/bots/default.nix

@@ -17,11 +17,15 @@ in {
     ./hesychius.nix
     ./smyth.nix
     ./nachtischsatan.nix
-    ./tlg-wotd.nix
+    # ./tlg-wotd.nix TODO reenable
     ./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/logotheca.nix

@@ -26,7 +26,6 @@
   };
 
   age.secrets = {
-    mastodon-token-logotheca.file = ../../secrets/mastodon-token-logotheca.age;
     matrix-token-lakai.file = ../../secrets/matrix-token-lakai.age;
   };
 

configs/bots/smyth.nix

@@ -20,15 +20,31 @@
     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=$(
-        ${pkgs.curl}/bin/curl -sSL http://www.perseus.tufts.edu/hopper/xmltoc?doc=Perseus%3Atext%3A1999.04.0007%3Asmythp%3D1 \
+        good_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"
-      ${pkgs.curl}/bin/curl -sSL "$url"\
+      good_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,9 +3,14 @@
   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";
@@ -41,7 +46,7 @@
       #ancientgreek #classics #wotd #wordoftheday
 
       transliteration=$(${pkgs.writers.writePython3 "translit.py" {
-        libraries = [ niveumPackages.cltk ];
+        libraries = py: [ py.cltk ];
       } ''
         import sys
         from cltk.phonology.grc.transcription import Transcriber
@@ -122,12 +127,12 @@
            -F parse_mode=Markdown \
            -F caption="$telegram_caption"
 
-      mastodon_upload_response=$(curl -X POST "https://botsin.space/api/v2/media" \
+      mastodon_upload_response=$(curl -X POST "${mastodonEndpoint}/api/v2/media" \
           -H "Authorization: Bearer $MASTODON_TOKEN" \
           -F "file=@$photo_path" \
           -F "description=$word ‘$definition’")
       mastodon_image_id=$(echo $mastodon_upload_response | jq -r .id)
-      curl -X POST "https://botsin.space/api/v1/statuses" \
+      curl -X POST "${mastodonEndpoint}/api/v1/statuses" \
           -H "Authorization: Bearer $MASTODON_TOKEN" \
           -d "status=$mastodon_caption" \
           -d "visibility=public" \
@@ -146,7 +151,6 @@
   };
 
   age.secrets = {
-    telegram-token-kmein.file = ../../secrets/telegram-token-kmein.age;
     mastodon-token-tlgwotd.file = ../../secrets/mastodon-token-tlgwotd.age;
   };
 

configs/browser.nix

@@ -1,10 +1,16 @@
 {
-  pkgs,
   config,
+  pkgs,
+  niveumPackages,
   ...
-}: let
-  inherit (import ../lib) tmpfilesConfig;
-in {
+}: {
+  environment.systemPackages = [
+    niveumPackages.cro
+    pkgs.tor-browser
+    pkgs.firefox
+    pkgs.brave
+  ];
+
   home-manager.users.me = {
     programs.firefox = {
       enable = true;
@@ -76,5 +82,9 @@ in {
     };
   };
 
+  home-manager.users.me = {
+    stylix.targets.firefox.profileNames = ["default"];
+  };
+
   environment.variables.BROWSER = "firefox";
 }

configs/cloud.nix

@@ -6,6 +6,16 @@
 }: let
   inherit (import ../lib) tmpfilesConfig;
 in {
+  systemd.user.services.systemd-tmpfiles-clean = {
+    enable = true;
+    wantedBy = [ "default.target" ];
+    startAt = "daily";
+    script = "systemd-tmpfiles --user --clean";
+    serviceConfig = {
+      Type = "oneshot";
+    };
+  };
+
   systemd.user.tmpfiles.users.me.rules = map tmpfilesConfig [
     {
       type = "d";

configs/default.nix

@@ -3,19 +3,20 @@
   lib,
   config,
   niveumPackages,
-  unstablePackages,
   inputs,
   ...
-}: let
+}:
+let
   inherit (lib.strings) makeBinPath;
   inherit (import ../lib) localAddresses kieran remoteDir;
-  defaultApplications = (import ../lib).defaultApplications {inherit pkgs;};
-in {
+  defaultApplications = (import ../lib).defaultApplications { inherit pkgs; };
+in
+{
   imports = [
     inputs.self.nixosModules.system-dependent
     inputs.self.nixosModules.power-action
     {
-      boot.supportedFilesystems = ["ntfs"];
+      boot.supportedFilesystems = [ "ntfs" ];
     }
     {
       nixpkgs = {
@@ -25,9 +26,6 @@ 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"
           ];
         };
       };
@@ -63,17 +61,6 @@ in {
         };
       };
     }
-    {
-      environment.systemPackages = [
-        pkgs.capitaine-cursors
-      ];
-
-      stylix.cursor = {
-        name = "capitaine-cursors-white";
-        package = pkgs.capitaine-cursors;
-        size = 12;
-      };
-    }
     {
       users.mutableUsers = false;
 
@@ -85,7 +72,10 @@ in {
         hashedPasswordFile = config.age.secrets.kfm-password.path;
         isNormalUser = true;
         uid = 1000;
-        extraGroups = ["pipewire" "audio"];
+        extraGroups = [
+          "pipewire"
+          "audio"
+        ];
       };
 
       nix.settings.trusted-users = [ config.users.users.me.name ];
@@ -98,25 +88,27 @@ in {
     }
     {
       environment.interactiveShellInit = "export PATH=$PATH";
-      environment.shellAliases = let
-        swallow = command: "${niveumPackages.swallow}/bin/swallow ${command}";
-      in {
-        o = "${pkgs.xdg-utils}/bin/xdg-open";
-        ns = "nix-shell --run zsh";
-        pbcopy = "${pkgs.xclip}/bin/xclip -selection clipboard -in";
-        pbpaste = "${pkgs.xclip}/bin/xclip -selection clipboard -out";
-        tmux = "${pkgs.tmux}/bin/tmux -2";
-        sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv";
-        zathura = swallow "${pkgs.zathura}/bin/zathura";
-        im = "${pkgs.openssh}/bin/ssh weechat@makanek -t tmux attach-session -t IM";
-        yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
-        yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -xic"; # Download with audio
-      };
+      environment.shellAliases =
+        let
+          swallow = command: "${niveumPackages.swallow}/bin/swallow ${command}";
+        in
+        {
+          o = "${pkgs.xdg-utils}/bin/xdg-open";
+          ns = "nix-shell --run zsh";
+          pbcopy = "${pkgs.xclip}/bin/xclip -selection clipboard -in";
+          pbpaste = "${pkgs.xclip}/bin/xclip -selection clipboard -out";
+          tmux = "${pkgs.tmux}/bin/tmux -2";
+          sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv";
+          zathura = swallow "${pkgs.zathura}/bin/zathura";
+          im = "${pkgs.openssh}/bin/ssh weechat@makanek -t tmux attach-session -t IM";
+          yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
+          yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata --audio-format mp3 --audio-quality 0 -xic"; # Download with audio
+        };
     }
     {
       i18n = {
         defaultLocale = "en_DK.UTF-8";
-        supportedLocales = ["all"];
+        supportedLocales = [ "all" ];
       };
     }
     {
@@ -132,33 +124,22 @@ in {
           enable = true;
           greeters.gtk = {
             enable = true;
-            indicators = ["~spacer" "~host" "~spacer" "~session" "~power"];
+            indicators = [
+              "~spacer"
+              "~host"
+              "~spacer"
+              "~session"
+              "~power"
+            ];
           };
         };
       };
     }
-    {
-      security.wrappers = {
-        pmount = {
-          setuid = true;
-          owner = "root";
-          group = "root";
-          source = "${pkgs.pmount}/bin/pmount";
-        };
-        pumount = {
-          setuid = true;
-          owner = "root";
-          group = "root";
-          source = "${pkgs.pmount}/bin/pumount";
-        };
-      };
-    }
-    {programs.command-not-found.enable = true;}
     {
       programs.gnupg = {
         agent = {
           enable = true;
-          pinentryPackage = pkgs.pinentry-rofi;
+          pinentryPackage = pkgs.pinentry-qt;
           settings = rec {
             default-cache-ttl = 2 * 60 * 60;
             max-cache-ttl = 4 * default-cache-ttl;
@@ -168,7 +149,11 @@ in {
 
       environment.systemPackages = [
         pkgs.gnupg
-        (pkgs.pass.withExtensions (e: [e.pass-otp e.pass-import e.pass-genphrase]))
+        (pkgs.pass.withExtensions (e: [
+          e.pass-otp
+          e.pass-import
+          e.pass-genphrase
+        ]))
       ];
     }
     {
@@ -181,12 +166,10 @@ in {
       };
     }
     {
-      networking.hosts =
-        lib.mapAttrs' (name: address: {
-          name = address;
-          value = ["${name}.local"];
-        })
-        localAddresses;
+      networking.hosts = lib.mapAttrs' (name: address: {
+        name = address;
+        value = [ "${name}.local" ];
+      }) localAddresses;
     }
     {
       home-manager.users.me.home.stateVersion = "22.05";
@@ -194,9 +177,9 @@ in {
     }
     {
       systemd.user.services.udiskie = {
-        after = ["udisks2.service"];
-        wants = ["udisks2.service"];
-        wantedBy = ["graphical-session.target"];
+        after = [ "udisks2.service" ];
+        wants = [ "udisks2.service" ];
+        wantedBy = [ "graphical-session.target" ];
         serviceConfig = {
           ExecStart = "${pkgs.udiskie}/bin/udiskie --verbose --no-config --notify";
         };
@@ -227,20 +210,19 @@ in {
     ./direnv.nix
     ./docker.nix
     ./dunst.nix
-    ./flix.nix
     ./fonts.nix
     ./fzf.nix
     ./git.nix
     ./hledger.nix
     ./htop.nix
-    ./hu-berlin.nix
-    ./fu-berlin.nix
-    ./fysi.nix
+    ./uni.nix
     ./i3.nix
     ./i3status-rust.nix
     ./keyboard.nix
+    ./mycelium.nix
     ./kdeconnect.nix
-    {home-manager.users.me.home.file.".XCompose".source = ../lib/keyboards/XCompose;}
+    { home-manager.users.me.home.file.".XCompose".source = ../lib/keyboards/XCompose; }
+    { services.upower.enable = true; }
     ./lb.nix
     ./mpv.nix
     ./mime.nix
@@ -248,8 +230,8 @@ in {
     ./nix.nix
     ./newsboat.nix
     ./flameshot.nix
-    ./fritzbox.nix
     ./packages.nix
+    ./virtualization.nix
     ./picom.nix
     ./stardict.nix
     ./polkit.nix
@@ -268,8 +250,12 @@ in {
     ./watson.nix
     ./wallpaper.nix
     ./zsh.nix
+    {
+      home-manager.users.me.home.file.".zshrc".text = ''
+        # nothing to see here
+      '';
+    }
     ./tor.nix
-    ./stw-berlin.nix
     ./mastodon-bot.nix
     {
       fileSystems."${remoteDir}/fritz" = {
@@ -299,7 +285,7 @@ in {
           download = "${config.users.users.me.home}/sync/Downloads";
           music = "${config.users.users.me.home}/mobile/audio";
           pictures = "${config.users.users.me.home}/cloud/nextcloud/Bilder";
-          publicShare =  "${config.users.users.me.home}/cloud/nextcloud/tmp";
+          publicShare = "${config.users.users.me.home}/cloud/nextcloud/tmp";
           videos = pictures;
         };
       };

configs/flameshot.nix

@@ -10,13 +10,12 @@
         autoCloseIdleDaemon = true;
         drawColor = "#ff0000";
         drawThickness = 2;
-        checkForUpdates = false;
         showDesktopNotification = true;
         disabledTrayIcon = true;
         showHelp = false;
         squareMagnifier = true;
         uploadWithoutConfirmation = true;
-        buttons = ''@Variant(\0\0\0\x7f\0\0\0\vQList<int>\0\0\0\0\x10\0\0\0\x2\0\0\0\x5\0\0\0\x13\0\0\0\xa\0\0\0\x1\0\0\0\xc\0\0\0\xd\0\0\0\x6\0\0\0\x8\0\0\0\0\0\0\0\xf\0\0\0\x4\0\0\0\xb\0\0\0\x3\0\0\0\x12\0\0\0\x9)'';
+        # 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

@@ -1,98 +0,0 @@
-{
-  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

@@ -22,12 +22,7 @@
 
   egyptianHiero = zip-font "EgyptianHiero" {
     url = "https://github.com/MKilani/Djehuty/archive/master.zip";
-    sha256 = "sha256-KbY4vedm757NWfDlgmNhslbZd+2Vs+o5PjtMMGDt61Y=";
-  };
-  brill = zip-font "Brill" {
-    url = "https://brill.com/fileasset/The_Brill_Typeface_Package_v_4_0.zip";
-    stripRoot = false;
-    hash = "sha256-ugmEIkeBzD/4C9wkVfbctEtnzI8Kw+YD6KGcbk4BAf4=";
+    sha256 = "sha256-S3vZxdeBj57KJsF+zaZw7sQw8T+z1aVC2CnpnZ0/x2c=";
   };
   antinoou = zip-font "Antinoou" {
     url = "https://www.evertype.com/fonts/coptic/AntinoouFont.zip";
@@ -92,7 +87,7 @@ in {
       newGardiner
       junicode
       koineGreek
-      brill
+      # brill
       ezra-sil
       fira
       font-awesome
@@ -107,11 +102,12 @@ in {
       lmodern
       merriweather
       ocr-a
+      montserrat
       roboto
       roboto-mono
       noto-fonts
-      noto-fonts-cjk
-      noto-fonts-emoji
+      noto-fonts-cjk-sans
+      noto-fonts-color-emoji
       roboto-slab
       scheherazade-new
       source-code-pro
@@ -119,14 +115,14 @@ in {
       source-serif-pro
       theano
       niveumPackages.tocharian-font
-      vistafonts
+      vista-fonts
       vollkorn
       zilla-slab
     ]; # google-fonts league-of-moveable-type
     fontconfig.defaultFonts = rec {
       monospace = ["Noto Sans Mono"] ++ emoji;
       serif = ["Noto Serif" "Noto Naskh Arabic" "Noto Serif Devanagari"];
-      sansSerif = ["Noto Sans Display" "Noto Naskh Arabic" "Noto Sans Hebrew" "Noto Sans Devanagari" "Noto Sans CJK JP" "Noto Sans Coptic"];
+      sansSerif = ["Noto Sans Display" "Noto Naskh Arabic" "Noto Sans Hebrew" "Noto Sans Devanagari" "Noto Sans CJK JP" "Noto Sans Coptic" "Noto Sans Syriac Western"];
       emoji = ["Noto Color Emoji"];
     };
     # xelatex fails with woff files

configs/fritzbox.nix

@@ -1,19 +0,0 @@
-{ 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/gaming.nix

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

configs/git.nix

@@ -17,7 +17,6 @@ in {
     pkgs.gitstats
     pkgs.patch
     pkgs.patchutils
-    inputs.self.packages.${pkgs.system}.git-preview
   ];
 
   environment.shellAliases = {
@@ -29,9 +28,7 @@ in {
     programs.git = {
       enable = true;
       package = pkgs.gitFull;
-      userName = kieran.name;
-      userEmail = kieran.email;
-      aliases = {
+      settings.alias = {
         br = "branch";
         co = "checkout";
         ci = "commit";
@@ -45,19 +42,12 @@ 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;
-      extraConfig = {
-        pull.ff = "only";
-        rebase.autoStash = true;
-        merge.autoStash = true;
-        push.autoSetupRemote = 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";
-      };
+      settings.user.name = kieran.name;
+      settings.user.email = kieran.email;
+      settings.pull.ff = "only";
+      settings.rebase.autoStash = true;
+      settings.merge.autoStash = true;
+      settings.push.autoSetupRemove = true;
     };
   };
 }

configs/hu-berlin.nix

@@ -1,148 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
-  inherit (import ../lib/email.nix) defaults pronouns;
-  inherit (import ../lib) remoteDir;
-  hu-defaults = {
-    imap.host = "mailbox.cms.hu-berlin.de";
-    imap.port = 993;
-    smtp.host = "mailhost.cms.hu-berlin.de";
-    smtp.port = 25;
-    smtp.tls.useStartTls = true;
-  };
-  hu-berlin-cifs-options = [
-    "uid=${toString config.users.users.me.uid}"
-    "gid=${toString config.users.groups.users.gid}"
-    "sec=ntlmv2"
-    "workgroup=german"
-    "credentials=${config.age.secrets.cifs-credentials-hu-berlin.path}"
-    "noauto"
-    "x-systemd.automount"
-    "x-systemd.device-timeout=1"
-    "x-systemd.idle-timeout=1min"
-  ];
-in {
-  fileSystems."${remoteDir}/hu/germpro2" = {
-    device = "//hugerm31c.user.hu-berlin.de/germpro2/ling";
-    fsType = "cifs";
-    options = hu-berlin-cifs-options;
-  };
-
-  fileSystems."${remoteDir}/hu/meinhaki/home" = {
-    device = "//hugerm31c.user.hu-berlin.de/germhome/ling/meinhaki";
-    fsType = "cifs";
-    options = hu-berlin-cifs-options;
-  };
-
-  age.secrets = {
-    cifs-credentials-hu-berlin.file = ../secrets/cifs-credentials-hu-berlin.age;
-    email-password-meinhaki = {
-      file = ../secrets/email-password-meinhaki.age;
-      owner = config.users.users.me.name;
-      group = config.users.users.me.group;
-      mode = "400";
-    };
-    email-password-dslalewa = {
-      file = ../secrets/email-password-dslalewa.age;
-      owner = config.users.users.me.name;
-      group = config.users.users.me.group;
-      mode = "400";
-    };
-  };
-
-  home-manager.users.me = {
-    programs.ssh = {
-      matchBlocks = {
-        "alew.hu-berlin.de" = {
-          user = "centos";
-          hostname = "141.20.187.219";
-        };
-      };
-    };
-
-    accounts.email.accounts = rec {
-      hu-employee =
-        lib.recursiveUpdate defaults
-        (lib.recursiveUpdate hu-defaults
-          rec {
-            userName = "meinhaki";
-            address = "kieran.meinhardt@hu-berlin.de";
-            aliases = ["${userName}@hu-berlin.de"];
-            passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-meinhaki.path}";
-            aerc.extraAccounts.signature-file = toString (pkgs.writeText "signature" signature.text);
-            himalaya = {
-              enable = true;
-              settings.backend = "imap";
-            };
-            signature = {
-              showSignature = "append";
-              text = ''
-                ${defaults.realName}
-                ${pronouns}
-                Studentische Hilfskraft / Administrator ALEW
-                Humboldt-Universität zu Berlin
-
-                Telefon: +49 (0)30 2093 9634
-                Raum 3.212, Dorotheenstraße 24, 10117 Berlin-Mitte
-                https://alew.hu-berlin.de
-              '';
-            };
-          });
-      hu-admin =
-        lib.recursiveUpdate defaults
-        (lib.recursiveUpdate hu-defaults
-          rec {
-            userName = "dslalewa";
-            address = "admin.alew.vglsprwi@hu-berlin.de";
-            himalaya = {
-              enable = true;
-              settings.backend = "imap";
-            };
-            aliases = ["${userName}@hu-berlin.de"];
-            passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-dslalewa.path}";
-            inherit (hu-employee) signature;
-            aerc.extraAccounts.signature-file = toString (pkgs.writeText "signature" signature.text);
-          });
-    };
-  };
-
-  environment.systemPackages = [
-    (pkgs.writers.writeDashBin "hu-ip" ''
-      ${pkgs.w3m}/bin/w3m -dump meineip.hu-berlin.de | head --lines=-4 | tail --lines=+3
-    '')
-    (
-      pkgs.writers.writePython3Bin "hu-eduroam-install"
-      {
-        libraries = with pkgs.python3Packages; [distro pyopenssl dbus-python];
-        flakeIgnore = ["E501" "E123" "W504" "E722" "F821" "E226" "E126" "E265" "W291"];
-      }
-      (builtins.readFile (builtins.fetchurl {
-        url = "https://www.cms.hu-berlin.de/de/dl/netze/wlan/config/eduroam/linux-installer/eduroam-linux-hub.py";
-        sha256 = "19x2kvwxx13265b2hj5fjf53g0liw6dw7xf9j9cav67cswmz60kf";
-      }))
-    )
-  ];
-
-  # ref https://github.com/NixOS/nixpkgs/issues/231038#issuecomment-1591888919
-  environment.etc."ppp/options".text = "ipcp-accept-remote";
-
-  systemd.services.hu-vpn = {
-    enable = true;
-    wants = ["network-online.target"];
-    serviceConfig.LoadCredential = "password:${config.age.secrets.email-password-meinhaki.path}";
-    script = ''
-      ${pkgs.openfortivpn}/bin/openfortivpn \
-        --password="$(cat "$CREDENTIALS_DIRECTORY/password")" \
-        --config=${
-        pkgs.writeText "hu-berlin.config" ''
-          host = forti-ssl.vpn.hu-berlin.de
-          port = 443
-          username = meinhaki
-        ''
-      }
-    '';
-  };
-}

configs/i3.nix

@@ -6,37 +6,36 @@
   ...
 }: let
   dashboard = pkgs.writers.writeDashBin "dashboard" ''
-    ${pkgs.alacritty}/bin/alacritty --class wtf --command ${pkgs.writers.writeDash "dashboard-inner" ''
-      export WTF_OWM_API_KEY="$(cat ${config.age.secrets.openweathermap-api-key.path})"
-      export WTF_MINIFLUX_API_KEY="$(cat ${config.age.secrets.miniflux-api-token.path})"
-      exec ${niveumPackages.dashboard}/bin/dashboard
+    ${pkgs.alacritty}/bin/alacritty --option font.size=4 --class dashboard --command ${pkgs.writers.writeDash "dashboard-inner" ''
+      exec ${pkgs.procps}/bin/watch -c -n 10 ${niveumPackages.q}/bin/q
     ''}
   '';
   inherit (import ../lib) defaultApplications;
   klem = niveumPackages.klem.override {
     config.dmenu = "${pkgs.dmenu}/bin/dmenu -i -p klem";
     config.scripts = {
-      "p.r" = pkgs.writers.writeDash "p.r" ''
+      "p.r paste" = pkgs.writers.writeDash "p.r" ''
         ${pkgs.curl}/bin/curl -fSs http://p.r --data-binary @- \
           | ${pkgs.coreutils}/bin/tail --lines=1 \
           | ${pkgs.gnused}/bin/sed 's/\\<r\\>/krebsco.de/'
       '';
-      # "envs.sh host" = pkgs.writers.writeDash "envs-host" ''
-      #   ${pkgs.curl}/bin/curl -F "file=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
-      # '';
-      "envs.sh mirror" = pkgs.writers.writeDash "envs-mirror" ''
-        ${pkgs.curl}/bin/curl -F "url=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
+      "envs.sh paste" = pkgs.writers.writeDash "envs-host" ''
+        ${pkgs.curl}/bin/curl -F "file=@-" https://envs.sh
       '';
+      # this segfaults
+      # "envs.sh mirror" = pkgs.writers.writeDash "envs-mirror" ''
+      #   ${pkgs.curl}/bin/curl -F "url=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
+      # '';
       "envs.sh shorten" = pkgs.writers.writeDash "envs-shorten" ''
         ${pkgs.curl}/bin/curl -F "shorten=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
       '';
-      "ix.io" = pkgs.writers.writeDash "ix.io" ''
-        ${pkgs.curl}/bin/curl -fSs -F 'f:1=<-' ix.io
-      '';
-      "go.r" = pkgs.writers.writeDash "go.r" ''
+      "go.r shorten" = pkgs.writers.writeDash "go.r" ''
         ${pkgs.curl}/bin/curl -fSs http://go.r -F "uri=$(${pkgs.coreutils}/bin/cat)"
       '';
-      "0x0.st" = pkgs.writers.writeDash "0x0.st" ''
+      "4d2.org paste" = pkgs.writers.writeDash "4d2-paste" ''
+        ${pkgs.curl}/bin/curl -F "file=@-" https://depot.4d2.org/
+      '';
+      "0x0.st shorten" = pkgs.writers.writeDash "0x0.st" ''
         ${pkgs.curl}/bin/curl -fSs https://0x0.st -F "shorten=$(${pkgs.coreutils}/bin/cat)"
       '';
       "rot13" = pkgs.writers.writeDash "rot13" ''
@@ -95,7 +94,7 @@ in {
   services.xserver = {
     windowManager.i3 = {
       enable = true;
-      package = pkgs.i3-gaps;
+      package = pkgs.i3;
     };
   };
 
@@ -114,6 +113,7 @@ in {
     '';
   };
 
+
   home-manager.users.me = let
     modifier = "Mod4";
     infoWorkspace = "ℹ";
@@ -132,7 +132,7 @@ in {
       border = 1;
     };
     bars = [
-      (config.home-manager.users.me.lib.stylix.i3.bar
+      (config.home-manager.users.me.stylix.targets.i3.exportedBarConfig
         // rec {
           workspaceButtons = true;
           mode = "hide"; # "dock";
@@ -270,32 +270,7 @@ in {
         # XF86Launch1 (thinkvantage)
       };
   in {
-    wayland.windowManager.sway = {
-      enable = true;
-      config = {
-        menu = "rofi -modi run,ssh,window -show run";
-        inherit modifier modes gaps bars floating window colors keybindings;
-        input = {
-          "*" = {
-            xkb_layout = "de";
-            xkb_variant = "T3";
-          };
-        };
-        terminal = (defaultApplications pkgs).terminal;
-        up = "k";
-        down = "j";
-        left = "h";
-        right = "l";
-        seat = {
-          "*" = {
-            hide_cursor = "when-typing enable";
-          };
-        };
-        startup = [
-          {command = "echo hello";}
-        ];
-      };
-    };
+    stylix.targets.i3.enable = true;
 
     xsession.windowManager.i3 = {
       enable = true;
@@ -309,22 +284,12 @@ in {
         exec "${pkgs.writers.writeDash "irc" "exec ${pkgs.alacritty}/bin/alacritty --class message -e ssh weechat@makanek -t tmux attach-session -t IM"}"
         exec "${pkgs.writers.writeDash "email" "exec ${pkgs.alacritty}/bin/alacritty --class message -e aerc"}"
 
-        assign [class="wtf"] ${infoWorkspace}
+        assign [class="dashboard"] ${infoWorkspace}
         exec ${dashboard}/bin/dashboard
       '';
-      config = lib.mkMerge [
-        {
-          inherit modifier gaps modes bars floating window colors keybindings;
-        }
-        {
-          keybindings = let
-            new-workspace = pkgs.writers.writeDash "new-workspace" ''
-              i3-msg workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
-            '';
-            move-to-new-workspace = pkgs.writers.writeDash "new-workspace" ''
-              i3-msg move container to workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
-            '';
-          in {
+      config = {
+          inherit modifier gaps modes bars floating window colors;
+          keybindings = keybindings // {
             "${modifier}+ß" = "exec ${niveumPackages.menu-calc}/bin/=";
             "${modifier}+F6" = "exec ${pkgs.xorg.xkill}/bin/xkill";
             "${modifier}+F9" = "exec ${pkgs.redshift}/bin/redshift -O 4000 -b 0.85";
@@ -335,8 +300,7 @@ in {
             # "${modifier}+x" = "exec ${new-workspace}";
             "XF86Display" = "exec ${niveumPackages.dmenu-randr}/bin/dmenu-randr";
           };
-        }
-      ];
+      };
     };
   };
 }

configs/i3status-rust.nix

@@ -55,7 +55,9 @@
           }
           {
             block = "battery";
-            device = config.niveum.batteryName;
+            format = "$icon $percentage $time";
+            device = "DisplayDevice";
+            driver = "upower";
           }
           {
             block = "sound";

configs/keyboard.nix

@@ -2,23 +2,63 @@
   pkgs,
   lib,
   ...
-}: let
+}:
+let
+
   commaSep = builtins.concatStringsSep ",";
-  xkbOptions = ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
+  xkbOptions = [
+    "compose:caps"
+    "terminate:ctrl_alt_bksp"
+    "grp:ctrls_toggle"
+  ];
   languages = {
-    deutsch = { code = "de"; variant = "T3"; };
-    greek = { code = "gr"; variant = "polytonic"; };
-    russian = { code = "ru"; variant = "phonetic"; };
-    arabic = ../lib/keyboards/arabic;
+    deutsch = {
+      code = "de";
+      variant = "T3";
+    };
+    greek = {
+      code = "gr";
+      variant = "polytonic";
+    };
+    russian = {
+      code = "ru";
+      variant = "phonetic";
+    };
+    arabic = {
+      code = "ara";
+      variant = "buckwalter";
+    }; # ../lib/keyboards/arabic;
     coptic = ../lib/keyboards/coptic;
     avestan = ../lib/keyboards/avestan;
     gothic = ../lib/keyboards/gothic;
-    sanskrit = { code = "in"; variant = "san-kagapa"; };
-    gujarati = {code = "in"; variant = "guj-kagapa"; };
-    hebrew = {code = "il"; variant = "phonetic";};
+    farsi = {
+      code = "ir";
+      variant = "qwerty";
+    };
+    syriac = {
+      code = "sy";
+      variant = "syc_phonetic";
+    };
+    sanskrit = {
+      code = "in";
+      variant = "san-kagapa";
+    };
+    gujarati = {
+      code = "in";
+      variant = "guj-kagapa";
+    };
+    urdu = {
+      code = "in";
+      variant = "urd-phonetic";
+    };
+    hebrew = {
+      code = "il";
+      variant = "phonetic";
+    };
   };
   defaultLanguage = languages.deutsch;
-in {
+in
+{
   services.libinput.enable = true;
 
   # man 7 xkeyboard-config
@@ -37,7 +77,13 @@ in {
           lib.mapAttrsToList (name: value: {
             name = "symbols/${name}";
             path = value;
-          }) (lib.filterAttrs (_: value: builtins.typeOf value == "path") languages)
+          }) (lib.filterAttrs (_: value: !(value ? "code")) languages)
+          ++ [
+            {
+              name = "symbols/ir";
+              path = ../lib/keyboards/farsi;
+            }
+          ]
         ))
       ];
     };
@@ -45,25 +91,40 @@ in {
 
   environment.etc."x11-locale".source = toString pkgs.xorg.libX11 + "share/X11/locale";
 
+  home-manager.users.me = {
+    home.file =
+      lib.mapAttrs' (name: path: lib.nameValuePair ".xkb/symbols/${name}" { source = path; })
+        (lib.filterAttrs (_: value: !(value ? "code")) languages) // {
+          ".xkb/symbols/ir".source = ../lib/keyboards/farsi;
+        };
+  };
+
   console.keyMap = "de";
 
-  environment.systemPackages =
-    lib.mapAttrsToList
-    (language: settings:
+  environment.systemPackages = lib.mapAttrsToList (
+    language: settings:
     let
       code = if settings ? "code" then settings.code else language;
       variant = if settings ? "variant" then settings.variant else "";
     in
-      pkgs.writers.writeDashBin "kb-${language}" ''
-        ${pkgs.xorg.setxkbmap}/bin/setxkbmap ${defaultLanguage.code},${code} ${defaultLanguage.variant},${variant} ${toString (map (option: "-option ${option}") xkbOptions)}
-      '')
-    languages;
+    pkgs.writers.writeDashBin "kb-${language}" ''
+      if [ -z $SWAYSOCK ]; then
+        ${pkgs.xorg.setxkbmap}/bin/setxkbmap ${defaultLanguage.code},${code} ${defaultLanguage.variant},${variant} ${
+          toString (map (option: "-option ${option}") xkbOptions)
+        }
+      else
+        swaymsg -s $SWAYSOCK 'input * xkb_layout "${defaultLanguage.code},${code}"'
+        swaymsg -s $SWAYSOCK 'input * xkb_variant "${defaultLanguage.variant},${variant}"'
+        swaymsg -s $SWAYSOCK 'input * xkb_options "${lib.concatStringsSep "," xkbOptions}"'
+      fi
+    ''
+  ) languages;
 
   # improve held key rate
   services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xset}/bin/xset r rate 300 50";
 
   systemd.user.services.gxkb = {
-    wantedBy = ["graphical-session.target"];
+    wantedBy = [ "graphical-session.target" ];
     serviceConfig = {
       SyslogIdentifier = "gxkb";
       ExecStart = "${pkgs.gxkb}/bin/gxkb";

configs/mpv.nix

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

configs/mycelium.nix

@@ -0,0 +1,15 @@
+{ lib, ... }:
+let
+  myceliumAddresses = import ../lib/mycelium-network.nix;
+in
+{
+  services.mycelium = {
+    enable = true;
+    openFirewall = true;
+  };
+
+  networking.hosts = lib.mapAttrs' (name: address: {
+    name = address;
+    value = [ "${name}.m" ];
+  }) myceliumAddresses;
+}

configs/neovim.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   niveumPackages,
+  config,
   ...
 }: {
   environment.variables.EDITOR = pkgs.lib.mkForce "nvim";
@@ -35,6 +36,24 @@
 
   environment.systemPackages = [
     (pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
-    niveumPackages.vim
+    (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.gopls
+    pkgs.nixfmt-rfc-style
+    pkgs.rust-analyzer
+    pkgs.nodePackages.typescript-language-server
+    pkgs.lua-language-server
+    pkgs.nodePackages.vscode-langservers-extracted
+    pkgs.lemminx # XML LSP
+    pkgs.jq-lsp
+    pkgs.dhall-lsp-server
   ];
 }

configs/networkmanager.nix

@@ -1,47 +1,7 @@
 {
-  lib,
   pkgs,
   ...
-}: let
-  profile = name: custom:
-    lib.recursiveUpdate {
-      connection.id = name;
-      connection.type = "wifi";
-      connection.interface-name = "wlp3s0";
-      connection.permissions = "";
-      wifi.mac-address-blacklist = "";
-      wifi.ssid = name;
-      wifi.mode = "infrastructure";
-      ipv4.dns-search = "";
-      ipv4.method = "auto";
-      ipv6.addr-gen-mode = "stable-privacy";
-      ipv6.dns-search = "";
-      ipv6.method = "auto";
-      proxy = {};
-    }
-    custom;
-  eduroamProfile = {
-    connection.uuid = "eae9fee6-a7d2-4120-a609-440b457d6fcf";
-    wifi-security = {
-      group = "ccmp;tkip;";
-      key-mgmt = "wpa-eap";
-      pairwise = "ccmp;";
-      proto = "rsn;";
-    };
-    "802-1x" = {
-      altsubject-matches = "DNS:srv1-radius.cms.hu-berlin.de;DNS:srv2-radius.cms.hu-berlin.de;";
-      anonymous-identity = "anonymous@wlan.hu-berlin.de";
-      ca-cert = pkgs.fetchurl {
-        url = "https://www.cms.hu-berlin.de/de/dl/netze/wlan/config/eduroam/t-telesec_globalroot_class_2.pem";
-        sha256 = "0if8aqd06sid7a0vw009zpa087wxcgdd2x6z2zs4pis5kvyqj2dk";
-      };
-      eap = "ttls;";
-      identity = lib.strings.fileContents <secrets/eduroam/identity>;
-      password = lib.strings.fileContents <secrets/eduroam/password>;
-      phase2-auth = "pap";
-    };
-  };
-in {
+}: {
   programs.nm-applet.enable = true;
 
   networking.networkmanager = {

configs/nix.nix

@@ -7,7 +7,7 @@
     config.allowUnfree = true;
   };
   nix = {
-    package = pkgs.nixFlakes;
+    package = pkgs.nixVersions.stable;
     extraOptions = "experimental-features = nix-command flakes";
     nixPath = ["nixpkgs=${inputs.nixpkgs}"];
   };

configs/packages.nix

@@ -4,7 +4,6 @@
   lib,
   inputs,
   niveumPackages,
-  unstablePackages,
   ...
 }: let
   worldradio = pkgs.callPackage ../packages/worldradio.nix {};
@@ -63,10 +62,15 @@ in {
   };
 
   environment.systemPackages = with pkgs; [
+    (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
-    firefox
-    tdesktop
+    telegram-desktop
     whois
     dnsutils
     # FILE MANAGERS
@@ -74,6 +78,7 @@ in {
     pcmanfm
     # MEDIA
     ffmpeg
+    simplescreenrecorder
     imagemagick
     exiftool
     nsxiv
@@ -86,23 +91,25 @@ in {
     gcc
     python3Packages.jsonschema # json validation
     pup # html toolkit
-    xsv # csv toolkit
+    xan # csv toolkit
     magic-wormhole-rs # file transfer
     man-pages
     man-pages-posix
     exfat # to mount windows drives
     # HARDWARE TOOLS
-    gnome.gnome-disk-utility
+    gnome-disk-utility
     arandr # xrandr for noobs
+    wdisplays
     libnotify # for notify-send
     xclip # clipboard CLI
-    xdragon # drag and drop
+    dragon-drop # drag and drop
     xorg.xkill # kill by clicking
+    portfolio # personal finance overview
     audacity
     calibre
     electrum
     inkscape
-    krita
+    niveumPackages.gimp
     gthumb
     astrolog
     obsidian
@@ -110,18 +117,17 @@ in {
     aichat # chat with llms
     anki-bin # flashcards
     jbofihe # lojbanic software
-    unstablePackages.aider-chat
-    # unstablePackages.zoom-us # video conferencing
+    zoom-us # video conferencing
     (pkgs.writers.writeDashBin "im" ''
       weechat_password=$(${pkgs.pass}/bin/pass weechat)
-      exec ${unstablePackages.weechat}/bin/weechat -t -r '/mouse enable; /remote add makanek http://${externalNetwork.makanek}:8002 -password='"$weechat_password"'; /remote connect makanek'
+      exec ${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
-    okular # the word is nucular
+    poppler-utils # pdf toolkit
+    kdePackages.okular # the word is nucular
     xournalpp # for annotating pdfs
     pdfpc # presenter console for pdf slides
     niveumPackages.hc # print files as qr codes
@@ -130,6 +136,7 @@ in {
     rink # unit converter
     niveumPackages.auc
     niveumPackages.noise-waves
+    niveumPackages.stag
     niveumPackages.cheat-sh
     niveumPackages.polyglot
     niveumPackages.qrpaste
@@ -144,25 +151,19 @@ in {
     niveumPackages.pls
     niveumPackages.mpv-tv
     niveumPackages.mpv-iptv
-    jellyfin-media-player
     niveumPackages.devanagari
     niveumPackages.betacode # ancient greek betacode to unicode converter
-    niveumPackages.meteo
-    niveumPackages.mahlzeit
-    niveumPackages.jq-lsp
+    pkgs.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
     niveumPackages.closest
     niveumPackages.trans
-    niveumPackages.cro
     (niveumPackages.mpv-radio.override {
       di-fm-key-file = config.age.secrets.di-fm-key.path;
     })
@@ -199,21 +200,14 @@ in {
       ${pkgs.openssh}/bin/ssh makanek "cd /var/lib/weechat/logs && grep --ignore-case --color=always --recursive $@" | ${pkgs.less}/bin/less --raw-control-chars
     '')
 
-    (pkgs.writers.writeDashBin "ncmpcpp-zaatar" ''MPD_HOST=${(import ../lib/local-network.nix).zaatar} exec ${pkgs.ncmpcpp}/bin/ncmpcpp "$@"'')
-    (pkgs.writers.writeDashBin "mpc-zaatar" ''MPD_HOST=${(import ../lib/local-network.nix).zaatar} exec ${pkgs.mpc_cli}/bin/mpc "$@"'')
-
     inputs.scripts.packages.x86_64-linux.alarm
 
     spotify
     ncspot
     playerctl
 
-    nix-index
-    niveumPackages.nix-index-update
-
     #krebs
-    niveumPackages.dic
-    config.nur.repos.mic92.ircsink
+    pkgs.nur.repos.mic92.ircsink
 
     (haskellPackages.ghcWithHoogle (hs: [
       hs.text
@@ -233,26 +227,14 @@ in {
     ]))
     # python3Packages.poetry
 
-    # language servers
-    pyright
-    haskellPackages.haskell-language-server
-    texlab
-    nil
-    rust-analyzer
-    nodePackages.typescript-language-server
-    lua-language-server
-    nodePackages.vscode-langservers-extracted
-
-    dhall-lsp-server
     dhall-nix
     dhall-bash
     dhall-json
     dhall
 
     html-tidy
-    nodePackages.csslint
-    nodePackages.jsonlint
     deno # better node.js
+    go
     texlive.combined.scheme-full
     latexrun
     (aspellWithDicts (dict: [dict.de dict.en dict.en-computers]))
@@ -264,6 +246,7 @@ in {
     # gnumeric
     dia
     pandoc
+    librsvg # pandoc depends on this to include SVG in documents
     # niveumPackages.man-pandoc
     typst
     # proselint
@@ -275,6 +258,10 @@ in {
     # nightly.rust
     shellcheck
 
+    # photography
+    gphoto2
+    darktable
+
     (pkgs.writers.writeDashBin "hass-cli" ''
       HASS_SERVER=http://zaatar.r:8123 HASS_TOKEN="$(cat ${config.age.secrets.home-assistant-token.path})"  exec ${pkgs.home-assistant-cli}/bin/hass-cli "$@"
     '')

configs/seafile.nix

@@ -1,23 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
-  services.xserver.displayManager.sessionCommands = "${pkgs.seafile-client}/bin/seafile-applet &";
-
-  home-manager.users.me.xdg.configFile = {
-    "Seafile/Seafile Client.conf".source = (pkgs.formats.ini {}).generate "Seafile Client.conf" {
-      Behavior = {
-        hideDockIcon = false;
-        hideMainWindowWhenStarted = true;
-      };
-      Settings = {
-        computerName = config.networking.hostName;
-        lastShiburl = "https://box.hu-berlin.de";
-      };
-      UsedServerAddresses.main = "https://box.hu-berlin.de";
-    };
-  };
-
-  environment.systemPackages = [pkgs.seafile-client];
-}

configs/sound.nix

@@ -1,6 +1,4 @@
 {pkgs, ...}: {
-  sound.enable = true;
-
   services.pipewire = {
     enable = true;
     alsa = {

configs/spacetime.nix

@@ -3,5 +3,6 @@
   location = {
     latitude = 52.517;
     longitude = 13.3872;
+    provider = "geoclue2";
   };
 }

configs/ssh.nix

@@ -3,8 +3,8 @@
   externalNetwork = import ../lib/external-network.nix;
 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,6 +41,7 @@ in {
 
   home-manager.users.me.programs.ssh = {
     enable = true;
+    enableDefaultConfig = false;
     matchBlocks = {
       "github.com" = {
         hostname = "ssh.github.com";

configs/sshd.nix

@@ -17,5 +17,7 @@ in {
     };
   };
 
-  users.users.root.openssh.authorizedKeys.keys = kieran.sshKeys;
+  users.users.root.openssh.authorizedKeys.keys = kieran.sshKeys ++ [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPoiRIn1dBUtpApcUyGbZKN+m5KBSgKIDQjdnQ8vU0xU kfm@kibbeh" # travel laptop
+  ];
 }

configs/stw-berlin.nix

@@ -1,52 +0,0 @@
-{
-  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,6 +18,18 @@ in {
   stylix.enable = true;
   stylix.image = generatedWallpaper;
 
+  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml";
+
+  stylix.cursor = {
+    name = "capitaine-cursors-white";
+    package = pkgs.capitaine-cursors;
+    size = 12;
+  };
+
+  home-manager.users.me = {
+    stylix.autoEnable = true;
+  };
+
   # environment.etc."stylix/wallpaper.png".source = generatedWallpaper;
 
   # stylix.polarity = "either";
@@ -58,7 +70,7 @@ in {
     };
 
     emoji = {
-      package = pkgs.noto-fonts-emoji;
+      package = pkgs.noto-fonts-color-emoji;
       name = "Noto Color Emoji";
     };
 

configs/tmux.nix

@@ -13,7 +13,7 @@
     aggressiveResize = true;
     escapeTime = 50;
     historyLimit = 7000;
-    shortcut = "a";
+    shortcut = "b";
     extraConfig = ''
       set -g mouse on
 
@@ -37,15 +37,6 @@
       set -g status-left-length 32
       set -g status-right-length 150
 
-      set -g status-bg colour242
-
-      setw -g window-status-format "#[fg=colour12,bg=colour233] #I #[fg=white,bg=colour237] #W "
-      setw -g window-status-current-format "#[fg=colour12,bg=colour233] * #[fg=white,bg=colour237,bold] #W "
-
-      set -g status-left ""
-      set -g status-right "#[fg=colour255,bg=colour237,bold] #(hostname -I) #[default]#[fg=colour12,bg=colour233] %FT%R "
-      set -g status-justify left
-
       set -g status-position bottom
     '';
   };

configs/uni.nix

@@ -30,7 +30,19 @@ in {
       };
     };
     accounts.email.accounts = {
-      fu-student =
+      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;
+        };
+      fu =
         lib.recursiveUpdate defaults
         (lib.recursiveUpdate fu-defaults
           rec {
@@ -38,21 +50,6 @@ 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";
@@ -68,6 +65,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";
+    };
     fu-sftp-key = {
       file = ../secrets/fu-sftp-key.age;
       owner = "root";
@@ -110,41 +113,39 @@ in {
         ];
       };
     };
-  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;
-  };
+  in home-directory-mount "meinhak99";
 
   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
-        ${pkgs.openconnect}/bin/openconnect vpn.fu-berlin.de --useragent=AnyConnect
+        # root firefox will not open login window unless root owns Xauthority
+        sudo cp $XAUTHORITY /root/.Xauthority
+        sudo chown root: /root/.Xauthority
+        XAUTHORITY=/root/.Xauthority sudo ${pkgs.openconnect}/bin/openconnect vpn.fu-berlin.de --useragent=AnyConnect
       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/virtualization.nix

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

configs/wpa_supplicant.nix

@@ -1,6 +1,9 @@
+{ config, ... }:
 {
   networking.wireless = {
     enable = true;
-    networks.Aether.pskRaw = "e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a";
+    secretsFile = config.age.secrets.wifi.path;
+    # networks.Aether.pskRaw = "e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a";
+    networks.Schilfpalast.pskRaw = "ext:schilfpalast";
   };
 }

configs/zsh.nix

@@ -2,11 +2,10 @@
   config,
   pkgs,
   ...
-}: {
-  home-manager.users.me.home.file.".zshrc".text = ''
-    # nothing to see here
-  '';
-
+}: let
+  promptColours.success = "cyan";
+  promptColours.failure = "red";
+in {
   environment.systemPackages = [pkgs.atuin];
   environment.variables.ATUIN_CONFIG_DIR = toString (pkgs.writeTextDir "/config.toml" ''
     auto_sync = true
@@ -58,7 +57,7 @@
 
       fpath=(${zsh-completions}/src $fpath)
     '';
-    promptInit = with config.niveum; ''
+    promptInit = ''
       autoload -Uz vcs_info
       zstyle ':vcs_info:*' enable git
       zstyle ':vcs_info:*' check-for-changes true

flake.nix

@@ -2,25 +2,25 @@
   description = "niveum: packages, modules, systems";
 
   inputs = {
+    self.submodules = true;
+
     agenix.url = "github:ryantm/agenix";
-    brockman.url = "github:kmein/brockman";
+    autorenkalender.url = "github:kmein/autorenkalender";
     coptic-dictionary.url = "github:kmein/coptic-dictionary";
-    flake-utils.url = "github:numtide/flake-utils";
-    home-manager.url = "github:nix-community/home-manager/release-24.05";
+    home-manager.url = "github:nix-community/home-manager/release-25.11";
     menstruation-backend.url = "github:kmein/menstruation.rs";
     menstruation-telegram.url = "github:kmein/menstruation-telegram";
-    nix-on-droid.url = "github:t184256/nix-on-droid/release-23.05";
+    nix-index-database.url = "github:nix-community/nix-index-database";
     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-24.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
     nur.url = "github:nix-community/NUR";
     recht.url = "github:kmein/recht";
-    retiolum.url = "git+https://git.thalheim.io/Mic92/retiolum";
-    stockholm.url = "github:krebs/stockholm";
-    rust-overlay.url = "github:oxalica/rust-overlay";
+    retiolum.url = "github:krebs/retiolum";
     scripts.url = "github:kmein/scripts";
-    stylix.url = "github:danth/stylix/release-24.05";
+    stockholm.url = "github:krebs/stockholm";
+    stylix.url = "github:danth/stylix/release-25.11";
     telebots.url = "github:kmein/telebots";
     tinc-graph.url = "github:kmein/tinc-graph";
     voidrice.url = "github:Lukesmithxyz/voidrice";
@@ -29,116 +29,107 @@
 
     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-on-droid.inputs.home-manager.follows = "home-manager";
-    nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
-    recht.inputs.flake-utils.follows = "flake-utils";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
     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;
   };
 
-  nixConfig = {
-    extra-substituters = [ "https://kmein.cachix.org" ];
-    extra-trusted-public-keys = [ "kmein.cachix.org-1:rsJ2b6++VQHJ1W6rGuDUYsK/qUkFA3bNpO6PyEyJ9Ls=" ];
-  };
-
-  outputs = inputs @ {
-    self,
-    nixpkgs,
-    nixpkgs-unstable,
-    nur,
-    brockman,
-    home-manager,
-    agenix,
-    retiolum,
-    nixinate,
-    flake-utils,
-    nix-on-droid,
-    stylix,
-    ...
-  }:
+  outputs =
+    inputs@{
+      self,
+      nixpkgs,
+      nixpkgs-unstable,
+      nur,
+      home-manager,
+      agenix,
+      retiolum,
+      nixinate,
+      flake-utils,
+      nix-index-database,
+      stylix,
+      ...
+    }:
+    let
+      lib = nixpkgs.lib;
+      eachSupportedSystem = lib.genAttrs lib.systems.flakeExposed;
+    in
     {
       apps = {
-        x86_64-darwin = let
-          pkgs = nixpkgs.legacyPackages.x86_64-darwin;
-        in {
-          deploy-maakaron = {
-            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
+        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 (pkgs.writers.writeDash "mock-secrets" ''
-                ${pkgs.findutils}/bin/find secrets -not -path '*/.*' -type f  | ${pkgs.coreutils}/bin/sort > secrets.txt
-              '');
+              program = toString (
+                pkgs.writers.writeDash "mock-secrets" ''
+                  ${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 (map (hostname: let
-            externalNetwork = import ./lib/external-network.nix;
-            targets = {
-              ful = "root@ful";
-              zaatar = "root@zaatar";
-              makanek = "root@makanek";
-              manakish = "root@manakish";
-              tahina = "root@tahina";
-              tabula = "root@tabula";
-              kabsa = "root@kabsa";
-              fatteh = "root@fatteh";
-            };
-          in
-            lib.attrsets.nameValuePair "deploy-${hostname}" {
-              type = "app";
-              program = toString (pkgs.writers.writeDash "deploy-${hostname}" ''
-                exec ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch \
-                  --max-jobs 2 \
-                  --log-format internal-json \
-                  --flake .?submodules=1#${hostname} \
-                  --target-host ${targets.${hostname}} 2>&1 \
-                  | ${pkgs.nix-output-monitor}/bin/nom --json
-              '');
-            }) (builtins.attrNames self.nixosConfigurations))
+          // builtins.listToAttrs (
+            map (
+              hostname:
+              let
+                targets = {
+                  ful = "root@ful";
+                  zaatar = "root@zaatar";
+                  makanek = "root@makanek";
+                  manakish = "root@manakish";
+                  tahina = "root@tahina";
+                  tabula = "root@tabula";
+                  kabsa = "root@kabsa";
+                  fatteh = "root@fatteh";
+                  kibbeh = "root@kibbeh";
+                };
+              in
+              lib.attrsets.nameValuePair "deploy-${hostname}" {
+                type = "app";
+                program = toString (
+                  pkgs.writers.writeDash "deploy-${hostname}" ''
+                    exec ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch \
+                      --max-jobs 2 \
+                      --log-format internal-json \
+                      --flake .#${hostname} \
+                      --target-host ${targets.${hostname}} 2>&1 \
+                      | ${pkgs.nix-output-monitor}/bin/nom --json
+                  ''
+                );
+              }
+            ) (builtins.attrNames self.nixosConfigurations)
+          )
           // {
             deploy-ful = {
               type = "app";
-              program = toString (pkgs.writers.writeDash "deploy-ful" ''
-                exec ${pkgs.nix}/bin/nix run .?submodules=1#nixinate.ful \
-                  --log-format internal-json 2>&1 \
-                  | ${pkgs.nix-output-monitor}/bin/nom --json
-              '');
+              program = toString (
+                pkgs.writers.writeDash "deploy-ful" ''
+                  exec ${pkgs.nix}/bin/nix run .#nixinate.ful \
+                    --log-format internal-json 2>&1 \
+                    | ${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;
@@ -146,43 +137,13 @@
         power-action = import modules/power-action.nix;
         system-dependent = import modules/system-dependent.nix;
         telegram-bot = import modules/telegram-bot.nix;
+        go-webring = import modules/go-webring.nix;
       };
 
       lib = {
         panoptikon = import lib/panoptikon.nix;
       };
 
-      nixOnDroidConfigurations = {
-        moto = nix-on-droid.lib.nixOnDroidConfiguration {
-          modules = [systems/moto/configuration.nix];
-          pkgs = import nixpkgs {
-            system = "aarch64-linux";
-            overlays = [nix-on-droid.overlays.default];
-          };
-          extraSpecialArgs = {
-            niveumPackages = inputs.self.packages.aarch64-linux;
-            niveumLib = inputs.self.lib;
-            inherit inputs;
-          };
-          home-manager-path = home-manager.outPath;
-        };
-      };
-
-      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 {
@@ -207,11 +168,10 @@
             agenix.nixosModules.default
             inputs.self.nixosModules.passport
             inputs.self.nixosModules.panoptikon
-            inputs.self.nixosModules.htgen
+            inputs.self.nixosModules.go-webring
             inputs.stockholm.nixosModules.reaktor2
-            brockman.nixosModule
             retiolum.nixosModules.retiolum
-            nur.nixosModules.nur
+            nur.modules.nixos.default
             { nixpkgs.overlays = [ inputs.stockholm.overlays.default ]; }
             {
               _module.args.nixinate = {
@@ -229,11 +189,20 @@
           specialArgs = niveumSpecialArgs system;
           modules = [
             systems/zaatar/configuration.nix
-            inputs.self.nixosModules.moodle-dl
             agenix.nixosModules.default
             retiolum.nixosModules.retiolum
           ];
         };
+        kibbeh = nixpkgs.lib.nixosSystem rec {
+          system = "x86_64-linux";
+          specialArgs = niveumSpecialArgs system;
+          modules = [
+            systems/kibbeh/configuration.nix
+            agenix.nixosModules.default
+            retiolum.nixosModules.retiolum
+            home-manager.nixosModules.home-manager
+          ];
+        };
         makanek = nixpkgs.lib.nixosSystem rec {
           system = "x86_64-linux";
           # for using inputs in other config files
@@ -241,11 +210,10 @@
           modules = [
             systems/makanek/configuration.nix
             inputs.self.nixosModules.telegram-bot
-            inputs.self.nixosModules.htgen
             inputs.self.nixosModules.passport
             agenix.nixosModules.default
             retiolum.nixosModules.retiolum
-            nur.nixosModules.nur
+            nur.modules.nixos.default
           ];
         };
         tahina = nixpkgs.lib.nixosSystem rec {
@@ -274,7 +242,8 @@
             agenix.nixosModules.default
             retiolum.nixosModules.retiolum
             home-manager.nixosModules.home-manager
-            nur.nixosModules.nur
+            nix-index-database.nixosModules.default
+            nur.modules.nixos.default
             stylix.nixosModules.stylix
           ];
         };
@@ -286,7 +255,8 @@
             agenix.nixosModules.default
             retiolum.nixosModules.retiolum
             home-manager.nixosModules.home-manager
-            nur.nixosModules.nur
+            nur.modules.nixos.default
+            nix-index-database.nixosModules.default
             stylix.nixosModules.stylix
           ];
         };
@@ -298,141 +268,135 @@
             agenix.nixosModules.default
             retiolum.nixosModules.retiolum
             home-manager.nixosModules.home-manager
-            nur.nixosModules.nur
+            nur.modules.nixos.default
+            nix-index-database.nixosModules.default
             stylix.nixosModules.stylix
           ];
         };
       };
-    }
-    // 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 {
-        inherit system;
-        overlays = [
-          nur.overlay
-          (self: super: {
-            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 "$@"'';
-          })
-        ];
-      };
-      unstablePackages = import nixpkgs-unstable {
-        inherit system;
-      };
-      wrapScript = {
-        packages ? [],
-        name,
-        script,
-      }:
-        pkgs.writers.writeDashBin name ''PATH=$PATH:${nixpkgs.lib.makeBinPath (packages ++ [pkgs.findutils pkgs.coreutils pkgs.gnused pkgs.gnugrep])} ${script} "$@"'';
-    in {
-      packages = rec {
+
+      packages = eachSupportedSystem (system: let
+        pkgs = import nixpkgs {
+          inherit system;
+          config.allowUnfree = true;
+          overlays = [
+            nur.overlays.default
+            (self: super: {
+              mpv = super.mpv.override {scripts = [super.mpvScripts.visualizer super.mpvScripts.mpris];};
+              dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
+            })
+          ];
+        };
+        wrapScript = {
+          packages ? [],
+          name,
+          script,
+        }:
+          pkgs.writers.writeDashBin name ''PATH=$PATH:${nixpkgs.lib.makeBinPath (packages ++ [pkgs.findutils pkgs.coreutils pkgs.gnused pkgs.gnugrep])} ${script} "$@"'';
+      in {
+        # linguistics and ancient world
         auc = pkgs.callPackage packages/auc.nix {};
         betacode = pkgs.callPackage packages/betacode.nix {};
-        brassica = pkgs.callPackage packages/brassica.nix {};
-        cheat-sh = pkgs.callPackage packages/cheat-sh.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 {};
-        cltk = pkgs.python3Packages.callPackage packages/cltk.nix {};
-        cro = pkgs.callPackage packages/cro.nix {};
+
+        # 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 {};
+        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
+        cro = pkgs.callPackage packages/cro.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 {};
-        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-pandoc = pkgs.callPackage packages/man/pandoc.nix {}; # TODO upstream
         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 {};
-        pls = pkgs.callPackage packages/pls.nix {};
-        polyglot = pkgs.callPackage packages/polyglot.nix {};
+        opustags = pkgs.callPackage packages/opustags.nix {}; # TODO upstream
+        q = pkgs.callPackage packages/q.nix {};
         qrpaste = pkgs.callPackage packages/qrpaste.nix {};
-        random-zeno = pkgs.callPackage packages/random-zeno.nix {};
+        go-webring = pkgs.callPackage packages/go-webring.nix {}; # TODO upstream
         rfc = pkgs.callPackage packages/rfc.nix {};
+        gimp = pkgs.callPackage packages/gimp.nix {};
         scanned = pkgs.callPackage packages/scanned.nix {};
-        swallow = pkgs.callPackage packages/swallow.nix {};
-        text2pdf = pkgs.callPackage packages/text2pdf.nix {};
+        text2pdf = pkgs.callPackage packages/text2pdf.nix {}; # TODO upstream
         timer = pkgs.callPackage packages/timer.nix {};
-        tocharian-font = pkgs.callPackage packages/tocharian-font.nix {};
-        trans = pkgs.callPackage packages/trans.nix {};
+        trans = pkgs.callPackage packages/trans.nix {}; # TODO upstream
         ttspaste = pkgs.callPackage packages/ttspaste.nix {};
         unicodmenu = pkgs.callPackage packages/unicodmenu.nix {};
         emailmenu = pkgs.callPackage packages/emailmenu.nix {};
-        untilport = pkgs.callPackage packages/untilport.nix {};
+        stag = pkgs.callPackage packages/stag.nix {}; # TODO upstream
         vg = pkgs.callPackage packages/vg.nix {};
         vim = pkgs.callPackage packages/vim.nix {niveumPackages = self.packages.${system};};
         obsidian-vim = pkgs.callPackage packages/obsidian-vim.nix {};
-        vimPlugins-cheat-sh-vim = pkgs.callPackage packages/vimPlugins/cheat-sh.nix {};
-        vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix {};
-        vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix {};
-        vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix {};
-        vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix {};
-        vimPlugins-vim-colors-paramount = pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix {};
-        vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix {};
-        vimPlugins-vim-fsharp = pkgs.callPackage packages/vimPlugins/vim-fsharp.nix {};
-        vimPlugins-vim-mail = pkgs.callPackage packages/vimPlugins/vim-mail.nix {};
-        vimPlugins-vim-reason-plus = pkgs.callPackage packages/vimPlugins/vim-reason-plus.nix {};
+        vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix {}; # TODO upstream
+        vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix {}; # TODO upstream
+        vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix {}; # TODO upstream
+        vimPlugins-mdwa-nvim = pkgs.callPackage packages/vimPlugins/mdwa-nvim.nix {}; # TODO upstream
+        vimPlugins-vim-ernest = pkgs.callPackage packages/vimPlugins/vim-ernest.nix {}; # TODO upstream
+        vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix {}; # TODO upstream
+        vimPlugins-vim-colors-paramount = pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix {}; # TODO upstream
+        vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix {}; # TODO upstream
+        vimPlugins-vim-fsharp = pkgs.callPackage packages/vimPlugins/vim-fsharp.nix {}; # TODO upstream
+        vimPlugins-vim-mail = pkgs.callPackage packages/vimPlugins/vim-mail.nix {}; # TODO upstream
+        vimPlugins-vim-reason-plus = pkgs.callPackage packages/vimPlugins/vim-reason-plus.nix {}; # TODO upstream
         vimv = pkgs.callPackage packages/vimv.nix {};
-        weechat-declarative = pkgs.callPackage packages/weechat-declarative.nix {};
-        weechatScripts-hotlist2extern = pkgs.callPackage packages/weechatScripts/hotlist2extern.nix {};
-        wttr = pkgs.callPackage packages/wttr.nix {};
-
-        itl = pkgs.callPackage packages/itl.nix {};
-        itools = pkgs.callPackage packages/itools.nix {itl = itl;};
+        weechat-declarative = pkgs.callPackage packages/weechat-declarative.nix {}; # TODO upstream
+        weechatScripts-hotlist2extern = pkgs.callPackage packages/weechatScripts/hotlist2extern.nix {}; # TODO upstream
+        dmenu-randr = pkgs.callPackage packages/dmenu-randr.nix {};
+        wttr = pkgs.callPackage packages/wttr.nix {}; # TODO upstream
 
         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/default.nix

@@ -45,11 +45,11 @@
   theme = pkgs: {
     gtk = {
       name = "Adwaita-dark";
-      package = pkgs.gnome.gnome-themes-extra;
+      package = pkgs.gnome-themes-extra;
     };
     icon = {
       name = "Adwaita";
-      package = pkgs.gnome.adwaita-icon-theme;
+      package = pkgs.adwaita-icon-theme;
     };
     cursor = {
       name = "capitaine-cursors-white";

lib/keyboards/farsi

@@ -0,0 +1,114 @@
+// https://github.com/gpuminingir/Farsi-Phonetic-Keyboard-Linux
+// by @gpuminingir
+
+partial alphanumeric_keys
+xkb_symbols "qwerty" {
+  // Classic Finnish keyboard layout without dead keys and {[]} on asdf + AltG
+  name[Group1]="Persian (QWERTY)";
+  include "ir(pesq_part_basic)"
+  include "ir(pesq_part_ext)"
+  include "ir(pesq_part_keypad)"
+  include "nbsp(zwnj2nb3nnb4)"
+  include "level3(ralt_switch)"  
+};
+
+hidden partial alphanumeric_keys
+xkb_symbols "pesq_part_basic" {
+  // Persian digits
+  key <AE01> { [ Arabic_1, exclam, exclam ] }; // ١ ! !
+  key <AE02> { [ Arabic_2, at, at ] }; // ٢ @ @
+  key <AE03> { [ Arabic_3, numbersign, numbersign ] }; // ٣ # #
+  key <AE04> { [ Farsi_4, dollar, dollar ] }; // ۴ $ $
+  key <AE05> { [ Farsi_5, percent, percent ] }; // ۵ % %
+  key <AE06> { [ Farsi_6, asciicircum, asciicircum ] }; // ۶ ^ ^
+  key <AE07> { [ Arabic_7, ampersand, ampersand ] }; // ٧ & &
+  key <AE08> { [ Arabic_8, KP_Multiply, KP_Multiply ] }; // ٨ * *
+  key <AE09> { [ Arabic_9, Armenian_parenright, Armenian_parenright, Armenian_parenleft ] }; // ٩ ) ) (
+  key <AE10> { [ Farsi_0, Armenian_parenleft, Armenian_parenleft ] }; // ۰ ( (
+  key <AE11> { [ underbar, KP_Subtract, KP_Subtract ] }; // _ – –
+  key <AE12> { [ KP_Equal, KP_Add, KP_Add ] }; // = + +
+
+  // Persian letters and symbols
+  key <AD01> { [ Arabic_qaf, Arabic_ghain ] }; // ق غ
+  key <AD02> { [ Arabic_sheen ] }; // ش
+  key <AD03> { [ Arabic_ain ] }; // ع
+  key <AD04> { [ Arabic_ra ] }; // ر
+  key <AD05> { [ Arabic_teh, Arabic_tah ] }; // ت ط
+  key <AD06> { [ Farsi_yeh ] }; // ى
+  key <AD07> { [ Arabic_waw ] }; // و
+  key <AD08> { [ Farsi_yeh ] }; // ى
+  key <AD09> { [ Arabic_waw ] }; // و
+  key <AD10> { [ Arabic_peh ] }; // پ
+  key <AD11> { [ bracketright, braceleft ] }; // ] } {
+  key <AD12> { [ bracketleft, braceright ] }; // [ { }
+
+  key <AC01> { [ Arabic_alef, Arabic_maddaonalef, Arabic_maddaonalef ] }; // ا آ آ
+  key <AC02> { [ Arabic_seen, Arabic_sad, Arabic_sheen, Arabic_sheen ] }; // س ص  ش 
+  key <AC03> { [ Arabic_dal, Arabic_thal ] }; // د ذ ذ
+  key <AC04> { [ Arabic_feh ] }; // ف
+  key <AC05> { [ Arabic_gaf, Arabic_ghain ] }; // گ
+  key <AC06> { [ Arabic_heh, Arabic_hah ] }; // ە ح ه
+  key <AC07> { [ Arabic_jeem, Arabic_jeh ] }; // ج ژ ژ
+  key <AC08> { [ Arabic_keheh ] }; // ک
+  key <AC09> { [ Arabic_lam ] }; // ل
+  key <AC10> { [ Arabic_semicolon, colon ] }; // ؛ : ։
+  key <AC11> { [ Arabic_comma, quotedbl, quotedbl ] }; // ، ” ”
+
+  key <AB01> { [ Arabic_zain, Arabic_dad, Arabic_zah, Arabic_zah ] }; //  ض ض ز خ
+  key <AB02> { [ Arabic_khah, Arabic_zah ] }; // ظ خ
+  key <AB03> { [ Arabic_theh, Arabic_tcheh ] }; // چ ث
+  key <AB04> { [ Arabic_hamza, Arabic_waw ] }; // و
+  key <AB05> { [ Arabic_beh ] }; // ب
+  key <AB06> { [ Arabic_noon ] }; // ن
+  key <AB07> { [ Arabic_meem ] }; // م
+  key <AB08> { [ Arabic_comma, rightcaret, leftcaret ] }; // , > <
+  key <AB09> { [ period, leftcaret, rightcaret ] }; // . < >
+  key <AB10> { [ slash,		Arabic_question_mark,	question ] }; // / ?
+
+  key <AE11> { [ minus, underscore ] };
+  key <AE12> { [ equal, plus, 0x1002212 ] };
+  key <BKSL> { [ backslash, bar, 0x1002010 ] };
+  key <TLDE> { [ U02DC, UFDFC, UFDF2 ] }; // ˜ ﷼ ﷲ
+};
+
+hidden partial alphanumeric_keys
+xkb_symbols "pesq_part_ext" {
+  // Persian and ASCII digits
+  key <AE01> { [ Farsi_1, exclam, grave, 1 ] };
+  key <AE02> { [ Farsi_2, 0x100066c, at, 2 ] };
+  key <AE03> { [ Farsi_3, 0x100066b, numbersign, 3 ] };
+  key <AE04> { [ Farsi_4, 0x100fdfc, dollar, 4 ] };
+  key <AE05> { [ Farsi_5, 0x100066a, percent, 5 ] };
+  key <AE06> { [ Farsi_6, multiply, asciicircum, 6 ] };
+  key <AE07> { [ Farsi_7, Arabic_comma, ampersand, 7 ] };
+  key <AE08> { [ Farsi_8, asterisk, enfilledcircbullet, 8 ] };
+  key <AE09> { [ Farsi_9, parenright, 0x100200e, 9 ] };
+  key <AE10> { [ Farsi_0, parenleft, 0x100200f, 0 ] };
+};
+
+hidden partial alphanumeric_keys
+xkb_symbols "pesq_part_keypad" {
+  // Persian digits and Mathematical operators
+  key <KPDV> { [ division, XF86_Ungrab ] };
+  key <KPMU> { [ multiply, XF86_ClearGrab ] };
+  key <KPSU> { [ 0x1002212, XF86_Prev_VMode ] };
+  key <KPAD> { [ plus, XF86_Next_VMode ] };
+
+  key <KPEN> { [ KP_Enter ] };
+  key <KPEQ> { [ equal ] };
+
+  key <KP7> { [ KP_Home, Farsi_7 ] };
+  key <KP8> { [ KP_Up, Farsi_8 ] };
+  key <KP9> { [ KP_Prior, Farsi_9 ] };
+
+  key <KP4> { [ KP_Left, Farsi_4 ] };
+  key <KP5> { [ KP_Begin, Farsi_5 ] };
+  key <KP6> { [ KP_Right, Farsi_6 ] };
+
+  key <KP1> { [ KP_End, Farsi_1 ] };
+  key <KP2> { [ KP_Down, Farsi_2 ] };
+  key <KP3> { [ KP_Next, Farsi_3 ] };
+
+  key <KP0> { [ KP_Insert, Farsi_0 ] };
+  key <KPDL> { [ KP_Delete, 0x100066b ] };
+};

lib/local-network.nix

@@ -1,10 +1,4 @@
 {
-  toum = "192.168.178.24";
-  zaatar = "192.168.178.21";
-  kabsa = "192.168.178.32";
-  android = "192.168.178.35";
-  manakish = "192.168.178.29";
-
-  officejet = "192.168.178.27";
-  fritzbox = "192.168.178.1";
+  officejet = "192.168.0.251";
+  router = "192.168.0.1";
 }

lib/mycelium-network.nix

@@ -0,0 +1,8 @@
+{
+  zaatar = "5c5:49e0:7793:f017:59e1:1715:9e0e:3fc8";
+  fatteh = "463:a0d4:daa3:aa8d:a9b1:744a:46a5:7a80";
+  ful = "5bf:d60e:bebf:5163:f495:8787:880c:6d41";
+  kabsa = "432:e30:d5d8:9311:e34b:6587:96ee:3fcb";
+  makanek = "43f:ad4f:fa67:d9f7:8a56:713c:7418:164b";
+  manakish = "512:d3bd:3cd9:fcc8:ae34:81fa:385f:8c21";
+}

lib/panoptikon.nix

@@ -2,7 +2,6 @@
   pkgs,
   lib,
   niveumPackages,
-  config,
   ...
 }: {
   # watcher scripts
@@ -37,7 +36,7 @@
         then "2"
         else "3"
       }s/^/${messagePrefix}/p" \
-        | ${config.nur.repos.mic92.ircsink}/bin/ircsink \
+        | ${pkgs.nur.repos.mic92.ircsink}/bin/ircsink \
           --nick ${nick} \
           --server ${server} \
           --target ${target}

lib/streams.nix

@@ -85,9 +85,6 @@ 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";
 
@@ -185,6 +182,12 @@ in
       logo = "https://www.metropolfm.de/wp-content/uploads/2017/04/berlin.png";
       tags = [tags.turkish];
     }
+    {
+      station = "Ancient FM";
+      stream = "https://mediaserv73.live-streams.nl:18058/stream";
+      desc = " Music of the Mediæval and Renaissance";
+      tags = [tags.trad];
+    }
     {
       stream = "http://rb-stream.de:8000/rrb_128.mp3";
       station = "Radio Golos Berlina";
@@ -1201,198 +1204,6 @@ 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á";
@@ -1400,12 +1211,6 @@ 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";
@@ -1548,6 +1353,11 @@ 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";
@@ -1643,21 +1453,6 @@ 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";
@@ -1665,12 +1460,6 @@ 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";
@@ -1840,11 +1629,6 @@ 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";
@@ -1915,18 +1699,23 @@ 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 = "XXX greek";
-      stream = "http://radio.hostchefs.net:8046/stream?1520818130148";
-      tags = [tags.greek];
-    }
-    {
-      station = "XXX turkish or greek";
+      station = "Kral FM Xanthi";
       stream = "https://onairmediagroup.live24.gr/kralfm100xanthi";
       tags = [tags.greek tags.turkish];
     }
@@ -1980,11 +1769,6 @@ 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/";
@@ -1995,16 +1779,6 @@ 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";
@@ -2019,9 +1793,25 @@ 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 = "Brownian noise";
+      station = "Brown 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

@@ -91,6 +91,7 @@ local language_servers = {
   -- tsserver = {}, -- typescript-language-server
   cssls = {},
   elmls = {}, -- elm-language-server
+  gopls = {}, -- gopls
   denols = {}, -- deno built in
   bashls = {}, -- bash-language-server
   lua_ls = {
@@ -112,7 +113,14 @@ local language_servers = {
   hls = {}, -- haskell-language-server
   html = {}, -- vscode-langservers-extracted
   jsonls = {}, -- vscode-langservers-extracted
-  nil_ls = {}, -- github:oxalica/nil
+  lemminx = {}, -- lemminx (for xml)
+  nil_ls = {
+    ['nil'] = {
+      formatting = {
+        command = { "nixfmt" },
+      },
+    },
+  }, -- github:oxalica/nil
   dhall_lsp_server = {}, -- dhall-lsp-server
   -- rnix = {}, -- rnix-lsp
   jqls = {}, -- jq-lsp
@@ -147,10 +155,11 @@ local language_servers = {
 }
 
 for server, settings in pairs(language_servers) do
-  require('lspconfig')[server].setup{
+  vim.lsp.config(server, {
     on_attach = on_attach,
     flags = lsp_flags,
     settings = settings,
     capabilities = capabilities
-  }
+  })
+  vim.lsp.enable(server)
 end

lib/vim/init.vim

@@ -3,8 +3,6 @@ vnoremap a= :Tabularize /=<CR>
 vnoremap a; :Tabularize /::<CR>
 vnoremap a- :Tabularize /-><CR>
 
-colorscheme dim
-
 " noremap <Leader>h :<C-u>split<CR>
 " noremap <Leader>v :<C-u>vsplit<CR>
 noremap <Leader>gs :Git<CR>
@@ -42,8 +40,6 @@ let g:netrw_banner=0
 let g:netrw_browse_split=4
 let g:netrw_altv=1 " open splits to the right
 let g:netrw_liststyle=3 " tree view
-let g:netrw_list_hide=netrw_gitignore#Hide()
-let g:netrw_list_hide.=',\(^\|\s\s\)\zs\.\S\+'
 let g:netrw_winsize = 25
 
 call matchadd('colorcolumn', '\%101v', 100)
@@ -106,6 +102,7 @@ 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
@@ -128,3 +125,12 @@ set complete+=kspell
 let g:pandoc#syntax#conceal#use = 0
 let g:pandoc#modules#disabled = []
 let g:pandoc#spell#default_langs = ['en', 'de']
+
+autocmd! User GoyoEnter Limelight
+autocmd! User GoyoLeave Limelight!
+
+
+" Disable Copilot by default
+let b:copilot_enabled = v:false
+" keymap to toggle it enabled
+nnoremap <leader>gc :let b:copilot_enabled = !b:copilot_enabled<CR>

modules/go-webring.nix

@@ -0,0 +1,140 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  inherit (lib)
+    mkEnableOption
+    mkPackageOption
+    mkOption
+    types
+    literalExpression
+    mkIf
+    ;
+  cfg = config.services.go-webring;
+
+  defaultAddress = "127.0.0.1:2857";
+in
+
+{
+  options = {
+    services.go-webring = {
+      enable = mkEnableOption "go-webring";
+
+      package = mkPackageOption pkgs "go-webring" { };
+
+      contactInstructions = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = "Contact instructions for errors";
+        example = "contact the admin and let them know what's up";
+      };
+
+      host = mkOption {
+        type = types.str;
+        description = "Host this webring runs on, primarily used for validation";
+        example = "my-webri.ng";
+      };
+
+      homePageTemplate = mkOption {
+        type = types.str;
+        description = ''
+          This should be any HTML file with the string "{{ . }}" placed
+          wherever you want the table of members inserted. This table is
+          plain HTML so you can style it with CSS.
+        '';
+      };
+
+      listenAddress = mkOption {
+        type = types.str;
+        default = defaultAddress;
+        description = "Host and port go-webring will listen on";
+      };
+
+      members = mkOption {
+        type = types.listOf (
+          types.submodule {
+            options = {
+              username = mkOption {
+                type = types.str;
+                description = "Member's name";
+              };
+              site = mkOption {
+                type = types.str;
+                description = "Member's site URL";
+              };
+            };
+          }
+        );
+        description = "List of members in the webring";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.go-webring = {
+      description = "go-webring service";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      requires = [ "network.target" ];
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = ''
+          ${lib.getExe cfg.package} \
+            ${lib.optionalString (cfg.contactInstructions != null) ("--contact " + lib.escapeShellArg cfg.contactInstructions)} \
+            --host ${cfg.host} \
+            --index ${pkgs.writeText "index.html" cfg.homePageTemplate} \
+            --listen ${cfg.listenAddress} \
+            --members ${
+              pkgs.writeText "list.txt" (
+                lib.concatMapStrings (member: member.username + " " + member.site + "\n") cfg.members
+              )
+            }
+        '';
+        User = "go-webring";
+        DynamicUser = true;
+        RuntimeDirectory = "go-webring";
+        WorkingDirectory = "/var/lib/go-webring";
+        StateDirectory = "go-webring";
+        RuntimeDirectoryMode = "0750";
+        Restart = "always";
+        RestartSec = 5;
+
+        # Hardening
+        CapabilityBoundingSet = [ "" ];
+        DeviceAllow = [ "" ];
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        PrivateDevices = true;
+        PrivateUsers = true;
+        ProcSubset = "pid";
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+          "AF_UNIX"
+        ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service"
+          "~@privileged"
+        ];
+        UMask = "0077";
+      };
+    };
+    environment.systemPackages = [ cfg.package ];
+  };
+}

modules/htgen.nix

@@ -1,47 +0,0 @@
-{
-  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.string;
+            type = lib.types.listOf lib.types.str;
             description = ''
               This can be used to pass secrets to the systemd service without adding them to the nix store.
             '';

modules/telegram-bot.nix

@@ -96,7 +96,7 @@ in {
               tokenFile = mkOption {type = types.path;};
               homeserver = mkOption {
                 type = types.str;
-                default = "botsin.space";
+                default = "social.krebsco.de";
               };
             };
           };

packages/brainmelter.nix

@@ -0,0 +1,39 @@
+{ writers, flite, netcat, gnused, ... }:
+writers.writeDashBin "brainmelter" ''
+  SERVER="brockman.news"
+  PORT=6667
+  NICK="irccat"
+  USER="irccat"
+  CHANNEL="#all"
+
+  # Open connection to IRC server using a FIFO and netcat
+  FIFO=$(mktemp -u)
+  mkfifo "$FIFO"
+  trap "rm -f $FIFO" EXIT
+
+  # Send IRC commands
+  {
+      echo "NICK $NICK"
+      echo "USER $USER 0 * :$USER"
+      sleep 5
+      echo "JOIN $CHANNEL"
+      while true; do
+          sleep 30
+          echo "PING :keepalive"
+      done
+  } > "$FIFO" &
+
+  # Read from server and write to stdout
+  ${netcat}/bin/nc "$SERVER" "$PORT" < "$FIFO" | while IFS= read -r line; do
+    voice="$(echo -e "awb\nkal\nrms\nslt" | shuf -n1)"
+    echo "$line" \
+      | ${gnused}/bin/sed -n 's/.*go.brockman.news\/\S\+ //p' \
+      | tee /dev/stderr \
+      | ${flite}/bin/flite -voice "$voice"
+    # Respond to PINGs to avoid timeout
+    if [ "$line" = PING* ]; then
+        server_ping=$(echo "$line" | cut -d':' -f2)
+        echo "PONG :$server_ping" > "$FIFO"
+    fi
+  done
+''

packages/cheat-sh.nix

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

packages/cltk.nix

@@ -1,61 +0,0 @@
-{ buildPythonPackage, lib, fetchPypi, gitpython, gensim, tqdm, torch, stringcase, stanza, spacy, scipy, scikit-learn, requests, rapidfuzz, pyyaml, nltk, boltons, poetry-core }:
-let
-  greek-accentuation = buildPythonPackage rec {
-    pname = "greek-accentuation";
-    version = "1.2.0";
-    src = fetchPypi {
-      inherit pname version;
-      hash = "sha256-l2HZXdqlLubvy2bWhhZVYGMpF0DXVKTDFehkcGF5xdk=";
-    };
-    meta = with lib; {
-      description = "Python 3 library for accenting (and analyzing the accentuation of) Ancient Greek words";
-      homepage = "https://github.com/jtauber/greek-accentuation";
-      license = licenses.mit;
-      maintainers = with maintainers; [ kmein ];
-    };
-  };
-in
-buildPythonPackage rec {
-  pname = "cltk";
-  format = "pyproject";
-  version = "1.3.0";
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-jAxvToUIo333HSVQDYVyUBY3YP+m1RnlNGelcvktp6s=";
-  };
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace "poetry>=1.1.13" poetry-core \
-      --replace "poetry.masonry.api" "poetry.core.masonry.api" \
-      --replace 'scipy = "<1.13.0"' 'scipy = "^1"' \
-      --replace 'boltons = "^21.0.0"' 'boltons = "^24.0.0"'
-  '';
-
-  propagatedBuildInputs = [
-    gitpython
-    gensim
-    boltons
-    greek-accentuation
-    pyyaml
-    nltk
-    rapidfuzz
-    requests
-    scikit-learn
-    scipy
-    spacy
-    stanza
-    stringcase
-    torch
-    tqdm
-  ];
-
-  nativeBuildInputs = [ poetry-core ];
-
-  meta = with lib; {
-    description = "Natural language processing (NLP) framework for pre-modern languages";
-    homepage = "https://cltk.org";
-    license = licenses.mit;
-    maintainers = with maintainers; [ kmein ];
-  };
-}

packages/cro.nix

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

packages/dic.nix

@@ -1,43 +0,0 @@
-{
-  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

@@ -1,24 +0,0 @@
-{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

@@ -1,64 +0,0 @@
-{
-  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

@@ -1,42 +0,0 @@
-{
-  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

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

packages/genius.nix

@@ -1,28 +0,0 @@
-{
-  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/gimp.nix

@@ -0,0 +1,20 @@
+{ gimp, fetchurl, runCommand, symlinkJoin, writers }:
+let
+  bring-out-the-gimp = fetchurl {
+    url = "https://c.krebsco.de/bring-out-the-gimp.png";
+    hash = "sha256-k42M5j58OzbcMJwx9CeM2mD2VsVwPKHwJvU55+Rkowc=";
+  };
+  data-dir-prefix = "share/gimp/2.0";
+  data-dir = symlinkJoin {
+    name = "gimp";
+    paths = [
+      (runCommand "splash" {} ''
+        mkdir -p $out/${data-dir-prefix}/images
+        install ${bring-out-the-gimp} $out/share/gimp/2.0/images/gimp-splash.png
+      '')
+      gimp
+    ];
+  };
+in writers.writeDashBin "gimp" ''
+  exec env GIMP2_DATADIR=${data-dir}/${data-dir-prefix} ${gimp}/bin/gimp "$@"
+''

packages/git-preview.nix

@@ -1,23 +0,0 @@
-{
-  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/go-webring.nix

@@ -0,0 +1,21 @@
+{ buildGoModule, fetchgit, lib }:
+buildGoModule {
+  pname = "go-webring";
+  version = "2024-12-18";
+
+  src = fetchgit {
+    url = "https://git.sr.ht/~amolith/go-webring";
+    rev = "0b5b1bf21ff91119ea2dd042ee9fe94e9d1cd8d4";
+    hash = "sha256-az6vBOGiZmzfsMjYUacXMHhDeRDmVI/arCKCpHeTcns=";
+  };
+
+  vendorHash = "sha256-3PnXB8AfZtgmYEPJuh0fwvG38dtngoS/lxyx3H+rvFs=";
+
+  meta = {
+    mainProgram = "go-webring";
+    description = "Simple webring implementation";
+    homepage = "https://git.sr.ht/~amolith/go-webring";
+    license = lib.licenses.bsd2; # cc0 as well
+    maintainers = [ lib.maintainers.kmein ];
+  };
+}

packages/hc.nix

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

packages/heuretes.nix

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

packages/htgen.nix

@@ -1,31 +0,0 @@
-{
-  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

@@ -1,13 +0,0 @@
-{
-  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

@@ -1,29 +0,0 @@
-{
-  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

@@ -1,16 +0,0 @@
-{
-  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

@@ -1,16 +0,0 @@
-{
-  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/literature-quote.nix

@@ -1,31 +1,31 @@
 {
   writers,
   lib,
-  xsv,
+  xan,
   curl,
   gnused,
 }:
 writers.writeDashBin "literature-quote" ''
-  PATH=$PATH:${lib.makeBinPath [xsv curl gnused]}
+  PATH=$PATH:${lib.makeBinPath [xan curl gnused]}
   ROW=$(curl -Ls http://kmein.github.io/logotheca/quotes.csv | shuf -n1)
   (
-    QUOTE="$(echo "$ROW" | xsv select 4)"
+    QUOTE="$(echo "$ROW" | xan select 3)"
 
     echo "$QUOTE" | sed 's/^"//;s/"$//;s/\s*||\s*/\n\n/g;s/\s*|\s*/\n/g'
     echo
 
-    AUTHOR="$(echo "$ROW" | xsv select 1)"
+    AUTHOR="$(echo "$ROW" | xan select 0)"
     # Prepare the output
     ATTRIBUTION="($AUTHOR"
 
-    SOURCE="$(echo "$ROW" | xsv select 2)"
+    SOURCE="$(echo "$ROW" | xan select 1)"
 
     # Add SOURCE if it's not empty
     if [ -n "$SOURCE" ]; then
       ATTRIBUTION="$ATTRIBUTION: $SOURCE"
     fi
 
-    LOC="$(echo "$ROW" | xsv select 3 | sed 's/""//;s/-/–/g')"
+    LOC="$(echo "$ROW" | xan select 2 | sed 's/""//;s/-/–/g')"
     # Add LOC if it's not empty
     if [ -n "$LOC" ]; then
       ATTRIBUTION="$ATTRIBUTION, $LOC"

packages/mahlzeit.nix

@@ -1,63 +0,0 @@
-{
-  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

@@ -1,89 +0,0 @@
-{
-  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

@@ -1,13 +0,0 @@
-{
-  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/obsidian-vim.nix

@@ -22,7 +22,7 @@ neovim.override {
         \ 'path': '${obsidiantVaultDirectory}',
         \ 'syntax': 'markdown',
         \ 'ext': '.md',
-        \ 'diary_rel_path' '.',
+        \ 'diary_rel_path': '.',
         \}]
 
       let NERDTreeSortOrder = ['[[-timestamp]]']

packages/pls.nix

@@ -1,6 +1,7 @@
 {
   lib,
   writers,
+  yt-dlp,
   miller,
   gnused,
   curl,
@@ -30,10 +31,27 @@
     "that's a good song!"
     "👍"
     "vibin'"
+    "this is a jam!"
+    "absolutely love it!"
+    "such a vibe!"
+    "this track is fire!"
+    "feeling this one!"
+    "pure gold!"
+    "this is my jam!"
+    "so catchy!"
+    "on repeat!"
+    "this is a masterpiece!"
+    "let's dance!"
+    "I'm all in!"
+    "so gut!"
+    "mega!"
+    "ich fühl's!"
+    "das ist Musik für die Seele!"
   ];
+
   messages.bad = [
     "how can anyone listen to this?"
-    "(╯°□°）╯ ┻━┻"
+    "(╯°□°）╯ ┻━┻"
     "skip this!"
     "next, please! i'm suffering!"
     "that's just bad music"
@@ -43,13 +61,45 @@
     "turn that down"
     "make it stooop"
     "noooo"
+    "this is painful to listen to"
+    "what is this noise?"
+    "not my cup of tea"
+    "this is a hard pass"
+    "yikes!"
+    "please no more"
+    "this is a disaster"
+    "I can't handle this"
+    "this is just wrong"
+    "let's skip this one"
+    "ugh, why?"
+    "definitely not a fan"
+    "wie kann man das hören?"
+    "das ist schrecklich!"
+    "bitte nicht!"
+    "das ist einfach schlecht"
+    "oh nein, nicht das!"
   ];
 
   messages.neutral = [
     "meh"
     "i have no opinion about this song"
     "idk man"
+    "it's okay"
+    "not bad, not great"
+    "just average"
+    "it's fine"
+    "i can take it or leave it"
+    "kann man hören"
+    "ist in ordnung"
+    "naja"
+    "nicht schlecht, nicht gut"
+    "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/q.nix

@@ -0,0 +1,9 @@
+{ writers, lib, todoman, khal, util-linux, wego, pass }:
+writers.writeDashBin "q" ''
+  export PATH=$PATH:${lib.makeBinPath [todoman khal util-linux wego pass]}
+  (todo list --due 240; echo) &
+  (khal list today today; echo) &
+  (cal -3; echo) &
+  (wego -location Berlin -owm-api-key "$(pass api-keys/openweathermap)" -frontend emoji -days 2; echo) &
+  wait
+''

packages/radio-news.nix

@@ -0,0 +1,47 @@
+{ writers, lib, gnused, curl, jq, yq }:
+writers.writeBashBin "radio-news" ''
+  set -efu
+  PATH=$PATH:${lib.makeBinPath [gnused curl jq yq]}
+
+  EVENTS=$(
+    curl https://www.goodnewsnetwork.org/feed/ \
+      | xq '
+        .rss.channel.item
+        | map(select((.pubDate|strptime("%a, %d %b %Y %H:%M:%S %z")) as $date | ($date | mktime) > (now - (60 * 60 * 24))) | {title, description})
+      '
+  )
+
+  SYSTEM_PROMPT=$(cat <<EOF
+  You are a news anchor writing a short news digest for a radio broadcast.
+  Summarize the following news headlines into a cohesive, engaging script under 400 words.
+  Keep it professional, concise as possible, and easy to follow.
+  Please no unnecessary explanations why the news is good.
+
+  Begin the digest with: "Here's your good news update."
+  EOF
+  )
+
+  REQUEST=$(cat <<EOF
+  {
+      "system_instruction": {
+        "parts": [
+          {
+            "text": $(jq -Rs <<< "$SYSTEM_PROMPT")
+          }
+        ]
+      },
+      "contents": [
+        {
+          "parts": [
+            {
+              "text": $(jq -Rs <<< "$EVENTS")
+            }
+          ]
+        }
+      ]
+    }
+  EOF
+  )
+
+  echo "$REQUEST" | curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash-8b:generateContent?key=$GEMINI_API_KEY" -s -H "Content-Type: application/json" -d @-
+''

packages/rfc.nix

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

packages/scanned.nix

@@ -2,8 +2,12 @@
 {
   writers,
   imagemagick,
+  ghostscript,
+  lib
 }:
 writers.writeDashBin "scanned" ''
+  export PATH=${lib.makeBinPath [ imagemagick ghostscript ]}:$PATH
+
   [ $# -eq 1 -a -f "$1" -a -r "$1" ] || exit 1
 
   ${imagemagick}/bin/convert \

packages/stag.nix

@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  ncurses,
+  taglib,
+  zlib,
+}:
+stdenv.mkDerivation rec {
+  pname = "stag";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "smabie";
+    repo = "stag";
+    rev = "v${version}";
+    hash = "sha256-IWb6ZbPlFfEvZogPh8nMqXatrg206BTV2DYg7BMm7R4=";
+  };
+
+  buildInputs = [
+    ncurses
+    taglib
+    zlib
+  ];
+
+  buildPhase = ''
+    make all
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp stag $out/bin/
+
+    mkdir -p $out/man/man1
+    mv stag.1 $out/man/man1/
+  '';
+  meta = {
+    description = "public domain utf8 curses based audio file tagger";
+    homepage = "https://github.com/smabie/stag";
+    license = lib.licenses.publicDomain;
+    maintainers = [ lib.maintainers.kmein ];
+    platforms = lib.platforms.unix;
+    source = src;
+  };
+}

packages/vim.nix

@@ -4,6 +4,10 @@
   fetchFromGitHub,
   vimUtils,
   niveumPackages,
+  writeText,
+  stylixColors ? null,
+  colorscheme ? null,
+  lib,
   ...
 }: (neovim.override {
   configure = {
@@ -12,9 +16,21 @@
       source ${../lib/vim/init.vim}
       let g:snippet_directory = '${vimPlugins.friendly-snippets}'
       luafile ${../lib/vim/init.lua}
+    '' + lib.optionalString (stylixColors != null) (with stylixColors.withHashtag; ''
+      luafile ${writeText "colors.lua" ''
+        require('base16-colorscheme').setup({
+          base00 = '${base00}', base01 = '${base01}', base02 = '${base02}', base03 = '${base03}',
+          base04 = '${base04}', base05 = '${base05}', base06 = '${base06}', base07 = '${base07}',
+          base08 = '${base08}', base09 = '${base09}', base0A = '${base0A}', base0B = '${base0B}',
+          base0C = '${base0C}', base0D = '${base0D}', base0E = '${base0E}', base0F = '${base0F}'
+        })
+      ''}
+    '') + lib.optionalString (colorscheme != null) ''
+      colorscheme ${colorscheme}
     '';
     packages.nvim = with vimPlugins; {
       start = [
+        base16-nvim
         nvim-cmp
         cmp-buffer
         cmp-path
@@ -24,6 +40,13 @@
 
         editorconfig-vim
 
+        copilot-vim
+
+        goyo
+        limelight-vim
+        niveumPackages.vimPlugins-mdwa-nvim
+        niveumPackages.vimPlugins-vim-ernest
+
         fzf-vim
         fzfWrapper
         supertab
@@ -58,6 +81,7 @@
         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.buildVimPluginFrom2Nix {
+}: (vimUtils.buildVimPlugin {
   pname = "cheat.sh-vim";
   version = "826219d1";
   src = fetchFromGitHub {

packages/vimPlugins/icalendar-vim.nix

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

packages/vimPlugins/jq-vim.nix

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

packages/vimPlugins/mdwa-nvim.nix

@@ -0,0 +1,13 @@
+{
+  vimUtils,
+  fetchFromGitHub,
+}: (vimUtils.buildVimPlugin {
+  pname = "mdwa.nvim";
+  version = "9f37270";
+  src = fetchFromGitHub {
+    owner = "tihawk";
+    repo = "mdwa.nvim";
+    rev = "9f3727037e0d85fd0930334b91b9687a5a880192";
+    hash = "sha256-h2jy2E+pN2Ma/5n9Eq2oXr9xHma2OxxVvx9EJ+bIYxA=";
+  };
+})

packages/vimPlugins/typst-vim.nix

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

packages/vimPlugins/vim-256noir.nix

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

packages/vimPlugins/vim-colors-paramount.nix

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

packages/vimPlugins/vim-ernest.nix

@@ -0,0 +1,14 @@
+{
+  vimUtils,
+  fetchFromGitHub,
+  lib,
+}: (vimUtils.buildVimPlugin {
+  pname = "vim-ernest";
+  version = "4b99bc3";
+  src = fetchFromGitHub {
+    owner = "lgalke";
+    repo = "vim-ernest";
+    rev = "4b99bc3fe3deb7bb958ad2f64cad93569eeb50d7";
+    hash = "sha256-AUuRnnZU39XUerBxNelEqVyDAalRm3VGNUQb15fjXjM=";
+  };
+})

packages/vimPlugins/vim-fetch.nix

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