diff options
| author | nin <nin@c-base.org> | 2018-01-30 23:06:17 +0100 |
|---|---|---|
| committer | nin <nin@c-base.org> | 2018-01-30 23:06:17 +0100 |
| commit | 6849d7aa4810d5f1f2ec55d852d21812dd1b8002 (patch) | |
| tree | b2b236981d6cb2d226fbe239845838a15c22b30e /makefu/1systems/x | |
| parent | 80c2e23ec028bfda5c0bad0e3269648d34d298b0 (diff) | |
| parent | ffc294575cb59585c3bfb6b85fa45fb69cdf1d41 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/1systems/x')
| -rw-r--r-- | makefu/1systems/x/config.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 3686acb6e..a32db91e1 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -61,7 +61,7 @@ with import <stockholm/lib>; <stockholm/makefu/2configs/hw/tp-x230.nix> <stockholm/makefu/2configs/hw/rtl8812au.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 @@ -86,6 +86,7 @@ with import <stockholm/lib>; nixpkgs.config.allowUnfree = true; + environment.systemPackages = [ pkgs.passwdqc-utils ]; # configure pulseAudio to provide a HDMI sink as well @@ -103,7 +104,4 @@ 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 ]; } |