flake.lock: Update

Flake lock file updates: • Updated input 'flake-utils': 'github:numtide/flake-utils/919d646de7be200f3bf08cb76ae1f09402b6f9b4' (2023-07-11) → 'github:numtide/flake-utils/f9e7cf818399d17d347f847525c5a5a8032e4e44' (2023-08-23) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/4cdad15f34e6321a2f789b99d42815b9142ac2ba' (2023-08-19) → 'github:NixOS/nixpkgs/74e5bdc5478ebbe7ba5849f0d765f92757bb9dbf' (2023-08-25) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/0b6f3e17dda02c9cf1e8edc6e411ba37093f09e2' (2023-08-20) → 'github:NixOS/nixpkgs/38b9aaf6682015f1d2fc7b7f48da96992c30cfa3' (2023-08-26) • Updated input 'nur': 'github:nix-community/NUR/18436a20915d6cc569d7fb13807a07ae5de10661' (2023-08-19) → 'github:nix-community/NUR/0f81f016eecec153a26099beb25b0c8bac87bd23' (2023-08-26) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/598b2f04ed252eb5808b108d7a10084c0c548753' (2023-08-19) → 'github:oxalica/rust-overlay/e90223633068a44f0fb62374e0fa360ccc987292' (2023-08-26) • Updated input 'voidrice': 'github:Lukesmithxyz/voidrice/f26e5678e626e604ed586fc6420b944dc023d3f2' (2023-08-18) → 'github:Lukesmithxyz/voidrice/86f05abcce1fd270032975775adb40040c746cfe' (2023-08-25)
feat: remock secrets
2026-03-28 15:21:08 +01:00 · 2023-08-27 00:40:57 +00:00 · 2023-08-23 17:42:54 +02:00 · 2023-08-23 15:51:56 +02:00 · 2023-08-23 13:05:09 +02:00 · 2023-08-23 13:05:09 +02:00
8 changed files with 138 additions and 118 deletions
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -292,6 +292,7 @@ in {
    ./watson.nix
    ./zsh.nix
    ./tor.nix
+    ./stw-berlin.nix
    ./mastodon-bot.nix
  ];
 }
--- a/configs/lb.nix
+++ b/configs/lb.nix
@@ -9,7 +9,7 @@
    startAt = "weekly";
    serviceConfig = {
      user = "kfm";
-      WorkingDirectory = "/home/kfm/cloud/Seafile/Books/Germanistik/LB";
+      WorkingDirectory = "/home/kfm/cloud/nextcloud/Books/Germanistik/LB";
    };
    script = ''
      first_year=2019
