felschr/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(nix): adopt new recommended Lix installation
All checks were successful
Test / tests (push) Successful in 11m49s
Details

Browse source 
The Lix NixOS module is not needed anymore with this approach.
This commit is contained in:
Felix Schröter 2025-09-15 21:01:17 +02:00
parent 05b3c065f5
commit 6780000825
Signed by: felschr
GPG key ID: 671E39E6744C807D
4 changed files with 14 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

53
flake.lock generated
View file

@ -250,21 +250,6 @@
"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": [
@ -328,43 +313,6 @@
"type": "github"
}
},
"lix": {
"flake": false,
"locked": {
"lastModified": 1751235704,
"narHash": "sha256-J4ycLoXHPsoBoQtEXFCelL4xlq5pT8U9tNWNKm43+YI=",
"rev": "1d7368585eebaa2c4bdbcb88fe600cfb2239b2c6",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1d7368585eebaa2c4bdbcb88fe600cfb2239b2c6.tar.gz?rev=1d7368585eebaa2c4bdbcb88fe600cfb2239b2c6"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz"
}
},
"lix-module": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1751240025,
"narHash": "sha256-SXUAlxpjPRkArRMHy5+Hdi+PiC+ND9yzzIjiaHmTvQU=",
"rev": "8b1094356f4723d6e89d3f8a95b333ee16d9ab02",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/8b1094356f4723d6e89d3f8a95b333ee16d9ab02.tar.gz?rev=8b1094356f4723d6e89d3f8a95b333ee16d9ab02"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz"
}
},
"matrix-appservices": {
"inputs": {
"devshell": "devshell",
@ -520,7 +468,6 @@
"flake-parts": "flake-parts",
"flake-utils": "flake-utils",
"home-manager": "home-manager_2",
"lix-module": "lix-module",
"matrix-appservices": "matrix-appservices",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",

6
flake.nix
View file

@ -19,12 +19,6 @@ rec {
nixos-hardware.url = "github:NixOS/nixos-hardware";
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
disko = {
url = "github:nix-community/disko/latest";
inputs.nixpkgs.follows = "nixpkgs";

1
home/shell/direnv.nix
View file

@ -4,6 +4,7 @@
programs.direnv = {
enable = true;
nix-direnv.enable = true;
nix-direnv.package = pkgs.lixPackageSets.stable.nix-direnv;
};
# for .envrc's in child directories add "source_up"

19
system/nix.nix
View file

@ -10,15 +10,22 @@ let
inherit (inputs.self.outputs) nixConfig;
in
{
imports = [
# TODO switch to lixFromNixpkgs once 2.93.2 is available
inputs.lix-module.nixosModules.default
# inputs.lix-module.nixosModules.lixFromNixpkgs
];
nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [
(final: prev: {
inherit (final.lixPackageSets.stable)
nixpkgs-review
# nix-direnv # HINT infinite recursion, overwritten in home-manager config instead
nix-eval-jobs
nix-fast-build
colmena
;
})
];
nix = {
package = pkgs.lixPackageSets.stable.lix;
settings = {
trusted-users = [ "@wheel" ];
substituters = nixConfig.extra-substituters;