added nixpkgs-master

This commit is contained in:
2024-11-02 21:26:42 -04:00
parent 2d0c2baee4
commit 9869f88a3e
5 changed files with 36 additions and 6 deletions

View File

@@ -29,7 +29,12 @@
extraSpecialArgs = {inherit inputs outputs;};
};
nixpkgs.config.allowUnfree = true;
nixpkgs = {
overlays = builtins.attrValues outputs.overlays;
config = {
allowUnfree = true;
};
};
programs = {
zsh.enable = true;

View File

@@ -1,8 +1,8 @@
{ lib, pkgs, ... }:
{
boot = {
kernelPackages = lib.mkDefault pkgs.linuxPackages_zen;
zfs.package = pkgs.zfs_unstable;
kernelPackages = lib.mkDefault pkgs.master.linuxPackages_zen;
zfs.package = pkgs.master.zfs_unstable;
};
services = {
desktopManager.plasma6.enable = true;

23
flake.lock generated
View File

@@ -139,11 +139,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1730519544,
"narHash": "sha256-F1QQ6AsFvnohoNPOe5yms5E8HtF1C83MrlL3CExwlxQ=",
"lastModified": 1730537918,
"narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "be00f01542ad0a2b9962ec691c5709944847686c",
"rev": "f6e0cd5c47d150c4718199084e5764f968f1b560",
"type": "github"
},
"original": {
@@ -169,6 +169,22 @@
"type": "github"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1730587346,
"narHash": "sha256-YAzfNPNFtztrOYe1Nhi6cTiT7kedRwmlfpijA9T2uuk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a8ffc2295c358629bc1bda569bf8b3bbb21aa1be",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1730327045,
@@ -236,6 +252,7 @@
"nixos-cosmic": "nixos-cosmic",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-stable": "nixpkgs-stable_2",
"system_tools": "system_tools",
"systems": "systems_3"

View File

@@ -18,6 +18,7 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs-master.url = "github:nixos/nixpkgs/master";
systems.url = "github:nix-systems/default-linux";
nixos-hardware.url = "github:nixos/nixos-hardware/master";

View File

@@ -6,4 +6,11 @@
config.allowUnfree = true;
};
};
# When applied, the master nixpkgs set (declared in the flake inputs) will be accessible through 'pkgs.master'
master = final: _prev: {
master = import inputs.nixpkgs-master {
system = final.system;
config.allowUnfree = true;
};
};
}