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 | 1de97fcef0a82307b3405d1b24ba5a999b572804 (patch) | |
tree | f37dcc0e861e9252d2e635546f12fadaca2bd906 /jeschli/1systems/bln | |
parent | 101733029e93a2d3ee8de8ed1d6039aacb010a4e (diff) | |
parent | 63a761b4da5262749c4cb122739666d412456776 (diff) |
Merge remote-tracking branch 'origin/staging/jeschli'
Diffstat (limited to 'jeschli/1systems/bln')
-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 716b9c484..e17d5a41b 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 ]; |