diff --git a/apple/macmini/6/README.md b/apple/macmini/6/README.md new file mode 100644 index 000000000..ac95f9b24 --- /dev/null +++ b/apple/macmini/6/README.md @@ -0,0 +1,40 @@ +# macmini 6.1/6.2 + +Everything should be working flawlessly **except** the wifi card which is not included in this config for performance and security reason. + +Here is the potential fix you can use for this : +- enable the b43 driver (it work but wifi performance are terrible) +```nix + boot = { + kernelModules = [ + "b43" + ]; + blacklistedKernelModules = [ + "wl" + "bcma" + ]; + }; + networking.enableB43Firmware = true; +``` +- enable the insecure broadcom_sta driver +```nix + nixpkgs.config.allowInsecurePredicate = + pkg: + builtins.elem (lib.getName pkg) [ + "broadcom-sta" # aka “wl” + ]; + boot = { + kernelModules = [ + "wl" + ]; + blacklistedKernelModules = [ + "b43" + "bcma" + ]; + extraModulePackages = [ + # install broadcom driver for macos wifi + # note : the user will need to add it to `permittedInsecurePackages` + config.boot.kernelPackages.broadcom_sta + ]; + }; +``` diff --git a/apple/macmini/6/default.nix b/apple/macmini/6/default.nix new file mode 100644 index 000000000..884610e48 --- /dev/null +++ b/apple/macmini/6/default.nix @@ -0,0 +1,22 @@ +{ + lib, + ... +}: +{ + imports = [ + ../. + ../../../common/gpu/24.05-compat.nix + ../../../common/cpu/intel/ivy-bridge/default.nix + ]; + + hardware.facetimehd.enable = false; + + boot.kernelModules = [ + "coretemp" + "applesmc" + ]; + + services = { + thermald.enable = lib.mkDefault true; + }; +} diff --git a/common/cpu/intel/ivy-bridge/cpu-only.nix b/common/cpu/intel/ivy-bridge/cpu-only.nix new file mode 100644 index 000000000..82892615d --- /dev/null +++ b/common/cpu/intel/ivy-bridge/cpu-only.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ../cpu-only.nix + ]; +} diff --git a/common/cpu/intel/ivy-bridge/default.nix b/common/cpu/intel/ivy-bridge/default.nix new file mode 100644 index 000000000..85d3466bf --- /dev/null +++ b/common/cpu/intel/ivy-bridge/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ../cpu-only.nix + ../../../gpu/intel/ivy-bridge + ]; +} diff --git a/common/gpu/intel/ivy-bridge/default.nix b/common/gpu/intel/ivy-bridge/default.nix new file mode 100644 index 000000000..6412c671f --- /dev/null +++ b/common/gpu/intel/ivy-bridge/default.nix @@ -0,0 +1,8 @@ +{ + imports = [ ../. ]; + + hardware.intelgpu = { + vaapiDriver = "intel-vaapi-driver"; + enableHybridCodec = true; + }; +} diff --git a/flake.nix b/flake.nix index 48ffb4a19..c06f1cb9f 100644 --- a/flake.nix +++ b/flake.nix @@ -64,6 +64,7 @@ apple-macbook-pro-12-1 = import ./apple/macbook-pro/12-1; apple-macbook-pro-14-1 = import ./apple/macbook-pro/14-1; apple-macmini-4-1 = import ./apple/macmini/4; + apple-macmini-6 = import ./apple/macmini/6; apple-t2 = import ./apple/t2; asrock-rack-altrad8ud-1l2t = import ./asrock-rack/altrad8ud-1l2t; asus-battery = import ./asus/battery.nix;