Finally switch to Lix!

This commit is contained in:
Whovian NTSN 2024-05-18 19:32:04 -04:00
parent 499b4bf30a
commit 2134f1f1d4
3 changed files with 88 additions and 1 deletions

View File

@ -63,6 +63,21 @@
"type": "github" "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": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -83,6 +98,50 @@
"type": "github" "type": "github"
} }
}, },
"lix": {
"flake": false,
"locked": {
"lastModified": 1714955862,
"narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=",
"ref": "refs/tags/2.90-beta.1",
"rev": "b6799ab0374a8e1907a48915d3187e07da41d88c",
"revCount": 15501,
"type": "git",
"url": "https://git@git.lix.systems/lix-project/lix"
},
"original": {
"ref": "refs/tags/2.90-beta.1",
"type": "git",
"url": "https://git@git.lix.systems/lix-project/lix"
}
},
"lix-module": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"flakey-profile": "flakey-profile",
"lix": [
"lix"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1715885250,
"narHash": "sha256-IUFYAl3158Ig5vySnRBHoPReb2/S97bjodCo6FhzJv4=",
"ref": "refs/heads/main",
"rev": "53d713eb486f21d653af3ef3528e9a19ecfc45e5",
"revCount": 81,
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
},
"original": {
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
}
},
"nix-index-database": { "nix-index-database": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -164,6 +223,8 @@
"agenix": "agenix", "agenix": "agenix",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"lix": "lix",
"lix-module": "lix-module",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nix-systems_default": "nix-systems_default", "nix-systems_default": "nix-systems_default",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",

View File

@ -42,6 +42,20 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
### Lix! Lix! Lix! Lix! Lix! Lix!
lix = {
url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
flake = false;
};
lix-module = {
url = "git+https://git.lix.systems/lix-project/nixos-module";
inputs.lix.follows = "lix";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
######### #########
# Extra inputs that I am adding just to make my life easier, # Extra inputs that I am adding just to make my life easier,
# but don't like that they're included >:( # but don't like that they're included >:(
@ -59,12 +73,13 @@
url = "github:nix-systems/default"; url = "github:nix-systems/default";
}; };
}; # inputs }; # inputs
outputs = { outputs = {
# Needed # Needed
self, nixpkgs, nixos-wsl, self, nixpkgs, nixos-wsl,
# Lix
lix-module,
# Added by me # Added by me
agenix, home-manager, nix-index-database, xil, ... }: agenix, home-manager, nix-index-database, xil, ... }:
let let
@ -79,7 +94,9 @@
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./system/nixos-wsl/configuration.nix ./system/nixos-wsl/configuration.nix
./system/nix_lix.nix
nixos-wsl.nixosModules.wsl nixos-wsl.nixosModules.wsl
lix-module.nixosModules.default
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
system.configurationRevision = self.shortRev or self.dirtyShortRev or "dirty"; system.configurationRevision = self.shortRev or self.dirtyShortRev or "dirty";

9
system/nix_lix.nix Normal file
View File

@ -0,0 +1,9 @@
{
nix.settings.extra-substituters = [
"https://cache.lix.systems"
];
nix.settings.trusted-public-keys = [
"cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
];
}