From 3f9f50745d609c10cd51a75ecd3418e70ae3d488 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sat, 4 Dec 2021 12:30:36 +0100 Subject: [PATCH] steveej-t14: update to nixos 21.11 --- nix/home-manager/programs/vscode/default.nix | 2 +- nix/os/devices/steveej-t14/versions.tmpl.nix | 14 ++++++++++---- nix/os/profiles/common/system.nix | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/nix/home-manager/programs/vscode/default.nix b/nix/home-manager/programs/vscode/default.nix index ffe1057..9a28bdf 100644 --- a/nix/home-manager/programs/vscode/default.nix +++ b/nix/home-manager/programs/vscode/default.nix @@ -2,7 +2,7 @@ let packagedExtensions = with pkgs.vscode-extensions; [ - bbenoist.Nix + # bbenoist.Nix ms-vscode-remote.remote-ssh vscodevim.vim diff --git a/nix/os/devices/steveej-t14/versions.tmpl.nix b/nix/os/devices/steveej-t14/versions.tmpl.nix index a3a1e8f..964e2ca 100644 --- a/nix/os/devices/steveej-t14/versions.tmpl.nix +++ b/nix/os/devices/steveej-t14/versions.tmpl.nix @@ -1,8 +1,8 @@ let nixpkgs = { 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' -%>"; + ref = "nixos-21.11"; + rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.11 | awk '{ print $1 }' | tr -d '\n' -%>"; }; in @@ -12,6 +12,12 @@ in suffix = "/nixos"; }; "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" = { url = "https://github.com/NixOS/nixpkgs/"; ref = "nixos-unstable"; @@ -24,7 +30,7 @@ in }; "home-manager-module" = { url = "https://github.com/nix-community/home-manager"; - ref = "release-21.05"; - rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-21.05 | awk '{ print $1 }' | tr -d '\n' -%>"; + ref = "release-21.11"; + rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-21.11 | awk '{ print $1 }' | tr -d '\n' -%>"; }; } diff --git a/nix/os/profiles/common/system.nix b/nix/os/profiles/common/system.nix index 6256dff..99b6ef8 100644 --- a/nix/os/profiles/common/system.nix +++ b/nix/os/profiles/common/system.nix @@ -17,8 +17,8 @@ # "https://hydra.nixos.org" ]; - nix.daemonNiceLevel = lib.mkDefault 19; - nix.daemonIONiceLevel = lib.mkDefault 7; + nix.daemonCPUSchedPolicy = "idle"; + nix.daemonIOSchedClass = "idle"; nix.maxJobs = lib.mkDefault "auto"; nix.buildCores = lib.mkDefault 0; nix.useSandbox = true;