From 5f405e5eab8dd969f0bb50dc148242166f06af82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= Date: Sun, 19 May 2024 10:54:54 +0200 Subject: [PATCH] treewide: lix update --- flake.lock | 20 ++++++++++---------- flake.nix | 4 +--- hosts/default.nix | 1 + modules/system/common/default.nix | 2 -- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 138c482..148e5c2 100644 --- a/flake.lock +++ b/flake.lock @@ -463,17 +463,17 @@ "lix": { "flake": false, "locked": { - "lastModified": 1714353561, - "narHash": "sha256-1OKjSB5kPw0Tnm/h4j1IZe6TfdX04QNbm1kn0q58Rls=", + "lastModified": 1716017186, + "narHash": "sha256-6YVtLy+1o36SYgWv0CmoMuxfS+i2SJrpcsoSnsVK5ck=", "ref": "refs/heads/main", - "rev": "e2ab89a74b1d6044cea91e91f5c3d5fce203c2e8", - "revCount": 15448, + "rev": "d1c8fd3b0981a53f122dc4b9e5cda705de3c1ac2", + "revCount": 15590, "type": "git", - "url": "https://git.lix.systems/nrabulinski/lix.git" + "url": "https://git.lix.systems/lix-project/lix.git" }, "original": { "type": "git", - "url": "https://git.lix.systems/nrabulinski/lix.git" + "url": "https://git.lix.systems/lix-project/lix.git" } }, "lix-module": { @@ -488,11 +488,11 @@ ] }, "locked": { - "lastModified": 1714868057, - "narHash": "sha256-Q9vGkxmuarySjPKO6yixjZ0tkaVIQS2wU9FpCpDA7+I=", + "lastModified": 1715885250, + "narHash": "sha256-IUFYAl3158Ig5vySnRBHoPReb2/S97bjodCo6FhzJv4=", "ref": "refs/heads/main", - "rev": "e31baf57680bab449ab5b40179cc4a08a99f5314", - "revCount": 62, + "rev": "53d713eb486f21d653af3ef3528e9a19ecfc45e5", + "revCount": 81, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module.git" }, diff --git a/flake.nix b/flake.nix index 9308c4b..fec5f22 100644 --- a/flake.nix +++ b/flake.nix @@ -143,9 +143,7 @@ inputs.crane.follows = "crane"; }; 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/nrabulinski/lix.git"; + url = "git+https://git.lix.systems/lix-project/lix.git"; flake = false; }; lix-module = { diff --git a/hosts/default.nix b/hosts/default.nix index a1ee1e3..53fb83f 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -53,6 +53,7 @@ modules = [ inputs.agenix.darwinModules.age inputs.home-manager.darwinModules.home-manager + inputs.lix-module.nixosModules.default self.darwinModules.settei self.darwinModules.common sharedOptions diff --git a/modules/system/common/default.nix b/modules/system/common/default.nix index 2560eab..1976696 100644 --- a/modules/system/common/default.nix +++ b/modules/system/common/default.nix @@ -36,8 +36,6 @@ let nixpkgs.overlays = [ (_: _: { inherit (inputs'.settei.packages) fish; }) ]; nix.settings.allow-import-from-derivation = false; - # TODO: Remove once config checking works with lix - nix.checkConfig = false; }; linuxConfig = lib.optionalAttrs isLinux {