Upgrade NixOS stable to 22.11 and upgrade packages
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
configuration = { lib, config, assignments, ... }:
|
||||
configuration = { lib, pkgs, config, assignments, ... }:
|
||||
let
|
||||
inherit (lib) mkMerge mkIf;
|
||||
inherit (lib.my) networkdAssignment;
|
||||
@@ -64,6 +64,9 @@
|
||||
browser = true;
|
||||
rootCredentialsFile = config.age.secrets."object/minio.env".path;
|
||||
dataDir = [ "/mnt/minio" ];
|
||||
|
||||
# TODO: Migrate from fs to snsd backend!
|
||||
package = pkgs.minio_legacy_fs;
|
||||
};
|
||||
|
||||
sharry = {
|
||||
|
@@ -1,6 +1,7 @@
|
||||
{ lib, ... }:
|
||||
let
|
||||
inherit (builtins) mapAttrs;
|
||||
inherit (lib) mkForce;
|
||||
in
|
||||
{
|
||||
nixos.systems.whale2 = {
|
||||
@@ -103,6 +104,9 @@ in
|
||||
oci-containers = {
|
||||
backend = "podman";
|
||||
};
|
||||
# NixOS has switched to using netavark, which is native to podman. It's currently missing an option to
|
||||
# disable iptables rules generation, which is very annoying.
|
||||
containers.containersConf.settings.network.network_backend = mkForce "cni";
|
||||
};
|
||||
|
||||
environment = {
|
||||
|
Reference in New Issue
Block a user