diff options
| author | tv <tv@krebsco.de> | 2017-03-05 17:01:57 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-03-05 17:01:57 +0100 |
| commit | 23a79b8fb02b3bebfb377f2b236432ff9a73343a (patch) | |
| tree | 494bcb3bb57b397bab756aebe86e85dbd5a2a2fd /makefu/1systems/x.nix | |
| parent | fd6c056a720544319f02cf02b64fa8dd2b657aa8 (diff) | |
| parent | cb48e9371a337d23e1f3f09b5d024ee60451d9d2 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/x.nix')
| -rw-r--r-- | makefu/1systems/x.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix index 08da9206..9666f50f 100644 --- a/makefu/1systems/x.nix +++ b/makefu/1systems/x.nix @@ -8,7 +8,7 @@ [ # base ../. ../2configs/main-laptop.nix - ../2configs/laptop-utils.nix + ../2configs/tools/all.nix ../2configs/laptop-backup.nix ../2configs/dnscrypt.nix @@ -46,7 +46,7 @@ ../2configs/mail-client.nix ../2configs/printer.nix ../2configs/virtualization.nix - ../2configs/virtualization-virtualbox.nix + # ../2configs/virtualization-virtualbox.nix ../2configs/wwan.nix ../2configs/rad1o.nix @@ -64,8 +64,10 @@ ../2configs/fs/sda-crypto-root-home.nix ]; - makefu.server.primary-itf = "wlp2s0"; + + makefu.server.primary-itf = "wlp3s0"; makefu.full-populate = true; + makefu.umts.apn = "web.vodafone.de"; nixpkgs.config.allowUnfree = true; krebs.nginx = { @@ -74,6 +76,7 @@ servers.default.server-names = [ "_" ]; }; + boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ]; environment.systemPackages = [ pkgs.passwdqc-utils pkgs.bintray-upload ]; virtualisation.docker.enable = true; |