From c4bb02b16e829ed5922527bb56b9be94281862da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Mon, 6 May 2024 22:26:36 +0200 Subject: [PATCH] Attempt at using lix Without remote builds and with my laptop setup it's not really viable for now :( --- flake.lock | 102 ++++++++++++++++++++++++++++++++++++++++++--- flake.nix | 13 ++++++ os/default.nix | 1 + os/lix/default.nix | 16 +++++++ 4 files changed, 127 insertions(+), 5 deletions(-) create mode 100644 os/lix/default.nix diff --git a/flake.lock b/flake.lock index d242979..0a09faf 100644 --- a/flake.lock +++ b/flake.lock @@ -203,11 +203,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -220,6 +220,24 @@ "inputs": { "systems": "systems_2" }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, "locked": { "lastModified": 1685518550, "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", @@ -234,6 +252,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" + } + }, "fromYaml": { "flake": false, "locked": { @@ -313,6 +346,48 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1714955862, + "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=", + "ref": "refs/tags/2.90-beta.1", + "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c", + "revCount": 15501, + "type": "git", + "url": "https://git@git.lix.systems/lix-project/lix" + }, + "original": { + "ref": "refs/tags/2.90-beta.1", + "type": "git", + "url": "https://git@git.lix.systems/lix-project/lix" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils", + "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" + }, + "original": { + "type": "git", + "url": "https://git.lix.systems/lix-project/nixos-module" + } + }, "nix-formatter-pack": { "inputs": { "nixpkgs": [ @@ -426,7 +501,7 @@ }, "nixvim": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ], @@ -513,7 +588,7 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "gitignore": "gitignore", "nixpkgs": [ "nixvim", @@ -539,6 +614,8 @@ "inputs": { "disko": "disko", "home-manager": "home-manager", + "lix": "lix", + "lix-module": "lix-module", "nix-on-droid": "nix-on-droid", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", @@ -610,6 +687,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "unixpkgs": { "locked": { "lastModified": 1714280680, diff --git a/flake.nix b/flake.nix index 1a57c34..04502ea 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,19 @@ description = "Geoffrey Frogeye's base configurations"; inputs = { + # Package manager + lix = { + url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1"; + flake = false; + }; + lix-module = { + url = "git+https://git.lix.systems/lix-project/nixos-module"; + inputs = { + lix.follows = "lix"; + nixpkgs.follows = "nixpkgs"; + }; + }; + # Packages nixpkgs.url = "nixpkgs/nixos-23.11"; unixpkgs.url = "nixpkgs"; # OS diff --git a/os/default.nix b/os/default.nix index 58375c2..0c2c71c 100644 --- a/os/default.nix +++ b/os/default.nix @@ -12,6 +12,7 @@ ./diff ./gaming ./geoffrey.nix + # ./lix ./printing ./remote-builds ./style diff --git a/os/lix/default.nix b/os/lix/default.nix new file mode 100644 index 0000000..363bd35 --- /dev/null +++ b/os/lix/default.nix @@ -0,0 +1,16 @@ +{ pkgs, lib, config, lix-module, ... }: +{ + imports = [ + lix-module.nixosModules.default + ]; + config = { + nix.settings = { + substituters = [ + "https://cache.lix.systems" + ]; + trusted-public-keys = [ + "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" + ]; + }; + }; +}