--- a/configs/stw-berlin.nix
+++ b/configs/stw-berlin.nix
@@ -0,0 +1,51 @@
+{
+  pkgs,
+  config,
+  ...
+}: {
+  age.secrets.stw-berlin-card-code.file = ../secrets/stw-berlin-card-code.age;
+
+  systemd.services.stw-berlin = {
+    enable = true;
+    wants = ["network-online.target"];
+    startAt = "weekly";
+    serviceConfig = {
+      user = "kfm";
+      WorkingDirectory = "/home/kfm/cloud/nextcloud/Uni/Meta/Mensa";
+      LoadCredential = [
+        "password:${config.age.secrets.stw-berlin-card-code.path}"
+      ];
+    };
+    script = ''
+      KARTEN_ID=8071859
+      PASSWORT=$(cat "$CREDENTIALS_DIRECTORY"/password)
+
+      endpoint=https://ks.stw.berlin:4433/TL1/TLM/KASVC
+      authorization_header='Authorization: Basic S0FTVkM6ekt2NXlFMUxaVW12VzI5SQ=='
+
+      get_auth_token() {
+        ${pkgs.curl}/bin/curl -sSL "$endpoint/LOGIN?karteNr=$KARTEN_ID&format=JSON&datenformat=JSON" \
+          -X POST \
+          -H "$authorization_header" \
+          --data-raw '{"BenutzerID":"'$KARTEN_ID'","Passwort":"'$PASSWORT'"}' \
+          | ${pkgs.jq}/bin/jq -r '.[0].authToken|@uri'
+      }
+
+
+      get_transactions() {
+        ${pkgs.curl}/bin/curl -sSL "$endpoint/TRANS?format=JSON&authToken=$(get_auth_token)&karteNr=$KARTEN_ID&datumVon=12.02.2018&datumBis=$(date -d tomorrow +%d.%m.%Y)" \
+          -H "$authorization_header" \
+          | ${pkgs.jq}/bin/jq
+      }
+
+      get_items() {
+        ${pkgs.curl}/bin/curl -sSL "$endpoint/TRANSPOS?format=JSON&authToken=$(get_auth_token)&karteNr=$KARTEN_ID&datumVon=12.02.2018&datumBis=$(date -d tomorrow +%d.%m.%Y)" \
+          -H "$authorization_header" \
+          | ${pkgs.jq}/bin/jq
+      }
+
+      get_transactions > transactions-$(date -I).json
+      get_items > items-$(date -I).json
+    '';
+  };
+}
--- a/flake.lock
+++ b/flake.lock
@@ -122,11 +122,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "lastModified": 1692799911,
+        "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
        "type": "github"
      },
      "original": {
@@ -327,11 +327,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1692414505,
-        "narHash": "sha256-sSTuyR9JYSxmUcYcj0Jvw1hIq1tz/Canw9mK0hEJvnE=",
+        "lastModified": 1692986144,
+        "narHash": "sha256-M4VFpy7Av9j+33HF5nIGm0k2+DXXW4qSSKdidIKg5jY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "4cdad15f34e6321a2f789b99d42815b9142ac2ba",
+        "rev": "74e5bdc5478ebbe7ba5849f0d765f92757bb9dbf",
        "type": "github"
      },
      "original": {
@@ -375,11 +375,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1692490387,
-        "narHash": "sha256-qU6BlSeuBeO3TsNqrLw6UksNSqyFOJ4pUGiC3WMsct0=",
+        "lastModified": 1693094031,
+        "narHash": "sha256-PyPWn5/WzryKDKuuiJJ8cd1BJCenhjbaicYQbwRM9Ao=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "0b6f3e17dda02c9cf1e8edc6e411ba37093f09e2",
+        "rev": "38b9aaf6682015f1d2fc7b7f48da96992c30cfa3",
        "type": "github"
      },
      "original": {
@@ -468,11 +468,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1692488764,
-        "narHash": "sha256-SCtwgqxLUCHf4gT83ab/46eqcw2ocm5FZanysSF9Bg4=",
+        "lastModified": 1693082793,
+        "narHash": "sha256-di/x+vrMYmjSHabbiuPi6EZ0m6HoPXOVtA7ugU3rVZM=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "18436a20915d6cc569d7fb13807a07ae5de10661",
+        "rev": "0f81f016eecec153a26099beb25b0c8bac87bd23",
        "type": "github"
      },
      "original": {
@@ -557,11 +557,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1692410823,
-        "narHash": "sha256-YM1QCenpghNqgleUmoCJUArTuMEBqScyQuhepA6JZaI=",
+        "lastModified": 1693015707,
+        "narHash": "sha256-SFr93DYn502sVT9nB5U8/cKg1INyEk/jCeq8tHioz7Y=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "598b2f04ed252eb5808b108d7a10084c0c548753",
+        "rev": "e90223633068a44f0fb62374e0fa360ccc987292",
        "type": "github"
      },
      "original": {
@@ -708,11 +708,11 @@
    "voidrice": {
      "flake": false,
      "locked": {
-        "lastModified": 1692361205,
-        "narHash": "sha256-xO5wT8Agu2PMGilpXobUwRliqNXYKl/x7OAaGRW83BI=",
+        "lastModified": 1692950210,
+        "narHash": "sha256-0RHvrinkg8LEV/aGnT2n9MNOwaf2ke/YAXRIipZiT2w=",
        "owner": "Lukesmithxyz",
        "repo": "voidrice",
-        "rev": "f26e5678e626e604ed586fc6420b944dc023d3f2",
+        "rev": "86f05abcce1fd270032975775adb40040c746cfe",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -82,7 +82,7 @@
            mock-secrets = {
              type = "app";
              program = toString (pkgs.writers.writeDash "mock-secrets" ''
-                ${pkgs.findutils}/bin/find secrets -not -path '*/.*' -type f  > secrets.txt
+                ${pkgs.findutils}/bin/find secrets -not -path '*/.*' -type f  | ${pkgs.coreutils}/bin/sort > secrets.txt
              '');
            };
            deploy = {
@@ -281,6 +281,9 @@
          })
        ];
      };
