summaryrefslogtreecommitdiffstats
path: root/jeschli/1systems/bln/config.nix
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2018-08-29 01:38:45 +0200
committertv <tv@krebsco.de>2018-08-29 01:38:45 +0200
commit000f2a7c9123fcd4b110c6c220570758d556c837 (patch)
tree8464e80b13adce3b5958ad6e9bcebc8a4f559cd9 /jeschli/1systems/bln/config.nix
parent16ad5fb0a835a1022656253ae838e83fa024e692 (diff)
parent413e0689acd4f6b322f9996950927ebd41d0e58c (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'jeschli/1systems/bln/config.nix')
-rw-r--r--jeschli/1systems/bln/config.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix
index 371a7052d..6e3c3bec8 100644
--- a/jeschli/1systems/bln/config.nix
+++ b/jeschli/1systems/bln/config.nix
@@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:
# bln config file
{
- imports = [
+ imports = [
./hardware-configuration.nix
<stockholm/jeschli>
<stockholm/jeschli/2configs/virtualbox.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; }
+ ];
+
}