nrabulinski/settei
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

treewide: lix update

Browse source
This commit is contained in:
Nikodem Rabuliński 2024-05-19 10:54:54 +02:00
parent b6d533135b
commit 5f405e5eab
4 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
flake.lock generated
View file

@ -463,17 +463,17 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1714353561, "lastModified": 1716017186,
"narHash": "sha256-1OKjSB5kPw0Tnm/h4j1IZe6TfdX04QNbm1kn0q58Rls=", "narHash": "sha256-6YVtLy+1o36SYgWv0CmoMuxfS+i2SJrpcsoSnsVK5ck=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "e2ab89a74b1d6044cea91e91f5c3d5fce203c2e8", "rev": "d1c8fd3b0981a53f122dc4b9e5cda705de3c1ac2",
"revCount": 15448, "revCount": 15590,
"type": "git", "type": "git",
"url": "https://git.lix.systems/nrabulinski/lix.git" "url": "https://git.lix.systems/lix-project/lix.git"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "https://git.lix.systems/nrabulinski/lix.git" "url": "https://git.lix.systems/lix-project/lix.git"
} }
}, },
"lix-module": { "lix-module": {
@ -488,11 +488,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714868057, "lastModified": 1715885250,
"narHash": "sha256-Q9vGkxmuarySjPKO6yixjZ0tkaVIQS2wU9FpCpDA7+I=", "narHash": "sha256-IUFYAl3158Ig5vySnRBHoPReb2/S97bjodCo6FhzJv4=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "e31baf57680bab449ab5b40179cc4a08a99f5314", "rev": "53d713eb486f21d653af3ef3528e9a19ecfc45e5",
"revCount": 62, "revCount": 81,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module.git" "url": "https://git.lix.systems/lix-project/nixos-module.git"
}, },

4
flake.nix
View file

@ -143,9 +143,7 @@
inputs.crane.follows = "crane"; inputs.crane.follows = "crane";
}; };
lix = { lix = {
# TODO: Go back once building on darwin is fixed url = "git+https://git.lix.systems/lix-project/lix.git";
# url = "git+https://git.lix.systems/lix-project/lix.git";
url = "git+https://git.lix.systems/nrabulinski/lix.git";
flake = false; flake = false;
}; };
lix-module = { lix-module = {

1
hosts/default.nix
View file

@ -53,6 +53,7 @@
modules = [ modules = [
inputs.agenix.darwinModules.age inputs.agenix.darwinModules.age
inputs.home-manager.darwinModules.home-manager inputs.home-manager.darwinModules.home-manager
inputs.lix-module.nixosModules.default
self.darwinModules.settei self.darwinModules.settei
self.darwinModules.common self.darwinModules.common
sharedOptions sharedOptions

2
modules/system/common/default.nix
View file

@ -36,8 +36,6 @@ let
nixpkgs.overlays = [ (_: _: { inherit (inputs'.settei.packages) fish; }) ]; nixpkgs.overlays = [ (_: _: { inherit (inputs'.settei.packages) fish; }) ];
nix.settings.allow-import-from-derivation = false; nix.settings.allow-import-from-derivation = false;
# TODO: Remove once config checking works with lix
nix.checkConfig = false;
}; };
linuxConfig = lib.optionalAttrs isLinux { linuxConfig = lib.optionalAttrs isLinux {