+      unstablePackages = import nixpkgs-unstable {
+        inherit system;
+      };
      wrapScript = {
        packages ? [],
        name,
@@ -334,7 +337,7 @@
        mpv-radio = pkgs.callPackage packages/mpv-radio.nix {di-fm-key-file = "/dev/null";};
        mpv-tuner = pkgs.callPackage packages/mpv-tuner.nix {di-fm-key-file = "/dev/null";};
        mpv-tv = pkgs.callPackage packages/mpv-tv.nix {};
-        mpv-visualizer = pkgs.callPackage packages/mpv-visualizer.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;};
--- a/packages/mpv-visualizer.nix
+++ b/packages/mpv-visualizer.nix
@@ -1,36 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchFromGitHub,
-  curl,
-  xclip,
-}:
-stdenvNoCC.mkDerivation rec {
-  pname = "visualizer";
-  version = "unstable-2021-07-10";
-
-  src = fetchFromGitHub {
-    owner = "mfcc64";
-    repo = "mpv-scripts";
-    rev = "a0cd87eeb974a4602c5d8086b4051b5ab72f42e1";
-    sha256 = "1xgd1nd117lpj3ppynhgaa5sbkfm7l8n6c9a2fy8p07is2dkndrq";
-  };
-
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/share/mpv/scripts
-    cp visualizer.lua $out/share/mpv/scripts
-    runHook postInstall
-  '';
-
-  passthru.scriptName = "visualizer.lua";
-
-  meta = with lib; {
-    description = "various audio visualization";
-    homepage = "https://github.com/mfcc64/mpv-scripts";
-    platforms = platforms.all;
-    maintainers = with maintainers; [kmein];
-  };
-}
--- a/2
+++ b/2
--- a/secrets.txt
+++ b/secrets.txt
@@ -1,65 +1,66 @@
-secrets/di-fm-key.age
-secrets/email-password-meinhark.age
-secrets/kabsa-retiolum-privateKey-ed25519.age
-secrets/makanek-specus-privateKey.age
-secrets/manakish-retiolum-privateKey-rsa.age
-secrets/kfm-password.age
-secrets/email-password-fysi.age
-secrets/github-token-i3status-rust.age
-secrets/nextcloud-password-admin.age
-secrets/zaatar-retiolum-privateKey-ed25519.age
-secrets/manakish-syncthing-cert.age
-secrets/telegram-token-betacode.age
-secrets/tabula-retiolum-privateKey-rsa.age
-secrets/zaatar-ympd-basicAuth.age
-secrets/zaatar-moodle-dl-basicAuth.age
-secrets/mega-password.age
-secrets/telegram-token-reverse.age
-secrets/email-password-meinhaki.age
-secrets/spotify-password.age
-secrets/telegram-token-kmein.age
-secrets/maxmind-license-key.age
-secrets/makanek-retiolum-privateKey-rsa.age
-secrets/spotify-username.age
-secrets/onlyoffice-jwt-key.age
-secrets/miniflux-credentials.age
-secrets/email-password-fsklassp.age
-secrets/kabsa-retiolum-privateKey-rsa.age
-secrets/traadfri-key.age
-secrets/tahina-retiolum-privateKey-rsa.age
-secrets/makanek-retiolum-privateKey-ed25519.age
-secrets/zaatar-retiolum-privateKey-rsa.age
-secrets/kabsa-specus-privateKey.age
-secrets/email-password-meinhak99.age
-secrets/nextcloud-password-kieran.age
-secrets/ful-root.age
-secrets/manakish-syncthing-key.age
-secrets/email-password-dslalewa.age
-secrets/zaatar-moodle-dl-tokens.json.age
-secrets/tabula-retiolum-privateKey-ed25519.age
-secrets/tahina-retiolum-privateKey-ed25519.age
-secrets/cifs-credentials-hu-berlin.age
-secrets/kabsa-syncthing-key.age
-secrets/hetzner-storagebox-credentials.age
-secrets/ful-retiolum-privateKey-rsa.age
-secrets/ful-retiolum-privateKey-ed25519.age
-secrets/zaatar-syncthing-key.age
-secrets/openweathermap-api-key.age
-secrets/secrets.nix
-secrets/email-password-cock.age
-secrets/telegram-token-nachtischsatan.age
-secrets/kabsa-syncthing-cert.age
-secrets/grafana-password-admin.age
-secrets/email-password-posteo.age
-secrets/manakish-retiolum-privateKey-ed25519.age
-secrets/restic.age
-secrets/home-assistant-token.age
-secrets/zaatar-syncthing-cert.age
-secrets/nextcloud-password-database.age
-secrets/telegram-token-menstruation.age
 secrets/alertmanager-token-reporters.age
 secrets/blackboard-calendar-ics.age
+secrets/cifs-credentials-hu-berlin.age
+secrets/di-fm-key.age
+secrets/email-password-cock.age
+secrets/email-password-dslalewa.age
+secrets/email-password-fsklassp.age
+secrets/email-password-fysi.age
+secrets/email-password-meinhak99.age
+secrets/email-password-meinhaki.age
+secrets/email-password-meinhark.age
+secrets/email-password-posteo.age
+secrets/ful-retiolum-privateKey-ed25519.age
+secrets/ful-retiolum-privateKey-rsa.age
+secrets/ful-root.age
 secrets/ful-specus-privateKey.age
