From 1ea056c38aea10928a4255a581e796c1e1db34dd Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 2 Jun 2024 06:43:32 -0400 Subject: modules: use `nixpkgs.flake` options --- modules/nixos/base/nix.nix | 4 ---- modules/nixos/server/default.nix | 8 ++------ 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'modules/nixos') diff --git a/modules/nixos/base/nix.nix b/modules/nixos/base/nix.nix index 720a074..8429346 100644 --- a/modules/nixos/base/nix.nix +++ b/modules/nixos/base/nix.nix @@ -1,16 +1,12 @@ { config, lib, - inputs, ... }: let cfg = config.base.nixSettings; enable = config.base.enable && cfg.enable; in { config = lib.mkIf enable { - # not sure why i can't use this on darwin? - environment.etc."nix/inputs/nixpkgs".source = lib.mkDefault inputs.nixpkgs.outPath; - nix = { channel.enable = lib.mkDefault false; gc.dates = lib.mkDefault "weekly"; diff --git a/modules/nixos/server/default.nix b/modules/nixos/server/default.nix index 1c23124..735a30f 100644 --- a/modules/nixos/server/default.nix +++ b/modules/nixos/server/default.nix @@ -26,18 +26,14 @@ in { man.enable = false; }; - environment = { - defaultPackages = lib.mkForce []; - etc."nix/inputs/nixpkgs".source = inputs.nixpkgs-stable.outPath; - }; + environment.defaultPackages = lib.mkForce []; nix = { gc = { - dates = "*-*-1,5,9,13,17,21,25,29 00:00:00"; + dates = "Mon,Wed,Fri *-*-* 00:00:00"; options = "-d --delete-older-than 2d"; }; - registry.n.flake = inputs.nixpkgs-stable; settings.allowed-users = [config.networking.hostName]; }; }; -- cgit v1.2.3