From a0575bdb2acfb94f2de31ca397e6ffa2796f6905 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Mon, 18 Aug 2025 12:00:00 +0100
Subject: [PATCH] Move gitea-actions-runner.nix

Also remove any unneeded references to outputs.nixosModules.
---
 flake.nix                                     |  2 -
 hosts/common/default.nix                      |  2 -
 hosts/nixedo/configuration.nix                |  4 --
 hosts/nixedo/homelab.nix                      |  1 -
 modules/nixos/default.nix                     |  6 ---
 modules/nixos/gitea-actions-runner.nix        | 50 -------------------
 modules/nixos/podman.nix                      | 25 ----------
 .../hosts/nixedo/gitea-actions-runner.nix     | 31 ++++++++++++
 users/opdavies.nix                            |  3 +-
 9 files changed, 32 insertions(+), 92 deletions(-)
 delete mode 100644 modules/nixos/default.nix
 delete mode 100644 modules/nixos/gitea-actions-runner.nix
 delete mode 100644 modules/nixos/podman.nix
 create mode 100644 modules2/hosts/nixedo/gitea-actions-runner.nix

diff --git a/flake.nix b/flake.nix
index 0cf8ce9a..ebb32cfd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -83,8 +83,6 @@
     inputs@{ flake-parts, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } {
       flake = {
-        nixosModules.default = import ./modules/nixos;
-
         overlays = import ./overlays { inherit inputs; };
       };
 
diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index a3caefd7..0421aa39 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -15,8 +15,6 @@
     ./users
 
     inputs.home-manager.nixosModules.home-manager
-
-    outputs.nixosModules.default
   ];
 
   nix = {
diff --git a/hosts/nixedo/configuration.nix b/hosts/nixedo/configuration.nix
index ff872ebc..88d3920c 100644
--- a/hosts/nixedo/configuration.nix
+++ b/hosts/nixedo/configuration.nix
@@ -19,10 +19,6 @@
     ../../users/opdavies.nix
   ];
 
-  features = {
-    cli.podman.enable = true;
-  };
-
   # TODO: why didn't it work when adding this to jitsi.nix?
   nixpkgs.config.permittedInsecurePackages = [
     "jitsi-meet-1.0.8043"
diff --git a/hosts/nixedo/homelab.nix b/hosts/nixedo/homelab.nix
index dd8e92a1..b105300e 100644
--- a/hosts/nixedo/homelab.nix
+++ b/hosts/nixedo/homelab.nix
@@ -8,7 +8,6 @@
 
     services = {
       audiobookshelf.enable = true;
-      gitea-actions-runner.enable = true;
       home-assistant.enable = true;
       homepage-dashboard.enable = true;
       jitsi.enable = true;
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
deleted file mode 100644
index 4e5d589d..00000000
--- a/modules/nixos/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./gitea-actions-runner.nix
-    ./podman.nix
-  ];
-}
diff --git a/modules/nixos/gitea-actions-runner.nix b/modules/nixos/gitea-actions-runner.nix
deleted file mode 100644
index 9318e22e..00000000
--- a/modules/nixos/gitea-actions-runner.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  config,
-  inputs,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-
-let
-  cfg = homelab.services.${service};
-  homelab = config.homelab;
-  service = "gitea-actions-runner";
-in
-{
-  options.homelab.services.${service} = {
-    enable = mkEnableOption "Enable ${service}";
-  };
-
-  config = mkIf cfg.enable {
-    services.${service}.instances.default = {
-      enable = true;
-
-      hostPackages = with pkgs; [
-        bash
-        coreutils
-        curl
-        gawk
-        gitMinimal
-        gnused
-        nix
-        nodejs
-        wget
-      ];
-
-      labels = [
-        "nixos:host"
-      ];
-
-      name = config.networking.hostName;
-      tokenFile = config.age.secrets.forgejo-runner-token.path;
-      url = config.services.forgejo.settings.server.ROOT_URL;
-    };
-
-    age.secrets = {
-      forgejo-runner-token.file = "${inputs.self}/secrets/forgejo-runner-token.age";
-    };
-  };
-}
diff --git a/modules/nixos/podman.nix b/modules/nixos/podman.nix
deleted file mode 100644
index edda7492..00000000
--- a/modules/nixos/podman.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.features.cli.podman;
-in
-{
-  options.features.cli.podman.enable = mkEnableOption "Enable podman";
-
-  config = mkIf cfg.enable {
-    virtualisation = {
-      oci-containers.backend = "podman";
-
-      podman = {
-        enable = true;
-
-        autoPrune = {
-          enable = true;
-          dates = "weekly";
-        };
-      };
-    };
-  };
-}
diff --git a/modules2/hosts/nixedo/gitea-actions-runner.nix b/modules2/hosts/nixedo/gitea-actions-runner.nix
new file mode 100644
index 00000000..1c794ee4
--- /dev/null
+++ b/modules2/hosts/nixedo/gitea-actions-runner.nix
@@ -0,0 +1,31 @@
+{ inputs, ... }:
+
+{
+  flake.modules.nixos."nixosConfigurations/nixedo" =
+    { config, pkgs, ... }:
+    {
+      services.gitea-actions-runner.instances.default = {
+        enable = true;
+
+        hostPackages = with pkgs; [
+          bash
+          coreutils
+          curl
+          gawk
+          gitMinimal
+          gnused
+          nix
+          nodejs
+          wget
+        ];
+
+        labels = [ "nixos:host" ];
+
+        name = config.networking.hostName;
+        tokenFile = config.age.secrets.forgejo-runner-token.path;
+        url = config.services.forgejo.settings.server.ROOT_URL;
+      };
+
+      age.secrets.forgejo-runner-token.file = "${inputs.self}/secrets/forgejo-runner-token.age";
+    };
+}
diff --git a/users/opdavies.nix b/users/opdavies.nix
index 62304f8e..613290c5 100644
--- a/users/opdavies.nix
+++ b/users/opdavies.nix
@@ -16,8 +16,7 @@ with lib;
     extraGroups = [
       "networkmanager"
       "wheel"
-    ]
-    ++ optional config.features.cli.podman.enable "podman";
+    ];
 
     packages = with pkgs; [
       magic-wormhole