flake.nix

@@ -112,7 +112,6 @@
       };
     in {
       inherit (pkgs)
-        clerie-system-upgrade
         chromium-incognito
         iot-data
         nix-remove-result-links
@@ -120,6 +119,7 @@
         nixfiles-auto-install
         nixfiles-generate-backup-secrets
         nixfiles-generate-config
+        nixfiles-system-upgrade
         nixfiles-updated-inputs
         nixfiles-update-ssh-host-keys
         update-from-hydra

modules/clerie-system-upgrade/default.nix

@@ -35,7 +35,7 @@ in
 
       serviceConfig = {
         Type = "oneshot";
-        ExecStart = pkgs.clerie-system-upgrade + "/bin/clerie-system-upgrade --no-confirm${optionalString cfg.allowReboot " --allow-reboot"}${optionalString (config.clerie.monitoring.enable) " --node-exporter-metrics-path /var/lib/prometheus-node-exporter/textfiles/clerie-system-upgrade.prom"}";
+        ExecStart = pkgs.nixfiles-system-upgrade + "/bin/nixfiles-system-upgrade --no-confirm${optionalString cfg.allowReboot " --allow-reboot"}${optionalString (config.clerie.monitoring.enable) " --node-exporter-metrics-path /var/lib/prometheus-node-exporter/textfiles/nixfiles-system-upgrade.prom"}";
       };
     };
     systemd.timers.clerie-system-auto-upgrade = mkIf cfg.autoUpgrade {
@@ -47,7 +47,7 @@ in
       after = [ "network-online.target" ];
     };
     environment.systemPackages = with pkgs; [
-      clerie-system-upgrade
+      nixfiles-system-upgrade
     ];
   };
 }

pkgs/nixfiles/nixfiles-system-upgrade.nix

@@ -1,8 +1,8 @@
 { pkgs, ... }:
 
 pkgs.writeShellApplication {
-  name = "clerie-system-upgrade";
+  name = "nixfiles-system-upgrade";
-  text = builtins.readFile ./clerie-system-upgrade.sh;
+  text = builtins.readFile ./nixfiles-system-upgrade.sh;
   runtimeInputs = with pkgs; [
     curl
     jq

pkgs/nixfiles/nixfiles-system-upgrade.sh

@@ -55,7 +55,7 @@ echo "Set as boot target"
 
 if [[ -n "$NODE_EXPORTER_METRICS_PATH" ]]; then
 	echo "Write monitoring check data"
-	echo "clerie_system_upgrade_last_check $(date +%s)" > "$NODE_EXPORTER_METRICS_PATH"
+	echo "nixfiles_system_upgrade_last_check $(date +%s)" > "$NODE_EXPORTER_METRICS_PATH"
 fi
 
 BOOTED_SYSTEM_KERNEL="$(readlink /run/booted-system/{initrd,kernel,kernel-modules})"

pkgs/nixfiles/nixfiles-updated-inputs.sh

@@ -3,7 +3,7 @@
 set -euo pipefail
 
 xgit() {
-	git -c "user.name=Flake Update Bot" -c "user.email=flake-update-bot@clerie.de" -c "core.pager=cat" "$@"
+	git -c "user.name=Flake Update Bot" -c "user.email=flake-update-bot@clerie.de" "$@"
 }
 
 NOW="$(date --utc +%Y-%m-%d-%H-%M)"
@@ -25,19 +25,8 @@ nix flake lock --update-input nixpkgs
 
 echo "[!] Commit changes"
 xgit add flake.lock
-
 xgit commit -m "Update nixpkgs ${NOW}" || true
 
-xgit diff --name-status origin/updated-inputs "${UPDATE_BRANCH}"
-
-echo "[!] biep"
-if xgit diff --quiet origin/updated-inputs "${UPDATE_BRANCH}"
-then
-	echo "[!] Nothing changed, removing branch"
-	xgit branch -D "${UPDATE_BRANCH}"
-	exit 0
-fi
-
 echo "[!] Publish ${UPDATE_BRANCH}"
 xgit push --set-upstream origin "${UPDATE_BRANCH}"
 

pkgs/overlay.nix

@@ -1,5 +1,4 @@
 final: prev: {
-  clerie-system-upgrade = final.callPackage ./clerie-system-upgrade/clerie-system-upgrade.nix {};
   chromium-incognito = final.callPackage ./chromium-incognito {};
   iot-data = final.python3.pkgs.callPackage ./iot-data {};
   nix-remove-result-links = final.callPackage ./nix-remove-result-links {};
@@ -7,6 +6,7 @@ final: prev: {
   nixfiles-auto-install = final.callPackage ./nixfiles/nixfiles-auto-install.nix {};
   nixfiles-generate-backup-secrets = final.callPackage ./nixfiles/nixfiles-generate-backup-secrets.nix {};
   nixfiles-generate-config = final.callPackage ./nixfiles/nixfiles-generate-config.nix {};
+  nixfiles-system-upgrade = final.callPackage ./nixfiles/nixfiles-system-upgrade.nix {};
   nixfiles-updated-inputs = final.callPackage ./nixfiles/nixfiles-updated-inputs.nix {};
   nixfiles-update-ssh-host-keys = final.callPackage ./nixfiles/nixfiles-update-ssh-host-keys.nix {};
   update-from-hydra = final.callPackage ./update-from-hydra {};