summaryrefslogtreecommitdiffstats
path: root/jeschli/1systems/bln/config.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-08-28 22:53:17 +0200
committermakefu <github@syntax-fehler.de>2018-08-28 22:53:17 +0200
commit9c516e9504003cae2abed8a6e24f0b135ac98c4f (patch)
tree95c81a6f2cb9f47181608428b2234370c243eed9 /jeschli/1systems/bln/config.nix
parentc07f56b772f3ea58d2a4c0f504fe3df381f6a043 (diff)
parent413e0689acd4f6b322f9996950927ebd41d0e58c (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'jeschli/1systems/bln/config.nix')
-rw-r--r--jeschli/1systems/bln/config.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix
index 716b9c484..6e3c3bec8 100644
--- a/jeschli/1systems/bln/config.nix
+++ b/jeschli/1systems/bln/config.nix
@@ -9,6 +9,8 @@
<stockholm/jeschli/2configs/emacs.nix>
<stockholm/jeschli/2configs/xdg.nix>
<stockholm/jeschli/2configs/xserver>
+# <stockholm/jeschli/1systems/bln/dcso-vpn.nix>
+ <stockholm/jeschli/2configs/officevpn.nix>
];
# boot.loader.systemd-boot.enable = true;
@@ -94,6 +96,8 @@
vagrant
# document viewer
zathura
+
+ samba
];
@@ -161,4 +165,9 @@
hardware.bluetooth.enable = true;
krebs.build.host = config.krebs.hosts.bln;
+
+ networking.interfaces.enp0s31f6.ipv4.addresses = [
+ { address = "10.99.23.2"; prefixLength = 24; }
+ ];
+
}