From 6b709efe07de21d1857f0e5089479d2cafc76196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= Date: Mon, 6 May 2024 22:13:00 +0200 Subject: [PATCH] yummy --- .github/actions/install-nix/action.yaml | 1 + flake.lock | 97 ++++++++++++++++++++++++- flake.nix | 11 +++ hosts/default.nix | 1 + modules/system/common/default.nix | 2 + 5 files changed, 109 insertions(+), 3 deletions(-) diff --git a/.github/actions/install-nix/action.yaml b/.github/actions/install-nix/action.yaml index b78d9c1..13c03b6 100644 --- a/.github/actions/install-nix/action.yaml +++ b/.github/actions/install-nix/action.yaml @@ -7,6 +7,7 @@ runs: steps: - uses: DeterminateSystems/nix-installer-action@main with: + # source-url: https://install.lix.systems/lix # Needs to be kept in sync with flake.nix extra-conf: | fallback = true diff --git a/flake.lock b/flake.lock index 0236fde..138c482 100644 --- a/flake.lock +++ b/flake.lock @@ -328,7 +328,25 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -363,6 +381,21 @@ "type": "github" } }, + "flakey-profile": { + "locked": { + "lastModified": 1712898590, + "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", + "owner": "lf-", + "repo": "flakey-profile", + "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", + "type": "github" + }, + "original": { + "owner": "lf-", + "repo": "flakey-profile", + "type": "github" + } + }, "helix": { "inputs": { "crane": [ @@ -427,6 +460,47 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1714353561, + "narHash": "sha256-1OKjSB5kPw0Tnm/h4j1IZe6TfdX04QNbm1kn0q58Rls=", + "ref": "refs/heads/main", + "rev": "e2ab89a74b1d6044cea91e91f5c3d5fce203c2e8", + "revCount": 15448, + "type": "git", + "url": "https://git.lix.systems/nrabulinski/lix.git" + }, + "original": { + "type": "git", + "url": "https://git.lix.systems/nrabulinski/lix.git" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils_3", + "flakey-profile": "flakey-profile", + "lix": [ + "lix" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1714868057, + "narHash": "sha256-Q9vGkxmuarySjPKO6yixjZ0tkaVIQS2wU9FpCpDA7+I=", + "ref": "refs/heads/main", + "rev": "e31baf57680bab449ab5b40179cc4a08a99f5314", + "revCount": 62, + "type": "git", + "url": "https://git.lix.systems/lix-project/nixos-module.git" + }, + "original": { + "type": "git", + "url": "https://git.lix.systems/lix-project/nixos-module.git" + } + }, "mailserver": { "inputs": { "blobs": "blobs", @@ -638,6 +712,8 @@ "helix": "helix", "hercules-ci-effects": "hercules-ci-effects", "home-manager": "home-manager", + "lix": "lix", + "lix-module": "lix-module", "mailserver": "mailserver", "niko-nur": "niko-nur", "nixpkgs": "nixpkgs_3", @@ -793,9 +869,24 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1709126324, @@ -863,7 +954,7 @@ "crane": [ "crane" ], - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ], diff --git a/flake.nix b/flake.nix index 2973edc..e4da91c 100644 --- a/flake.nix +++ b/flake.nix @@ -139,6 +139,17 @@ inputs.nixpkgs.follows = "nixpkgs"; 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"; + flake = false; + }; + lix-module = { + url = "git+https://git.lix.systems/lix-project/nixos-module.git"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.lix.follows = "lix"; + }; }; /* diff --git a/hosts/default.nix b/hosts/default.nix index 4ccfcac..a1ee1e3 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -38,6 +38,7 @@ inputs.home-manager.nixosModules.home-manager inputs.nvidia-patch.nixosModules.nvidia-patch inputs.attic.nixosModules.atticd + inputs.lix-module.nixosModules.default self.nixosModules.settei self.nixosModules.common sharedOptions diff --git a/modules/system/common/default.nix b/modules/system/common/default.nix index 1976696..2560eab 100644 --- a/modules/system/common/default.nix +++ b/modules/system/common/default.nix @@ -36,6 +36,8 @@ 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 {