move stuff

modules/nixos/hardware/amd/default.nix

@@ -0,0 +1,70 @@
+{
+  lib,
+  pkgs,
+  config,
+  namespace,
+  ...
+}:
+let
+  cfg = config.${namespace}.hardware.amd;
+in
+{
+  imports = [ ./options.nix ];
+
+  config = lib.mkIf cfg.enable {
+    boot = {
+      kernelModules = [ "nct6775" ];
+      kernelParams = [ (if cfg.enable then "amdgpu.ppfeaturemask=0xffffffff" else null) ];
+    };
+
+    # Configure programs
+    programs.corectrl = {
+      enable = cfg.corectrl.enable;
+      package = pkgs.corectrl;
+    };
+
+    # Configure environment
+    environment = {
+      # Force radv
+      variables = {
+        AMD_VULKAN_ICD = "RADV";
+        STEAM_FORCE_DESKTOPUI_SCALING = "1.0";
+        GDK_SCALE = "1";
+      };
+    };
+
+    # Configure polkit
+    security.polkit = lib.mkIf cfg.corectrl.enablePolkit {
+      extraConfig = ''
+        polkit.addRule(function(action, subject) {
+          if ((action.id == "org.corectrl.helper.init" ||
+              action.id == "org.corectrl.helperkiller.init") &&
+              subject.local == true &&
+              subject.active == true &&
+              subject.isInGroup("${cfg.corectrl.polkitGroup}")) {
+                  return polkit.Result.YES;
+          }
+        });
+      '';
+    };
+
+    # nixpkg is broken so need to manually define
+    systemd.services.lactd = lib.mkIf cfg.lact.enable {
+      description = "AMDGPU Control Daemon";
+      path = with pkgs; [
+        bash
+        lact
+      ];
+      script = ''
+        lact daemon
+      '';
+      wantedBy = [ "multi-user.target" ];
+      after = [ "multi-user.target" ];
+    };
+
+    # Configure environment
+    environment = {
+      systemPackages = with pkgs; lib.mkIf cfg.lact.enable [ lact ];
+    };
+  };
+}

modules/nixos/hardware/amd/options.nix

@@ -0,0 +1,27 @@
+{ lib, namespace, ... }:
+with lib;
+{
+  options.${namespace}.hardware.amd = {
+    enable = mkEnableOption "amd hardware config";
+
+    corectrl.enable = mkOption {
+      type = types.bool;
+      default = false;
+    };
+
+    corectrl.enablePolkit = mkOption {
+      type = types.bool;
+      default = false;
+    };
+
+    corectrl.polkitGroup = mkOption {
+      type = types.str;
+      default = "wheel";
+    };
+
+    lact.enable = mkOption {
+      type = types.bool;
+      default = false;
+    };
+  };
+}

modules/nixos/hardware/nvidia/default.nix

@@ -0,0 +1,58 @@
+{
+  lib,
+  config,
+  namespace,
+  ...
+}:
+with lib;
+let
+  cfg = config.${namespace}.hardware.nvidia;
+in
+{
+  imports = [ ./options.nix ];
+
+  config = mkIf cfg.enable {
+    hardware = {
+      # Nvidia
+      nvidia = {
+        package =
+          if cfg.enableBeta then
+            config.boot.kernelPackages.nvidiaPackages.beta
+          else
+            config.boot.kernelPackages.nvidiaPackages.latest;
+
+        # Modesetting is required.
+        modesetting.enable = true;
+
+        # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
+        powerManagement.enable = true;
+
+        # Fine-grained power management. Turns off GPU when not in use.
+        # Experimental and only works on modern Nvidia GPUs (Turing or newer).
+        powerManagement.finegrained = false;
+
+        # Use the NVidia open source kernel module (not to be confused with the
+        # independent third-party "nouveau" open source driver).
+        # Support is limited to the Turing and later architectures. Full list of
+        # supported GPUs is at:
+        # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
+        # Only available from driver 515.43.04+
+        # Currently alpha-quality/buggy, so false is currently the recommended setting.
+        open = cfg.enableOpen;
+
+        # Enable the Nvidia settings menu,
+        # accessible via `nvidia-settings`.
+        nvidiaSettings = cfg.nvidiaSettings;
+      };
+    };
+
+    # Services configs
+    services.xserver = {
+      # Load nvidia driver for Xorg and Wayland
+      videoDrivers = [ "nvidia" ];
+    };
+
+    # Virtualisation
+    hardware.nvidia-container-toolkit.enable = cfg.enableNvidiaDocker;
+  };
+}

