From aa233bcc99f757782dd91eca9e455040a5fed331 Mon Sep 17 00:00:00 2001
From: Leon Vatthauer <leon.vatthauer@fau.de>
Date: Sun, 16 Feb 2025 22:36:26 +0100
Subject: [PATCH] reinstall gunther

---
 gunther/configuration.nix          | 23 ++++++++++++++++--
 gunther/hardware-configuration.nix | 14 +++++------
 gunther/hw2.nix                    | 39 ++++++++++++++++++++++++++++++
 gunther/leonv.nix                  |  2 +-
 4 files changed, 68 insertions(+), 10 deletions(-)
 create mode 100644 gunther/hw2.nix

diff --git a/gunther/configuration.nix b/gunther/configuration.nix
index 08b920b..9489742 100755
--- a/gunther/configuration.nix
+++ b/gunther/configuration.nix
@@ -32,10 +32,29 @@
 
   # Bootloader.
   boot = {
+    # insert amdgpu earlier
+    initrd.kernelModules = [ "amdgpu" ];
+
+    # use latest kernel
+    kernelPackages = pkgs.linuxPackages_latest;
+
     # systemd-boot
     loader.efi.canTouchEfiVariables = true;
     loader.efi.efiSysMountPoint = "/boot";
-    loader.systemd-boot.enable = true;
+    loader.systemd-boot = {
+      enable = true;
+      windows = {
+        "windows" = {
+            title = "Windows";
+            efiDeviceHandle = "HD0b";
+            sortKey = "y_windows";
+          };
+      };
+      edk2-uefi-shell = {
+        enable = true;
+        sortKey = "z_edk2";
+      };
+    };
     
     # plymouth
     plymouth = {
@@ -177,7 +196,7 @@
         adi1090x-plymouth-themes
       ];
 
-  system.stateVersion = "24.05";
+  system.stateVersion = "24.11";
 
   # source zsh
   programs.zsh.enable = true;
diff --git a/gunther/hardware-configuration.nix b/gunther/hardware-configuration.nix
index f4feebb..419102e 100644
--- a/gunther/hardware-configuration.nix
+++ b/gunther/hardware-configuration.nix
@@ -9,19 +9,19 @@
     ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ "amdgpu" ];
+  boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/8dce9c4c-8b94-4b1e-af4f-3fa5450f2b74";
+    { device = "/dev/disk/by-uuid/6c6042af-b5d7-4401-a378-53c97617578a";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/3DD6-C061";
+    { device = "/dev/disk/by-uuid/D30E-E8CC";
       fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
+      options = [ "fmask=0022" "dmask=0022" ];
     };
 
   swapDevices = [ ];
@@ -31,8 +31,8 @@
   # 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.enp6s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp7s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
diff --git a/gunther/hw2.nix b/gunther/hw2.nix
new file mode 100644
index 0000000..f4feebb
--- /dev/null
+++ b/gunther/hw2.nix
@@ -0,0 +1,39 @@
+# 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 = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ "amdgpu" ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/8dce9c4c-8b94-4b1e-af4f-3fa5450f2b74";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/3DD6-C061";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices = [ ];
+
+  # 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.enp6s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/gunther/leonv.nix b/gunther/leonv.nix
index 8a1cfc3..da6c8b2 100755
--- a/gunther/leonv.nix
+++ b/gunther/leonv.nix
@@ -6,7 +6,7 @@
     ./eww
   ];
   /* The home.stateVersion option does not have a default and must be set */
-  home.stateVersion = "24.05";
+  home.stateVersion = "24.11";
   home.username = "leonv";
   home.homeDirectory = "/home/leonv";