Skip to content

Commit 0de5e90

Browse files
Merge branch 'lix-implementation'
2 parents 634ed6d + 9baee73 commit 0de5e90

File tree

3 files changed

+116
-33
lines changed

3 files changed

+116
-33
lines changed

flake.lock

Lines changed: 104 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,16 @@
2828
inputs.nixpkgs.follows = "nixpkgs";
2929
};
3030

31+
# Add this section to your flake inputs!
32+
#
33+
# Note that this assumes you have a flake-input called nixpkgs,
34+
# which is often the case. If you've named it something else,
35+
# you'll need to change the `nixpkgs` below.
36+
lix-module = {
37+
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
38+
inputs.nixpkgs.follows = "nixpkgs";
39+
};
40+
3141
# utility
3242
disko.url = "github:nix-community/disko/latest";
3343
git-hooks-nix.url = "github:cachix/git-hooks.nix";
@@ -68,6 +78,7 @@
6878
nixpkgs,
6979
nix-darwin,
7080
home-manager,
81+
lix-module,
7182
systems,
7283
...
7384
}@inputs:
@@ -157,6 +168,7 @@
157168
modules =
158169
[
159170
./configurations/darwin/${name}
171+
lix-module.nixosModules.default
160172
]
161173
++ lib.optionals enableHomeManager [
162174
home-manager.darwinModules.home-manager
@@ -285,16 +297,4 @@
285297
]
286298
);
287299
};
288-
289-
# use cachix for faster builds in places
290-
nixConfig = {
291-
extra-substituters = [
292-
"https://nix-community.cachix.org"
293-
"https://pre-commit-hooks.cachix.org"
294-
];
295-
extra-trusted-public-keys = [
296-
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
297-
"pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc="
298-
];
299-
};
300300
}

shell.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ pkgs.mkShellNoCC {
4040
# nix support
4141
caligula # burn the iso images
4242
home-manager
43-
nix
4443
nh # nix helper
4544
nix-output-monitor # nix output monitor
4645
nvd # nix/nixos package version diff tool

0 commit comments

Comments
 (0)