From b95720eb1bf3350369e924987c25bbb1205a8851 Mon Sep 17 00:00:00 2001 From: ene Date: Fri, 17 Feb 2023 16:53:15 +0100 Subject: Feat(services): Use default.nix files --- services/default.nix | 4 ++-- services/nix/default.nix | 22 ++++++++++++++++++++++ services/nix/nix.nix | 22 ---------------------- services/printing/default.nix | 4 ++++ services/printing/printing.nix | 4 ---- 5 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 services/nix/default.nix delete mode 100644 services/nix/nix.nix create mode 100644 services/printing/default.nix delete mode 100644 services/printing/printing.nix diff --git a/services/default.nix b/services/default.nix index 4de96e62..9b34a2e4 100644 --- a/services/default.nix +++ b/services/default.nix @@ -1,6 +1,6 @@ {config, ...}: { imports = [ - ./printing/printing.nix - ./nix/nix.nix + ./printing + ./nix ]; } diff --git a/services/nix/default.nix b/services/nix/default.nix new file mode 100644 index 00000000..27f9b170 --- /dev/null +++ b/services/nix/default.nix @@ -0,0 +1,22 @@ +{ + config, + lib, + pkgs, + ... +}: { + nix = { + gc = { + automatic = true; + dates = "daily"; + options = "--delete-older-than 3"; + }; + settings = { + auto-optimise-store = true; + experimental-features = ["nix-command" "flakes"]; + fallback = true; + + keep-failed = true; #keep failed tmp build dirs + pure-eval = true; # restrict file system and network access to hash + }; + }; +} diff --git a/services/nix/nix.nix b/services/nix/nix.nix deleted file mode 100644 index 27f9b170..00000000 --- a/services/nix/nix.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: { - nix = { - gc = { - automatic = true; - dates = "daily"; - options = "--delete-older-than 3"; - }; - settings = { - auto-optimise-store = true; - experimental-features = ["nix-command" "flakes"]; - fallback = true; - - keep-failed = true; #keep failed tmp build dirs - pure-eval = true; # restrict file system and network access to hash - }; - }; -} diff --git a/services/printing/default.nix b/services/printing/default.nix new file mode 100644 index 00000000..d178e3b6 --- /dev/null +++ b/services/printing/default.nix @@ -0,0 +1,4 @@ +{config, ...}: { + # Enable CUPS to print documents. + services.printing.enable = true; +} diff --git a/services/printing/printing.nix b/services/printing/printing.nix deleted file mode 100644 index d178e3b6..00000000 --- a/services/printing/printing.nix +++ /dev/null @@ -1,4 +0,0 @@ -{config, ...}: { - # Enable CUPS to print documents. - services.printing.enable = true; -} -- cgit 1.4.1