Start of modernization of skyflake.

Author: makuru-org

example-server.nix

@@ -34,7 +34,7 @@
   networking.hostName = "example${toString instance}";
   users.users.root.password = "";
 
-  # TODO:
+  # TODO:? Shoulld firewall be fixed?
   networking.firewall.enable = false;
 
   networking.useDHCP = false;
@@ -64,7 +64,9 @@
           IPv6AcceptRA = true;
         };
         addresses = [ {
-          addressConfig.Address = "fec0::${toString instance}/64";
+          # TODO: addressConfig needs to be removed.
+          # trace: warning: Using 'addressConfig' is deprecated! Move all attributes inside one level up and remove it.
+          addressConfig.Address = "fec0::${toString instance}/64"; # 
         } ];
       };
     };
@@ -78,7 +80,7 @@
       }) [ 1 2 3 ]
     );
 
-    storage.ceph = rec {
+    storage.ceph = {
       fsid = "8364da79-5e03-49ae-82ea-7d936278cb0f";
       monKeyring = example/ceph.mon.keyring;
       adminKeyring = example/ceph.client.admin.keyring;

flake.lock

@@ -2,8 +2,12 @@
   description = "Hyperconverged Infratructure for NixOS";
 
   inputs = {
-    microvm.url = "github:astro/microvm.nix";
-    microvm.inputs.nixpkgs.follows = "nixpkgs";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    microvm = {
+      url = "github:astro/microvm.nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     nix-cache-cut.url = "github:astro/nix-cache-cut";
   };
 

flake.nix

@@ -41,7 +41,7 @@ in
   systemd.services.skyflake-install-cache-gc = {
     wantedBy = [ "multi-user.target" ];
     requires = [ "nomad.service" ];
-    path = with pkgs; [ nomad ];
+    path = [ config.services.nomad.package ];
     script = ''
       nomad run -detach ${jobFile}
     '';

nixos-modules/cache-cut.nix

@@ -9,7 +9,7 @@ in
     description = ''
       All cluster nodes with their addresses, or at least those who
       run coordination servers (eg. nomad servers, ceph server,
-      ...).
+       seaweedfs server ...).
     '';
     default = {};
     type = types.attrsOf (types.submodule {

nixos-modules/nodes.nix

@@ -42,7 +42,7 @@ in
   config = {
     services.nomad = {
       enable = true;
-      package = pkgs.nomad_1_4;
+      package = pkgs.nomad_1_6; # nomad 1.6 is the newest version under an foss license.
       dropPrivileges = false;
       enableDocker = false;
 

nixos-modules/nomad.nix

@@ -143,8 +143,6 @@ let
   ];
 
   cfg = config.skyflake.deploy;
-  gcCfg = config.skyflake.gc;
-
 in {
   options.skyflake = with lib; {
     deploy = {

nixos-modules/ssh-deploy.nix

@@ -146,7 +146,9 @@ in {
         publicNetwork = clusterNetwork; #"0.0.0.0/0, ::/0";
         clusterNetwork = lib.concatStringsSep ", " (
           lib.concatMap ({ addresses ? [], ... }:
-            lib.concatMap ({ addressConfig ? {}, ... }:
+            # Needs to be changed because of 
+            # trace: warning: Using 'addressConfig' is deprecated! Move all attributes inside one level up and remove it.
+            lib.concatMap ({ addressConfig ? {}, ... }: 
               if addressConfig ? Address
               then [ addressConfig.Address ]
               else []

nixos-modules/storage/ceph/server.nix

@@ -11,7 +11,6 @@
 let
   nixpkgs = builtins.getFlake nixpkgsRef;
   pkgs = nixpkgs.legacyPackages.${system};
-  inherit (pkgs) lib;
   microvm = builtins.getFlake microvmFlake;
   flake = builtins.getFlake flakeRef;
 
@@ -46,7 +45,6 @@ let
             };
           }
           # From the host's skyflake.deploy.customizationModule
-          @customizationModule@
         ];
       };
 
@@ -64,4 +62,4 @@ import ./nomad-job.nix {
 
   inherit pkgs runner;
   inherit (extended) config;
-}
+}

vm/build-vm.nix

@@ -20,6 +20,7 @@
       '';
     };
 
+    # TODO: rename it to something that allows more than ceph.
     deploy.rbds = mkOption {
       default = {};
       description = ''