From edc2461e5a29a75c792a525267681b5121bc99bc Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Fri, 25 Oct 2024 13:31:09 +0200
Subject: [PATCH 1/4] pkgs/git-pp: Git pull and push in one go

---
 flake.nix               | 1 +
 pkgs/git-pp/default.nix | 9 +++++++++
 pkgs/git-pp/git-pp.sh   | 5 +++++
 pkgs/overlay.nix        | 1 +
 4 files changed, 16 insertions(+)
 create mode 100644 pkgs/git-pp/default.nix
 create mode 100755 pkgs/git-pp/git-pp.sh

diff --git a/flake.nix b/flake.nix
index 85bff37..e916744 100644
--- a/flake.nix
+++ b/flake.nix
@@ -124,6 +124,7 @@
         chromium-incognito
         git-checkout-github-pr
         git-diff-word
+        git-pp
         iot-data
         nix-remove-result-links
         nixfiles-auto-install
diff --git a/pkgs/git-pp/default.nix b/pkgs/git-pp/default.nix
new file mode 100644
index 0000000..f486920
--- /dev/null
+++ b/pkgs/git-pp/default.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+pkgs.writeShellApplication {
+  name = "git-pp";
+  text = builtins.readFile ./git-pp.sh;
+  runtimeInputs = with pkgs; [
+    git
+  ];
+}
diff --git a/pkgs/git-pp/git-pp.sh b/pkgs/git-pp/git-pp.sh
new file mode 100755
index 0000000..3973331
--- /dev/null
+++ b/pkgs/git-pp/git-pp.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+git pull --rebase && git push
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index ef56c14..d4bf798 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -9,6 +9,7 @@ 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 {};

From b779a75969cc0dcff78a849ee7c8b6748c103b9e Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Fri, 25 Oct 2024 14:40:34 +0200
Subject: [PATCH 2/4] hosts/zinc: Remove cura

---
 hosts/zinc/programs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosts/zinc/programs.nix b/hosts/zinc/programs.nix
index 5143028..0c04215 100644
--- a/hosts/zinc/programs.nix
+++ b/hosts/zinc/programs.nix
@@ -6,7 +6,7 @@
     firefox
 
     blender
-    cura
+    #cura # libarcus library is currently broken, required for curaengine
   ];
 
 }

From bf294bee3ae86d7559e689cea45f7b9928b00d87 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Fri, 25 Oct 2024 15:02:40 +0200
Subject: [PATCH 3/4] flake.nix: Update harmonia

---
 flake.lock        | 12 ++++++------
 flake.nix         |  3 ++-
 flake/overlay.nix |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index 810f475..4f0c0ab 100644
--- a/flake.lock
+++ b/flake.lock
@@ -167,16 +167,16 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1716301230,
-        "narHash": "sha256-olEXRstmP0lf0H11ht6j3co7mNwcDEXTm+eGfwdEJzM=",
-        "owner": "clerie",
+        "lastModified": 1727121740,
+        "narHash": "sha256-72nDVSvUfZsLa2HbyricOpA0Eb8gxs/VST25b6DNBpM=",
+        "owner": "nix-community",
         "repo": "harmonia",
-        "rev": "e99509779ce6d6ed46062ac556b71f6ca1eb59ad",
+        "rev": "ff44006a30f93ac40d76c786e15149d901946c2b",
         "type": "github"
       },
       "original": {
-        "owner": "clerie",
-        "ref": "clerie/multiple-signing-keys",
+        "owner": "nix-community",
+        "ref": "harmonia-v1.0.2",
         "repo": "harmonia",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index e916744..feb27c8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     harmonia = {
-      url = "github:clerie/harmonia/clerie/multiple-signing-keys";
+      url = "github:nix-community/harmonia/harmonia-v1.0.2";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     fieldpoc.url = "git+https://git.clerie.de/clerie/fieldpoc.git";
@@ -125,6 +125,7 @@
         git-checkout-github-pr
         git-diff-word
         git-pp
+        harmonia
         iot-data
         nix-remove-result-links
         nixfiles-auto-install
diff --git a/flake/overlay.nix b/flake/overlay.nix
index b1bd7e3..a2c3cea 100644
--- a/flake/overlay.nix
+++ b/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_21;
+    nixForHarmonia = final.nixVersions.nix_2_23;
   };
   inherit (nurausstieg.packages.${final.system})
     nurausstieg;

From 092a4cc277f3649056ea782aaca6e9e7c3311791 Mon Sep 17 00:00:00 2001
From: Flake Update Bot <flake-update-bot@clerie.de>
Date: Sat, 26 Oct 2024 03:03:03 +0200
Subject: [PATCH 4/4] Update nixpkgs 2024-10-26-01-03

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4f0c0ab..534c8b9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -288,11 +288,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1725983898,
-        "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=",
+        "lastModified": 1729665710,
+        "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43",
+        "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d",
         "type": "github"
       },
       "original": {