flake.lock

@@ -167,16 +167,16 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1727121740,
+        "lastModified": 1716301230,
-        "narHash": "sha256-72nDVSvUfZsLa2HbyricOpA0Eb8gxs/VST25b6DNBpM=",
+        "narHash": "sha256-olEXRstmP0lf0H11ht6j3co7mNwcDEXTm+eGfwdEJzM=",
-        "owner": "nix-community",
+        "owner": "clerie",
         "repo": "harmonia",
-        "rev": "ff44006a30f93ac40d76c786e15149d901946c2b",
+        "rev": "e99509779ce6d6ed46062ac556b71f6ca1eb59ad",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "clerie",
-        "ref": "harmonia-v1.0.2",
+        "ref": "clerie/multiple-signing-keys",
         "repo": "harmonia",
         "type": "github"
       }

flake.nix

@@ -19,7 +19,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     harmonia = {
-      url = "github:nix-community/harmonia/harmonia-v1.0.2";
+      url = "github:clerie/harmonia/clerie/multiple-signing-keys";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     fieldpoc.url = "git+https://git.clerie.de/clerie/fieldpoc.git";
@@ -124,8 +124,6 @@
         chromium-incognito
         git-checkout-github-pr
         git-diff-word
-        git-pp
-        harmonia
         iot-data
         nix-remove-result-links
         nixfiles-auto-install

flake/overlay.nix

@@ -15,7 +15,7 @@ final: prev: {
   inherit (chaosevents.packages.${final.system})
     chaosevents;
   harmonia = harmonia.packages.${final.system}.harmonia.override {
-    nixForHarmonia = final.nixVersions.nix_2_23;
+    nixForHarmonia = final.nixVersions.nix_2_21;
   };
   inherit (nurausstieg.packages.${final.system})
     nurausstieg;

hosts/zinc/programs.nix

@@ -6,7 +6,7 @@
     firefox
 
     blender
-    #cura # libarcus library is currently broken, required for curaengine
+    cura
   ];
 
 }

pkgs/git-pp/default.nix

@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-
-pkgs.writeShellApplication {
-  name = "git-pp";
-  text = builtins.readFile ./git-pp.sh;
-  runtimeInputs = with pkgs; [
-    git
-  ];
-}

pkgs/git-pp/git-pp.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-git pull --rebase && git push

pkgs/overlay.nix

@@ -9,7 +9,6 @@ final: prev: {
   chromium-incognito = final.callPackage ./chromium-incognito {};
   git-checkout-github-pr = final.callPackage ./git-checkout-github-pr {};
   git-diff-word = final.callPackage ./git-diff-word {};
-  git-pp = final.callPackage ./git-pp {};
   iot-data = final.python3.pkgs.callPackage ./iot-data {};
   nix-remove-result-links = final.callPackage ./nix-remove-result-links {};
   nixfiles-auto-install = final.callPackage ./nixfiles/nixfiles-auto-install.nix {};