Reorganize current framework modules into 13-inch directory

README.md

@@ -131,9 +131,9 @@ See code for all available configurations.
 | [Dell XPS 17 9700, nvidia](dell/xps/17-9700/nvidia)                 | `<nixos-hardware/dell/xps/17-9700/nvidia>`         |
 | [Dell XPS 17 9710, intel only](dell/xps/17-9710/intel)              | `<nixos-hardware/dell/xps/17-9710/intel>`          |
 | [Dell XPS E7240](dell/e7240)                                        | `<nixos-hardware/dell/e7240>`                      |
-| [Framework 11th Gen Intel Core](framework)                          | `<nixos-hardware/framework>`                       |
+| [Framework 11th Gen Intel Core](framework/13-inch/11th-gen-intel)   | `<nixos-hardware/framework/13-inch/11th-gen-intel>`|
-| [Framework 12th Gen Intel Core](framework/12th-gen-intel)           | `<nixos-hardware/framework/12th-gen-intel>`        |
+| [Framework 12th Gen Intel Core](framework/13-inch/12th-gen-intel)   | `<nixos-hardware/framework/13-inch/12th-gen-intel>`|
-| [Framework 13th Gen Intel Core](framework/13th-gen-intel)           | `<nixos-hardware/framework/13th-gen-intel>`        |
+| [Framework 13th Gen Intel Core](framework/13-inch/13th-gen-intel)   | `<nixos-hardware/framework/13-inch/13th-gen-intel>`|
 | [Framework 13 AMD Ryzen 7040 Series](framework/13-inch/7040-amd)    | `<nixos-hardware/framework/13-inch/7040-amd>`      |
 | [FriendlyARM NanoPC-T4](friendlyarm/nanopc-t4)                      | `<nixos-hardware/friendlyarm/nanopc-t4>`           |
 | [FriendlyARM NanoPi R5s](friendlyarm/nanopi-r5s)                    | `<nixos-hardware/friendlyarm/nanopi-r5s>`          |

flake.nix

@@ -66,8 +66,9 @@
       dell-xps-17-9700-nvidia = import ./dell/xps/17-9700/nvidia;
       dell-xps-17-9710-intel = import ./dell/xps/17-9710/intel;
       framework = import ./framework;
-      framework-12th-gen-intel = import ./framework/12th-gen-intel;
+      framework-11th-gen-intel = import ./framework/13-inch/11th-gen-intel;
-      framework-13th-gen-intel = import ./framework/13th-gen-intel;
+      framework-12th-gen-intel = import ./framework/13-inch/12th-gen-intel;
+      framework-13th-gen-intel = import ./framework/13-inch/13th-gen-intel;
       framework-13-7040-amd = import ./framework/13-inch/7040-amd;
       friendlyarm-nanopc-t4 = import ./friendlyarm/nanopc-t4;
       friendlyarm-nanopi-r5s = import ./friendlyarm/nanopi-r5s;

framework/13-inch/11th-gen-intel/README.md

