From 4103176fa4e843cd0321ae9887087c70f2f53061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Fri, 20 Jun 2025 17:59:20 +0200 Subject: [PATCH] use lix --- flake.lock | 122 ++++++++++++++++++++++++++++++++------ flake.nix | 9 ++- hosts/MONSTER/default.nix | 1 - hosts/aero/default.nix | 1 - 4 files changed, 110 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 24b9a36..585bad4 100644 --- a/flake.lock +++ b/flake.lock @@ -23,7 +23,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1731533236, @@ -39,6 +39,39 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "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" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -87,12 +120,47 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1746827285, + "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=", + "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils", + "flakey-profile": "flakey-profile", + "lix": "lix", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1746838955, + "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=", + "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz" + } + }, "matugen": { "inputs": { "nixpkgs": [ "nixpkgs" ], - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1716548249, @@ -148,7 +216,7 @@ "nixpkgs" ], "nuschtosSearch": "nuschtosSearch", - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1749420898, @@ -166,7 +234,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -190,6 +258,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "lix-module": "lix-module", "matugen": "matugen", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs", @@ -197,21 +266,6 @@ } }, "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -226,6 +280,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "systems_3": { "locked": { "lastModified": 1681028828, @@ -240,6 +309,21 @@ "repo": "default", "type": "github" } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 3382fa3..2aee4ce 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,10 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + lix-module = { + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -21,6 +25,7 @@ nixpkgs, home-manager, nixvim, + lix-module, matugen, nix-flatpak, ... @@ -36,7 +41,6 @@ allowUnfree = true; allowUnsupportedSystem = true; experimental-features = "nix-command flakes"; - permittedInsecurePackages = [ "nix-2.25.0pre20240807_cfe66dbe" ]; }; overlays = [ (final: prev: { @@ -68,6 +72,7 @@ ./modules/nixos ./hosts/${hostname} home-manager.nixosModules.home-manager + lix-module.nixosModules.default nix-flatpak.nixosModules.nix-flatpak { _module.args = @@ -100,7 +105,7 @@ sharedModules = [ matugen.homeManagerModules.default nix-flatpak.homeManagerModules.nix-flatpak - inputs.nixvim.homeManagerModules.nixvim + nixvim.homeManagerModules.nixvim ./modules/home-manager/modules/nixvim ]; users.${username} = { diff --git a/hosts/MONSTER/default.nix b/hosts/MONSTER/default.nix index b38eae9..dfdac19 100644 --- a/hosts/MONSTER/default.nix +++ b/hosts/MONSTER/default.nix @@ -3,7 +3,6 @@ imports = [ ./hardware-configuration.nix ]; nix = { - package = pkgs.nixVersions.latest; settings.experimental-features = [ "nix-command" "flakes" diff --git a/hosts/aero/default.nix b/hosts/aero/default.nix index 53c0a51..82c3adf 100644 --- a/hosts/aero/default.nix +++ b/hosts/aero/default.nix @@ -8,7 +8,6 @@ imports = [ ./hardware-configuration.nix ]; nix = { - package = pkgs.nixVersions.latest; settings.experimental-features = [ "nix-command" "flakes"