albert/nix
albert/nix
1
0
Fork 0
Code Issues Pull requests Activity Actions

Testing master nixpkgs

Browse source
This commit is contained in:
iFargle 2023-08-11 11:01:58 +09:00
parent 5b72e3c563
commit 09ece9052e
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
flake.nix
View file

@ -7,6 +7,7 @@
# NixOS packages # NixOS packages
stable-nixpkgs.url = "nixpkgs/nixos-23.05"; stable-nixpkgs.url = "nixpkgs/nixos-23.05";
unstable-nixpkgs.url = "nixpkgs/nixos-unstable"; unstable-nixpkgs.url = "nixpkgs/nixos-unstable";
master-nixpkgs.url = "nixpkgs/master";
# Manage dotfiles in a home directory # Manage dotfiles in a home directory
home-manager.url = "github:nix-community/home-manager/release-23.05"; home-manager.url = "github:nix-community/home-manager/release-23.05";
@ -27,7 +28,7 @@
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
}; };
outputs = { stable-nixpkgs, unstable-nixpkgs, home-manager, lanzaboote, nur, sops-nix, /*nixos-hardware,*/ ... }@inputs: outputs = { stable-nixpkgs, unstable-nixpkgs, master-nixpkgs, home-manager, lanzaboote, nur, sops-nix, /*nixos-hardware,*/ ... }@inputs:
let let
# Variables - Remember to set these # Variables - Remember to set these
hostname = "nixos-laptop"; hostname = "nixos-laptop";
@ -43,6 +44,11 @@
config = { allowUnfree = true; }; config = { allowUnfree = true; };
}; };
master = import master-nixpkgs {
inherit system;
config = { allowUnfree = true; };
}
lib = stable-nixpkgs.lib; lib = stable-nixpkgs.lib;
in { in {
# NixOS Configuration files: # NixOS Configuration files:
@ -52,6 +58,7 @@
inherit system; inherit system;
specialArgs = { specialArgs = {
inherit unstable; inherit unstable;
inherit master;
inherit hostname; inherit hostname;
}; };
modules = [ modules = [

4
hosts/nixos-laptop/configuration.nix
View file

@ -1,4 +1,4 @@
{ lib, config, pkgs, ... }: { { lib, config, pkgs, master, ... }: {
# Set your time zone. # Set your time zone.
time.timeZone = "Asia/Tokyo"; time.timeZone = "Asia/Tokyo";
@ -32,7 +32,7 @@
opengl.driSupport = true; opengl.driSupport = true;
# opengl.extraPackages = with pkgs; [ nvidia-vaapi-driver ]; # opengl.extraPackages = with pkgs; [ nvidia-vaapi-driver ];
nvidia = { nvidia = with master.pkgs {
open = false; open = false;
package = config.boot.kernelPackages.nvidiaPackages.stable; package = config.boot.kernelPackages.nvidiaPackages.stable;
# powerManagement.finegrained = true; # powerManagement.finegrained = true;