From f5a41eeb3f5ad384e5bb26a0f92cd3bb8a4dab45 Mon Sep 17 00:00:00 2001 From: zuckerberg <5-zuckerberg@users.noreply.git.neet.dev> Date: Sun, 11 Apr 2021 18:41:05 -0400 Subject: [PATCH] module for flakes --- common/flakes.nix | 20 ++++++++++++++------ machines/mitty/configuration.nix | 2 ++ machines/nanachi/configuration.nix | 2 ++ machines/neet.dev/configuration.nix | 2 ++ machines/reg/configuration.nix | 2 ++ 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/common/flakes.nix b/common/flakes.nix index aa60c1e..6927fb8 100644 --- a/common/flakes.nix +++ b/common/flakes.nix @@ -1,10 +1,18 @@ { pkgs, ... }: -{ - nix = { - package = pkgs.nixFlakes; - extraOptions = '' - experimental-features = nix-command flakes - ''; +let + cfg = config.nix.flakes; +in { + options.nix.flakes = { + enable = mkEnableOption "use nix flakes"; + }; + + config = mkIf cfg.enable { + nix = { + package = pkgs.nixFlakes; + extraOptions = '' + experimental-features = nix-command flakes + ''; + }; }; } diff --git a/machines/mitty/configuration.nix b/machines/mitty/configuration.nix index d0fbbec..da38ea2 100644 --- a/machines/mitty/configuration.nix +++ b/machines/mitty/configuration.nix @@ -21,4 +21,6 @@ security.acme.acceptTerms = true; security.acme.email = "letsencrypt+5@tar.ninja"; + + nix.flakes.enable = true; } diff --git a/machines/nanachi/configuration.nix b/machines/nanachi/configuration.nix index a915a84..fb0ab35 100644 --- a/machines/nanachi/configuration.nix +++ b/machines/nanachi/configuration.nix @@ -22,6 +22,8 @@ security.acme.acceptTerms = true; security.acme.email = "letsencrypt+5@tar.ninja"; + nix.flakes.enable = true; + services.nginx.virtualHosts."nanachi.neet.dev" = { enableACME = true; forceSSL = true; diff --git a/machines/neet.dev/configuration.nix b/machines/neet.dev/configuration.nix index c1d9753..df920f2 100644 --- a/machines/neet.dev/configuration.nix +++ b/machines/neet.dev/configuration.nix @@ -28,6 +28,8 @@ security.acme.acceptTerms = true; security.acme.email = "letsencrypt+5@tar.ninja"; + nix.flakes.enable = true; + # tmp services.nginx.virtualHosts."tmp.neet.space" = { enableACME = true; diff --git a/machines/reg/configuration.nix b/machines/reg/configuration.nix index 98b9ee2..83cbd06 100644 --- a/machines/reg/configuration.nix +++ b/machines/reg/configuration.nix @@ -18,6 +18,8 @@ allowDiscards = true; }; + nix.flakes.enable = true; + networking.useDHCP = false; networking.interfaces.enp57s0f1.useDHCP = true; networking.interfaces.wlp0s20f3.useDHCP = true;