Update authentik to 2024.10.4

flake.lock

@@ -1022,11 +1022,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1732812356,
+        "lastModified": 1733376361,
-        "narHash": "sha256-LNcgjOLArRlx2W6XSi0yc0xwLjrK3KF9LxAMqUgFDgw=",
+        "narHash": "sha256-aLJxoTDDSqB+/3orsulE6/qdlX6MzDLIITLZqdgMpqo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "581d7e4d23b91daf2afa0005a5d3d01d6a8884fe",
+        "rev": "929116e316068c7318c54eb4d827f7d9756d5e9c",
         "type": "github"
       },
       "original": {

modules/cloud/authentik/default.nix

@@ -22,8 +22,8 @@ let
     };
     authentik = mkImage {
       imageName = "ghcr.io/goauthentik/server";
-      finalImageTag = "2024.8.2";
+      finalImageTag = "2024.1.0.4";
-      imageDigest = "sha256:71984fdbb7a9414f5172bb446104d3fe4ab1ab412c8b3343bb97b04449dd53eb";
+      imageDigest = "sha256:5843c56a56be58dcee8927c705f8c9def0af7189511c0e8e687d430f543b0f6d";
     };
   };
   authentikEnv = pkgs.writeText "authentik.env" ''

modules/personal/fonts/default.nix

