From f7244a341fc1318a744d9bdf42d34a88581fb508 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Wed, 2 Feb 2022 11:11:11 -0600 Subject: [PATCH 1/5] feat(framework): Add initial settings - Enable deep sleep - Use kernel that's 5.12 or latest - Enable fingerprint scanner - HiDPI --- flake.nix | 1 + framework/default.nix | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 framework/default.nix diff --git a/flake.nix b/flake.nix index f8b88d4..a6b05aa 100644 --- a/flake.nix +++ b/flake.nix @@ -39,6 +39,7 @@ dell-xps-15-9560-intel = import ./dell/xps/15-9560/intel; dell-xps-15-9560-nvidia = import ./dell/xps/15-9560/nvidia; dell-xps-17-9710-intel = import ./dell/xps/17-9710/intel; + framework = import ./framework; friendlyarm-nanopc-t4 = import ./friendlyarm/nanopc-t4; google-pixelbook = import ./google/pixelbook; gpd-micropc = import ./gpd/micropc; diff --git a/framework/default.nix b/framework/default.nix new file mode 100644 index 0000000..d36b595 --- /dev/null +++ b/framework/default.nix @@ -0,0 +1,27 @@ +{ lib, pkgs, ... }: { + imports = [ + ../common/cpu/intel + ../common/pc/laptop + ../common/pc/laptop/ssd + ]; + + # For Power consumption + # https://kvark.github.io/linux/framework/2021/10/17/framework-nixos.html + boot.kernelParams = [ "mem_sleep_default=deep" ]; + + # Requires at least 5.12 for working wi-fi and bluetooth. + # https://community.frame.work/t/using-the-ax210-with-linux-on-the-framework-laptop/1844/89 + boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.12") (lib.mkDefault pkgs.linuxPackages_latest); + + # For fingerprint support + services.fprintd.enable = true; + + # HiDPI + hardware.video.hidpi.enable = lib.mkDefault true; + services.xserver.dpi = 200; + environment.variables = { + GDK_SCALE = "2"; + GDK_DPI_SCALE = "0.5"; + _JAVA_OPTIONS = "-Dsun.java2d.uiScale=2"; + }; +} From 4a7e3d64f496be6636fefeaf0024eb752fc3320c Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 4 Feb 2022 10:06:29 -0600 Subject: [PATCH 2/5] fix(framework): Follow x1 QHD settings --- framework/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/framework/default.nix b/framework/default.nix index d36b595..3cfa523 100644 --- a/framework/default.nix +++ b/framework/default.nix @@ -17,11 +17,16 @@ services.fprintd.enable = true; # HiDPI - hardware.video.hidpi.enable = lib.mkDefault true; + # Leaving here for documentation + # hardware.video.hidpi.enable = lib.mkDefault true; + + # Fix font sizes in X services.xserver.dpi = 200; + fonts.fontconfig.dpi = 200; + + # Fix sizes of GTK/GNOME ui elements environment.variables = { - GDK_SCALE = "2"; - GDK_DPI_SCALE = "0.5"; - _JAVA_OPTIONS = "-Dsun.java2d.uiScale=2"; + GDK_SCALE = lib.mkDefault "2"; + GDK_DPI_SCALE = lib.mkDefault "0.5"; }; } From d0fd296ecd5bdaa8c03723489ddda73143afb7a4 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 4 Feb 2022 10:10:45 -0600 Subject: [PATCH 3/5] docs: Add framework --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9b2338a..9503c1e 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,7 @@ See code for all available configurations. | [Dell XPS 15 9560](dell/xps/15-9560) | `` | | [Dell XPS 17 9710, intel only](dell/xps/17-9710/intel) | `` | | [Dell XPS E7240](dell/e7240) | `` | +| [Framework](framework) | `` | | [FriendlyARM NanoPC-T4](friendlyarm/nanopc-t4) | `` | | [GPD MicroPC](gpd/micropc) | `` | | [Google Pixelbook](google/pixelbook) | `` | From 59753d2f8a2b0f56174d401d2edec31c0623301d Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Fri, 4 Feb 2022 10:20:10 -0600 Subject: [PATCH 4/5] fix(framework): Remove fonts.fontconfig.dpi It no longer has any effect and tests fail then. --- framework/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/framework/default.nix b/framework/default.nix index 3cfa523..1b9a29b 100644 --- a/framework/default.nix +++ b/framework/default.nix @@ -22,7 +22,6 @@ # Fix font sizes in X services.xserver.dpi = 200; - fonts.fontconfig.dpi = 200; # Fix sizes of GTK/GNOME ui elements environment.variables = { From 081907627cf036c4259cd22260c041ac462ea0da Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 8 Mar 2022 09:17:02 -0600 Subject: [PATCH 5/5] fix(framework): Drop GTK environment variables https://github.com/NixOS/nixos-hardware/pull/376 --- framework/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/framework/default.nix b/framework/default.nix index 1b9a29b..678f78c 100644 --- a/framework/default.nix +++ b/framework/default.nix @@ -21,11 +21,5 @@ # hardware.video.hidpi.enable = lib.mkDefault true; # Fix font sizes in X - services.xserver.dpi = 200; - - # Fix sizes of GTK/GNOME ui elements - environment.variables = { - GDK_SCALE = lib.mkDefault "2"; - GDK_DPI_SCALE = lib.mkDefault "0.5"; - }; + # services.xserver.dpi = 200; }