Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dell XPS 13-9320 #872

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions dell/xps/13-9320/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{ lib, pkgs, ... }: {
imports = [
../../../common/cpu/intel
../../../common/pc/laptop
../../../common/pc/ssd
./webcam.nix

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

after these commits 1 and 2 , we probably can remove the webcam file and just add

 hardware.ipu6 = {
    enable = true;
    platform = "ipu6ep";
  };

];

# Allows for updating firmware via `fwupdmgr`.
services.fwupd.enable = lib.mkDefault true;

}
32 changes: 32 additions & 0 deletions dell/xps/13-9320/webcam.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{ config, pkgs, ... }:

{
hardware.firmware = let
ivsc-firmware = with pkgs; stdenv.mkDerivation rec {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might potentially want to move this to nixpkgs if it is also useful for other hardware.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ohh, it is in nixpkgs nowadays as well I see.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right. In that case, we should pull it from there.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mr created to cover add the necessary symbolic links NixOS/nixpkgs#295508

pname = "ivsc-firmware";
version = "10c214fea5560060d387fbd2fb8a1af329cb6232";

src = pkgs.fetchFromGitHub {
owner = "intel";
repo = "ivsc-firmware";
rev = version;
sha256 = "sha256-kEoA0yeGXuuB+jlMIhNm+SBljH+Ru7zt3PzGb+EPBPw=";

};

installPhase = ''
mkdir -p $out/lib/firmware/vsc/soc_a1_prod

cp firmware/ivsc_pkg_ovti01a0_0.bin $out/lib/firmware/vsc/soc_a1_prod/ivsc_pkg_ovti01a0_0_a1_prod.bin
cp firmware/ivsc_skucfg_ovti01a0_0_1.bin $out/lib/firmware/vsc/soc_a1_prod/ivsc_skucfg_ovti01a0_0_1_a1_prod.bin
cp firmware/ivsc_fw.bin $out/lib/firmware/vsc/soc_a1_prod/ivsc_fw_a1_prod.bin
'';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

meta.description and license would be nice to have.

};
in [
ivsc-firmware
];
hardware.ipu6 = {
enable = true;
platform = "ipu6ep";
};
}
1 change: 1 addition & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
dell-xps-13-7390 = import ./dell/xps/13-7390;
dell-xps-13-9300 = import ./dell/xps/13-9300;
dell-xps-13-9310 = import ./dell/xps/13-9310;
dell-xps-13-9320 = import ./dell/xps/13-9320;
dell-xps-13-9333 = import ./dell/xps/13-9333;
dell-xps-13-9343 = import ./dell/xps/13-9343;
dell-xps-13-9350 = import ./dell/xps/13-9350;
Expand Down