From 75149c73449b0a573163a8be1bd63f093da39c9a Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Sat, 30 Jul 2022 20:17:39 +0200
Subject: [PATCH] Arion: Add flake

---
 flake.lock             | 21 +++++++++++++++++++++
 flake.nix              |  6 ++++++
 system/hosts/sail.nix  |  7 ++++---
 system/nixos/arion.nix | 10 +++++++---
 4 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 5fb885a..36f2af6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,25 @@
 {
   "nodes": {
+    "arion": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1654878283,
+        "narHash": "sha256-JWdKBMzEibS2neY0nEs9E8kn4zRepEbwSw7HzxbEiAg=",
+        "owner": "hercules-ci",
+        "repo": "arion",
+        "rev": "e5fb978143240f8d293e6e5acc9691acf472928d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "arion",
+        "type": "github"
+      }
+    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -171,6 +191,7 @@
     },
     "root": {
       "inputs": {
+        "arion": "arion",
         "darwin": "darwin",
         "home-manager": "home-manager",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
diff --git a/flake.nix b/flake.nix
index f463d44..108a854 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,6 +17,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    arion = {
+      url = "github:hercules-ci/arion";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     zig-overlay = {
       url = "github:arqv/zig-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -39,6 +44,7 @@
 
       config-sail = import ./system/flakes/sail.nix {
         inherit (inputs) nixpkgs;
+        inherit (inputs) arion;
       };
     in
     config-Styx // config-sail;
diff --git a/system/hosts/sail.nix b/system/hosts/sail.nix
index b8d5e92..7bcb578 100644
--- a/system/hosts/sail.nix
+++ b/system/hosts/sail.nix
@@ -1,13 +1,14 @@
-{ pkgs, ... }:
+{ pkgs, arion, ... }:
 
 {
   imports = [
     ../../hardware/hosts/sail.nix
-
     ../nixos/ssh.nix
 
-    ../nixos/arion.nix
     ../nixos/git.nix
+
+    arion.nixosModules.arion
+    ../nixos/arion.nix
   ];
 
   nix = {
diff --git a/system/nixos/arion.nix b/system/nixos/arion.nix
index f04e8e8..3aed765 100644
--- a/system/nixos/arion.nix
+++ b/system/nixos/arion.nix
@@ -7,7 +7,11 @@
   ];
 
   virtualisation.docker.enable = false;
-  virtualisation.podman.enable = true;
-  virtualisation.podman.dockerSocket.enable = true;
-  virtualisation.podman.defaultNetwork.dnsname.enable = true;
+
+  virtualisation.podman = {
+    enable = true;
+
+    dockerSocket.enable = true;
+    defaultNetwork.dnsname.enable = true;
+  };
 }