summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/darwin/base/default.nix3
-rw-r--r--modules/darwin/base/nix.nix16
-rw-r--r--modules/nixos/base/nix.nix4
-rw-r--r--modules/nixos/server/default.nix8
-rw-r--r--modules/shared/base/nix.nix7
5 files changed, 4 insertions, 34 deletions
diff --git a/modules/darwin/base/default.nix b/modules/darwin/base/default.nix
index 5066832..532419f 100644
--- a/modules/darwin/base/default.nix
+++ b/modules/darwin/base/default.nix
@@ -1,7 +1,8 @@
{
imports = [
../../shared
- ./nix.nix
./programs.nix
];
+
+ services.nix-daemon.enable = true;
}
diff --git a/modules/darwin/base/nix.nix b/modules/darwin/base/nix.nix
deleted file mode 100644
index dd593f9..0000000
--- a/modules/darwin/base/nix.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- config,
- lib,
- inputs,
- ...
-}: let
- cfg = config.base.nixSettings;
- enable = config.base.enable && cfg.enable;
-in {
- config = lib.mkIf enable {
- # not sure why i have to force this
- environment.etc."nix/inputs/nixpkgs".source = lib.mkForce inputs.nixpkgs.outPath;
-
- services.nix-daemon.enable = true;
- };
-}
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];
};
};
diff --git a/modules/shared/base/nix.nix b/modules/shared/base/nix.nix
index 2575a05..26f16bc 100644
--- a/modules/shared/base/nix.nix
+++ b/modules/shared/base/nix.nix
@@ -2,7 +2,6 @@
config,
lib,
pkgs,
- inputs,
...
}: let
cfg = config.base.nixSettings;
@@ -14,12 +13,6 @@ in {
config = lib.mkIf enable {
nix = {
- registry.n.flake = lib.mkDefault inputs.nixpkgs;
-
- nixPath = [
- "nixpkgs=/etc/nix/inputs/nixpkgs"
- ];
-
settings = {
auto-optimise-store = pkgs.stdenv.isLinux;
experimental-features = ["nix-command" "flakes" "auto-allocate-uids" "repl-flake"];