remove dektop-hardware module
This commit is contained in:
		
							parent
							
								
									a208ca4df2
								
							
						
					
					
						commit
						f1855c1265
					
				
					 9 changed files with 40 additions and 37 deletions
				
			
		|  | @ -149,6 +149,7 @@ | |||
|             self.nixosModules.tailscale | ||||
|             self.nixosModules.allowed-unfree-list | ||||
|             self.nixosModules.extra-caches | ||||
|             self.nixosModules.systemd-boot | ||||
| 
 | ||||
|             zerforschen-plus.nixosModules.default | ||||
|           ] | ||||
|  | @ -181,7 +182,7 @@ | |||
|             self.nixosModules.modern-desktop | ||||
|             self.nixosModules.nix-ld | ||||
|             self.nixosModules.quiet-boot | ||||
|             self.nixosModules.systemd-boot | ||||
|             self.nixosModules.firmware-updates | ||||
| 
 | ||||
|             home-manager.nixosModules.home-manager | ||||
|             servicepoint-simulator.nixosModules.default | ||||
|  |  | |||
|  | @ -1,20 +0,0 @@ | |||
| { lib, ... }: | ||||
| { | ||||
|   networking.networkmanager.enable = true; | ||||
|   # 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.eno1.useDHCP = lib.mkDefault true; | ||||
|   # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true; | ||||
| 
 | ||||
|   hardware = { | ||||
|     enableRedistributableFirmware = true; | ||||
|     bluetooth.enable = true; | ||||
|   }; | ||||
| 
 | ||||
|   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; | ||||
| 
 | ||||
|   services.fwupd.enable = true; | ||||
| } | ||||
|  | @ -8,7 +8,6 @@ | |||
|     ../../modules/gaming.nix | ||||
|     vinzenzNixosModules.steam | ||||
|     ../../modules/desktop-environment.nix | ||||
|     ../../modules/desktop-hardware.nix | ||||
| 
 | ||||
|     ../../home/ronja | ||||
|   ]; | ||||
|  |  | |||
|  | @ -1,3 +1,4 @@ | |||
| { lib, ... }: | ||||
| { | ||||
|   boot = { | ||||
|     supportedFilesystems = [ "btrfs" ]; | ||||
|  | @ -38,5 +39,10 @@ | |||
|     { device = "/dev/disk/by-uuid/bf9d19fb-499b-4bfb-b67d-131fa5bf8259"; } | ||||
|   ]; | ||||
| 
 | ||||
|   hardware.cpu.intel.updateMicrocode = true; | ||||
|   hardware.bluetooth.enable = true; | ||||
| 
 | ||||
|   networking = { | ||||
|     networkmanager.enable = true; | ||||
|     useDHCP = lib.mkDefault true; | ||||
|   }; | ||||
| } | ||||
|  |  | |||
|  | @ -10,7 +10,6 @@ | |||
|     vinzenzNixosModules.printing | ||||
|     vinzenzNixosModules.podman | ||||
|     ../../modules/desktop-environment.nix | ||||
|     ../../modules/desktop-hardware.nix | ||||
| 
 | ||||
|     ../../home/vinzenz | ||||
|     ../../home/ronja | ||||
|  |  | |||
|  | @ -1,7 +1,7 @@ | |||
| { | ||||
|   lib, | ||||
|   vinzenzNixosModules, | ||||
|   pkgs, | ||||
|   lib, | ||||
|   ... | ||||
| }: | ||||
| { | ||||
|  | @ -12,15 +12,11 @@ | |||
|       "kvm-intel" | ||||
|       "xe" | ||||
|     ]; | ||||
|     hardware.cpu.intel.updateMicrocode = true; | ||||
| 
 | ||||
|     # 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; | ||||
| 
 | ||||
|     hardware.enableRedistributableFirmware = true; | ||||
|     networking = { | ||||
|       networkmanager.enable = true; | ||||
|       useDHCP = lib.mkDefault true; | ||||
|     }; | ||||
| 
 | ||||
|     boot = { | ||||
|       kernelPackages = pkgs.linuxPackages_zen; | ||||
|  | @ -62,5 +58,7 @@ | |||
| 
 | ||||
|     services.thermald.enable = true; | ||||
|     services.hardware.bolt.enable = true; # thunderbolt security | ||||
| 
 | ||||
|     hardware.bluetooth.enable = true; | ||||
|   }; | ||||
| } | ||||
|  |  | |||
|  | @ -13,7 +13,6 @@ | |||
|     vinzenzNixosModules.podman | ||||
|     #../../modules/niri.nix | ||||
|     ../../modules/desktop-environment.nix | ||||
|     ../../modules/desktop-hardware.nix | ||||
| 
 | ||||
|     ../../home/vinzenz | ||||
|     ../../home/ronja | ||||
|  |  | |||
|  | @ -1,10 +1,14 @@ | |||
| { vinzenzNixosModules, pkgs, ... }: | ||||
| { | ||||
|   vinzenzNixosModules, | ||||
|   pkgs, | ||||
|   lib, | ||||
|   ... | ||||
| }: | ||||
| { | ||||
|   imports = [ vinzenzNixosModules.amd-graphics ]; | ||||
|   config = { | ||||
|     # amd cpu | ||||
|     boot.kernelModules = [ "kvm-amd" ]; | ||||
|     hardware.cpu.amd.updateMicrocode = true; | ||||
| 
 | ||||
|     boot = { | ||||
|       initrd.availableKernelModules = [ | ||||
|  | @ -23,6 +27,12 @@ | |||
|     fileSystems = import ./fstab.nix; | ||||
|     swapDevices = [ ]; | ||||
| 
 | ||||
|     networking.interfaces.eno1.wakeOnLan.enable = true; | ||||
|     networking = { | ||||
|       networkmanager.enable = true; | ||||
|       useDHCP = lib.mkDefault true; | ||||
|       interfaces.eno1.wakeOnLan.enable = true; | ||||
|     }; | ||||
| 
 | ||||
|     hardware.bluetooth.enable = true; | ||||
|   }; | ||||
| } | ||||
|  |  | |||
							
								
								
									
										11
									
								
								nixosModules/firmware-updates.nix
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								nixosModules/firmware-updates.nix
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,11 @@ | |||
| { | ||||
|   hardware = { | ||||
|     enableRedistributableFirmware = true; | ||||
|     cpu = { | ||||
|       amd.updateMicrocode = true; | ||||
|       intel.updateMicrocode = true; | ||||
|     }; | ||||
|   }; | ||||
| 
 | ||||
|   services.fwupd.enable = true; | ||||
| } | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Vinzenz Schroeter
						Vinzenz Schroeter