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

versions: bump to 20.09 and improve NIX_PATH assembly

Browse source 
The NIX_PATH assembly now walks over all keys in the given channel
repositories and assembles a NIX_PATH entry from it. Previously it made
assumptions about a set of hardcoded keys being available, which wasn't
ideal as it didn't allow device-entries.
This commit is contained in:
steveej 2020-10-17 15:25:47 +02:00
parent eaad3a11b4
commit 89c9f9e606
15 changed files with 221 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nix/os/devices/steveej-rmvbl-sdep0/configuration.nix
View file

@ -1,6 +1,10 @@
{ ... }:
{
nixpkgs.config.packageOverrides = pkgs: with pkgs; {
nixPath = (import ../../../default.nix { versionsPath = ./versions.nix; }).nixPath;
};
imports = [
../../profiles/common/configuration.nix
../../profiles/graphical/configuration.nix

32
nix/os/devices/steveej-rmvbl-sdep0/versions.nix
View file

@ -1,20 +1,30 @@
let
nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.09";
rev = "51aaa3fa1b69559456f9bd4968bd5b179a784f67";
};
in
{
channelsNixosStable = {
ref = "nixos-20.03";
rev = "5659cb448e9b615d642c5fe52779c2223e72f7eb";
inherit nixpkgs;
nixos = nixpkgs // {
suffix = "/nixos";
};
channelsNixosUnstable = {
"channels-nixos-stable" = nixpkgs;
"channels-nixos-unstable" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-unstable";
rev = "daaa0e33505082716beb52efefe3064f0332b521";
rev = "24c9b05ac53e422f1af81a156f1fd58499eb27fb";
};
nixpkgsMaster = {
"nixpkgs-master" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "master";
rev = "55dc3b76f0ca1dd62d158b92a637fe484df5227d";
rev = "396f3407a28a0ce8ee537d6f4440d3e6cb359570";
};
homeManagerModule = {
url = "https://github.com/rycee/home-manager";
ref = "release-20.03";
rev = "e6f96b6aa3e99495f9f6f3488ecf78dd316e5bec";
"home-manager-module" = {
url = "https://github.com/nix-community/home-manager";
ref = "release-20.09";
rev = "7339784e07217ed0232e08d1ea33b610c94657d8";
};
}

4
nix/os/devices/steveej-t480s-work/system.nix
View file

@ -75,6 +75,10 @@ in {
ssh = {
enable = true;
authorizedKeys = keys.users.steveej.openssh;
hostKeys = [
"/etc/secrets/initrd/ssh_host_rsa_key"
"/etc/secrets/initrd/ssh_host_ed25519_key"
];
};
};

32
nix/os/devices/steveej-t480s-work/versions.nix
View file

@ -1,20 +1,30 @@
let
nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.09";
rev = "51aaa3fa1b69559456f9bd4968bd5b179a784f67";
};
in
{
channelsNixosStable = {
ref = "nixos-20.03-small";
rev = "eabc31612eabea2573a09ce5bcacdad3bfccd264";
inherit nixpkgs;
nixos = nixpkgs // {
suffix = "/nixos";
};
channelsNixosUnstable = {
"channels-nixos-stable" = nixpkgs;
"channels-nixos-unstable" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-unstable";
rev = "84d74ae9c9cbed73274b8e4e00be14688ffc93fe";
rev = "24c9b05ac53e422f1af81a156f1fd58499eb27fb";
};
nixpkgsMaster = {
"nixpkgs-master" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "master";
rev = "c0e65c63401c9c75c403df207e4bd6439b965cb4";
rev = "7c4305be84ae74499e1ddd9b8e97bcaaf6da0f7d";
};
homeManagerModule = {
url = "https://github.com/rycee/home-manager";
ref = "release-20.03";
rev = "e6f96b6aa3e99495f9f6f3488ecf78dd316e5bec";
"home-manager-module" = {
url = "https://github.com/nix-community/home-manager";
ref = "release-20.09";
rev = "7339784e07217ed0232e08d1ea33b610c94657d8";
};
}

30
nix/os/devices/steveej-t480s-work/versions.tmpl.nix
View file

@ -1,20 +1,30 @@
let
nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.09";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-20.09 | awk '{ print $1 }' | tr -d '\n' -%>";
};
in
{
channelsNixosStable = {
ref = "nixos-20.03-small";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs-channels nixos-20.03-small | awk '{ print $1 }' | tr -d '\n' -%>";
inherit nixpkgs;
nixos = nixpkgs // {
suffix = "/nixos";
};
channelsNixosUnstable = {
"channels-nixos-stable" = nixpkgs;
"channels-nixos-unstable" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-unstable";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs-channels nixos-unstable | awk '{ print $1 }' | tr -d '\n' -%>";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-unstable | awk '{ print $1 }' | tr -d '\n' -%>";
};
nixpkgsMaster = {
"nixpkgs-master" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "master";
rev = "<% git ls-remote https://github.com/NixOS/nixpkgs.git master | head -n1 | awk '{ print $1 }' | tr -d '\n' -%>";
};
homeManagerModule = {
url = "https://github.com/rycee/home-manager";
ref = "release-20.03";
rev = "<% git ls-remote https://github.com/rycee/home-manager.git release-20.03 | awk '{ print $1 }' | tr -d '\n' -%>";
"home-manager-module" = {
url = "https://github.com/nix-community/home-manager";
ref = "release-20.09";
rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-20.09 | awk '{ print $1 }' | tr -d '\n' -%>";
};
}

37
nix/os/devices/vmd32387.contaboserver.net/versions.nix
View file

@ -1,20 +1,37 @@
let
nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.09";
rev = "51aaa3fa1b69559456f9bd4968bd5b179a784f67";
};
in
{
channelsNixosStable = {
inherit nixpkgs;
"channels-nixos-stable" = nixpkgs;
"channels-nixos-20.03" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.03";
rev = "ff6fda61600cc60404bab5cb6b18b8636785b7bc";
};
channelsNixosUnstable = {
ref = "nixos-unstable";
rev = "84d74ae9c9cbed73274b8e4e00be14688ffc93fe";
"channels-nixos-19.09" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-19.09";
rev = "75f4ba05c63be3f147bcc2f7bd4ba1f029cedcb1";
};
nixpkgsMaster = {
"channels-nixos-unstable" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-unstable";
rev = "24c9b05ac53e422f1af81a156f1fd58499eb27fb";
};
"nixpkgs-master" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "master";
rev = "50e986ba967811afdb5edb3b6eda4369059e4238";
rev = "9b3e35d991ea6a43f256069dcb2e006006730d05";
};
homeManagerModule = {
url = "https://github.com/rycee/home-manager";
ref = "release-20.03";
rev = "e6f96b6aa3e99495f9f6f3488ecf78dd316e5bec";
"home-manager-module" = {
url = "https://github.com/nix-community/home-manager";
ref = "release-20.09";
rev = "7339784e07217ed0232e08d1ea33b610c94657d8";
};
}

37
nix/os/devices/vmd32387.contaboserver.net/versions.tmpl.nix Normal file
View file

@ -0,0 +1,37 @@
let
nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.09";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-20.09 | awk '{ print $1 }' | tr -d '\n' -%>";
};
in
{
inherit nixpkgs;
"channels-nixos-stable" = nixpkgs;
"channels-nixos-20.03" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.03";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-20.03 | awk '{ print $1 }' | tr -d '\n' -%>";
};
"channels-nixos-19.09" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-19.09";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-19.09 | awk '{ print $1 }' | tr -d '\n' -%>";
};
"channels-nixos-unstable" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-unstable";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-unstable | awk '{ print $1 }' | tr -d '\n' -%>";
};
"nixpkgs-master" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "master";
rev = "<% git ls-remote https://github.com/NixOS/nixpkgs.git master | head -n1 | awk '{ print $1 }' | tr -d '\n' -%>";
};
"home-manager-module" = {
url = "https://github.com/nix-community/home-manager";
ref = "release-20.09";
rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-20.09 | awk '{ print $1 }' | tr -d '\n' -%>";
};
}