2 files changed, 78 insertions, 9 deletions
diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix
index c5f8101ea..371a7052d 100644
--- a/jeschli/1systems/bln/config.nix
+++ b/jeschli/1systems/bln/config.nix
@@ -11,8 +11,22 @@
     <stockholm/jeschli/2configs/xserver>
   ];
 
-  boot.loader.systemd-boot.enable = true;
+#  boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.efi.efiSysMountPoint = "/boot";
+  boot.loader.grub = {
+    devices = [ "nodev" ];
+    efiSupport = true;
+    enable = true;
+    extraEntries = ''
+      menuentry "Debian" {
+        insmod ext2
+        insmod chain
+        chainloader /EFI/debian/grubx64.efi
+      }
+    '';
+    version = 2;
+  };
 
   jeschliFontSize = 20;
 
@@ -56,7 +70,6 @@
     sqlite
   # internet
     thunderbird
-    hipchat
     chromium
     google-chrome
   # programming languages
@@ -78,6 +91,7 @@
     texlive.combined.scheme-full
     pandoc
     redis
+    vagrant
   # document viewer
     zathura
   ];
@@ -92,14 +106,25 @@
   services.printing.enable = true;
   services.printing.drivers = [ pkgs.postscript-lexmark ];
 
-  # Enable the X11 windowing system.
-  services.xserver.videoDrivers = [ "nvidia" ];
+  services.redis.enable = true;
+
+  services.xserver = {
+
+    desktopManager.session = lib.mkForce [];
+
+    enable = true;
+    display = 11;
+    tty = 11;
+
+    dpi = 200;
+
+    videoDrivers = [ "nvidia" ];
+    synaptics = {
+      enable = false;
+    };
+
+  };
 
-#  services.xserver.windowManager.xmonad.enable = true;
-#  services.xserver.windowManager.xmonad.enableContribAndExtras = true;
-#  services.xserver.displayManager.sddm.enable = true;
-#  services.xserver.dpi = 100;
-#  fonts.fontconfig.dpi = 100;
 
   users.extraUsers.jeschli = {
     isNormalUser = true;
diff --git a/jeschli/1systems/bln/dcso-vpn.nix b/jeschli/1systems/bln/dcso-vpn.nix
new file mode 100644
index 000000000..0a5623bf0
--- /dev/null
+++ b/jeschli/1systems/bln/dcso-vpn.nix
@@ -0,0 +1,44 @@
+with import <stockholm/lib>;
+{ ... }:
+
+{
+
+  users.extraUsers = {
+    dcsovpn = rec {
+      name = "dcsovpn";
+      uid = genid "dcsovpn";
+      description = "user for running dcso openvpn";
+      home = "/home/${name}";
+    };
+  };
+
+  users.extraGroups.dcsovpn.gid = genid "dcsovpn";
+
+  services.openvpn.servers = {
+    dcso = {
+      config = ''
+        client
+        dev tun
+        tun-mtu 1356
+        mssfix
+        proto udp
+        float
+        remote 217.111.55.41 1194
+        nobind
+        user dcsovpn
+        group dcsovpn
+        persist-key
+        persist-tun
+        ca ${toString <secrets/dcsovpn/ca.pem>}
+        cert ${toString <secrets/dcsovpn/cert.pem>}
+        key ${toString <secrets/dcsovpn/cert.key>}
+        verb 3
+        mute 20
+        auth-user-pass ${toString <secrets/dcsovpn/login.txt>}
+        route-method exe
+        route-delay 2
+      '';
+      updateResolvConf = true;
+    };
+  };
+}