+secrets/github-token-i3status-rust.age
+secrets/grafana-password-admin.age
+secrets/hetzner-storagebox-credentials.age
+secrets/home-assistant-token.age
+secrets/kabsa-retiolum-privateKey-ed25519.age
+secrets/kabsa-retiolum-privateKey-rsa.age
+secrets/kabsa-specus-privateKey.age
+secrets/kabsa-syncthing-cert.age
+secrets/kabsa-syncthing-key.age
+secrets/kfm-password.age
+secrets/makanek-retiolum-privateKey-ed25519.age
+secrets/makanek-retiolum-privateKey-rsa.age
+secrets/makanek-specus-privateKey.age
+secrets/manakish-retiolum-privateKey-ed25519.age
+secrets/manakish-retiolum-privateKey-rsa.age
+secrets/manakish-syncthing-cert.age
+secrets/manakish-syncthing-key.age
+secrets/maxmind-license-key.age
+secrets/mega-password.age
+secrets/miniflux-credentials.age
+secrets/nextcloud-password-admin.age
+secrets/nextcloud-password-database.age
 secrets/nextcloud-password-fysi.age
-secrets/weechat-sec.conf.age
+secrets/nextcloud-password-kieran.age
+secrets/onlyoffice-jwt-key.age
+secrets/openweathermap-api-key.age
+secrets/restic.age
+secrets/secrets.nix
+secrets/spotify-password.age
+secrets/spotify-username.age
+secrets/stw-berlin-card-code.age
+secrets/tabula-retiolum-privateKey-ed25519.age
+secrets/tabula-retiolum-privateKey-rsa.age
+secrets/tahina-retiolum-privateKey-ed25519.age
+secrets/tahina-retiolum-privateKey-rsa.age
+secrets/telegram-token-betacode.age
+secrets/telegram-token-kmein.age
+secrets/telegram-token-menstruation.age
+secrets/telegram-token-nachtischsatan.age
 secrets/telegram-token-proverb.age
+secrets/telegram-token-reverse.age
+secrets/traadfri-key.age
+secrets/weechat-sec.conf.age
+secrets/zaatar-moodle-dl-basicAuth.age
+secrets/zaatar-moodle-dl-tokens.json.age
+secrets/zaatar-retiolum-privateKey-ed25519.age
+secrets/zaatar-retiolum-privateKey-rsa.age
+secrets/zaatar-syncthing-cert.age
+secrets/zaatar-syncthing-key.age
+secrets/zaatar-ympd-basicAuth.age
Author	SHA1	Message	Date
github-actions[bot]	f4e2885b86	flake.lock: Update Flake lock file updates: • Updated input 'flake-utils': 'github:numtide/flake-utils/919d646de7be200f3bf08cb76ae1f09402b6f9b4' (2023-07-11) → 'github:numtide/flake-utils/f9e7cf818399d17d347f847525c5a5a8032e4e44' (2023-08-23) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/4cdad15f34e6321a2f789b99d42815b9142ac2ba' (2023-08-19) → 'github:NixOS/nixpkgs/74e5bdc5478ebbe7ba5849f0d765f92757bb9dbf' (2023-08-25) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/0b6f3e17dda02c9cf1e8edc6e411ba37093f09e2' (2023-08-20) → 'github:NixOS/nixpkgs/38b9aaf6682015f1d2fc7b7f48da96992c30cfa3' (2023-08-26) • Updated input 'nur': 'github:nix-community/NUR/18436a20915d6cc569d7fb13807a07ae5de10661' (2023-08-19) → 'github:nix-community/NUR/0f81f016eecec153a26099beb25b0c8bac87bd23' (2023-08-26) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/598b2f04ed252eb5808b108d7a10084c0c548753' (2023-08-19) → 'github:oxalica/rust-overlay/e90223633068a44f0fb62374e0fa360ccc987292' (2023-08-26) • Updated input 'voidrice': 'github:Lukesmithxyz/voidrice/f26e5678e626e604ed586fc6420b944dc023d3f2' (2023-08-18) → 'github:Lukesmithxyz/voidrice/86f05abcce1fd270032975775adb40040c746cfe' (2023-08-25)	2023-08-27 00:40:57 +00:00
Kierán Meinhardt	07f5d25e96	feat: remock secrets	2023-08-23 17:42:54 +02:00
Kierán Meinhardt	b5e9fd73e0	feat: remove mpv-visualizer as it has been upstreamed now	2023-08-23 15:51:56 +02:00
Kierán Meinhardt	34687dde21	feat: stw-berlin stats	2023-08-23 13:05:09 +02:00
Kierán Meinhardt	4ce7c7a91a	fix: lb subscription	2023-08-23 13:05:09 +02:00