modules/nixos/hardware/nvidia/options.nix

@@ -0,0 +1,27 @@
+{ lib, namespace, ... }:
+with lib;
+{
+  options.${namespace}.hardware.nvidia = {
+    enable = mkEnableOption "nvidia hardware config";
+
+    enableOpen = mkOption {
+      type = types.bool;
+      default = false;
+    };
+
+    nvidiaSettings = mkOption {
+      type = types.bool;
+      default = false;
+    };
+
+    enableBeta = mkOption {
+      type = types.bool;
+      default = false;
+    };
+
+    enableNvidiaDocker = mkOption {
+      type = types.bool;
+      default = false;
+    };
+  };
+}

modules/nixos/hardware/raspberry-pi/default.nix

@@ -0,0 +1,92 @@
+{
+  config,
+  lib,
+  pkgs,
+  namespace,
+  ...
+}:
+let
+  cfg = config.${namespace}.hardware.raspberry-pi;
+in
+{
+  options.${namespace}.hardware.raspberry-pi = {
+    enable = lib.mkEnableOption "Raspberry Pi common configuration";
+
+    variant = lib.mkOption {
+      type = lib.types.enum [
+        "4"
+        "5"
+      ];
+      description = "Raspberry Pi variant (4 or 5)";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    # Common Raspberry Pi packages
+    environment.systemPackages =
+      with pkgs;
+      [
+        libraspberrypi
+        raspberrypi-eeprom
+        raspberrypifw
+        raspberrypiWirelessFirmware
+        raspberrypi-armstubs
+      ]
+      ++ lib.optionals (cfg.variant == "4") [
+        i2c-tools
+      ]
+      ++ lib.optionals (cfg.variant == "5") [
+        erofs-utils
+        fex
+        squashfuse
+        squashfsTools
+      ];
+
+    # Common nixpkgs overlays for Raspberry Pi
+    nixpkgs.overlays = lib.mkAfter [
+      (_self: super: {
+        # This is used in (modulesPath + "/hardware/all-firmware.nix") when at least
+        # enableRedistributableFirmware is enabled
+        inherit (super) raspberrypiWirelessFirmware;
+        # Some derivations want to use it as an input,
+        # e.g. raspberrypi-dtbs, omxplayer, sd-image-* modules
+        inherit (super) raspberrypifw;
+      })
+    ];
+
+    # Common Bluetooth configuration
+    systemd.services.btattach = {
+      before = [ "bluetooth.service" ];
+      after = [ "dev-ttyAMA0.device" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.bluez}/bin/btattach -B /dev/ttyAMA0 -P bcm -S 3000000";
+      };
+    };
+
+    # Common hardware settings
+    hardware.i2c.enable = lib.mkIf (cfg.variant == "4") true;
+
+    # Pi 5 specific settings
+    hardware.graphics.enable32Bit = lib.mkIf (cfg.variant == "5") (lib.mkForce false);
+    zramSwap.enable = lib.mkIf (cfg.variant == "5") true;
+
+    # Pi 5 specific system tags
+    system.nixos.tags = lib.mkIf (cfg.variant == "5") (
+      let
+        bootCfg = config.boot.loader.raspberry-pi;
+      in
+      [
+        "raspberry-pi-${bootCfg.variant}"
+        bootCfg.bootloader
+        config.boot.kernelPackages.kernel.version
+      ]
+    );
+
+    # Common programs
+    programs.kdeconnect.enable = lib.mkDefault false;
+
+    # Root user shell configuration
+    users.users.root.shell = pkgs.zsh;
+  };
+}