diff options
| author | Franck Cuny <franck@fcuny.net> | 2025-10-06 19:35:43 -0700 |
|---|---|---|
| committer | Franck Cuny <franck@fcuny.net> | 2025-10-06 19:35:43 -0700 |
| commit | 1ab6692453ae981a9600492566e5ed032fd01761 (patch) | |
| tree | 291a45ebed986c3baf80a2e85749d28aa01b5772 | |
| parent | getting fancy! (diff) | |
| download | infra-1ab6692453ae981a9600492566e5ed032fd01761.tar.gz | |
nix configuration is applied by default to nixos machines
Diffstat (limited to '')
| -rw-r--r-- | machines/nixos/x86_64-linux/do-rproxy/default.nix | 2 | ||||
| -rw-r--r-- | machines/nixos/x86_64-linux/synology-vm/default.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/default.nix | 1 | ||||
| -rw-r--r-- | modules/nixos/nix.nix (renamed from profiles/nix/nix.nix) | 9 | ||||
| -rw-r--r-- | profiles/nix/gc.nix | 8 |
5 files changed, 10 insertions, 12 deletions
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/profiles/nix/nix.nix b/modules/nixos/nix.nix index f80c808..34afa21 100644 --- a/profiles/nix/nix.nix +++ b/modules/nixos/nix.nix @@ -1,10 +1,19 @@ { 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" 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; -} |