From 268cf2ce9bbc136ac38e57e0fd870e925d5d5c81 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 3 Dec 2025 13:12:09 +0100 Subject: [PATCH] unfuck lix --- common.nix | 17 ++++++++-- flake.lock | 91 ++---------------------------------------------------- flake.nix | 20 ------------ 3 files changed, 17 insertions(+), 111 deletions(-) diff --git a/common.nix b/common.nix index 266ede4..597c367 100644 --- a/common.nix +++ b/common.nix @@ -5,14 +5,14 @@ pkgs, lib, niri, - lix-module, + # lix-module, rs-programs, ... }: with lib; with builtins; { - imports = [ lix-module.nixosModules.default ]; + # imports = [ lix-module.nixosModules.default ]; environment = { systemPackages = with pkgs; [ @@ -76,6 +76,19 @@ with builtins; hardware.graphics.enable = true; + nixpkgs.overlays = [ + (final: prev: { + inherit (prev.lixPackageSets.stable) + nixpkgs-review + nix-eval-jobs + nix-fast-build + colmena + ; + }) + ]; + + nix.package = pkgs.lixPackageSets.stable.lix; + services = { systemd-lock-handler.enable = true; openssh = { diff --git a/flake.lock b/flake.lock index 1e79c88..898e98f 100644 --- a/flake.lock +++ b/flake.lock @@ -228,39 +228,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "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" - } - }, "fromYaml": { "flake": false, "locked": { @@ -316,43 +283,6 @@ "type": "github" } }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1763408228, - "narHash": "sha256-5zdqDsaVKHheZQyLEUgmH3J6YO7V53HAEj+BkzO0Cd4=", - "rev": "7d46e9db7ec1fa02f3b1b9a7dc24fbc43e7b821d", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/7d46e9db7ec1fa02f3b1b9a7dc24fbc43e7b821d.tar.gz?rev=7d46e9db7ec1fa02f3b1b9a7dc24fbc43e7b821d" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" - } - }, - "lix-module": { - "inputs": { - "flake-utils": "flake-utils", - "flakey-profile": "flakey-profile", - "lix": [ - "lix" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1761960361, - "narHash": "sha256-FvuAw56NIVJpS3Kr8Wv9PpU4eehZMcdIVkxjStuYmqc=", - "rev": "c47f62187601ea2991b79a9bacdbfdf76cd29fbe", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/c47f62187601ea2991b79a9bacdbfdf76cd29fbe.tar.gz?rev=c47f62187601ea2991b79a9bacdbfdf76cd29fbe" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" - } - }, "niri": { "inputs": { "niri-stable": "niri-stable", @@ -625,8 +555,6 @@ "crane": "crane", "fenix": "fenix", "home-manager": "home-manager", - "lix": "lix", - "lix-module": "lix-module", "niri": "niri", "nixcord": "nixcord", "nixos-hardware": "nixos-hardware", @@ -694,7 +622,7 @@ "gnome-shell": "gnome-shell", "nixpkgs": "nixpkgs_4", "nur": "nur", - "systems": "systems_2", + "systems": "systems", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -745,21 +673,6 @@ "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" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -848,7 +761,7 @@ "flake-parts": "flake-parts_3", "nixpkgs": "nixpkgs_5", "rust-manifest": "rust-manifest", - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1739736913, diff --git a/flake.nix b/flake.nix index a68902f..51295e0 100644 --- a/flake.nix +++ b/flake.nix @@ -10,23 +10,6 @@ typst-within.url = "github:schrottkatze/typst"; crane.url = "github:ipetkov/crane"; nixcord.url = "github:kaylorben/nixcord"; - # lix-module = { - # url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; - - # url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; - # - lix = { - url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; - flake = false; - }; - - lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.lix.follows = "lix"; - }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -43,7 +26,6 @@ nixpkgs, nixpkgs-stable, nixpkgs-unstable-small, - lix-module, typst-within, home-manager, nixos-hardware, @@ -90,7 +72,6 @@ pkgs-unstable-small pkgs-stable rs-programs - lix-module niri ; }; @@ -129,7 +110,6 @@ pkgs-unstable-small pkgs-stable rs-programs - lix-module niri ; };