Deuxfleurs
/
nixcfg
17
6
Fork 2
Code Issues 8 Pull Requests 1 Projects Releases Wiki Activity

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: lx
GPG Key ID: 0E496D15096376BE
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nix/configuration.nix
View File

@ -64,15 +64,15 @@ SystemMaxUse=1G
wget wget
htop htop
smartmontools smartmontools
links links2
git git
rclone rclone
docker docker
docker-compose docker-compose
wireguard wireguard-tools
wesher wesher
qemu #qemu
qemu_kvm #qemu_kvm
]; ];
programs.vim.defaultEditor = true; programs.vim.defaultEditor = true;

20
nix/deuxfleurs.nix
View File

@ -143,7 +143,9 @@ in
node_meta = { node_meta = {
"site" = cfg.site_name; "site" = cfg.site_name;
}; };
ui = true; ui_config = {
enabled = true;
};
bind_addr = "${cfg.cluster_ip}"; bind_addr = "${cfg.cluster_ip}";
addresses = { addresses = {
@ -170,12 +172,12 @@ in
}; };
services.nomad.enable = true; services.nomad.enable = true;
services.nomad.package = pkgs.nomad_1_1; services.nomad.package = pkgs.nomad_1_3;
services.nomad.extraPackages = [ services.nomad.extraPackages = [
pkgs.glibc pkgs.glibc
pkgs.zstd pkgs.zstd
pkgs.qemu #pkgs.qemu
pkgs.qemu_kvm #pkgs.qemu_kvm
]; ];
services.nomad.settings = services.nomad.settings =
(if cfg.is_raft_server (if cfg.is_raft_server
@ -227,11 +229,11 @@ in
]; ];
} }
]; ];
qemu = [ #qemu = [
{ # {
enabled = true; # enabled = true;
} # }
]; #];
} }
]; ];
}; };

2
upgrade_nixos
View File

@ -1,6 +1,6 @@
#!/usr/bin/env ./sshtool #!/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 nix-channel --update
cmd nixos-rebuild boot cmd nixos-rebuild boot