@@ -8,7 +8,7 @@ with lib;
     packages = with pkgs; mkForce [
       noto-fonts-emoji-blob-bin
       ibm-plex
-      (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
+      nerd-fonts.symbols-only
       noto-fonts
       (pkgs.noto-fonts-cjk-sans or pkgs.noto-fonts-cjk)
       merriweather

modules/services/nix-cache/default.nix

@@ -39,7 +39,7 @@ in
 
     services.harmonia = mkIf cfg.enableServer {
       enable = true;
-      signKeyPath = cfg.privateKeyFile;
+      signKeyPaths = [ cfg.privateKeyFile ];
       settings = {
         bind = bindAddr;
         priority = 45;

nki-personal-do/secrets/secrets.yaml

@@ -43,7 +43,7 @@ peertube-env: ENC[AES256_GCM,data:ZrWBwSfMuepIYTzHVCCSnpsXb+MTcOfklI0O/UdcGaR3Rz
 nix-build-farm:
     private-key: ENC[AES256_GCM,data:bYQ5TAHgJ8rZmmnp0ZW9pM3p6e2ewAqz9+clp2lDnvPsU/YHr/POSW+UESvulT0UDI8t5th71py2G4BG3z9PdPaWw2iSm6hW3VITYCGYvLbF2yK6anSkww0ilpjwm5NXKJLTiPehkAqsZlZsAxeYw5bF0+7JjeH9+49jLOXtGD0uFSf5M3wVZcObzSYsdGaNKGYkokBYeZii1tdwZvAuUKKZ1eOvDAz5v6hjqZA7brDWr5IZXNCqRZOdyGQ5g3UP4o5XFnl57d1RAmKPK9WaTCjbi0hMfms4zldqGeXTRDAhvqMH2w/BY7KvgIOr+aQelTvQbOciq+DaZbzNgdI5gqrSUA19EEL04Qu/gjoVGwMhZ7Lq9+yS2Lb+xdhmn/99sbcRjaRqqjgzHRvbyirPT9EuEAdrijyuZzY9kASv8LN/Q8cawRZNk2vf0M8Qzg0F7iw2kcDrf+dwdcyrrAbg2XDlGsFBckBcPKA44PkOPtFLHZRU9pSpd15rL1JIes6m2YX7AmJFP2+FA5WjXQoqF+CRhBVUWXaXAmcq,iv:7Uqnu2xEcHotczRzIcDfq9bM7wNXdz0Fg2HNpxlV1/Q=,tag:w5aLsT9LN92+83rdP2YJTg==,type:str]
 vikunja:
-    env: ENC[AES256_GCM,data:cHbpfD5THQidjF/Hx5QREJyUJApEHhtalLFMs3npY/zsS9WscCkpKwEPxOmxie/jB2iIQQvR5Xlvbnbr5DVAIduXy7KJCyDEUV1jyJI0+V1FeT5q+69fKg4Jbqz9S32ozMJP0agnKSIvMhZZ8vu+gyMU7UWro5r+VYtVsqb8TlC5Vn8vNK0GcB0nmRUxcBcjuywKhDBrGuAdXpNrb/fqLmnOe5iBk8oXqyyUjF6I+qVn+K8VMfl/Da/2pb7GbuXuQ4jJB1gVrN4+R3uRwB9iKlrc1lF+QJm+pCGqoQU9AjDHxDzIBaGYgSvU82EXUlbDBGyR9r/y0PQ8/59otE1A83EsMyMmA1CerncA8dM24Zv85O9tmsryqqPa6azfVi794tH6YT2lK2dBKxbn6cwusC7fRacON4JmMe2RLZWApZJF9xQd2h64Ffs4x9WC228vemRJC2iKp+Tj6CqCpcfHB/UJxyBaS5GSh6VJ1XV4gnilTLQBvOBgmXd4WOkHy1C1tEI8GKO+TJ0Q/TDuWMSb9hw+uGBi749OHOf5bizCRXo4IfdDt+g1KsnBp2ZLeX3wK3ucNR4UHUcb2MOT0gkRDljn8AhEwu9RrA4DmUTELclkMcyiiMJCl4kBdacjU1RM4GJ5AqqaeIzQd9ny5yRuU5ozQf3URaaRs3oAupAv/y0cuZo7ga80SQj8onxY3FCYeZpVZe+3Jjmx4Qqwrh5L7dNmVPTN1D2BF41oj6mCdM4fEconzt7L229QT/ZA,iv:W7vpIw2815QurKF3N18lP1eIqoc3IODfOvLyJOE0kA4=,tag:d2Ip7Y6Kwo4keP2hzQMwMQ==,type:str]
+    env: ENC[AES256_GCM,data:wHwLaX7z31Ogee0fSIJ4EpP/FUHOmj8lESqPacmrgokf9+2NpG8OKt99csDiYM9EEq2S3P70N6r+Dhzxob53lmQhNK8JuvZqrZ1HxgvMXirjnkXl0LGqVHBM4QdMvxVkICRNc1GMrG6ZY4OBQkn5did1ZZiCuXFC/ByuNTqBNHXoZmZMrewF9MFY+wfGx7+gIYzZ5JF1sgkTqtBdnAiUT2t9AaYNc8qjoZvNj3sgMb35/tKG0CYpt0vz6QuMQwOBJNrRkh2lV7YgTcr1tOkTc2FvRoLLyDykl8fjUf9KDcJLz672E90D0rRA5oHp/Lk28sSThh9WAM0skJofjXMOpq9ScsljWovUuizXUVCg5O/79EyhI7zPX6M3C/415sWdmGLYcRYRq7Ww1IoRgi2j9nCDLstHSMgF1igRWnsBEIFISCmSURMHOZNMkxWsxJ+0HJoMX9bmoZLLMrkjCqyPi/1r0X90aforkmA2xB+pC8rvYBKSxXYt8Nfu6KOK1JsmKTMmmC1R1dswuXvt/qCCH0yf0tl7GrGACKkDerDXVDZj4+SygkXM2bQF/L/KjQI7UspSdmGUmAvjhX31Zt1qZoYa2E2gabBWSGgXDuNixgbL/twaUA1CcA+ZPVBH0oAlOCc0dLXy0OZSn2U4IV1NH//66s1cmWEQQs4GKxhXzABiBvYaSj45LQtnEo2/HaifKhBWPxkjY9fW85Hy4Bgock4ReHYKsCF0LbsgKZhZ+WQp9mjTGLKxmRJJskwSEgxLmjK+AC2FK8zq2COMQ/eOxHe9OxEwjiQs5xCwnYXt2wOMHcxg3yoBCkTxoqMLs11kWORqcXzyoW1rV5W5DHk8K+7a4N385arHyg9+9S2FtfFUL46/GPcqf7lw5qgCDP/An5lPQZxA7/ItLzxFkviSx+e/cNl3UMTdx2aX4dn4L2cv54GuXDMHVHw++onJJnqn97aczK4O5y0=,iv:4T7vftUcSOS84MpZUOM9ODA36GSrKeW5TClQM3GN2mk=,tag:5mzK4NsmmrYERRn+Vb01Eg==,type:str]
     provider-clientsecret: ENC[AES256_GCM,data:/fN1rH2CKoaivhespd+/KamERjBQOdwR7QQ+hoB+pQ3ZSrBVIKbLMWyOJe8f7rVwXAByqDxQIZJEVPjcjhWSU1eicwpu57FBx+/xJLFazspTVZ+5XKyAwR+UxTHDGAgtFV00QHN53l7ygg4joWWko4IPN1JIpNIASaIWWzpsrIo=,iv:NLsZcmE1kKlzV7B/XPVfENMWlpQtOpESH0ByX1KQ8IQ=,tag:P+ZmsKq0KJAeRTTbvbduMg==,type:str]
 sops:
     kms: []
@@ -78,8 +78,8 @@ sops:
             by9kZFlTRVdCZFkxYTVVb0RIRk8zUlkKCqMw9oL9RaYBV5Hhy3o8Nm5xmGrPH8Sd
             hv36sxRFFNZT/DCKaHaSRbT3mfpBZSTXJt1dgl4nZe6whH54t/1KmA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-12-07T15:37:34Z"
+    lastmodified: "2024-12-07T15:58:00Z"
-    mac: ENC[AES256_GCM,data:iG2Nyy9vVyFni5n30ytm9fM6grpDIuCKy2oIjbAnlf98pIC3PXOW2DodTfyo5cP7Wqb5ursD8d89XhoDvB+ConWWyKTG982ek0C2PU8veiNTTlEuzNGg+GafadMyeK8zZv3Vvbc1tCH8bPyWkvLHKgEccX5YXj4rhC9JGch3Ry0=,iv:Milv9EVRVpiWrSYuXg4X1vUT+8EXVLH5CoCwiD1peQg=,tag:x5UWToiWeEHEwx+KhudJzQ==,type:str]
+    mac: ENC[AES256_GCM,data:ugW/IqGYYblO7GAM/W1PePKOJr5iJM42/SCHL8ew/QwXuOibhWWGkxObFeZ83u0DCmhH2fPqK/rI3seA6QLaWFeB2wrkyy4u13D5PISrObVtmQVD50kogObqd2CVdlQFIGQypw3/EB8oWNPcBRCvlAPPhZaB9a3SWS4CaTu+lPg=,iv:6IW7xOO9hBqK65WSLYnk7ViGs9xhoaMpsCeITbWNgHs=,tag:zXtnRBQemAT3cN1+QM7OHA==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.1

nki-personal-do/vikunja.nix

@@ -27,24 +27,6 @@ in
   services.vikunja = {
     inherit port;
     enable = true;
-    package =
-      builtins.seq
-        (lib.assertMsg (pkgs.vikunja.version == "0.24.5") "Vikunja probably doesn't need custom versions anymore")
-        (pkgs.vikunja.overrideAttrs
-          (attrs: {
-            src = pkgs.fetchFromGitHub {
-              owner = "go-vikunja";
-              repo = "vikunja";
-              rev = "e57f04ec23e9ff8aa9877d2ea7d571c2a44790b0";
-              hash = "sha256-W6o1h6XBPvT1lH1zO5N7HcodksKill5eqSuaFl2kfuY=";
-            };
-
-            passthru = attrs.passthru // {
-              overrideModAttrs = attrs: {
-                outputHash = "sha256-UWjlivF9ySXCAr84A1trCJ/n9pB98ZhEyG11qz3PL7g=";
-              };
-            };
-          }));
 
     frontendScheme = "https";
     frontendHostname = host;
@@ -75,6 +57,7 @@ in
         todoist.enable = true;
         trello.enable = true;
       };
+      backgrounds.providers.unsplash.enabled = true;
       auth = {
         local.enabled = false;
         openid = {

overlay.nix

@@ -9,9 +9,6 @@ let
     # Typst updates really quickly.
     typst = final.unstable.typst;
     typst-lsp = final.unstable.typst-lsp;
-
-    # Until 0.35 is in
-    kitty = final.unstable.kitty;
   };
   overlay-imported = final: prev: {
     sway = prev.sway.override { sway-unwrapped = final.swayfx-unwrapped; };
@@ -74,26 +71,10 @@ let
       nativeMessagingHosts = with final; [ kdePackages.plasma-browser-integration ];
     });
 
-    # Add desktop file to premid
+    vikunja =
-    premid = final.symlinkJoin {
+      builtins.seq
-      name = prev.premid.name;
+        (final.lib.assertMsg (prev.vikunja.version == "0.24.5") "Vikunja probably doesn't need custom versions anymore")
-      paths = [
+        (final.callPackage ./packages/common/vikunja.nix { });
-        prev.premid
-        (final.makeDesktopItem {
-          name = prev.premid.name;
-          desktopName = "PreMID";
-          exec = "${final.lib.getExe prev.premid} --no-sandbox %U";
-          icon = "premid";
-        })
-      ];
-    };
-
-    # https://github.com/NixOS/nixpkgs/issues/334822
-    vulkan-validation-layers = prev.vulkan-validation-layers.overrideAttrs (attrs: {
-      buildInputs = attrs.buildInputs ++ [
-        final.spirv-tools
-      ];
-    });
   };
 
   overlay-libs = final: prev: {
@@ -119,19 +100,6 @@ let
       nativeMessagingHosts = with final; [ kdePackages.plasma-browser-integration ];
     };
   };
-
-  overlay-rust-is-dumb = final: prev: {
-    # Use stable delta compiled with old Rust version
-    delta = final.stable.delta;
-    deepfilternet = final.stable.deepfilternet;
-    harmonia = final.callPackage
-      (import
-        (builtins.fetchurl {
-          url = "https://raw.githubusercontent.com/Mic92/nixpkgs/63f91202f5cd071187ede5e5ffc56003cb442876/pkgs/by-name/ha/harmonia/package.nix";
-          sha256 = "1mz211c0bxn116ix0j5xx4wlglpbkfg7d3npw1z8hg9gc0vbj2xb";
-        }))
-      { };
-  };
 in
 [
   # inputs.swayfx.inputs.scenefx.overlays.override
@@ -146,7 +114,6 @@ in
   overlay-imported
   overlay-versioning
   overlay-libs
-  overlay-rust-is-dumb
 
   (import ./packages/common)
 

packages/common/vikunja.nix

@@ -0,0 +1,128 @@
+{ lib, fetchFromGitHub, stdenv, nodejs, pnpm, buildGoModule, mage, writeShellScriptBin, nixosTests, autoPatchelfHook, musl }:
+
+let
+  version = "0.24.5-git";
+  src = fetchFromGitHub {
+    owner = "go-vikunja";
+    repo = "vikunja";
+    rev = "e57f04ec23e9ff8aa9877d2ea7d571c2a44790b0";
+    hash = "sha256-W6o1h6XBPvT1lH1zO5N7HcodksKill5eqSuaFl2kfuY=";
+  };
+
+  frontend = stdenv.mkDerivation (finalAttrs: {
+    pname = "vikunja-frontend";
+    inherit version src;
+
+    sourceRoot = "${finalAttrs.src.name}/frontend";
+
+    pnpmDeps = pnpm.fetchDeps {
+      inherit (finalAttrs) pname version src sourceRoot;
+      hash = "sha256-sOCaJDBgEMID+lN5plQpSqaGBIUs5h2tAwDzhtOH53o=";
+    };
+
+    nativeBuildInputs = [
+      nodejs
+      pnpm.configHook
+      autoPatchelfHook
+    ];
+
+    buildInputs = [
+      musl # For sass-embedded
+    ];
+
+    doCheck = true;
+    dontAutoPatchelf = true;
+
+    # See https://github.com/sass/embedded-host-node/issues/334
+    preBuild = ''
+      autoPatchelf node_modules/.pnpm/sass-embedded*
+    '';
+
+    postBuild = ''
+      pnpm run build
+    '';
+
+    checkPhase = ''
+      pnpm run test:unit --run
+    '';
+
+    installPhase = ''
+      cp -r dist/ $out
+    '';
+  });
+
+  # Injects a `t.Skip()` into a given test since there's apparently no other way to skip tests here.
+  skipTest = lineOffset: testCase: file:
+    let
+      jumpAndAppend = lib.concatStringsSep ";" (lib.replicate (lineOffset - 1) "n" ++ [ "a" ]);
+    in
+    ''
+      sed -i -e '/${testCase}/{
+      ${jumpAndAppend} t.Skip();
+      }' ${file}
+    '';
+in
+buildGoModule {
+  inherit src version;
+  pname = "vikunja";
+
+  nativeBuildInputs =
+    let
+      fakeGit = writeShellScriptBin "git" ''
+        if [[ $@ = "describe --tags --always --abbrev=10" ]]; then
+            echo "${version}"
+        else
+            >&2 echo "Unknown command: $@"
+            exit 1
+        fi
+      '';
+    in
+    [ fakeGit mage ];
+
+  vendorHash = "sha256-UWjlivF9ySXCAr84A1trCJ/n9pB98ZhEyG11qz3PL7g=";
+
+  inherit frontend;
+
+  prePatch = ''
+    cp -r ${frontend} frontend/dist
+  '';
+
+  postConfigure = ''
+    # These tests need internet, so we skip them.
+    ${skipTest 1 "TestConvertTrelloToVikunja" "pkg/modules/migration/trello/trello_test.go"}
+    ${skipTest 1 "TestConvertTodoistToVikunja" "pkg/modules/migration/todoist/todoist_test.go"}
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    # Fixes "mkdir /homeless-shelter: permission denied" - "Error: error compiling magefiles" during build
+    export HOME=$(mktemp -d)
+    mage build:build
+
+    runHook postBuild
+  '';
+
+  checkPhase = ''
+    mage test:unit
+    mage test:integration
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -Dt $out/bin vikunja
+    runHook postInstall
+  '';
+
+  passthru.tests.vikunja = nixosTests.vikunja;
+
+  meta = {
+    changelog = "https://kolaente.dev/vikunja/api/src/tag/v${version}/CHANGELOG.md";
+    description = "Todo-app to organize your life";
+    homepage = "https://vikunja.io/";
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ leona ];
+    mainProgram = "vikunja";
+    platforms = lib.platforms.linux;
+  };
+}