From fdbb506e2e5d60d355f3a8b718211c7a4a56a943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Tue, 2 Apr 2019 09:21:06 -0400 Subject: Stuff --- config/common.nix | 3 ++- config/orbekk-pkgs.nix | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/common.nix b/config/common.nix index 6efcbcb..2ca58f7 100644 --- a/config/common.nix +++ b/config/common.nix @@ -42,7 +42,6 @@ buildCores = lib.mkDefault 0; # auto configure gc.automatic = lib.mkDefault true; nixPath = lib.mkBefore [ - "orbekk=https://hydra.orbekk.com/project/orbekk-projects/channel/latest/nixexprs.tar.bz2" "nixpkgs-stable=https://nixos.org/channels/nixos-18.03/nixexprs.tar.xz" "nixpkgs-unstable=https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz" "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs" @@ -54,6 +53,8 @@ ]; binaryCaches = trustedBinaryCaches; binaryCachePublicKeys = [ "hydra.orbekk.com-1:aAKJuVqMptWoFfY9fhUADdXw5LM5IfSGjTSobuxg+Bo=" ]; + daemonNiceLevel = 10; + daemonIONiceLevel = 5; }; boot.cleanTmpDir = true; diff --git a/config/orbekk-pkgs.nix b/config/orbekk-pkgs.nix index ce29f59..0c81eb7 100644 --- a/config/orbekk-pkgs.nix +++ b/config/orbekk-pkgs.nix @@ -2,12 +2,11 @@ # "orbekk=https://hydra.orbekk.com/project/orbekk-projects/channel/latest/nixexprs.tar.bz2" { config, lib, pkgs, ... }: let - orbekkPkgs = import {}; stablePkgs = import {}; in { nixpkgs.config.packageOverrides = pkgs: { # Broken in nixos-unstable matrix-synapse = stablePkgs.matrix-synapse; - } // orbekkPkgs; + }; } -- cgit v1.2.3