From b978e8c9038834197e7f0516dba325d037ee1cd8 Mon Sep 17 00:00:00 2001 From: Mic92 <96200+Mic92@users.noreply.github.com> Date: Tue, 3 Sep 2024 20:18:57 +0000 Subject: [PATCH 1/2] Add GPD Win Mini 2024 to the configuration list. (#1099) Add GPD Win Mini 2024 to the configuration list. (#1099) lenovo: fix unstable wifi on Yoga laptops Add extra modprobe options to fix unstable wifi on Yoga laptops. * Merge branch 'NixOS:master' into master * Add basic GPD Mini configuration. * Merge branch 'NixOS:master' into master * flake: Restore flake.nix to original format Restore the flake.nix file to the original format from nixos-hardware master. --- README.md | 1 + flake.nix | 1 + gpd/win-mini/2024/README.md | 1 + gpd/win-mini/2024/default.nix | 12 ++++++++++++ gpd/win-mini/default.nix | 17 +++++++++++++++++ 5 files changed, 32 insertions(+) create mode 100644 gpd/win-mini/2024/README.md create mode 100644 gpd/win-mini/2024/default.nix create mode 100644 gpd/win-mini/default.nix diff --git a/README.md b/README.md index 1f51b11..21a48e5 100644 --- a/README.md +++ b/README.md @@ -170,6 +170,7 @@ See code for all available configurations. | [GPD Pocket 3](gpd/pocket-3) | `` | | [GPD WIN 2](gpd/win-2) | `` | | [GPD WIN Max 2 2023](gpd/win-max-2/2023) | `` | +| [GPD WIN Mini 2024](gpd/win-mini/2024) | `` | | [Google Pixelbook](google/pixelbook) | `` | | [HP Elitebook 2560p](hp/elitebook/2560p) | `` | | [HP Elitebook 830g6](hp/elitebook/830/g6) | `` | diff --git a/flake.nix b/flake.nix index 619d4b9..b7102cd 100644 --- a/flake.nix +++ b/flake.nix @@ -106,6 +106,7 @@ gpd-pocket-3 = import ./gpd/pocket-3; gpd-win-2 = import ./gpd/win-2; gpd-win-max-2-2023 = import ./gpd/win-max-2/2023; + gpd-win-mini-2024 = import ./gpd/win-mini/2024; hp-elitebook-2560p = import ./hp/elitebook/2560p; hp-elitebook-830g6 = import ./hp/elitebook/830/g6; hp-elitebook-845g7 = import ./hp/elitebook/845/g7; diff --git a/gpd/win-mini/2024/README.md b/gpd/win-mini/2024/README.md new file mode 100644 index 0000000..7e266f7 --- /dev/null +++ b/gpd/win-mini/2024/README.md @@ -0,0 +1 @@ +# GPD Win Mini 2024 diff --git a/gpd/win-mini/2024/default.nix b/gpd/win-mini/2024/default.nix new file mode 100644 index 0000000..fcd8a0a --- /dev/null +++ b/gpd/win-mini/2024/default.nix @@ -0,0 +1,12 @@ +{ config, lib, ... }: +with lib; +{ + imports = [ + ./.. + ../../../common/cpu/amd + ../../../common/cpu/amd/pstate.nix + ../../../common/gpu/amd + ]; + + hardware.bluetooth.enable = true; +} diff --git a/gpd/win-mini/default.nix b/gpd/win-mini/default.nix new file mode 100644 index 0000000..6361d57 --- /dev/null +++ b/gpd/win-mini/default.nix @@ -0,0 +1,17 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; +let + cfg = config.hardware.gpd.ppt; +in +{ + imports = [ + ../../common/pc/laptop + ../../common/pc/ssd + ../../common/hidpi.nix + ]; +} From a5e2826fc2b75cb6f1ac012fa3dd80602817ef67 Mon Sep 17 00:00:00 2001 From: flakeuser Date: Tue, 3 Sep 2024 17:35:08 -0700 Subject: [PATCH 2/2] Set mkDefault for enabling bluetooth. --- gpd/win-mini/2024/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpd/win-mini/2024/default.nix b/gpd/win-mini/2024/default.nix index fcd8a0a..c8eb1bf 100644 --- a/gpd/win-mini/2024/default.nix +++ b/gpd/win-mini/2024/default.nix @@ -8,5 +8,5 @@ with lib; ../../../common/gpu/amd ]; - hardware.bluetooth.enable = true; + hardware.bluetooth.enable = lib.mkDefault true; }