eeva/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware synced 2024-11-20 09:59:42 +01:00
Code Issues Releases Wiki Activity

purism/librem/5r4: make it usuable without an overlay

Browse source 
In larger installations nixpkgs.overlays adds significant overhead
because it's harder to share nixpkgs between different NixOS machines
i.e. using nixpkgs.pkgs
This commit is contained in:
Jörg Thalheim 2024-05-05 07:13:06 +02:00 committed by mergify[bot]
parent d1659c9eb8
commit 6cb18a6649
5 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
purism/librem/5r4/audio.nix
View file

@ -9,7 +9,7 @@
enable = true; enable = true;
# this is required to correctly configure the modem as PA source/sink # this is required to correctly configure the modem as PA source/sink
extraConfig = '' extraConfig = ''
.include ${pkgs.librem5-base}/etc/pulse/librem5.pa .include ${config.hardware.librem5.package}/etc/pulse/librem5.pa
''; '';
}; };

25
purism/librem/5r4/default.nix
View file

@ -1,8 +1,15 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let cfg = config.hardware.librem5; let
cfg = config.hardware.librem5;
linuxPackages_librem5 = pkgs.linuxPackagesFor (pkgs.callPackage ./kernel.nix { });
ubootLibrem5 = pkgs.callPackage ./u-boot { };
in { in {
options = { options = {
hardware.librem5 = { hardware.librem5 = {
package = lib.mkOption {
type = lib.types.package;
default = pkgs.callPackage ./librem5-base { };
};
wifiCard = lib.mkOption { wifiCard = lib.mkOption {
type = lib.types.enum [ "redpine" "sparklan" "none" ]; type = lib.types.enum [ "redpine" "sparklan" "none" ];
description = lib.mdDoc '' description = lib.mdDoc ''
@ -42,15 +49,6 @@ in {
lockdownFix = lib.mkDefault true; lockdownFix = lib.mkDefault true;
}; };
nixpkgs.overlays = [
(import ./kernel)
(final: prev: {
ubootLibrem5 = final.callPackage ./u-boot { };
librem5-base = final.callPackage ./librem5-base { };
})
];
boot = { boot = {
kernelParams = [ "rootwait" ]; kernelParams = [ "rootwait" ];
@ -59,12 +57,11 @@ in {
grub.enable = false; grub.enable = false;
}; };
kernelPackages = lib.mkDefault pkgs.linuxPackages_librem5; kernelPackages = lib.mkDefault linuxPackages_librem5;
}; };
services.udev.packages = lib.mkIf cfg.installUdevPackages [ pkgs.librem5-base ]; services.udev.packages = lib.mkIf cfg.installUdevPackages [ config.hardware.librem5.package ];
environment.systemPackages = with pkgs; [ ubootLibrem5 ];
environment.systemPackages = [ ubootLibrem5 ];
}; };
} }

0
purism/librem/5r4/kernel/kernel.nix → purism/librem/5r4/kernel.nix
View file

3
purism/librem/5r4/kernel/default.nix
View file

@ -1,3 +0,0 @@
final: prev: {
linuxPackages_librem5 = final.linuxPackagesFor (final.callPackage ./kernel.nix { });
}

2
purism/librem/5r4/lockdown-fix.nix
View file

@ -11,7 +11,7 @@ lib.mkIf config.hardware.librem5.lockdownFix {
systemd.services.librem5-lockdown-support = { systemd.services.librem5-lockdown-support = {
description = "Set up drivers for the orientation and proximity sensors on Librem 5"; description = "Set up drivers for the orientation and proximity sensors on Librem 5";
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.ExecStart = "${pkgs.librem5-base}/bin/lockdown-support.sh"; serviceConfig.ExecStart = "${config.hardware.librem5.package}/bin/lockdown-support.sh";
wantedBy = [ "default.target" ]; wantedBy = [ "default.target" ];
path = [ pkgs.kmod ]; path = [ pkgs.kmod ];
}; };