modules: nix options

1 files changed, 4 insertions, 38 deletions

diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index a55548c..6b605ee 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -1,19 +1,13 @@
 {
-  config,
-  lib,
   inputs,
   pkgs,
+  lib,
+  config,
   ...
 }:
 {
-  imports = [ ./nh.nix ];
-
-  nixpkgs.config = {
-    cudaSupport = true;
-    allowUnfree = true;
-  };
-
-  programs.nix-index-database.comma.enable = true;
+  imports = [ ./extended.nix ];
+  nixpkgs.config.allowUnfree = true;
 
   nix = {
     gc.automatic = true;
@@ -22,27 +16,6 @@
     package = pkgs.nixVersions.git;
     nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
     channel.enable = false;
-    # distributedBuilds = true;
-
-    buildMachines =
-      map
-        (system: {
-          inherit system;
-
-          hostName = "eu.nixbuild.net";
-          maxJobs = 100;
-
-          supportedFeatures = [
-            "benchmark"
-            "big-parallel"
-          ];
-        })
-        [
-          "x86_64-linux"
-          "i686-linux"
-          "aarch64-linux"
-          "armv7l-linux"
-        ];
 
     settings = {
       auto-optimise-store = true;
@@ -60,15 +33,8 @@
       flake-registry = "${inputs.flake-registry}/flake-registry.json";
       trusted-users = [ "@wheel" ];
       max-jobs = "auto";
-      extra-platforms = config.boot.binfmt.emulatedSystems;
       keep-outputs = true;
 
-      extra-sandbox-paths = [
-        config.programs.ccache.cacheDir
-        "/run/binfmt"
-        "${pkgs.qemu}"
-      ];
-
       system-features = [
         "nixos-test"
         "kvm"