From f27bfd7cf1d586f8d641ce922b24989e70e1e44d Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Thu, 11 Jul 2024 20:21:45 +0200 Subject: [PATCH] feat: Switch to lix --- flake.lock | 90 +++++++++++++++++++++++++++++++++-- flake.nix | 6 +++ os-mods/cachix/caches/lix.nix | 11 +++++ 3 files changed, 104 insertions(+), 3 deletions(-) create mode 100644 os-mods/cachix/caches/lix.nix diff --git a/flake.lock b/flake.lock index 2bfae9a..05e7b97 100644 --- a/flake.lock +++ b/flake.lock @@ -303,6 +303,24 @@ "inputs": { "systems": "systems_5" }, + "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_5": { + "inputs": { + "systems": "systems_6" + }, "locked": { "lastModified": 1705309234, "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", @@ -317,6 +335,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" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -421,6 +454,41 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1720626042, + "narHash": "sha256-f8k+BezKdJfmE+k7zgBJiohtS3VkkriycdXYsKOm3sc=", + "rev": "2a4376be20d70feaa2b0e640c5041fb66ddc67ed", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2a4376be20d70feaa2b0e640c5041fb66ddc67ed.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/2.90.0.tar.gz" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils_2", + "flakey-profile": "flakey-profile", + "lix": "lix", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1720641669, + "narHash": "sha256-yEO2cGNgzm9x/XxiDQI+WckSWnZX63R8aJLBRSXtYNE=", + "rev": "5c48c833c15bb80d127a398a8c2484d42fdd8257", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/5c48c833c15bb80d127a398a8c2484d42fdd8257.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz" + } + }, "llama-cpp": { "inputs": { "flake-parts": "flake-parts_2", @@ -443,7 +511,7 @@ "nix-alien": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nix-filter": "nix-filter", "nix-index-database": "nix-index-database", "nixpkgs": [ @@ -545,7 +613,7 @@ "nix-ld-rs": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_4" }, "locked": { @@ -564,7 +632,7 @@ }, "nix-wallpaper": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ], @@ -902,6 +970,7 @@ "emacs-overlay": "emacs-overlay", "envfs": "envfs", "home-manager": "home-manager_2", + "lix-module": "lix-module", "llama-cpp": "llama-cpp", "nix-alien": "nix-alien", "nix-index-database": "nix-index-database_2", @@ -990,6 +1059,21 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 23e5233..61d98b2 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,10 @@ url = "github:NixOS/nixpkgs/nixos-unstable"; }; nixinate.url = "git+https://git.vlt81.de/tristan/nixinate.git"; + lix-module = { + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs"; + }; chaotic = { url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; }; @@ -60,6 +64,7 @@ { self , nixpkgs , nixos-hardware + , lix-module , nixtheplanet , nixinate , home-manager @@ -101,6 +106,7 @@ plasma-manager.homeManagerModules.plasma-manager ]; osModules = [ + lix-module.nixosModules.default disko.nixosModules.disko home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index diff --git a/os-mods/cachix/caches/lix.nix b/os-mods/cachix/caches/lix.nix new file mode 100644 index 0000000..d4c3af9 --- /dev/null +++ b/os-mods/cachix/caches/lix.nix @@ -0,0 +1,11 @@ +{ + nix = { + settings = { + substituters = [ + "https://cache.lix.systems" + ]; + trusted-public-keys = [ + ]; + }; + }; +}