diff --git a/flake.lock b/flake.lock index 1459647..4bed158 100644 --- a/flake.lock +++ b/flake.lock @@ -628,6 +628,22 @@ "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": { "locked": { "lastModified": 1668765800, @@ -847,6 +863,7 @@ "mailserver": "mailserver", "minecraft-servers": "minecraft-servers", "nixos-generators": "nixos-generators", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", "riff": "riff", diff --git a/flake.nix b/flake.nix index 0e0688c..5510b6e 100644 --- a/flake.nix +++ b/flake.nix @@ -42,10 +42,13 @@ url = "github:nix-community/nixos-generators"; 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 - , home-manager, hyprpaper, hyprland, nixos-generators, ... }@inputs: + , home-manager, hyprpaper, hyprland, nixos-generators, nixos-hardware, ... }@inputs: let inherit (nixpkgs) lib; inherit (builtins) mapAttrs; diff --git a/nixos/hosts/thalassa/aoife/configuration.nix b/nixos/hosts/thalassa/aoife/configuration.nix index 8e74847..fc5a513 100644 --- a/nixos/hosts/thalassa/aoife/configuration.nix +++ b/nixos/hosts/thalassa/aoife/configuration.nix @@ -2,12 +2,13 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ config, pkgs, inputs, ... }: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + inputs.nixos-hardware.nixosModules.lenovo-thinkpad-z ]; # Bootloader. @@ -17,13 +18,6 @@ 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 networking.networkmanager.enable = true;