summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/vbob
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-12-28 16:04:47 +0100
committermakefu <github@syntax-fehler.de>2017-12-28 16:04:47 +0100
commit040f6f9f5c7808ea188444f15a704818f94624f7 (patch)
tree2553649fd4501cc9ef630114b8b510a066061489 /makefu/1systems/vbob
parent6f150a4ab47f037c1b8ec5e8d1675d86b0738155 (diff)
ma vbob.r: prepare pppd
Diffstat (limited to 'makefu/1systems/vbob')
-rw-r--r--makefu/1systems/vbob/config.nix64
1 files changed, 41 insertions, 23 deletions
diff --git a/makefu/1systems/vbob/config.nix b/makefu/1systems/vbob/config.nix
index f71634501..f318c0e61 100644
--- a/makefu/1systems/vbob/config.nix
+++ b/makefu/1systems/vbob/config.nix
@@ -3,37 +3,57 @@
krebs.build.host = config.krebs.hosts.vbob;
makefu.awesome.modkey = "Mod1";
imports =
- [ # Include the results of the hardware scan.
+ [
<stockholm/makefu>
- (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>)
- (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>)
+ {
+ imports = [<stockholm/makefu/2configs/fs/single-partition-ext4.nix> ];
+ boot.loader.grub.device = "/dev/vda";
+ }
+ # {
+ # imports = [
+ # <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>
+ # ];
+ # virtualbox.baseImageSize = 35 * 1024;
+ # fileSystems."/media/share" = {
+ # fsType = "vboxsf";
+ # device = "share";
+ # options = [ "rw" "uid=9001" "gid=9001" ];
+ # };
+ # }
+
+ # {
+ # imports = [
+ # <nixpkgs/nixos/modules/virtualisation/qemu-vm.nix>
+ # ];
+ # fileSystems."/nix" = {
+ # device ="/dev/disk/by-label/nixstore";
+ # fsType = "ext4";
+ # };
+ # }
+
+
# base gui
- <stockholm/makefu/2configs/main-laptop.nix>
+ # <stockholm/makefu/2configs/main-laptop.nix>
+ # <stockholm/makefu/2configs/tools/core-gui.nix>
+
+ <stockholm/makefu/2configs/zsh-user.nix>
# security
<stockholm/makefu/2configs/sshd-totp.nix>
# Tools
<stockholm/makefu/2configs/tools/core.nix>
- <stockholm/makefu/2configs/tools/core-gui.nix>
<stockholm/makefu/2configs/tools/dev.nix>
- <stockholm/makefu/2configs/tools/extra-gui.nix>
- <stockholm/makefu/2configs/tools/sec.nix>
+ # <stockholm/makefu/2configs/tools/extra-gui.nix>
+ # <stockholm/makefu/2configs/tools/sec.nix>
# environment
<stockholm/makefu/2configs/tinc/retiolum.nix>
- <stockholm/makefu/2configs/audio/jack-on-pulse.nix>
- <stockholm/makefu/2configs/audio/realtime-audio.nix>
-
];
networking.extraHosts = import (toString <secrets/extra-hosts.nix>);
nixpkgs.config.allowUnfree = true;
- fileSystems."/nix" = {
- device ="/dev/disk/by-label/nixstore";
- fsType = "ext4";
- };
# allow vbob to deploy self
users.extraUsers = {
@@ -45,9 +65,13 @@
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
+
+ system.activationScripts.prepare-fortclientvpnssl = ''
+ # TODO: for forticlientsslpn
+ mkdir -p /usr/{s,}bin
+ ln -fs ${pkgs.ppp}/bin/pppd /usr/sbin/pppd
+ ln -fs ${pkgs.coreutils}/bin/tail /usr/bin/tail
+ '';
environment.systemPackages = with pkgs;[
fortclientsslvpn ppp xclip
get
@@ -55,7 +79,6 @@
# docker
#devpi-web
#devpi-client
- debmirror
ansible
];
# virtualisation.docker.enable = true;
@@ -67,10 +90,5 @@
8010
];
- fileSystems."/media/share" = {
- fsType = "vboxsf";
- device = "share";
- options = [ "rw" "uid=9001" "gid=9001" ];
- };
}