Update

modules/base.nix

@@ -4,7 +4,7 @@
   boot = {
     loader.systemd-boot.enable = true;
     loader.efi.canTouchEfiVariables = true;
-    kernelPackages = pkgs.linuxPackages_latest;
+    kernelPackages = pkgs.linuxPackages_cachyos;
     supportedFilesystems = [ "ntfs" ];
 
     # Helpful for large games, shader caches and some launchers.
@@ -16,10 +16,11 @@
 
   networking.networkmanager.enable = true;
 
-  time.timeZone = "Europe/Berlin";
+  # Override these in configuration.nix if you need local defaults.
+  time.timeZone = lib.mkDefault "UTC";
 
-  i18n.defaultLocale = "de_DE.UTF-8";
-  console.keyMap = "de";
+  i18n.defaultLocale = lib.mkDefault "en_US.UTF-8";
+  console.keyMap = lib.mkDefault "us";
 
   nix.settings = {
     experimental-features = [ "nix-command" "flakes" ];
@@ -40,6 +41,7 @@
   hardware = {
     enableRedistributableFirmware = true;
     cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   };
 
   services.fwupd.enable = true;

modules/desktop/budgie.nix

@@ -1,8 +1,6 @@
-{ config, lib, ... }:
+{ ... }:
 
 {
-  config = lib.mkIf (config.profiles.desktop == "budgie") {
-    services.xserver.enable = true;
-    services.desktopManager.budgie.enable = true;
-  };
+  services.xserver.enable = true;
+  services.desktopManager.budgie.enable = true;
 }

modules/desktop/common.nix

@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    seahorse
+    wayland-utils
+    wl-clipboard
+  ];
+}

modules/desktop/default.nix

@@ -1,28 +0,0 @@
-{ lib, pkgs, ... }:
-
-{
-  imports = [
-    ./budgie.nix
-    ./gnome.nix
-    ./hyprland.nix
-    ./kde.nix
-  ];
-
-  options.profiles.desktop = lib.mkOption {
-    type = lib.types.enum [
-      "kde"
-      "gnome"
-      "budgie"
-      "hyprland"
-    ];
-    default = "kde";
-    example = "hyprland";
-    description = "Waehlt die Desktop-Umgebung fuer dieses System aus.";
-  };
-
-  config.environment.systemPackages = with pkgs; [
-    seahorse
-    wayland-utils
-    wl-clipboard
-  ];
-}

modules/desktop/gnome.nix

@@ -1,13 +1,11 @@
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:
 
 {
-  config = lib.mkIf (config.profiles.desktop == "gnome") {
-    services.xserver.enable = true;
-    services.displayManager.gdm.enable = true;
-    services.desktopManager.gnome.enable = true;
+  services.xserver.enable = true;
+  services.displayManager.gdm.enable = true;
+  services.desktopManager.gnome.enable = true;
 
-    environment.systemPackages = with pkgs; [
-      gnome-tweaks
-    ];
-  };
+  environment.systemPackages = with pkgs; [
+    gnome-tweaks
+  ];
 }

modules/desktop/hyprland.nix

@@ -1,22 +1,20 @@
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:
 
 {
-  config = lib.mkIf (config.profiles.desktop == "hyprland") {
-    services.displayManager.sddm = {
-      enable = true;
-      wayland.enable = true;
-    };
-
-    programs.hyprland = {
-      enable = true;
-      withUWSM = true;
-    };
-
-    environment.systemPackages = with pkgs; [
-      dunst
-      kitty
-      waybar
-      wofi
-    ];
+  services.displayManager.sddm = {
+    enable = true;
+    wayland.enable = true;
   };
+
+  programs.hyprland = {
+    enable = true;
+    withUWSM = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    dunst
+    kitty
+    waybar
+    wofi
+  ];
 }

modules/desktop/kde.nix

@@ -1,14 +1,12 @@
-{ config, lib, ... }:
+{ ... }:
 
 {
-  config = lib.mkIf (config.profiles.desktop == "kde") {
-    services.xserver.enable = true;
+  services.xserver.enable = true;
 
-    services.displayManager.sddm = {
-      enable = true;
-      wayland.enable = true;
-    };
-
-    services.desktopManager.plasma6.enable = true;
+  services.displayManager.sddm = {
+    enable = true;
+    wayland.enable = true;
   };
+
+  services.desktopManager.plasma6.enable = true;
 }

modules/gaming.nix

@@ -19,12 +19,14 @@
   };
 
   environment.systemPackages = with pkgs; [
+    ftb-app
     gamemode
     goverlay
     heroic
     lact
     lutris
     mangohud
+    prismlauncher
     protontricks
     steam-run
     wineWowPackages.stable

modules/graphics/nvidia.nix

@@ -0,0 +1,22 @@
+{ config, pkgs, ... }:
+
+{
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
+  };
+
+  services.xserver.videoDrivers = [ "nvidia" ];
+
+  hardware.nvidia = {
+    modesetting.enable = true;
+    nvidiaSettings = true;
+    open = false;
+    package = config.boot.kernelPackages.nvidiaPackages.latest;
+  };
+
+  environment.systemPackages = with pkgs; [
+    mesa-demos
+    vulkan-tools
+  ];
+}

modules/packages.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  # Eigene Zusatzpakete kommen hier rein.
+  environment.systemPackages = with pkgs; [
+  ];
+}

modules/peripherals.nix

@@ -18,10 +18,4 @@
     solaar
     usbutils
   ];
-
-  # Observed devices:
-  # - 048d:5702 Integrated Technology Express RGB LED Controller
-  # - 1235:8211 Focusrite Scarlett Solo (3rd Gen.)
-  # - 1b1c:1bfd Corsair K70 CORE RGB
-  # - 046d:c539 Logitech Lightspeed receiver
 }