nixos

commit 07c7bef3ce6a62e2c87ddf6e77ca2812c36ce0e3
parent 05c4ac0331290d5308d45fcf733c2b46bd174e87
Author: MTRNord <mtrnord1@gmail.com>
Date:   Wed, 13 Sep 2023 20:42:10 +0200

Mow

Diffstat:
M
flake.lock
 | 
65
++++++++++++++++-------------------------------------------------
M
flake.nix
 | 
11
++++++++---
M
nixos/worker-1/configuration.nix
 | 
2
++

3 files changed, 26 insertions(+), 52 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -1,44 +1,26 @@
 {
   "nodes": {
-    "deploy-rs": {
+    "docker-utils": {
       "inputs": {
-        "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs",
-        "utils": "utils"
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1694158470,
-        "narHash": "sha256-yWx9eBDHt6WR3gr65+J85KreHdMypty/P6yM35tIYYM=",
-        "owner": "serokell",
-        "repo": "deploy-rs",
-        "rev": "d0cfc042eba92eb206611c9e8784d41a2c053bab",
+        "lastModified": 1688996287,
+        "narHash": "sha256-0nsFaYv9pWdx9hqL+Ob8isjaacEzCZlYzD+V9hmm1Ao=",
+        "owner": "collinarnett",
+        "repo": "docker-utils",
+        "rev": "865560663ed8aed4bf31ae91a34005dd819e359d",
         "type": "github"
       },
       "original": {
-        "owner": "serokell",
-        "repo": "deploy-rs",
+        "owner": "collinarnett",
+        "repo": "docker-utils",
         "type": "github"
       }
     },
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1668681692,
-        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
         "lastModified": 1673956053,
         "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
         "owner": "edolstra",
@@ -105,7 +87,7 @@
     },
     "kubenix": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
         "nixpkgs": "nixpkgs_2",
         "systems": "systems",
         "treefmt": "treefmt"
@@ -126,15 +108,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1671417167,
-        "narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=",
-        "owner": "NixOS",
+        "lastModified": 1688646010,
+        "narHash": "sha256-kCeza5eKI2NEi8k0EoeZfv3lN1r1Vwx+L/VA6I8tmG4=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bb31220cca6d044baa6dc2715b07497a2a7c4bc7",
+        "rev": "5daaa32204e9c46b05cd709218b7ba733d07e80c",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -222,7 +204,7 @@
     },
     "root": {
       "inputs": {
-        "deploy-rs": "deploy-rs",
+        "docker-utils": "docker-utils",
         "hardware": "hardware",
         "home-manager": "home-manager",
         "impermanence": "impermanence",
@@ -285,21 +267,6 @@
         "repo": "treefmt-nix",
         "type": "github"
       }
-    },
-    "utils": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
@@ -24,10 +24,10 @@
     # nix-colors.url = "github:misterio77/nix-colors";
 
     kubenix.url = "github:hall/kubenix";
-    deploy-rs.url = "github:serokell/deploy-rs";
+    docker-utils.url = "github:collinarnett/docker-utils";
   };
 
-  outputs = { self, nixpkgs, home-manager, sops-nix, deploy-rs, ... }@inputs:
+  outputs = { self, nixpkgs, home-manager, sops-nix, docker-utils, ... }@inputs:
     let
       inherit (self) outputs;
       forAllSystems = nixpkgs.lib.genAttrs [
@@ -41,9 +41,15 @@
       packages = forAllSystems (system:
         let
           pkgs = nixpkgs.legacyPackages.${system};
+          build-draupnir = {
+            # TODO: Pull Draupnir
+            # TODO: Run yarn describe version task
+            # TODO: Build image using https://github.com/collinarnett/docker-utils
+          };
         in
         import ./pkgs { inherit pkgs; }
       );
+
       # Devshell for bootstrapping
       # Acessible through 'nix develop' or 'nix-shell' (legacy)
       devShells = forAllSystems (system:
@@ -89,6 +95,5 @@
           ];
         };
       };
-      checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
     };
 }
diff --git a/nixos/worker-1/configuration.nix b/nixos/worker-1/configuration.nix
@@ -100,6 +100,8 @@
 
   };
 
+  boot.binfmt.emulatedSystems = [ "x86_64-linux" ];
+
   # Broken
   systemd.network.wait-online.enable = false;
   systemd.network = {