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

steveej-t14: update to nixos 21.11

Browse source
This commit is contained in:
steveej 2021-12-04 12:30:36 +01:00
parent e36218e777
commit 3f9f50745d
3 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nix/home-manager/programs/vscode/default.nix
View file

@ -2,7 +2,7 @@
let let
packagedExtensions = with pkgs.vscode-extensions; [ packagedExtensions = with pkgs.vscode-extensions; [
bbenoist.Nix # bbenoist.Nix
ms-vscode-remote.remote-ssh ms-vscode-remote.remote-ssh
vscodevim.vim vscodevim.vim

14
nix/os/devices/steveej-t14/versions.tmpl.nix
View file

@ -1,8 +1,8 @@
let let
nixpkgs = { nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-21.05"; ref = "nixos-21.11";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.05 | awk '{ print $1 }' | tr -d '\n' -%>"; rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.11 | awk '{ print $1 }' | tr -d '\n' -%>";
}; };
in in
@ -12,6 +12,12 @@ in
suffix = "/nixos"; suffix = "/nixos";
}; };
"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-unstable" = { "channels-nixos-unstable" = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-unstable"; ref = "nixos-unstable";
@ -24,7 +30,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-21.05"; ref = "release-21.11";
rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-21.05 | awk '{ print $1 }' | tr -d '\n' -%>"; rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-21.11 | awk '{ print $1 }' | tr -d '\n' -%>";
}; };
} }

4
nix/os/profiles/common/system.nix
View file

@ -17,8 +17,8 @@
# "https://hydra.nixos.org" # "https://hydra.nixos.org"
]; ];
nix.daemonNiceLevel = lib.mkDefault 19; nix.daemonCPUSchedPolicy = "idle";
nix.daemonIONiceLevel = lib.mkDefault 7; nix.daemonIOSchedClass = "idle";
nix.maxJobs = lib.mkDefault "auto"; nix.maxJobs = lib.mkDefault "auto";
nix.buildCores = lib.mkDefault 0; nix.buildCores = lib.mkDefault 0;
nix.useSandbox = true; nix.useSandbox = true;