@@ -0,0 +1,17 @@
+# [Framework Laptop 13](https://frame.work/)
+
+## Updating Firmware
+
+First put enable `fwupd`
+
+```nix
+services.fwupd.enable = true;
+```
+
+Then run
+
+```sh
+ $ fwupdmgr update
+```
+
+[Latest Update](https://fwupd.org/lvfs/devices/work.frame.Laptop.TGL.BIOS.firmware)

framework/13-inch/11th-gen-intel/default.nix

@@ -0,0 +1,10 @@
+{ lib, pkgs, ...}: {
+  imports = [
+    ../.
+    ../intel.nix
+  ];
+
+  # Requires at least 5.16 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.16") (lib.mkDefault pkgs.linuxPackages_latest);
+}

framework/13-inch/12th-gen-intel/README.md

@@ -11,7 +11,7 @@ services.fwupd.enable = true;
 Then run
 
 ```sh
- $ sudo fwupdmgr update
+ $ fwupdmgr update
 ```
 
 - [Latest Update](https://fwupd.org/lvfs/devices/work.frame.Laptop.ADL.BIOS.firmware)

framework/13-inch/12th-gen-intel/default.nix

@@ -1,17 +1,13 @@
 { lib, pkgs, ... }: {
   imports = [
-    ../../common/cpu/intel
+    ../.
-    ../../common/pc/laptop
+    ../intel.nix
-    ../../common/pc/laptop/ssd
   ];
 
   boot.kernelParams = [
     # For Power consumption
     # https://kvark.github.io/linux/framework/2021/10/17/framework-nixos.html
     "mem_sleep_default=deep"
-    # For Power consumption
-    # https://community.frame.work/t/linux-battery-life-tuning/6665/156
-    "nvme.noacpi=1"
     # Workaround iGPU hangs
     # https://discourse.nixos.org/t/intel-12th-gen-igpu-freezes/21768/4
     "i915.enable_psr=1"
@@ -48,34 +44,4 @@
   # https://www.tomshardware.com/news/intel-thread-director-coming-to-linux-5-18
   boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.18") (lib.mkDefault pkgs.linuxPackages_latest);
 
-  # Fix TRRS headphones missing a mic
-  # https://community.frame.work/t/headset-microphone-on-linux/12387/3
-  boot.extraModprobeConfig = ''
-    options snd-hda-intel model=dell-headset-multi
-  '';
-
-  # For fingerprint support
-  services.fprintd.enable = lib.mkDefault true;
-
-  # Custom udev rules
-  services.udev.extraRules = ''
-    # Fix headphone noise when on powersave
-    # https://community.frame.work/t/headphone-jack-intermittent-noise/5246/55
-    SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0xa0e0", ATTR{power/control}="on"
-    # Ethernet expansion card support
-    ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0bda", ATTR{idProduct}=="8156", ATTR{power/autosuspend}="20"
-  '';
-
-  # Mis-detected by nixos-generate-config
-  # https://github.com/NixOS/nixpkgs/issues/171093
-  # https://wiki.archlinux.org/title/Framework_Laptop#Changing_the_brightness_of_the_monitor_does_not_work
-  hardware.acpilight.enable = lib.mkDefault true;
-
-  # Fix font sizes in X
-  # services.xserver.dpi = 200;
-
-  # This adds a patched ectool, to interact with the Embedded Controller
-  # Can be used to interact with leds from userspace, etc.
-  # Not part of a nixos release yet, so package only gets added if it exists.
-  environment.systemPackages = lib.optional (pkgs ? "fw-ectool") pkgs.fw-ectool;
 }

framework/13-inch/13th-gen-intel/README.md

@@ -11,5 +11,5 @@ services.fwupd.enable = true;
 Then run
 
 ```sh
- $ sudo fwupdmgr update
+ $ fwupdmgr update
 ```

framework/13-inch/13th-gen-intel/default.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }: {
+{
   imports = [
     # Same config as 12th Gen. The chipsets and mainboard are similar enough
     # that no separate configuration is needed.

framework/13-inch/7040-amd/default.nix

@@ -1,10 +1,9 @@
 { lib, pkgs, ... }: {
   imports = [
+    ../.
     ../../../common/cpu/amd
     ../../../common/cpu/amd/pstate.nix
     ../../../common/gpu/amd
-    ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
   ];
 
   # Newer kernel is better for amdgpu driver updates
@@ -15,24 +14,4 @@
   # AMD has better battery life with PPD over TLP:
   # https://community.frame.work/t/responded-amd-7040-sleep-states/38101/13
   services.power-profiles-daemon.enable = lib.mkDefault true;
-
-  # Fix TRRS headphones missing a mic
-  # https://community.frame.work/t/headset-microphone-on-linux/12387/3
-  #
-  # Temporary until a kernel patch is merged to fix this
-  boot.extraModprobeConfig = ''
-    options snd-hda-intel model=dell-headset-multi
-  '';
-
-  # For fingerprint support
-  services.fprintd.enable = lib.mkDefault true;
-
-  # Custom udev rules
-  services.udev.extraRules = ''
-    # Ethernet expansion card support
-    ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0bda", ATTR{idProduct}=="8156", ATTR{power/autosuspend}="20"
-  '';
-
-  # Needed for desktop environments to detect/manage display brightness
-  hardware.sensor.iio.enable = lib.mkDefault true;
 }

framework/13-inch/default.nix

@@ -0,0 +1,32 @@
+{ lib, pkgs, ... }: {
+  imports = [
+    ../common/pc/laptop
+    ../common/pc/laptop/ssd
+  ];
+
+  # Fix TRRS headphones missing a mic
+  # https://community.frame.work/t/headset-microphone-on-linux/12387/3
+  boot.extraModprobeConfig = ''
+    options snd-hda-intel model=dell-headset-multi
+  '';
+
+  # For fingerprint support
+  services.fprintd.enable = lib.mkDefault true;
+
+  # Custom udev rules
+  services.udev.extraRules = ''
+    # Ethernet expansion card support
+    ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0bda", ATTR{idProduct}=="8156", ATTR{power/autosuspend}="20"
+  '';
+
+  # Fix font sizes in X
+  # services.xserver.dpi = 200;
+
+  # Needed for desktop environments to detect/manage display brightness
+  hardware.sensor.iio.enable = lib.mkDefault true;
+
+  # This adds a patched ectool, to interact with the Embedded Controller
+  # Can be used to interact with leds from userspace, etc.
+  # Not part of a nixos release yet, so package only gets added if it exists.
+  environment.systemPackages = lib.optional (pkgs ? "fw-ectool") pkgs.fw-ectool;
+}

framework/13-inch/intel.nix

@@ -0,0 +1,30 @@
+{ lib, pkgs, ... }: {
+  imports = [
+    ../../common/cpu/intel
+  ];
+
+  boot.kernelParams = [
+    # Fixes a regression in s2idle, making it more power efficient than deep sleep
+    "acpi_osi=\"!Windows 2020\""
+    # For Power consumption
+    # https://community.frame.work/t/linux-battery-life-tuning/6665/156
+    "nvme.noacpi=1"
+  ];
+
+  # Requires at least 5.16 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.16") (lib.mkDefault pkgs.linuxPackages_latest);
+
+  # Custom udev rules
+  services.udev.extraRules = ''
+    # Fix headphone noise when on powersave
+    # https://community.frame.work/t/headphone-jack-intermittent-noise/5246/55
+    SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0xa0e0", ATTR{power/control}="on"
+  '';
+
+  # Mis-detected by nixos-generate-config
+  # https://github.com/NixOS/nixpkgs/issues/171093
+  # https://wiki.archlinux.org/title/Framework_Laptop#Changing_the_brightness_of_the_monitor_does_not_work
+  hardware.acpilight.enable = lib.mkDefault true;
+
+}

framework/README.md

@@ -11,7 +11,7 @@ services.fwupd.enable = true;
 Then run
 
 ```sh
- $ sudo fwupdmgr update
+ $ fwupdmgr update
 ```
 
 [Latest Update](https://fwupd.org/lvfs/devices/work.frame.Laptop.TGL.BIOS.firmware)

framework/default.nix

@@ -1,53 +1,7 @@
-{ lib, pkgs, ... }: {
+{
+  # Per original module layout, default framework export was the 11th gen Intel
+  # of the Framework 13 Laptop
   imports = [
-    ../common/cpu/intel
+    ./13-inch/11th-gen-intel
-    ../common/pc/laptop
-    ../common/pc/laptop/ssd
   ];
-
-  boot.kernelParams = [
-    # Fixes a regression in s2idle, making it more power efficient than deep sleep
-    "acpi_osi=\"!Windows 2020\""
-    # For Power consumption
-    # https://community.frame.work/t/linux-battery-life-tuning/6665/156
-    "nvme.noacpi=1"
-  ];
-
-  # Requires at least 5.16 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.16") (lib.mkDefault pkgs.linuxPackages_latest);
-
-  # Fix TRRS headphones missing a mic
-  # https://community.frame.work/t/headset-microphone-on-linux/12387/3
-  boot.extraModprobeConfig = ''
-    options snd-hda-intel model=dell-headset-multi
-  '';
-
-  # For fingerprint support
-  services.fprintd.enable = lib.mkDefault true;
-
-  # Custom udev rules
-  services.udev.extraRules = ''
-    # Fix headphone noise when on powersave
-    # https://community.frame.work/t/headphone-jack-intermittent-noise/5246/55
-    SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0xa0e0", ATTR{power/control}="on"
-    # Ethernet expansion card support
-    ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0bda", ATTR{idProduct}=="8156", ATTR{power/autosuspend}="20"
-  '';
-
-  # Mis-detected by nixos-generate-config
-  # https://github.com/NixOS/nixpkgs/issues/171093
-  # https://wiki.archlinux.org/title/Framework_Laptop#Changing_the_brightness_of_the_monitor_does_not_work
-  hardware.acpilight.enable = lib.mkDefault true;
-
-  # Needed for desktop environments to detect/manage display brightness
-  hardware.sensor.iio.enable = lib.mkDefault true;
-
-  # Fix font sizes in X
-  # services.xserver.dpi = 200;
-
-  # This adds a patched ectool, to interact with the Embedded Controller
-  # Can be used to interact with leds from userspace, etc.
-  # Not part of a nixos release yet, so package only gets added if it exists.
-  environment.systemPackages = lib.optional (pkgs ? "fw-ectool") pkgs.fw-ectool;
 }