changed Puenktchen graphics drivers
This commit is contained in:
		
							parent
							
								
									2c001e8dcd
								
							
						
					
					
						commit
						1b0435b9a3
					
				
					 3 changed files with 31 additions and 1 deletions
				
			
		|  | @ -103,7 +103,6 @@ | ||||||
|           attrs.nixos-hardware.nixosModules.common-cpu-amd |           attrs.nixos-hardware.nixosModules.common-cpu-amd | ||||||
|           attrs.nixos-hardware.nixosModules.common-cpu-amd-pstate |           attrs.nixos-hardware.nixosModules.common-cpu-amd-pstate | ||||||
|           attrs.nixos-hardware.nixosModules.common-cpu-amd-zenpower |           attrs.nixos-hardware.nixosModules.common-cpu-amd-zenpower | ||||||
|           attrs.nixos-hardware.nixosModules.common-gpu-amd |  | ||||||
|           ./hosts |           ./hosts | ||||||
|           ./users/willifan |           ./users/willifan | ||||||
|         ]; |         ]; | ||||||
|  |  | ||||||
|  | @ -1,3 +1,4 @@ | ||||||
|  | <<<<<<< HEAD | ||||||
| # Do not modify this file!  It was generated by ‘nixos-generate-config’ | # Do not modify this file!  It was generated by ‘nixos-generate-config’ | ||||||
| # and may be overwritten by future invocations.  Please make changes | # and may be overwritten by future invocations.  Please make changes | ||||||
| # to /etc/nixos/configuration.nix instead. | # to /etc/nixos/configuration.nix instead. | ||||||
|  | @ -24,3 +25,31 @@ | ||||||
|   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; |   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; | ||||||
|   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; |   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; | ||||||
| } | } | ||||||
|  | ======= | ||||||
|  | # Do not modify this file!  It was generated by ‘nixos-generate-config’ | ||||||
|  | # and may be overwritten by future invocations.  Please make changes | ||||||
|  | # to /etc/nixos/configuration.nix instead. | ||||||
|  | { config, lib, pkgs, modulesPath, ... }: | ||||||
|  | 
 | ||||||
|  | { | ||||||
|  |   imports = | ||||||
|  |     [ (modulesPath + "/installer/scan/not-detected.nix") | ||||||
|  |     ]; | ||||||
|  | 
 | ||||||
|  |   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; | ||||||
|  |   boot.initrd.kernelModules = [ ]; | ||||||
|  |   boot.kernelModules = [ "kvm-amd" ]; | ||||||
|  |   boot.extraModulePackages = [ ]; | ||||||
|  | 
 | ||||||
|  |   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking | ||||||
|  |   # (the default) this is the recommended approach. When using systemd-networkd it's | ||||||
|  |   # still possible to use this option, but it's recommended to use it in conjunction | ||||||
|  |   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. | ||||||
|  |   networking.useDHCP = lib.mkDefault true; | ||||||
|  |   # networking.interfaces.enp4s0f3u1u1c2.useDHCP = lib.mkDefault true; | ||||||
|  |   # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; | ||||||
|  | 
 | ||||||
|  |   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; | ||||||
|  |   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; | ||||||
|  | } | ||||||
|  | >>>>>>> 70274e1 (changed Puenktchen graphics drivers) | ||||||
|  |  | ||||||
|  | @ -5,4 +5,6 @@ | ||||||
|     ./disko.nix |     ./disko.nix | ||||||
|     ./syncthing.nix |     ./syncthing.nix | ||||||
|   ]; |   ]; | ||||||
|  | 
 | ||||||
|  |   boot.initrd.kernelModules = [ "amdgpu" ]; | ||||||
| } | } | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue