From bc19d899dfd20c8af954cbe492524e5c8f846ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 20 Jul 2023 15:36:53 +0200
Subject: [PATCH] rip: docker container

---
 flake.lock              | 41 ---------------------------------------
 flake.nix               |  5 -----
 pkgs/actions-runner.nix | 43 -----------------------------------------
 pkgs/flake-module.nix   |  5 +----
 4 files changed, 1 insertion(+), 93 deletions(-)
 delete mode 100644 pkgs/actions-runner.nix

diff --git a/flake.lock b/flake.lock
index 29f98f6..934be91 100644
--- a/flake.lock
+++ b/flake.lock
@@ -40,46 +40,6 @@
         "type": "github"
       }
     },
-    "lowdown-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1633514407,
-        "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
-        "owner": "kristapsdz",
-        "repo": "lowdown",
-        "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "kristapsdz",
-        "repo": "lowdown",
-        "type": "github"
-      }
-    },
-    "nix": {
-      "inputs": {
-        "flake-compat": [],
-        "lowdown-src": "lowdown-src",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-regression": []
-      },
-      "locked": {
-        "lastModified": 1686048923,
-        "narHash": "sha256-/XCWa2osNFIpPC5MkxlX6qTZf/DaTLwS3LWN0SRFiuU=",
-        "owner": "nixos",
-        "repo": "nix",
-        "rev": "84050709ea18f3285a85d729f40c8f8eddf5008e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "2.16.1",
-        "repo": "nix",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1689846894,
@@ -100,7 +60,6 @@
       "inputs": {
         "disko": "disko",
         "flake-parts": "flake-parts",
-        "nix": "nix",
         "nixpkgs": "nixpkgs",
         "sops-nix": "sops-nix",
         "srvos": "srvos",
diff --git a/flake.nix b/flake.nix
index da3ab52..0b2eed6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,11 +24,6 @@
     srvos.url = "github:numtide/srvos";
     # Use the version of nixpkgs that has been tested to work with SrvOS
     srvos.inputs.nixpkgs.follows = "nixpkgs";
-
-    nix.url = "github:/nixos/nix?ref=2.16.1";
-    nix.inputs.nixpkgs.follows = "nixpkgs";
-    nix.inputs.nixpkgs-regression.follows = "";
-    nix.inputs.flake-compat.follows = "";
   };
 
   outputs = inputs@{ flake-parts, ... }:
diff --git a/pkgs/actions-runner.nix b/pkgs/actions-runner.nix
deleted file mode 100644
index 90b2764..0000000
--- a/pkgs/actions-runner.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ pkgs, inputs }:
-let
-  # FIXME get rid of nix input?
-  base = import (inputs.nix + "/docker.nix") {
-    inherit pkgs;
-    name = "nix-ci-base";
-    maxLayers = 10;
-    extraPkgs = with pkgs; [
-      nodejs_20 # nodejs is needed for running most 3rdparty actions
-      # add any other pre-installed packages here
-    ];
-    # do we want this at all?
-    channelURL = "https://nixos.org/channels/nixpkgs-unstable";
-    nixConf = {
-      substituters = [
-        "https://cache.nixos.org/"
-        "https://nix-community.cachix.org"
-        # insert any other binary caches here
-      ];
-      trusted-public-keys = [
-        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        # insert the public keys for those binary caches here
-      ];
-      # allow using the new flake commands in our workflows
-      experimental-features = [ "nix-command" "flakes" ];
-    };
-  };
-in
-pkgs.dockerTools.buildImage {
-  name = "nix-runner";
-  tag = "latest";
-
-  fromImage = base;
-  fromImageName = null;
-  fromImageTag = "latest";
-
-  copyToRoot = pkgs.buildEnv {
-    name = "image-root";
-    paths = [ pkgs.coreutils-full ];
-    pathsToLink = [ "/bin" ]; # add coreutuls (which includes sleep) to /bin
-  };
-}
diff --git a/pkgs/flake-module.nix b/pkgs/flake-module.nix
index 68bdd8d..facaffa 100644
--- a/pkgs/flake-module.nix
+++ b/pkgs/flake-module.nix
@@ -1,12 +1,9 @@
-{ lib, inputs, ... }: {
+{ lib, ... }: {
   perSystem = { pkgs, inputs', ... }: {
     packages = {
       inherit (pkgs.callPackage ./renovate { }) renovate;
     } // lib.optionalAttrs (!pkgs.stdenv.isDarwin) {
       gitea = pkgs.callPackage ./gitea { };
-      actions-runner = pkgs.callPackage ./actions-runner.nix {
-        inherit inputs;
-      };
     };
   };
 }