nixos: finish bump to 20.03 including home-manager
This commit is contained in:
parent
6430cc374e
commit
0ca2cc885f
7 changed files with 20 additions and 32 deletions
|
@ -6,8 +6,6 @@
|
|||
programs.firefox = {
|
||||
enable = true;
|
||||
enableAdobeFlash = false;
|
||||
enableGoogleTalk = true;
|
||||
enableIcedTea = true;
|
||||
};
|
||||
|
||||
programs.browserpass = {
|
||||
|
|
|
@ -53,15 +53,6 @@ in {
|
|||
virtualisation = {
|
||||
libvirtd = {
|
||||
enable = true;
|
||||
extraOptions = [
|
||||
"--listen"
|
||||
];
|
||||
extraConfig = ''
|
||||
listen_tls = 0
|
||||
listen_tcp = 1
|
||||
auth_tcp="none"
|
||||
tcp_port = "16509"
|
||||
'';
|
||||
};
|
||||
|
||||
virtualbox.host = {
|
||||
|
|
|
@ -1,20 +1,20 @@
|
|||
{
|
||||
channelsNixosStable = {
|
||||
ref = "nixos-20.03";
|
||||
rev = "48723f48ab92381f0afd50143f38e45cf3080405";
|
||||
rev = "70717a337f7ae4e486ba71a500367cad697e5f09";
|
||||
};
|
||||
channelsNixosUnstable = {
|
||||
ref = "nixos-unstable";
|
||||
rev = "0f5ce2fac0c726036ca69a5524c59a49e2973dd4";
|
||||
rev = "029a5de08390bb03c3f44230b064fd1850c6658a";
|
||||
};
|
||||
nixpkgsMaster = {
|
||||
url = "https://github.com/NixOS/nixpkgs/";
|
||||
ref = "master";
|
||||
rev = "7fe32a614abfd6d6afacb27d8e7c99fb6f9e41b7";
|
||||
rev = "ba5ace74d447bab0e0df06cb9471df8421d61026";
|
||||
};
|
||||
homeManagerModule = {
|
||||
url = "https://github.com/rycee/home-manager";
|
||||
ref = "release-19.09";
|
||||
rev = "b78b5fa4a073dfcdabdf0deb9a8cfd56050113be";
|
||||
ref = "release-20.03";
|
||||
rev = "96fcf3b017d813fac300ecb821b6db6b7b5d0c40";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -39,7 +39,7 @@ in {
|
|||
enableCryptodisk = true;
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices = [
|
||||
boot.initrd.luks.devices = builtins.listToAttrs [
|
||||
{
|
||||
name =
|
||||
let
|
||||
|
@ -47,9 +47,11 @@ in {
|
|||
lastelem = (builtins.length splitstring)-1;
|
||||
in
|
||||
builtins.elemAt splitstring lastelem;
|
||||
value = {
|
||||
device = (ownLib.disk.bootLuksDevice cfg.diskId);
|
||||
preLVM = true;
|
||||
allowDiscards = true;
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
|
|
|
@ -34,8 +34,9 @@
|
|||
pkgs.corefonts
|
||||
];
|
||||
|
||||
console.font = "lat9w-16";
|
||||
|
||||
i18n = {
|
||||
consoleFont = "lat9w-16";
|
||||
defaultLocale = "en_US.UTF-8";
|
||||
};
|
||||
time.timeZone = "Europe/Berlin";
|
||||
|
|
|
@ -1,24 +1,20 @@
|
|||
{
|
||||
channelsNixosStable = {
|
||||
ref = "nixos-20.03";
|
||||
rev = "730453919bdc191496eb5dda04d69c4c99c724b9";
|
||||
};
|
||||
channelsNixos1909 = {
|
||||
ref = "nixos-19.09";
|
||||
rev = "64565f9d8ffe5bc3737ebd5f6b97756fac16d23b";
|
||||
rev = "70717a337f7ae4e486ba71a500367cad697e5f09";
|
||||
};
|
||||
channelsNixosUnstable = {
|
||||
ref = "nixos-unstable";
|
||||
rev = "0729b8c55e0dfaf302af4c57546871d47a652048";
|
||||
rev = "029a5de08390bb03c3f44230b064fd1850c6658a";
|
||||
};
|
||||
nixpkgsMaster = {
|
||||
url = "https://github.com/NixOS/nixpkgs/";
|
||||
ref = "master";
|
||||
rev = "47f61c9d7f116701ad9ca0d4b894ebb5f36ef5cf";
|
||||
rev = "7a4ee350b007bcb4c689123ad21a8468f91a19b9";
|
||||
};
|
||||
homeManagerModule = {
|
||||
url = "https://github.com/rycee/home-manager";
|
||||
ref = "release-19.09";
|
||||
rev = "0d1ca254d0f213a118459c5be8ae465018132f74";
|
||||
ref = "release-20.03";
|
||||
rev = "96fcf3b017d813fac300ecb821b6db6b7b5d0c40";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
};
|
||||
homeManagerModule = {
|
||||
url = "https://github.com/rycee/home-manager";
|
||||
ref = "release-19.09";
|
||||
rev = "<% git ls-remote https://github.com/rycee/home-manager.git release-19.09 | awk '{ print $1 }' | tr -d '\n' -%>";
|
||||
ref = "release-20.03";
|
||||
rev = "<% git ls-remote https://github.com/rycee/home-manager.git release-20.03 | awk '{ print $1 }' | tr -d '\n' -%>";
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue