1
0

Compare commits

..

4 Commits

Author SHA1 Message Date
ef21e92952
flake.nix: Add lix 2024-10-25 20:29:39 +02:00
bf294bee3a flake.nix: Update harmonia 2024-10-25 15:02:40 +02:00
b779a75969 hosts/zinc: Remove cura 2024-10-25 14:40:34 +02:00
edc2461e5a pkgs/git-pp: Git pull and push in one go 2024-10-25 13:31:16 +02:00
7 changed files with 26 additions and 9 deletions

View File

@ -200,16 +200,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"
}

View File

@ -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";
};
lix-module = {
@ -128,6 +128,8 @@
chromium-incognito
git-checkout-github-pr
git-diff-word
git-pp
harmonia
iot-data
nix-remove-result-links
nixfiles-auto-install

View File

@ -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;

View File

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

9
pkgs/git-pp/default.nix Normal file
View File

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

5
pkgs/git-pp/git-pp.sh Executable file
View File

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

View File

@ -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 {};