Update to nixos 22.05

This commit is contained in:
Alex 2022-07-27 11:18:23 +02:00
parent 2453a45c74
commit 7d7efab9ee
Signed by untrusted user: lx
GPG key ID: 0E496D15096376BE
3 changed files with 16 additions and 14 deletions

View file

@ -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;

View file

@ -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;
# }
#];
}
];
};

View file

@ -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