From 1ab6692453ae981a9600492566e5ed032fd01761 Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Mon, 6 Oct 2025 19:35:43 -0700
Subject: nix configuration is applied by default to nixos machines

---
 machines/nixos/x86_64-linux/do-rproxy/default.nix  |  2 --
 .../nixos/x86_64-linux/synology-vm/default.nix     |  2 --
 modules/nixos/default.nix                          |  1 +
 modules/nixos/nix.nix                              | 36 ++++++++++++++++++++++
 profiles/nix/gc.nix                                |  8 -----
 profiles/nix/nix.nix                               | 27 ----------------
 6 files changed, 37 insertions(+), 39 deletions(-)
 create mode 100644 modules/nixos/nix.nix
 delete mode 100644 profiles/nix/gc.nix
 delete mode 100644 profiles/nix/nix.nix

diff --git a/machines/nixos/x86_64-linux/do-rproxy/default.nix b/machines/nixos/x86_64-linux/do-rproxy/default.nix
index fe8e367..061a6ca 100644
--- a/machines/nixos/x86_64-linux/do-rproxy/default.nix
+++ b/machines/nixos/x86_64-linux/do-rproxy/default.nix
@@ -25,8 +25,6 @@
     "${self}/profiles/programs/home-manager.nix"
     "${self}/profiles/admin-user/user.nix"
     "${self}/profiles/admin-user/home-manager.nix"
-    "${self}/profiles/nix/nix.nix"
-    "${self}/profiles/nix/gc.nix"
     "${self}/profiles/network/networkd.nix"
     "${self}/profiles/network/firewall.nix"
     "${self}/profiles/network/fail2ban.nix"
diff --git a/machines/nixos/x86_64-linux/synology-vm/default.nix b/machines/nixos/x86_64-linux/synology-vm/default.nix
index dbf7bf9..97eafaf 100644
--- a/machines/nixos/x86_64-linux/synology-vm/default.nix
+++ b/machines/nixos/x86_64-linux/synology-vm/default.nix
@@ -21,8 +21,6 @@
     "${self}/profiles/programs/home-manager.nix"
     "${self}/profiles/admin-user/user.nix"
     "${self}/profiles/admin-user/home-manager.nix"
-    "${self}/profiles/nix/nix.nix"
-    "${self}/profiles/nix/gc.nix"
     "${self}/profiles/network/networkd.nix"
     "${self}/profiles/network/firewall.nix"
     "${self}/profiles/services/podman.nix"
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 669cd75..1cf2c5d 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -3,6 +3,7 @@
   imports = [
     ./base.nix
     ./cgroups.nix
+    ./nix.nix
     ./ssh.nix
   ];
 }
diff --git a/modules/nixos/nix.nix b/modules/nixos/nix.nix
new file mode 100644
index 0000000..34afa21
--- /dev/null
+++ b/modules/nixos/nix.nix
@@ -0,0 +1,36 @@
+{ pkgs, lib, ... }:
+{
+  nix = {
+    gc = {
+      automatic = true;
+      options = "--delete-older-than 14d";
+    };
+
+    optimise.automatic = true;
+
+    extraOptions = ''
+      tarball-ttl = 900
+    '';
+
+    package = pkgs.nixVersions.stable;
+
+    settings = {
+      trusted-substituters = [
+        "https://cachix.cachix.org"
+        "https://nixpkgs.cachix.org"
+        "https://nix-community.cachix.org"
+      ];
+      trusted-public-keys = [
+        "cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM="
+        "nixpkgs.cachix.org-1:q91R6hxbwFvDqTSDKwDAV4T5PxqXGxswD8vhONFMeOE="
+        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      ];
+      trusted-users = [ "root" ];
+      experimental-features = lib.mkDefault [
+        "nix-command"
+        "flakes"
+      ];
+    };
+  };
+}
diff --git a/profiles/nix/gc.nix b/profiles/nix/gc.nix
deleted file mode 100644
index c39476c..0000000
--- a/profiles/nix/gc.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }:
-{
-  nix.gc = {
-    automatic = true;
-    options = "--delete-older-than 14d";
-  };
-  nix.optimise.automatic = true;
-}
diff --git a/profiles/nix/nix.nix b/profiles/nix/nix.nix
deleted file mode 100644
index f80c808..0000000
--- a/profiles/nix/nix.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  nix = {
-    extraOptions = ''
-      tarball-ttl = 900
-    '';
-    package = pkgs.nixVersions.stable;
-    settings = {
-      trusted-substituters = [
-        "https://cachix.cachix.org"
-        "https://nixpkgs.cachix.org"
-        "https://nix-community.cachix.org"
-      ];
-      trusted-public-keys = [
-        "cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM="
-        "nixpkgs.cachix.org-1:q91R6hxbwFvDqTSDKwDAV4T5PxqXGxswD8vhONFMeOE="
-        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      ];
-      trusted-users = [ "root" ];
-      experimental-features = lib.mkDefault [
-        "nix-command"
-        "flakes"
-      ];
-    };
-  };
-}
-- 
cgit v1.2.3