From 9930b9a6df96aa7eda1991f65db1a0c8400e3772 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Tue, 29 Nov 2022 10:14:26 +0800 Subject: [PATCH] nixops: nixos 22.11 --- nixops/chiron-hardware-configuration.nix | 2 +- nixops/desktop.nix | 11 +++++++---- nixops/hera-hardware-configuration.nix | 2 +- nixops/hestia-hardware-configuration.nix | 2 +- nixops/rpi-server.nix | 6 +++--- nixops/rpi.nix | 6 +++--- nixops/zeus-hardware-configuration.nix | 2 +- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/nixops/chiron-hardware-configuration.nix b/nixops/chiron-hardware-configuration.nix index 81fe8ef6..fa6d8e97 100644 --- a/nixops/chiron-hardware-configuration.nix +++ b/nixops/chiron-hardware-configuration.nix @@ -22,7 +22,7 @@ swapDevices = [ ]; - nix.maxJobs = lib.mkDefault 16; + nix.settings.max-jobs = lib.mkDefault 16; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; boot.loader.systemd-boot.enable = true; diff --git a/nixops/desktop.nix b/nixops/desktop.nix index 356b275f..96f157d4 100644 --- a/nixops/desktop.nix +++ b/nixops/desktop.nix @@ -35,7 +35,10 @@ in nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ opensc yubikey-manager yubikey-manager-qt yubico-piv-tool - wget vim gitAndTools.gitFull sshfs firefox-wayland chromium thunderbird-wayland hexchat + wget vim gitAndTools.gitFull sshfs + firefox + thunderbird + chromium usbutils pciutils uhubctl file lm_sensors audacious acpi gimp imagemagick (python3.withPackages(ps: with ps; [ numpy scipy matplotlib qtconsole regex ])) @@ -157,9 +160,9 @@ in services.udev.packages = [ artiq.packages.x86_64-linux.openocd-bscanspi ]; services.udev.extraRules = (import ./extra-udev.nix); - nix.binaryCachePublicKeys = ["nixbld.m-labs.hk-1:5aSRVA5b320xbNvu30tqxVPXpld73bhtOeH6uAjRyHc="]; - nix.binaryCaches = ["https://nixbld.m-labs.hk" "https://cache.nixos.org"]; - nix.sandboxPaths = ["/opt"]; + nix.settings.trusted-public-keys = ["nixbld.m-labs.hk-1:5aSRVA5b320xbNvu30tqxVPXpld73bhtOeH6uAjRyHc="]; + nix.settings.substituters = ["https://nixbld.m-labs.hk" "https://cache.nixos.org"]; + nix.settings.extra-sandbox-paths = ["/opt"]; nix.extraOptions = '' experimental-features = nix-command flakes impure-derivations diff --git a/nixops/hera-hardware-configuration.nix b/nixops/hera-hardware-configuration.nix index f388d5c2..9ee3aab9 100644 --- a/nixops/hera-hardware-configuration.nix +++ b/nixops/hera-hardware-configuration.nix @@ -22,7 +22,7 @@ swapDevices = [ ]; - nix.maxJobs = lib.mkDefault 16; + nix.settings.max-jobs = lib.mkDefault 16; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; boot.loader.systemd-boot.enable = true; diff --git a/nixops/hestia-hardware-configuration.nix b/nixops/hestia-hardware-configuration.nix index abdaba0e..38e758c2 100644 --- a/nixops/hestia-hardware-configuration.nix +++ b/nixops/hestia-hardware-configuration.nix @@ -22,7 +22,7 @@ swapDevices = [ ]; - nix.maxJobs = lib.mkDefault 16; + nix.settings.max-jobs = lib.mkDefault 16; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; boot.loader.systemd-boot.enable = true; diff --git a/nixops/rpi-server.nix b/nixops/rpi-server.nix index bae109f4..6505419b 100644 --- a/nixops/rpi-server.nix +++ b/nixops/rpi-server.nix @@ -112,9 +112,9 @@ networking.firewall.allowedTCPPorts = [ 631 ]; networking.firewall.interfaces.wlan0.allowedUDPPorts = [ 53 67 ]; - nix.binaryCachePublicKeys = ["nixbld.m-labs.hk-1:5aSRVA5b320xbNvu30tqxVPXpld73bhtOeH6uAjRyHc="]; - nix.binaryCaches = ["https://cache.nixos.org" "https://nixbld.m-labs.hk"]; - nix.trustedUsers = ["root" "sb"]; + nix.settings.trusted-public-keys = ["nixbld.m-labs.hk-1:5aSRVA5b320xbNvu30tqxVPXpld73bhtOeH6uAjRyHc="]; + nix.settings.substituters = ["https://nixbld.m-labs.hk" "https://cache.nixos.org"]; + nix.settings.trusted-users = ["root" "sb"]; nix.extraOptions = '' experimental-features = nix-command flakes impure-derivations diff --git a/nixops/rpi.nix b/nixops/rpi.nix index 857eab4d..5ea3e742 100644 --- a/nixops/rpi.nix +++ b/nixops/rpi.nix @@ -65,9 +65,9 @@ in programs.fish.enable = true; programs.wireshark.enable = true; - nix.binaryCachePublicKeys = ["nixbld.m-labs.hk-1:5aSRVA5b320xbNvu30tqxVPXpld73bhtOeH6uAjRyHc="]; - nix.binaryCaches = ["https://cache.nixos.org" "https://nixbld.m-labs.hk"]; - nix.trustedUsers = ["root" "sb"]; + nix.settings.trusted-public-keys = ["nixbld.m-labs.hk-1:5aSRVA5b320xbNvu30tqxVPXpld73bhtOeH6uAjRyHc="]; + nix.settings.substituters = ["https://nixbld.m-labs.hk" "https://cache.nixos.org"]; + nix.settings.trusted-users = ["root" "sb"]; nix.extraOptions = '' experimental-features = nix-command flakes impure-derivations diff --git a/nixops/zeus-hardware-configuration.nix b/nixops/zeus-hardware-configuration.nix index 6a2b9610..a073f0c2 100644 --- a/nixops/zeus-hardware-configuration.nix +++ b/nixops/zeus-hardware-configuration.nix @@ -22,7 +22,7 @@ swapDevices = [ ]; - nix.maxJobs = lib.mkDefault 16; + nix.settings.max-jobs = lib.mkDefault 16; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; boot.loader.systemd-boot.enable = true;