From a9f51807b4f513653ec2fef7065921b8b84dd936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Tue, 9 Jan 2024 08:49:55 +0100
Subject: [PATCH] feat: reinstate nixinate for aarch64 ful

---
 flake.lock | 45 ++++++++++++++++++++++++++++++++++++++++-----
 flake.nix  | 24 ++++++++++++++++++++++--
 2 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index 284ee16..c50237e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -732,6 +732,24 @@
         "type": "github"
       }
     },
+    "nixinate_2": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_6"
+      },
+      "locked": {
+        "lastModified": 1688141737,
+        "narHash": "sha256-qHrNMYWukOKmKVf6wXOGKj1xxUnOGjvTRbt/PLLXuBE=",
+        "owner": "matthewcroughan",
+        "repo": "nixinate",
+        "rev": "7902ae845e6cc5bd450e510cdf5e009a6e4a44d9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "matthewcroughan",
+        "repo": "nixinate",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1693636127,
@@ -906,6 +924,22 @@
       }
     },
     "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1653060744,
+        "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "dfd82985c273aac6eced03625f454b334daae2e8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1703467016,
         "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=",
@@ -921,7 +955,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_8": {
       "locked": {
         "lastModified": 1659446231,
         "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=",
@@ -937,7 +971,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_9": {
       "locked": {
         "lastModified": 1615532953,
         "narHash": "sha256-SWpaGjrp/INzorEqMz3HLi6Uuk9I0KAn4YS8B4n3q5g=",
@@ -1167,7 +1201,8 @@
         "menstruation-backend": "menstruation-backend_2",
         "menstruation-telegram": "menstruation-telegram_2",
         "nix-on-droid": "nix-on-droid_2",
-        "nixpkgs": "nixpkgs_6",
+        "nixinate": "nixinate_2",
+        "nixpkgs": "nixpkgs_7",
         "nixpkgs-old": "nixpkgs-old_2",
         "nixpkgs-unstable": "nixpkgs-unstable_2",
         "nur": "nur_2",
@@ -1446,7 +1481,7 @@
     "telebots_2": {
       "inputs": {
         "flake-utils": "flake-utils_5",
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_8"
       },
       "locked": {
         "lastModified": 1703313352,
@@ -1581,7 +1616,7 @@
         "flake-utils": [
           "flake-utils"
         ],
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": "nixpkgs_9"
       },
       "locked": {
         "lastModified": 1615819231,
diff --git a/flake.nix b/flake.nix
index 67cb080..2ddbc3b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,6 +9,7 @@
     menstruation-backend.url = "github:kmein/menstruation.rs";
     menstruation-telegram.url = "github:kmein/menstruation-telegram";
     nix-on-droid.url = "github:t184256/nix-on-droid/release-23.05";
+    nixinate.url = "github:matthewcroughan/nixinate";
     nixpkgs-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
@@ -61,6 +62,7 @@
     home-manager,
     agenix,
     retiolum,
+    nixinate,
     flake-utils,
     nix-on-droid,
     stylix,
@@ -72,7 +74,8 @@
           pkgs = nixpkgs.legacyPackages.x86_64-linux;
           lib = nixpkgs.lib;
         in
-          {
+          nixinate.nixinate.x86_64-linux self
+          // {
             mock-secrets = {
               type = "app";
               program = toString (pkgs.writers.writeDash "mock-secrets" ''
@@ -96,7 +99,15 @@
               program = toString (pkgs.writers.writeDash "deploy-${hostname}" ''
                 exec ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --max-jobs 2 --log-format internal-json --flake .?submodules=1#${hostname} --build-host ${targets.${hostname}} --target-host ${targets.${hostname}} 2>&1 | ${pkgs.nix-output-monitor}/bin/nom --json
               '');
-            }) (builtins.attrNames self.nixosConfigurations));
+            }) (builtins.attrNames self.nixosConfigurations))
+          // {
+            deploy-ful = {
+              type = "app";
+              program = toString (pkgs.writers.writeDash "deploy-ful" ''
+                exec ${pkgs.nix}/bin/nix run .?submodules=1#nixinate.ful --log-format internal-json 2>&1 | ${pkgs.nix-output-monitor}/bin/nom --json
+              '');
+            };
+          };
       };
 
       nixosModules = {
@@ -155,6 +166,15 @@
             inputs.self.nixosModules.panoptikon
             retiolum.nixosModules.retiolum
             nur.nixosModules.nur
+            {
+              _module.args.nixinate = {
+                host = "ful";
+                sshUser = "root";
+                buildOn = "remote";
+                substituteOnTarget = true;
+                hermetic = false;
+              };
+            }
           ];
         };
         zaatar = nixpkgs.lib.nixosSystem rec {