Use unstable nix tool
This commit is contained in:
parent
84429fca90
commit
3f7f9ceead
22
flake.lock
22
flake.lock
|
@ -67,11 +67,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1660496378,
|
||||
"narHash": "sha256-sgAhmrC1iSnl5T2VPPiMpciH1aRw5c7PYEdXX6jd6Gk=",
|
||||
"lastModified": 1660581366,
|
||||
"narHash": "sha256-et+bi9/jlSF/pHx5AYB9ZP2XDdZEQ0vnF7xlvs4503Y=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "879121648fe522b38cc1cf75aef160a14a1f2e7b",
|
||||
"rev": "3d47bbaa26e7a771059d828eecf3bd8bf28a8b0f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -87,6 +87,7 @@
|
|||
"home-manager": "home-manager",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"secrets": "secrets",
|
||||
"unstable-nixpkgs": "unstable-nixpkgs",
|
||||
"vscode-server": "vscode-server",
|
||||
"website": "website"
|
||||
}
|
||||
|
@ -111,6 +112,21 @@
|
|||
"url": "file:///home/h7x4/git/nix-secrets"
|
||||
}
|
||||
},
|
||||
"unstable-nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1660646295,
|
||||
"narHash": "sha256-V4G+egGRc3elXPTr7QLJ7r7yrYed0areIKDiIAlMLC8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "762b003329510ea855b4097a37511eb19c7077f0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-unstable",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"vscode-server": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
21
flake.nix
21
flake.nix
|
@ -3,6 +3,7 @@
|
|||
|
||||
inputs = {
|
||||
nixpkgs.url = "nixpkgs/nixos-22.05";
|
||||
unstable-nixpkgs.url = "nixpkgs/nixos-unstable";
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-22.05";
|
||||
|
@ -44,6 +45,7 @@
|
|||
outputs = inputs@{
|
||||
self,
|
||||
nixpkgs,
|
||||
unstable-nixpkgs,
|
||||
home-manager,
|
||||
vscode-server,
|
||||
secrets,
|
||||
|
@ -65,6 +67,17 @@
|
|||
overlays = [ self.overlays.lib ];
|
||||
};
|
||||
|
||||
unstable-pkgs = import unstable-nixpkgs {
|
||||
inherit system;
|
||||
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
android_sdk.accept_license = true;
|
||||
};
|
||||
|
||||
overlays = [ self.overlays.lib ];
|
||||
};
|
||||
|
||||
in {
|
||||
overlays = {
|
||||
lib = import ./overlays/lib;
|
||||
|
@ -111,7 +124,13 @@
|
|||
./hosts/common.nix
|
||||
./hosts/${name}/configuration.nix
|
||||
"${vscode-server}/default.nix"
|
||||
{ config._module.args = { inherit inputs; secrets = secrets.outputs.default; }; }
|
||||
{
|
||||
config._module.args = {
|
||||
inherit inputs;
|
||||
inherit unstable-pkgs;
|
||||
secrets = secrets.outputs.default;
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
in {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, config, inputs, secrets, ... }:
|
||||
{ pkgs, unstable-pkgs, config, inputs, secrets, ... }:
|
||||
let
|
||||
inherit (pkgs) lib;
|
||||
# inherit (specialArgs) machineVars;
|
||||
|
@ -10,7 +10,7 @@ in {
|
|||
};
|
||||
|
||||
nix = {
|
||||
package = pkgs.nixFlakes;
|
||||
package = unstable-pkgs.nixFlakes;
|
||||
distributedBuilds = config.networking.hostName != "Tsuki";
|
||||
binaryCaches = [
|
||||
"https://cache.nixos.org/"
|
||||
|
|
Loading…
Reference in New Issue