4 files changed, 64 insertions, 56 deletions
diff --git a/modules/nixos/sils/default.nix b/modules/nixos/sils/default.nix
index 4db5358..dfa0510 100644
--- a/modules/nixos/sils/default.nix
+++ b/modules/nixos/sils/default.nix
@@ -2,6 +2,7 @@
   imports = [
     ./basesystem.nix
     ./meta.nix
+    ./nix.nix
     ./plymouth.nix
     ./theming.nix
   ];
diff --git a/modules/nixos/sils/nix.nix b/modules/nixos/sils/nix.nix
new file mode 100644
index 0000000..dc50470
--- /dev/null
+++ b/modules/nixos/sils/nix.nix
@@ -0,0 +1,63 @@
+{
+  self,
+  config,
+  nixpkgs,
+  lib,
+  ...
+}: let
+  cfg = config.sils.nix;
+in {
+  options.sils.nix = {
+    remoteBuild = lib.mkEnableOption;
+  };
+  config = {
+    nix = {
+      registry = {
+        nixpkgs.flake = nixpkgs;
+        n.flake = nixpkgs;
+        self.flake = self;
+        s.flake = self;
+      };
+      channel.enable = false;
+      distributedBuilds = cfg.remoteBuild;
+      buildMachines = [
+        {
+          hostName = "server1.vhack.eu";
+          protocol = "ssh-ng";
+          system = "x86_64-linux";
+          supportedFeatures = ["big-parallel"];
+        }
+      ];
+      gc = {
+        automatic = true;
+        dates = "daily";
+        options = "--delete-older-than 3";
+      };
+      settings = {
+        auto-optimise-store = true;
+        experimental-features = ["nix-command" "flakes"];
+        substituters = [
+          "https://cache.garnix.io"
+          "https://hyprland.cachix.org"
+        ];
+        trusted-public-keys = [
+          "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+          "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+        ];
+      };
+    };
+    home-manager.users.root.home = lib.mkIf cfg.remoteBuild {
+      username = "root";
+      homeDirectory = "/root";
+      stateVersion = "23.05";
+      file.".ssh/config" = {
+        text = ''
+          Host server1.vhack.eu
+                 IdentitiesOnly yes
+                 IdentityFIle ${config.age.secrets.nixremote.path}
+                 User nixremote
+        '';
+      };
+    };
+  };
+}
diff --git a/sys/default.nix b/sys/default.nix
index a6be9eb..155bf1e 100644
--- a/sys/default.nix
+++ b/sys/default.nix
@@ -8,7 +8,6 @@
     ./impermanence
     ./keyboard
     ./networking
-    ./nix
     ./opengl
     ./packages
     ./services
diff --git a/sys/nix/default.nix b/sys/nix/default.nix
deleted file mode 100644
index 71dab10..0000000
--- a/sys/nix/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  self,
-  config,
-  nixpkgs,
-  ...
-}: {
-  nix = {
-    registry = {
-      nixpkgs.flake = nixpkgs;
-      n.flake = nixpkgs;
-      self.flake = self;
-      s.flake = self;
-    };
-    channel.enable = false;
-    distributedBuilds = true;
-    buildMachines = [
-      {
-        hostName = "server1.vhack.eu";
-        protocol = "ssh-ng";
-        system = "x86_64-linux";
-        supportedFeatures = ["big-parallel"];
-      }
-    ];
-    gc = {
-      automatic = true;
-      dates = "daily";
-      options = "--delete-older-than 3";
-    };
-    settings = {
-      auto-optimise-store = true;
-      experimental-features = ["nix-command" "flakes"];
-      substituters = [
-        "https://cache.garnix.io"
-        "https://hyprland.cachix.org"
-      ];
-      trusted-public-keys = [
-        "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
-        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-      ];
-    };
-  };
-  home-manager.users.root.home = {
-    username = "root";
-    homeDirectory = "/root";
-    stateVersion = "23.05";
-    file.".ssh/config" = {
-      text = ''
-        Host server1.vhack.eu
-               IdentitiesOnly yes
-               IdentityFIle ${config.age.secrets.nixremote.path}
-               User nixremote
-      '';
-    };
-  };
-}