diff options
author | makefu <github@syntax-fehler.de> | 2017-11-14 15:36:50 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2017-11-14 15:36:50 +0100 |
commit | 6e6a92f4acaf44af6650c764073fbcb5b856a096 (patch) | |
tree | db1901c8c0536bfa3d1ae648a5ece67eee36bab7 | |
parent | 9594d6bdb37802b705fd8afb4ade6c575ea541e5 (diff) |
ma hw/stk1160: rip
-rw-r--r-- | 1systems/x/config.nix | 6 | ||||
-rw-r--r-- | 2configs/hw/stk1160.nix | 15 |
2 files changed, 4 insertions, 17 deletions
diff --git a/1systems/x/config.nix b/1systems/x/config.nix index 1524b485f..1dd1a070f 100644 --- a/1systems/x/config.nix +++ b/1systems/x/config.nix @@ -62,7 +62,7 @@ with import <stockholm/lib>; <stockholm/makefu/2configs/hw/rtl8812au.nix> <stockholm/makefu/2configs/hw/exfat-nofuse.nix> <stockholm/makefu/2configs/hw/wwan.nix> - <stockholm/makefu/2configs/hw/stk1160.nix> + # <stockholm/makefu/2configs/hw/stk1160.nix> # <stockholm/makefu/2configs/rad1o.nix> # Filesystem @@ -87,7 +87,6 @@ with import <stockholm/lib>; nixpkgs.config.allowUnfree = true; - environment.systemPackages = [ pkgs.passwdqc-utils ]; # configure pulseAudio to provide a HDMI sink as well @@ -105,4 +104,7 @@ with import <stockholm/lib>; ''; # hard dependency because otherwise the device will not be unlocked boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }]; + + nix.package = pkgs.nixUnstable; + environment.systemPackages = [ pkgs.passwdqc-utils pkgs.nixUnstable ]; } diff --git a/2configs/hw/stk1160.nix b/2configs/hw/stk1160.nix deleted file mode 100644 index b3a9e1a5a..000000000 --- a/2configs/hw/stk1160.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: -{ - # TODO: un-pin linuxPackages somehow - boot.kernelPackages = builtins.trace "Warning: overriding kernel Packages with 4.9" pkgs.linuxPackages; - nixpkgs.config.packageOverrides = pkgs: { - linux_4_9 = pkgs.linux_4_9.override { - extraConfig = '' - MEDIA_ANALOG_TV_SUPPORT y - VIDEO_STK1160_COMMON m - VIDEO_STK1160_AC97 y - VIDEO_STK1160 m - ''; - }; - }; -} |