aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-07-27 11:18:23 +0200
committerAlex Auvolat <alex@adnab.me>2022-07-27 11:18:23 +0200
commit7d7efab9ee6b45b62e8966bbb56a5cf90397b179 (patch)
treee0e33e167bf1baaf567e419769684890476b9ee9
parent2453a45c740a8d5bdcc090495429c17ed4701cac (diff)
downloadnixcfg-7d7efab9ee6b45b62e8966bbb56a5cf90397b179.tar.gz
nixcfg-7d7efab9ee6b45b62e8966bbb56a5cf90397b179.zip
Update to nixos 22.05
-rw-r--r--nix/configuration.nix8
-rw-r--r--nix/deuxfleurs.nix20
-rwxr-xr-xupgrade_nixos2
3 files changed, 16 insertions, 14 deletions
diff --git a/nix/configuration.nix b/nix/configuration.nix
index 825cab2..53246e3 100644
--- a/nix/configuration.nix
+++ b/nix/configuration.nix
@@ -64,15 +64,15 @@ SystemMaxUse=1G
wget
htop
smartmontools
- links
+ links2
git
rclone
docker
docker-compose
- wireguard
+ wireguard-tools
wesher
- qemu
- qemu_kvm
+ #qemu
+ #qemu_kvm
];
programs.vim.defaultEditor = true;
diff --git a/nix/deuxfleurs.nix b/nix/deuxfleurs.nix
index 82bec18..5d08503 100644
--- a/nix/deuxfleurs.nix
+++ b/nix/deuxfleurs.nix
@@ -143,7 +143,9 @@ in
node_meta = {
"site" = cfg.site_name;
};
- ui = true;
+ ui_config = {
+ enabled = true;
+ };
bind_addr = "${cfg.cluster_ip}";
addresses = {
@@ -170,12 +172,12 @@ in
};
services.nomad.enable = true;
- services.nomad.package = pkgs.nomad_1_1;
+ services.nomad.package = pkgs.nomad_1_3;
services.nomad.extraPackages = [
pkgs.glibc
pkgs.zstd
- pkgs.qemu
- pkgs.qemu_kvm
+ #pkgs.qemu
+ #pkgs.qemu_kvm
];
services.nomad.settings =
(if cfg.is_raft_server
@@ -227,11 +229,11 @@ in
];
}
];
- qemu = [
- {
- enabled = true;
- }
- ];
+ #qemu = [
+ # {
+ # enabled = true;
+ # }
+ #];
}
];
};
diff --git a/upgrade_nixos b/upgrade_nixos
index fd6cc62..1297a2b 100755
--- a/upgrade_nixos
+++ b/upgrade_nixos
@@ -1,6 +1,6 @@
#!/usr/bin/env ./sshtool
-cmd nix-channel --add https://nixos.org/channels/nixos-21.11 nixos
+cmd nix-channel --add https://nixos.org/channels/nixos-22.05 nixos
cmd nix-channel --update
cmd nixos-rebuild boot