diff options
| author | Yegor Timoshenko <yegortimoshenko@riseup.net> | 2018-05-15 19:56:14 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-15 19:56:14 +0300 |
| commit | fbf167ed1e832f6996e62972e84c1489ae62d962 (patch) | |
| tree | c24ea37d963bc8cdc5c2eb03fdd2de9a21b90bfa /dell | |
| parent | b47ca3e37766646b54a371c67c93d54e3e01cb06 (diff) | |
| parent | 0794564c45956c1b4711b38d2a2d43d85d12cbae (diff) | |
Merge pull request #58 from yorickvP/master
add XPS 13 (9360)
Diffstat (limited to 'dell')
| -rw-r--r-- | dell/xps/13-9360/default.nix | 26 | ||||
| -rw-r--r-- | dell/xps/13-9360/qca6174-firmware.nix | 26 |
2 files changed, 52 insertions, 0 deletions
diff --git a/dell/xps/13-9360/default.nix b/dell/xps/13-9360/default.nix new file mode 100644 index 0000000..e13e758 --- /dev/null +++ b/dell/xps/13-9360/default.nix @@ -0,0 +1,26 @@ +{ lib, pkgs, ... }: + +{ + imports = [ + ../../../common/cpu/intel/kaby-lake + ../../../common/pc/laptop + ]; + + boot.blacklistedKernelModules = [ "psmouse" ]; # touchpad goes over i2c + + # TODO: decide on boot loader policy + boot.loader = { + efi.canTouchEfiVariables = lib.mkDefault true; + systemd-boot.enable = lib.mkDefault true; + }; + + hardware.firmware = lib.mkBefore [ pkgs.qca6174-firmware ]; + + # TODO: move to general HiDPI profile + i18n.consoleFont = lib.mkDefault "latarcyrheb-sun32"; # 4K screen, use bigger console font + + # TODO: upstream to NixOS/nixpkgs + nixpkgs.overlays = [(final: previous: { + qca6174-firmware = final.callPackage ./qca6174-firmware.nix {}; + })]; +} diff --git a/dell/xps/13-9360/qca6174-firmware.nix b/dell/xps/13-9360/qca6174-firmware.nix new file mode 100644 index 0000000..930107d --- /dev/null +++ b/dell/xps/13-9360/qca6174-firmware.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "${target}-firmware-${version}"; + version = "${branch}-00042"; + + branch = "4.4.1.c1"; + target = "QCA6174"; + + src = fetchurl { + url = "https://github.com/kvalo/ath10k-firmware/raw/master/${target}/hw3.0/${branch}/firmware-6.bin_RM.${version}-QCARMSWP-1"; + sha256 = "01vvz3qhqw5l3yilcqgk1spk4y9k4qy7na7a57cbl037r231szdh"; + }; + + buildCommand = '' + install -D $src $out/lib/firmware/ath10k/${target}/hw3.0/firmware-6.bin + ''; + + meta = with stdenv.lib; { + description = "Updated firmware for the qca6174 wireless chip"; + homepage = "https://github.com/kvalo/ath10k-firmware/tree/master/QCA6174/hw3.0"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ yorickvp ]; + platforms = platforms.linux; + }; +} |