diff options
author | tv <tv@krebsco.de> | 2017-06-29 22:04:58 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2017-06-29 22:04:58 +0200 |
commit | 077a6a699129416cdeb0a9da3aba30d156e46b7a (patch) | |
tree | d5588c0024a942fef6f4d597aedac5708dd7fa45 /makefu/2configs/hw | |
parent | 10adb2d27e3005c7239585eb38dbbe3b5b01a400 (diff) | |
parent | 51e091c7c3fb52579bc9ed59d1c7db633cd24e5b (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/hw')
-rw-r--r-- | makefu/2configs/hw/exfat-nofuse.nix | 4 | ||||
-rw-r--r-- | makefu/2configs/hw/stk1160.nix | 3 | ||||
-rw-r--r-- | makefu/2configs/hw/wwan.nix | 8 |
3 files changed, 13 insertions, 2 deletions
diff --git a/makefu/2configs/hw/exfat-nofuse.nix b/makefu/2configs/hw/exfat-nofuse.nix new file mode 100644 index 000000000..ca3485e9f --- /dev/null +++ b/makefu/2configs/hw/exfat-nofuse.nix @@ -0,0 +1,4 @@ +{ config, ... }: +{ + boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ]; +} diff --git a/makefu/2configs/hw/stk1160.nix b/makefu/2configs/hw/stk1160.nix index b4d033d76..e73741e26 100644 --- a/makefu/2configs/hw/stk1160.nix +++ b/makefu/2configs/hw/stk1160.nix @@ -1,9 +1,8 @@ { pkgs, ... }: { # TODO: un-pin linuxPackages somehow - boot.kernelPackages = builtins.trace "Warning: overriding kernel Packages with 4.9" pkgs.linuxPackages_4_9; nixpkgs.config.packageOverrides = pkgs: { - linux_4_9 = pkgs.linux_4_9.override { + linux_latest = pkgs.linux_latest.override { extraConfig = '' MEDIA_ANALOG_TV_SUPPORT y VIDEO_STK1160_COMMON m diff --git a/makefu/2configs/hw/wwan.nix b/makefu/2configs/hw/wwan.nix new file mode 100644 index 000000000..0eb0c97d7 --- /dev/null +++ b/makefu/2configs/hw/wwan.nix @@ -0,0 +1,8 @@ +_: + +{ + makefu.umts = { + enable = true; + modem-device = "/dev/serial/by-id/usb-Lenovo_H5321_gw_2D5A51BA0D3C3A90-if01"; + }; +} |