Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ivan Malison 2021-07-20 20:44:45 -06:00
commit 495358f6eb

View File

@ -1,6 +1,6 @@
{ {
inputs = { inputs = {
nixos-hardware.url = github:nixos/nixos-hardware; nixos-hardware.url = github:IvanMalison/nixos-hardware;
nix = { nix = {
url = github:IvanMalison/nix/master; url = github:IvanMalison/nix/master;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -68,7 +68,11 @@
}; };
adele = nixpkgs.lib.nixosSystem { adele = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ forAll ./machines/adele.nix ]; modules = [ forAll ./machines/adele.nix ({ ... }: {
imports = [
nixos-hardware.nixosModules.dell-xps-17-9700-intel
];
})];
}; };
biskcomp = nixpkgs.lib.nixosSystem { biskcomp = nixpkgs.lib.nixosSystem {
system = "aarch64-linux"; system = "aarch64-linux";