this repo has no description
refactor: remove shared options from nix settings because it was causing problems
+64
-72
+64
-72
modules/nix.nix
+64
-72
modules/nix.nix
···
2
2
delib,
3
3
inputs,
4
4
...
5
-
}: let
6
-
shared = {
5
+
}:
6
+
delib.module {
7
+
name = "nix";
8
+
9
+
# TODO: double check home-manager options
10
+
home.always = {
7
11
nixpkgs.config = import ../files/nixpkgs-config.nix;
8
-
9
-
nix.settings = {
10
-
auto-optimise-store = true;
11
-
experimental-features = ["nix-command" "flakes"];
12
-
trusted-users = ["root" "@wheel" "ovy"];
13
-
};
12
+
xdg.configFile."nixpkgs/config.nix".source = ../files/nixpkgs-config.nix;
14
13
};
15
-
in
16
-
delib.module {
17
-
name = "nix";
14
+
15
+
nixos.always = {
16
+
nixpkgs.config = import ../files/nixpkgs-config.nix;
18
17
19
-
# TODO: double check home-manager options
20
-
home.always =
21
-
shared
22
-
// {
23
-
xdg.configFile."nixpkgs/config.nix".source = ../files/nixpkgs-config.nix;
18
+
nix = {
19
+
gc = {
20
+
automatic = true;
21
+
options = "--delete-older-than 10d";
22
+
dates = "weekly";
24
23
};
25
24
26
-
nixos.always =
27
-
shared
28
-
// {
29
-
nix = {
30
-
gc = {
31
-
automatic = true;
32
-
options = "--delete-older-than 10d";
33
-
dates = "weekly";
34
-
};
25
+
nixPath = ["nixpkgs=${inputs.nixpkgs}"];
35
26
36
-
nixPath = ["nixpkgs=${inputs.nixpkgs}"];
27
+
registry.nixpkgs.to = {
28
+
type = "path";
29
+
path = inputs.nixpkgs;
30
+
narHash = inputs.nixpkgs.narHash;
31
+
};
37
32
38
-
registry.nixpkgs.to = {
39
-
type = "path";
40
-
path = inputs.nixpkgs;
41
-
narHash = inputs.nixpkgs.narHash;
42
-
};
33
+
settings = {
34
+
auto-optimise-store = true;
35
+
experimental-features = ["nix-command" "flakes"];
36
+
trusted-users = ["root" "@wheel" "ovy"];
37
+
};
38
+
};
43
39
44
-
settings = {
45
-
auto-optimise-store = true;
46
-
experimental-features = ["nix-command" "flakes"];
47
-
trusted-users = ["root" "@wheel" "ovy"];
48
-
};
49
-
};
40
+
system.tools.nixos-option.enable = false;
41
+
};
50
42
51
-
system.tools.nixos-option.enable = false;
52
-
};
43
+
darwin.always = {
44
+
nixpkgs.config = import ../files/nixpkgs-config.nix;
53
45
54
-
darwin.always = {
55
-
nix = {
56
-
buildMachines = [
57
-
{
58
-
hostName = "rushing.axolotl-map.ts.net";
59
-
sshUser = "colmena-deploy";
60
-
system = "x86_64-linux";
61
-
speedFactor = 2;
62
-
maxJobs = 6;
63
-
protocol = "ssh-ng";
64
-
}
65
-
{
66
-
hostName = "skyline.axolotl-map.ts.net";
67
-
sshUser = "colmena-deploy";
68
-
system = "aarch64-linux";
69
-
speedFactor = 1;
70
-
maxJobs = 2;
71
-
protocol = "ssh-ng";
72
-
}
73
-
];
46
+
nix = {
47
+
buildMachines = [
48
+
{
49
+
hostName = "rushing.axolotl-map.ts.net";
50
+
sshUser = "colmena-deploy";
51
+
system = "x86_64-linux";
52
+
speedFactor = 2;
53
+
maxJobs = 6;
54
+
protocol = "ssh-ng";
55
+
}
56
+
{
57
+
hostName = "skyline.axolotl-map.ts.net";
58
+
sshUser = "colmena-deploy";
59
+
system = "aarch64-linux";
60
+
speedFactor = 1;
61
+
maxJobs = 2;
62
+
protocol = "ssh-ng";
63
+
}
64
+
];
74
65
75
-
distributedBuilds = true;
66
+
distributedBuilds = true;
76
67
77
-
gc = {
78
-
automatic = true;
79
-
options = "--delete-older-than 7d";
80
-
interval.Weekday = 6;
81
-
};
68
+
gc = {
69
+
automatic = true;
70
+
options = "--delete-older-than 7d";
71
+
interval.Weekday = 6;
72
+
};
82
73
83
-
optimise.automatic = true;
74
+
optimise.automatic = true;
84
75
85
-
settings = {
86
-
builders-use-substitutes = true;
87
-
experimental-features = "nix-command flakes";
88
-
trusted-users = ["root" "ovy"];
89
-
};
76
+
settings = {
77
+
builders-use-substitutes = true;
78
+
experimental-features = "nix-command flakes";
79
+
trusted-users = ["root" "ovy"];
80
+
sandbox = true;
90
81
};
91
82
};
92
-
}
83
+
};
84
+
}