Merge branch 'up/master' into microsoft/surface/6.1.3

This commit is contained in:
mexisme
2023-01-19 03:10:40 +13:00
4 changed files with 14 additions and 14 deletions

View File

@@ -42,14 +42,18 @@
* Support Tools
** TODO Incorporate @hpfr's function(s) from this commit:
- https://github.com/hpfr/system/commit/03fa1b0a83f8a336e812910d0d50f5247a8a630c
** TODO Create derivative for `iptsd` touch-screen daemon
- [ ] Download
- [ ] Install binary
- [ ] Enable via systemd
- @hpfr's repo forked for posterity, as he no longer has a Surface:
https://github.com/mexisme/hpfr-nix-linux-surface-system/commit/03fa1b0a83f8a336e812910d0d50f5247a8a630c
** DONE Create derivative for `iptsd` touch-screen daemon
- State "DONE" from "TODO" [2023-01-11 Wed 12:09]
- [X] Download
- [X] Install binary
- [X] Enable via systemd
** TODO Create derivative to patch and rebuild libwacom
- github.com/linux-surface/libwacom-surface
- The plan is to do this in a separate PR against `nixpkgs` instead of `nixos-hardware`
** TODO Create derivative to install `surface-control`
** DONE Create derivative to install `surface-control`
- State "DONE" from "TODO" [2023-01-11 Wed 12:05]
- Download github.com/linux-surface/surface-control
** TODO Create derivative to install `surface-dtx-daemon`
- Download github.com/linux-surface/surface-dtx-daemon

View File

@@ -1,12 +1,10 @@
{ lib, ... }:
{ ... }:
# This module is intended to support the Surface Laptop range, specifically those with AMD CPUs.
# It's expected it will work equally well on many other Surface models, but they may need further
# config changes to work well.
let
inherit (lib) mkDefault;
in {
{
imports = [
../common
../../../common/pc

View File

@@ -1,12 +1,10 @@
{ lib, ... }:
{ ... }:
# This module is intended to support the Surface Pro range, specifically those with Intel CPUs.
# It's expected it will work equally well on many other Surface models, but they may need further
# config changes to work well.
let
inherit (lib) mkDefault;
in {
{
imports = [
../common
../../../common/pc