steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

srv0: udpate to nixos 21.05

Browse source
This commit is contained in:
steveej 2021-08-20 23:27:49 +02:00
parent 73da55d9e9
commit 821c04cef3
4 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nix/os/devices/srv0.home-ch.stefanjunker.de/hw.nix
View file

@ -4,7 +4,6 @@ let
stage1Modules = [ stage1Modules = [
"aesni_intel" "aesni_intel"
"kvm-intel" "kvm-intel"
"aes_x86_64"
"virtio_balloon" "virtio_balloon"
"virtio_scsi" "virtio_scsi"

17
nix/os/devices/srv0.home-ch.stefanjunker.de/versions.nix
View file

@ -1,14 +1,19 @@
let let
nixpkgs = { nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.09"; ref = "nixos-21.05";
rev = "ac60476ed94fd5424d9f3410c438825f793a8cbb"; rev = "a1007637cea374bd1bafd754cfd5388894c49129";
}; };
in in
{ {
inherit nixpkgs; inherit nixpkgs;
"channels-nixos-stable" = nixpkgs; "channels-nixos-stable" = nixpkgs;
"channels-nixos-21.05" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-21.05";
rev = "a1007637cea374bd1bafd754cfd5388894c49129";
};
"channels-nixos-20.03" = { "channels-nixos-20.03" = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.03"; ref = "nixos-20.03";
@ -22,16 +27,16 @@ in
"channels-nixos-unstable" = { "channels-nixos-unstable" = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-unstable"; ref = "nixos-unstable";
rev = "900115a4f7fdd9189e7803ca781a65be663f2c89"; rev = "253aecf69ed7595aaefabde779aa6449195bebb7";
}; };
"nixpkgs-master" = { "nixpkgs-master" = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "master"; ref = "master";
rev = "f0fa05742058fef85c49e132c2851940915698ef"; rev = "200f2a7c58ed6b40b618377288c071314875fcd3";
}; };
"home-manager-module" = { "home-manager-module" = {
url = "https://github.com/nix-community/home-manager"; url = "https://github.com/nix-community/home-manager";
ref = "release-20.09"; ref = "release-21.05";
rev = "2aa20ae969f2597c4df10a094440a66e9d7f8c86"; rev = "b39647e52ed3c0b989e9d5c965e598ae4c38d7ef";
}; };
} }

13
nix/os/devices/srv0.home-ch.stefanjunker.de/versions.tmpl.nix
View file

@ -1,14 +1,19 @@
let let
nixpkgs = { nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.09"; ref = "nixos-21.05";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-20.09 | awk '{ print $1 }' | tr -d '\n' -%>"; rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.05 | awk '{ print $1 }' | tr -d '\n' -%>";
}; };
in in
{ {
inherit nixpkgs; inherit nixpkgs;
"channels-nixos-stable" = nixpkgs; "channels-nixos-stable" = nixpkgs;
"channels-nixos-21.05" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-21.05";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.05 | awk '{ print $1 }' | tr -d '\n' -%>";
};
"channels-nixos-20.03" = { "channels-nixos-20.03" = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.03"; ref = "nixos-20.03";
@ -31,7 +36,7 @@ in
}; };
"home-manager-module" = { "home-manager-module" = {
url = "https://github.com/nix-community/home-manager"; url = "https://github.com/nix-community/home-manager";
ref = "release-20.09"; ref = "release-21.05";
rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-20.09 | awk '{ print $1 }' | tr -d '\n' -%>"; rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-21.05 | awk '{ print $1 }' | tr -d '\n' -%>";
}; };
} }

2
nix/os/modules/ddclient-ovh.nix
View file

@ -23,7 +23,7 @@ in {
server = "www.ovh.com"; server = "www.ovh.com";
ssl = true; ssl = true;
domains = [ cfg.domain ]; domains = [ cfg.domain ];
use = "web, web=ifconfig.co"; use = "web";
inherit (passwords.dyndns.${cfg.domain}) username password; inherit (passwords.dyndns.${cfg.domain}) username password;
}; };
}; };