diff options
author | jeschli <jeschli@gmail.com> | 2018-07-31 19:24:39 +0200 |
---|---|---|
committer | jeschli <jeschli@gmail.com> | 2018-07-31 19:24:39 +0200 |
commit | 2611bd8751b5b3d6785e3f7078b964866a093e1b (patch) | |
tree | ea261c15cdda13447756012e3ff6f6a14a25590d /jeschli/1systems | |
parent | 6669a912c6b69b19f929aa0edc2fe6481c3a6fe8 (diff) | |
parent | 6607847d26ea402c550df551f2c7d65e31cfaf13 (diff) |
Merge remote-tracking branch 'origin/staging/jeschli'
Diffstat (limited to 'jeschli/1systems')
-rw-r--r-- | jeschli/1systems/bln/config.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix index 716b9c4..e17d5a4 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 ]; |