From da0e1e8e2844f19b1b7a717d1fa2637518ba8dc7 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Thu, 9 Jun 2022 19:16:28 +0000 Subject: [PATCH] Fix build on mistmane --- sets/workstation.nix | 2 +- system/mistmane/boot-config.nix | 1 - system/mistmane/default.nix | 7 ++----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/sets/workstation.nix b/sets/workstation.nix index 93d7ce8..df34e23 100644 --- a/sets/workstation.nix +++ b/sets/workstation.nix @@ -36,7 +36,7 @@ steam-hardware.enable = true; sane = { enable = true; - brscan5.enable = true; + brscan5.enable = (pkgs.system == "x86_64-linux"); }; }; diff --git a/system/mistmane/boot-config.nix b/system/mistmane/boot-config.nix index 932e4ba..cfc415e 100644 --- a/system/mistmane/boot-config.nix +++ b/system/mistmane/boot-config.nix @@ -3,7 +3,6 @@ { boot = { kernel.sysctl."vm.swappiness" = 5; - kernelPackages = pkgs.linuxPackages_pinebookpro_lts; kernelParams = [ "console=tty1" ]; cleanTmpDir = true; loader.grub.enable = false; diff --git a/system/mistmane/default.nix b/system/mistmane/default.nix index 7a36910..660291d 100644 --- a/system/mistmane/default.nix +++ b/system/mistmane/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, inputs, ... }: { imports = [ @@ -6,6 +6,7 @@ ./hardware-configuration.nix ../../sets/laptop.nix ../../sets/workstation.nix + "${inputs.wip-pinebook-pro}/pinebook_pro.nix" ]; networking.hostName = "mistmane"; @@ -45,9 +46,5 @@ extraConfig = lib.mkForce "HandlePowerKey=lock"; }; - # rockchip/dptx.bin isn't in the initrd. Instead of fix nixpkgs let's do something incredibly cursed - boot.extraModulePackages = [ (pkgs.callPackage ../../externals/packages/dptx-dummy { kernel = config.boot.kernelPackages.kernel; }) ]; - boot.initrd.availableKernelModules = [ "dptx-dummy" ]; - system.stateVersion = "21.11"; }