murex: switch back to upstream kernel

This commit is contained in:
Gabriel Ebner 2019-05-31 19:08:45 +02:00
parent f78f549c6b
commit 43765b9038
1 changed files with 6 additions and 7 deletions

View File

@ -13,10 +13,9 @@
uboot.enable = true; uboot.enable = true;
}; };
# boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
# boot.kernelPackages = pkgs.linuxPackages_4_18; # boot.kernelPackages = pkgs.linuxPackages_4_18;
# boot.kernelPackages = pkgs.linuxPackages_latest; # boot.kernelPackages = pkgs.linuxPackages_rpi;
boot.kernelPackages = pkgs.linuxPackages_rpi;
boot.kernelParams = [ boot.kernelParams = [
"cma=32M" # for virtual console, see https://nixos.wiki/wiki/NixOS_on_ARM "cma=32M" # for virtual console, see https://nixos.wiki/wiki/NixOS_on_ARM
@ -141,11 +140,11 @@
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = "yes"; RemainAfterExit = "yes";
}; };
script = '' script = let gpio = toString (458 + 17); in ''
if echo 17 > /sys/class/gpio/export; then if echo ${gpio} > /sys/class/gpio/export; then
echo high > /sys/class/gpio/gpio17/direction echo high > /sys/class/gpio/gpio${gpio}/direction
fi fi
chown octoprint:dialout /sys/class/gpio/gpio17/value chown octoprint:dialout /sys/class/gpio/gpio${gpio}/value
''; '';
}; };
users.users.${config.services.octoprint.user}.extraGroups = [ users.users.${config.services.octoprint.user}.extraGroups = [