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 | |
| parent | fd6c056a720544319f02cf02b64fa8dd2b657aa8 (diff) | |
| parent | cb48e9371a337d23e1f3f09b5d024ee60451d9d2 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems')
| -rw-r--r-- | makefu/1systems/filepimp.nix | 2 | ||||
| -rw-r--r-- | makefu/1systems/x.nix | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/makefu/1systems/filepimp.nix b/makefu/1systems/filepimp.nix index 0fabf6d93..e143d0046 100644 --- a/makefu/1systems/filepimp.nix +++ b/makefu/1systems/filepimp.nix @@ -3,7 +3,7 @@ let byid = dev: "/dev/disk/by-id/" + dev; part1 = disk: disk + "-part1"; rootDisk = byid "ata-SanDisk_SDSSDP064G_140237402890"; - primary-interface = "enp2s0"; # c8:cb:b8:cf:e4:dc + primary-interface = "enp3s0"; # c8:cb:b8:cf:e4:dc # N54L Chassis: # ____________________ # |______FRONT_______| diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix index 08da92068..9666f50ff 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; |