add nixos-hardware

This commit is contained in:
Vivian 2022-11-29 09:48:23 +01:00
parent a2146b2f3f
commit f97de218bf
3 changed files with 23 additions and 9 deletions

View file

@ -628,6 +628,22 @@
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": {
"locked": {
"lastModified": 1669650994,
"narHash": "sha256-uwASLUfedIQ5q01TtMwZDEV2HCZr5nVPZjzVgCG+D5I=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "7883883d135ce5b7eae5dce4bfa12262b85c1c46",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixos-hardware",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1668765800, "lastModified": 1668765800,
@ -847,6 +863,7 @@
"mailserver": "mailserver", "mailserver": "mailserver",
"minecraft-servers": "minecraft-servers", "minecraft-servers": "minecraft-servers",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixvim": "nixvim", "nixvim": "nixvim",
"riff": "riff", "riff": "riff",

View file

@ -42,10 +42,13 @@
url = "github:nix-community/nixos-generators"; url = "github:nix-community/nixos-generators";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nixos-hardware.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = { self, nixpkgs, vault-secrets, minecraft-servers, colmena outputs = { self, nixpkgs, vault-secrets, minecraft-servers, colmena
, home-manager, hyprpaper, hyprland, nixos-generators, ... }@inputs: , home-manager, hyprpaper, hyprland, nixos-generators, nixos-hardware, ... }@inputs:
let let
inherit (nixpkgs) lib; inherit (nixpkgs) lib;
inherit (builtins) mapAttrs; inherit (builtins) mapAttrs;

View file

@ -2,12 +2,13 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, ... }: { config, pkgs, inputs, ... }:
{ {
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-z
]; ];
# Bootloader. # Bootloader.
@ -17,13 +18,6 @@
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
networking.hostName = "nixos"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Enable networking # Enable networking
networking.networkmanager.enable = true; networking.networkmanager.enable = true;