diff --git a/.forgejo/workflows/build.nix b/.forgejo/workflows/build.nix
index 1ecda4c4..e29a1f1f 100644
--- a/.forgejo/workflows/build.nix
+++ b/.forgejo/workflows/build.nix
@@ -1,22 +1,15 @@
-{pkgs?import<nixpkgs>{}}: pkgs.mkShell (with pkgs; {
-  nativeBuildInputs = [
-    rustup
-    pkg-config
-    freetype
-    libclang
-    cloc
-    #bear
-  ];
-  buildInputs = [
-    jack2
-    lilv
-    serd
-    libclang
-    #suil
-    glib
-    gtk3
-  ];
-  LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath [
+{pkgs?import<nixpkgs>{}}:let
+  stdenv = pkgs.clang19Stdenv;
+  name = "tek";
+  nativeBuildInputs = with pkgs; [ grcov time rustup cloc just pkg-config freetype libclang ];
+  buildInputs = with pkgs; let
+    #suil = pkgs.enableDebugging (pkgs.suil.overrideAttrs (a: b: {
+      #dontStrip = true; separateDebugInfo = true;
+    #}));
+  in [ jack2 lilv serd libclang /*suil*/ glib gtk3 ];
+  VST3_SDK_DIR = "/home/user/Lab/Music/tek/vst3sdk/";
+  LIBCLANG_PATH = "${pkgs.libclang.lib.outPath}/lib";
+  LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath (with pkgs; [
     pipewire.jack
     # for ChowKick.lv2:
     freetype
@@ -32,7 +25,9 @@
     curl
     libglvnd
     #xorg_sys_opengl
-  ];
-  VST3_SDK_DIR = "/home/user/Lab/Music/tek/vst3sdk/";
-  LIBCLANG_PATH = "${pkgs.libclang.lib.outPath}/lib";
-})
+  ]);
+in pkgs.mkShell.override {
+  inherit stdenv;
+} {
+  inherit name nativeBuildInputs buildInputs VST3_SDK_DIR LIBCLANG_PATH LD_LIBRARY_PATH;
+}
diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml
index 46c25922..c3b0230c 100644
--- a/.forgejo/workflows/build.yaml
+++ b/.forgejo/workflows/build.yaml
@@ -7,5 +7,9 @@ jobs:
       - run: nix-channel --list && nix-channel --update
       - run: nix-shell --cores 4 -p git --command 'git clone --recursive $GITHUB_SERVER_URL/$GITHUB_REPOSITORY .'
       - run: whoami && pwd && ls -al
-      - run: nix-shell --cores 4 --command 'cloc src/ && cloc . && rustup install nightly && cargo version -vv && just cov && just doc && just build-release' .forgejo/workflows/build.nix
+      - run: nix-shell --cores 4 --command 'cloc src/ && cloc .' .forgejo/workflows/build.nix
+      - run: nix-shell --cores 4 --command 'rustup install nightly && cargo version -vv' .forgejo/workflows/build.nix
+      - run: nix-shell --cores 4 --command 'just cov-md' .forgejo/workflows/build.nix
+      - run: nix-shell --cores 4 --command 'just doc' .forgejo/workflows/build.nix
+      - run: nix-shell --cores 4 --command 'just build-release' .forgejo/workflows/build.nix
       #- run: nix-shell -p docker --command "docker run --security-opt seccomp=unconfined -v $PWD:/volume xd009642/tarpaulin cargo tarpaulin --out Html --all-features"