From 84b6a384921597effd2b2c75eea73de66fcdcb6e Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Sun, 19 Mar 2023 01:10:50 +0100
Subject: [PATCH] wip: remove arion

---
 flake.nix              |  1 -
 system/flakes/sail.nix |  4 +---
 system/hosts/sail.nix  |  2 +-
 system/nixos/arion.nix | 14 +++-----------
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/flake.nix b/flake.nix
index 798c513..61a3dc3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,7 +46,6 @@
         inherit (inputs) nixpkgs;
         inherit (inputs) home-manager;
         inherit (inputs) ragenix;
-        inherit (inputs) arion;
         inherit inputs;
       };
 
diff --git a/system/flakes/sail.nix b/system/flakes/sail.nix
index 1e3999a..925d4e9 100644
--- a/system/flakes/sail.nix
+++ b/system/flakes/sail.nix
@@ -1,4 +1,4 @@
-{ nixpkgs, home-manager, ragenix, arion, inputs, ... }:
+{ nixpkgs, home-manager, ragenix, inputs, ... }:
 
 let
   overlay-neovim = inputs.neovim-nightly-overlay.overlay;
@@ -26,8 +26,6 @@ in
 
       ragenix.nixosModules.default
 
-      arion.nixosModules.arion
-
       {
         nixpkgs = nixpkgsConfig;
         nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
diff --git a/system/hosts/sail.nix b/system/hosts/sail.nix
index f75e215..c087322 100644
--- a/system/hosts/sail.nix
+++ b/system/hosts/sail.nix
@@ -41,7 +41,7 @@ in
 
     ../nixos/mosquitto.nix
 
-    (import ../nixos/arion.nix (args // { inherit secret; }))
+    ../nixos/arion.nix
     ../../container/weewx
     ../../container/matrix
     ../../container/proxitok
diff --git a/system/nixos/arion.nix b/system/nixos/arion.nix
index e345809..61791a2 100644
--- a/system/nixos/arion.nix
+++ b/system/nixos/arion.nix
@@ -1,10 +1,6 @@
-{ pkgs, config, secret, ... }:
+{ pkgs, config, ... }:
 
 {
-  environment.systemPackages = [
-    pkgs.arion
-  ];
-
   virtualisation = {
     docker.enable = false;
 
@@ -26,14 +22,10 @@
     oci-containers = {
       backend = "podman";
     };
-
-    arion = {
-      backend = "podman-socket";
-    };
   };
 
   networking.firewall.interfaces."podman+" = {
-    allowedUDPPorts = [ 53 ];
-    allowedTCPPorts = [ 53 ];
+    allowedUDPPorts = [ 53 443 ];
+    allowedTCPPorts = [ 53 443 ];
   };
 }