flake.nix: Add lix

flake.lock

@@ -158,6 +158,39 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flakey-profile": {
+      "locked": {
+        "lastModified": 1712898590,
+        "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
+        "owner": "lf-",
+        "repo": "flakey-profile",
+        "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lf-",
+        "repo": "flakey-profile",
+        "type": "github"
+      }
+    },
     "harmonia": {
       "inputs": {
         "flake-parts": "flake-parts",
@@ -167,20 +200,58 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1716301230,
+        "lastModified": 1727121740,
-        "narHash": "sha256-olEXRstmP0lf0H11ht6j3co7mNwcDEXTm+eGfwdEJzM=",
+        "narHash": "sha256-72nDVSvUfZsLa2HbyricOpA0Eb8gxs/VST25b6DNBpM=",
-        "owner": "clerie",
+        "owner": "nix-community",
         "repo": "harmonia",
-        "rev": "e99509779ce6d6ed46062ac556b71f6ca1eb59ad",
+        "rev": "ff44006a30f93ac40d76c786e15149d901946c2b",
         "type": "github"
       },
       "original": {
-        "owner": "clerie",
+        "owner": "nix-community",
-        "ref": "clerie/multiple-signing-keys",
+        "ref": "harmonia-v1.0.2",
         "repo": "harmonia",
         "type": "github"
       }
     },
+    "lix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1729298361,
+        "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
+        "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
+        "type": "tarball",
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
+      }
+    },
+    "lix-module": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "flakey-profile": "flakey-profile",
+        "lix": "lix",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729360442,
+        "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=",
+        "ref": "stable",
+        "rev": "2bbdcd73b9a464f8acf45a7100feb979883ba485",
+        "revCount": 110,
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/nixos-module.git"
+      },
+      "original": {
+        "ref": "stable",
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/nixos-module.git"
+      }
+    },
     "mitel-ommclient2": {
       "inputs": {
         "nixpkgs": [
@@ -330,6 +401,7 @@
         "fernglas": "fernglas",
         "fieldpoc": "fieldpoc",
         "harmonia": "harmonia",
+        "lix-module": "lix-module",
         "nixos-exporter": "nixos-exporter",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_3",
@@ -416,6 +488,21 @@
         "type": "github"
       }
     },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [

flake.nix

@@ -19,7 +19,11 @@
       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 = {
+      url = "git+https://git.lix.systems/lix-project/nixos-module.git?ref=stable";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     fieldpoc.url = "git+https://git.clerie.de/clerie/fieldpoc.git";
@@ -124,6 +128,8 @@
         chromium-incognito
         git-checkout-github-pr
         git-diff-word
+        git-pp
+        harmonia
         iot-data
         nix-remove-result-links
         nixfiles-auto-install

flake/modules.nix

@@ -1,6 +1,7 @@
 { self
 , fernglas
 , fieldpoc
+, lix-module
 , nixos-exporter
 , solid-xmpp-alarm
 , sops-nix
@@ -12,6 +13,7 @@
   imports = [
     fernglas.nixosModules.default
     fieldpoc.nixosModules.default
+    lix-module.nixosModules.default
     nixos-exporter.nixosModules.default
     solid-xmpp-alarm.nixosModules.solid-xmpp-alarm
     sops-nix.nixosModules.sops

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;

hosts/zinc/programs.nix

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

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
+  ];
+}

pkgs/git-pp/git-pp.sh

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

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