From 1b0435b9a3e76027c0e6869944efe1f274d9f46f Mon Sep 17 00:00:00 2001
From: willifan <willifan@proton.me>
Date: Thu, 7 Nov 2024 21:59:01 +0100
Subject: [PATCH] changed Puenktchen graphics drivers
---
flake.nix | 1 -
hosts/Lillie/hardware-configuration.nix | 29 +++++++++++++++++++++++++
hosts/Puenktchen/default.nix | 2 ++
3 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/flake.nix b/flake.nix
index 1de6908..60572d9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -103,7 +103,6 @@
attrs.nixos-hardware.nixosModules.common-cpu-amd
attrs.nixos-hardware.nixosModules.common-cpu-amd-pstate
attrs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
- attrs.nixos-hardware.nixosModules.common-gpu-amd
./hosts
./users/willifan
];
diff --git a/hosts/Lillie/hardware-configuration.nix b/hosts/Lillie/hardware-configuration.nix
index 169d21f..571eac9 100644
--- a/hosts/Lillie/hardware-configuration.nix
+++ b/hosts/Lillie/hardware-configuration.nix
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
# 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.
@@ -24,3 +25,31 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
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)
diff --git a/hosts/Puenktchen/default.nix b/hosts/Puenktchen/default.nix
index 2f8eb6c..d34a683 100644
--- a/hosts/Puenktchen/default.nix
+++ b/hosts/Puenktchen/default.nix
@@ -5,4 +5,6 @@
./disko.nix
./syncthing.nix
];
+
+ boot.initrd.kernelModules = [ "amdgpu" ];
}