diff --git a/configuration.nix b/configuration.nix index 4e3fb3b..a453c5a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -8,6 +8,7 @@ ./application-configuration.nix ./software-development-configuration.nix ./school-configuration.nix + ./virtualisation-configuration.nix ]; # Enable networking and bluetooth @@ -92,7 +93,7 @@ users.users.caleb = { isNormalUser = true; description = "caleb"; - extraGroups = [ "networkmanager" "wheel" "usrp" ]; + extraGroups = [ "networkmanager" "wheel" ]; hashedPassword = "$y$j9T$v6EDyPW8C/K.Th4xg8MHL/$tA67k6U0kLtafTNNW2DM7j.xObjPSaZFQ4e/beBX7g2"; packages = with pkgs; [ @@ -143,20 +144,37 @@ services.printing.drivers = [ pkgs.brlaser ]; # remote build - nix.buildMachines = [{ - hostName = "january"; - system = "x86_64-linux"; - protocol = "ssh-ng"; - maxJobs = 1; - speedFactor = 2; - supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; - mandatoryFeatures = [ ]; - }]; + nix.buildMachines = [ + { + hostName = "talos"; + system = "x86_64-linux"; + protocol = "ssh-ng"; + speedFactor = 4; + supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; + mandatoryFeatures = [ ]; + } + { + hostName = "january"; + system = "x86_64-linux"; + protocol = "ssh-ng"; + speedFactor = 3; + supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; + mandatoryFeatures = [ ]; + } + { + hostName = "pubnix"; + system = "x86_64-linux"; + protocol = "ssh-ng"; + speedFactor = 2; + supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; + mandatoryFeatures = [ ]; + } + ]; nix.distributedBuilds = true; # optional, useful when the builder has a faster internet connection than yours nix.extraOptions = '' - builders-use-substitutes = true - ''; + builders-use-substitutes = true + ''; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions