Skip to content

Commit 3534f80

Browse files
refactor: explicitly add lix module
don't want to build for pi...takes too long because of cpu emulation
1 parent 8667666 commit 3534f80

5 files changed

Lines changed: 22 additions & 15 deletions

File tree

configurations/darwin/mbp3/default.nix

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
{
22
self,
3-
lib,
3+
inputs,
44
pkgs,
55
userConfigs,
66
...
77
}:
88
{
99
# A module that automatically imports everything else in the parent folder.
10-
imports =
11-
with builtins;
12-
map (fn: ./${fn}) (
13-
filter (fn: fn != "default.nix" && lib.hasSuffix ".nix" fn) (attrNames (readDir ./.))
14-
);
10+
imports = [
11+
# nix setup
12+
inputs.lix-module.nixosModule.default
13+
14+
./brew.nix
15+
./config.nix
16+
./home.nix
17+
./nixpkgs.nix
18+
./system.nix
19+
];
1520

1621
# For home-manager to work.
1722
users.users =

configurations/nixos/lab/default.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
inputs.nixos-hardware.nixosModules.common-pc-ssd
1717
./hardware-configuration.nix
1818

19+
# nix setup
20+
inputs.lix-module.nixosModule.default
21+
1922
# config
2023
./config.nix
2124
./home.nix

configurations/nixos/legion/default.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
inputs.nixos-hardware.nixosModules.common-pc-ssd
1919
./hardware-configuration.nix
2020

21+
# nix setup
22+
inputs.lix-module.nixosModule.default
23+
2124
# config
2225
./config.nix
2326
./home.nix

configurations/nixos/penguin/default.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
1818
./hardware-configuration.nix
1919

20+
# nix setup
21+
inputs.lix-module.nixosModule.default
22+
2023
# config
2124
./config.nix
2225
./home.nix

flake.nix

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
nixpkgs,
8383
nix-darwin,
8484
home-manager,
85-
lix-module,
8685
systems,
8786
...
8887
}@inputs:
@@ -145,10 +144,7 @@
145144
{
146145
${name} = lib.nixosSystem {
147146
modules =
148-
[
149-
./configurations/nixos/${name}
150-
lix-module.nixosModules.default
151-
]
147+
[ ./configurations/nixos/${name} ]
152148
++ lib.optionals enableHomeManager [
153149
home-manager.nixosModules.home-manager
154150
(mkHomeManagerConfig system userConfigs)
@@ -171,10 +167,7 @@
171167
{
172168
${name} = lib.darwinSystem {
173169
modules =
174-
[
175-
./configurations/darwin/${name}
176-
lix-module.nixosModules.default
177-
]
170+
[ ./configurations/darwin/${name} ]
178171
++ lib.optionals enableHomeManager [
179172
home-manager.darwinModules.home-manager
180173
(mkHomeManagerConfig system userConfigs)

0 commit comments

Comments
 (0)