diff options
| author | tv <tv@krebsco.de> | 2016-07-22 13:22:13 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-07-22 13:22:13 +0200 |
| commit | 45c62ec4d3ec61ba593657676f5a09d47622564e (patch) | |
| tree | 7937fbefaddc5e0168e44ab1d6e355c42192d7e8 /makefu/1systems/vbob.nix | |
| parent | 8b58e6e6e25e38586f3cc8879aa0444d4fdf6f0d (diff) | |
| parent | 0bd78c3b0de0fa79322e9031f45dcc62abd094d1 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/1systems/vbob.nix')
| -rw-r--r-- | makefu/1systems/vbob.nix | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix index 3fcb173ce..27a216316 100644 --- a/makefu/1systems/vbob.nix +++ b/makefu/1systems/vbob.nix @@ -8,9 +8,10 @@ (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>) (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>) ../2configs/main-laptop.nix #< base-gui - # (toString <secrets>)/extra-hosts.nix + # <secrets/extra-hosts.nix> # environment + ../2configs/tinc/retiolum.nix ]; # workaround for https://github.com/NixOS/nixpkgs/issues/16641 @@ -28,8 +29,15 @@ openssh.authorizedKeys.keys = [ config.krebs.users.makefu-vbob.pubkey ]; }; }; + + environment.shellAliases = { + forti = "cat ~/vpn/pw.txt | xclip; sudo forticlientsslvpn"; + }; + # TODO: for forticleintsslpn + # ln -s /r/current-system/sw/bin/pppd /usr/sbin/pppd + # ln -s /r/current-system/sw/bin/tail /usr/bin/tail environment.systemPackages = with pkgs;[ - fortclientsslvpn + fortclientsslvpn ppp xclip get logstash docker @@ -45,13 +53,6 @@ 8010 ]; - krebs.retiolum = { - enable = true; - connectTo = [ - "omo" - "gum" - ]; - }; virtualisation.docker.enable = false; fileSystems."/media/share" = { |