diff options
| author | lassulus <lassulus@lassul.us> | 2018-02-10 19:48:38 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2018-02-10 19:48:38 +0100 |
| commit | f2aeaae4a471a9db50b303a2528a084f8eb68496 (patch) | |
| tree | 4cd282af4ee0731077cbe11c9d090f894a76b2fc /makefu/1systems/x | |
| parent | e000690cc2fa3b494cf3b44eb0213dda80b34e12 (diff) | |
| parent | e7418fbdf1bdddeeabe123c04bbd858fc70fe031 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/x')
| -rw-r--r-- | makefu/1systems/x/config.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index a32db91e1..d5a9bdcfb 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -59,8 +59,9 @@ with import <stockholm/lib>; # Hardware <stockholm/makefu/2configs/hw/tp-x230.nix> + # <stockholm/makefu/2configs/hw/tpm.nix> <stockholm/makefu/2configs/hw/rtl8812au.nix> - <stockholm/makefu/2configs/hw/wwan.nix> + <stockholm/makefu/2configs/hw/network-manager.nix> <stockholm/makefu/2configs/hw/stk1160.nix> # <stockholm/makefu/2configs/rad1o.nix> @@ -82,13 +83,9 @@ with import <stockholm/lib>; makefu.server.primary-itf = "wlp3s0"; makefu.full-populate = true; - makefu.umts.apn = "web.vodafone.de"; nixpkgs.config.allowUnfree = true; - environment.systemPackages = [ pkgs.passwdqc-utils ]; - - # configure pulseAudio to provide a HDMI sink as well networking.firewall.enable = true; networking.firewall.allowedTCPPorts = [ 80 24800 26061 8000 3000 ]; @@ -100,8 +97,15 @@ with import <stockholm/lib>; krebs.tinc.retiolum.connectTo = [ "omo" "gum" "prism" ]; networking.extraHosts = '' - 192.168.1.11 omo.local + 192.168.1.11 omo.local ''; # 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 ]; + nixpkgs.overlays = [ (import <python/overlay.nix>) ]; + + # environment.variables = { GOROOT = [ "${pkgs.go.out}/share/go" ]; }; + } |