diff options
| author | makefu <github@syntax-fehler.de> | 2018-02-06 11:59:08 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2018-02-06 11:59:08 +0100 |
| commit | c1b2f919572a485cafdc56af5d9e3240ac74469c (patch) | |
| tree | 00953819d00d90053aa4709081e06a438d7ddcaf /makefu | |
| parent | 083941f7dba4347084779b65cefa9b8cc9713939 (diff) | |
ma x.r: disable makefu.umts, cleanup
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/1systems/x/config.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index f3a1d488c..d5a9bdcfb 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -83,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 ]; @@ -101,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" ]; }; + } |