diff options
| author | lassulus <lassulus@lassul.us> | 2017-11-14 20:29:41 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-11-14 20:29:41 +0100 |
| commit | 635543efe237e79202cc95db6f303699cadd0c85 (patch) | |
| tree | 38111477148a2ae9245981a5f42fc3350701c157 /makefu/1systems/x/config.nix | |
| parent | 7d95a0fc450399d86a8b92a9ffe472a0839c7661 (diff) | |
| parent | 1cbc2e5aa359e7e9b4b32c9ef75902576347a6d0 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/x/config.nix')
| -rw-r--r-- | makefu/1systems/x/config.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index f7db75564..1dd1a070f 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -23,8 +23,6 @@ with import <stockholm/lib>; # <stockholm/makefu/2configs/deployment/wiki-irc-bot> # <stockholm/makefu/2configs/torrent.nix> - # <stockholm/makefu/2configs/lanparty/lancache.nix> - # <stockholm/makefu/2configs/lanparty/lancache-dns.nix> # <stockholm/makefu/2configs/deployment/dirctator.nix> # <stockholm/makefu/2configs/vncserver.nix> # <stockholm/makefu/2configs/deployment/led-fader> @@ -64,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 @@ -75,6 +73,11 @@ with import <stockholm/lib>; { programs.adb.enable = true; } + # temporary + # <stockholm/makefu/2configs/lanparty/lancache.nix> + # <stockholm/makefu/2configs/lanparty/lancache-dns.nix> + # <stockholm/makefu/2configs/lanparty/samba.nix> + # <stockholm/makefu/2configs/lanparty/mumble-server.nix> ]; @@ -84,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 @@ -102,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 ]; } |