From d592ec35994e6bd5fa068c81a8b7ac5feed282d8 Mon Sep 17 00:00:00 2001 From: Mohammad Rafiq Date: Fri, 4 Apr 2025 19:41:42 +0800 Subject: [PATCH] refactor: switch nix impl to lix --- flake.lock | 86 +++++++++++++++++++++++++++++++++++++++++- flake.nix | 4 ++ modules/nix-config.nix | 5 ++- 3 files changed, 93 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 791f5fe..33d3c12 100644 --- a/flake.lock +++ b/flake.lock @@ -179,6 +179,39 @@ "type": "github" } }, + "flake-utils_2": { + "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": { @@ -331,6 +364,41 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1737234286, + "narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=", + "rev": "079528098f5998ba13c88821a2eca1005c1695de", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils_2", + "flakey-profile": "flakey-profile", + "lix": "lix", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742943028, + "narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=", + "rev": "868d97695bab9d21f6070b03957bcace249fbe3c", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/868d97695bab9d21f6070b03957bcace249fbe3c.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz" + } + }, "mnw": { "locked": { "lastModified": 1742255973, @@ -498,6 +566,7 @@ "hyprcloser": "hyprcloser", "hyprshaders": "hyprshaders", "impermanence": "impermanence", + "lix-module": "lix-module", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", @@ -505,7 +574,7 @@ "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", "stylix": "stylix", - "systems": "systems" + "systems": "systems_2" } }, "rust-overlay": { @@ -631,6 +700,21 @@ "type": "github" } }, + "systems_2": { + "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": { diff --git a/flake.nix b/flake.nix index 094f37c..867570b 100644 --- a/flake.nix +++ b/flake.nix @@ -149,5 +149,9 @@ }; url = "github:danth/stylix"; }; + lix-module = { + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; } diff --git a/modules/nix-config.nix b/modules/nix-config.nix index 22e8fc4..4ca2010 100644 --- a/modules/nix-config.nix +++ b/modules/nix-config.nix @@ -1,4 +1,7 @@ +{ inputs, ... }: { + imports = [ inputs.lix-module.nixosModules.default ]; + system.stateVersion = "24.11"; nixpkgs.config.allowUnfree = true; @@ -7,7 +10,7 @@ experimental-features = [ "nix-command" "flakes" - "pipe-operators" + "pipe-operator" ]; trusted-users = [ "@wheel" ];