diff --git a/flake.lock b/flake.lock index 7cfc478..534c8b9 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 85bff37..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"; @@ -124,6 +124,8 @@ chromium-incognito 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; 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 ]; } 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 {};