From 053cf6a43400c62129f982339b0fb63ab6f29e5c Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Tue, 19 Jun 2018 09:12:04 +0200
Subject: j bln: +dcso-vpn

---
 jeschli/1systems/bln/dcso-vpn.nix | 44 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 jeschli/1systems/bln/dcso-vpn.nix

(limited to 'jeschli/1systems/bln')

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;
+    };
+  };
+}
-- 
cgit v1.2.3


From 1c64a03b396177010885147e1ff704e12f2f1b07 Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Tue, 19 Jun 2018 09:14:15 +0200
Subject: j bln: +debian efi bootentry

---
 jeschli/1systems/bln/config.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'jeschli/1systems/bln')

diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix
index c5f8101ea..1680bcfb4 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;
 
-- 
cgit v1.2.3


From 05c8cf3df5f6166c21dfd2dc316bf5de957dce94 Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Tue, 19 Jun 2018 09:14:43 +0200
Subject: j bln: -hipchat

---
 jeschli/1systems/bln/config.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'jeschli/1systems/bln')

diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix
index 1680bcfb4..8b9603abb 100644
--- a/jeschli/1systems/bln/config.nix
+++ b/jeschli/1systems/bln/config.nix
@@ -70,7 +70,6 @@
     sqlite
   # internet
     thunderbird
-    hipchat
     chromium
     google-chrome
   # programming languages
-- 
cgit v1.2.3


From 505bfbfbe53375f13ab8f43b4fc3d53ff0e1e6e4 Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Tue, 19 Jun 2018 09:32:37 +0200
Subject: j bln: +vagrant

---
 jeschli/1systems/bln/config.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'jeschli/1systems/bln')

diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix
index c9a7a34e2..a8329c412 100644
--- a/jeschli/1systems/bln/config.nix
+++ b/jeschli/1systems/bln/config.nix
@@ -76,6 +76,7 @@
     texlive.combined.scheme-full
     pandoc
     redis
+    vagrant
   # document viewer
     zathura
   ];
-- 
cgit v1.2.3


From 7ee237d1ad6c26c7569d3e26875dec5b077c1650 Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Wed, 27 Jun 2018 17:24:25 +0200
Subject: j bln: fix xserver service

---
 jeschli/1systems/bln/config.nix | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'jeschli/1systems/bln')

diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix
index 7d371341d..c06c59281 100644
--- a/jeschli/1systems/bln/config.nix
+++ b/jeschli/1systems/bln/config.nix
@@ -106,14 +106,23 @@
   services.printing.enable = true;
   services.printing.drivers = [ pkgs.postscript-lexmark ];
 
-  # Enable the X11 windowing system.
-  services.xserver.videoDrivers = [ "nvidia" ];
-
-#  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;
+  services.xserver = {
+
+    desktopManager.session = lib.mkForce [];
+
+    enable = true;
+    display = 11;
+    tty = 11;
+
+    dpi = 200;
+
+    videoDrivers = [ "nvidia" ];
+    synaptics = {
+      enable = false;
+    };
+
+  };
+
 
   users.extraUsers.jeschli = {
     isNormalUser = true;
-- 
cgit v1.2.3


From b439342e7533e3f695db8a46576c54d180f56a58 Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Mon, 9 Jul 2018 14:30:17 +0200
Subject: j bln: enable redis

---
 jeschli/1systems/bln/config.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'jeschli/1systems/bln')

diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix
index c06c59281..371a7052d 100644
--- a/jeschli/1systems/bln/config.nix
+++ b/jeschli/1systems/bln/config.nix
@@ -106,6 +106,8 @@
   services.printing.enable = true;
   services.printing.drivers = [ pkgs.postscript-lexmark ];
 
+  services.redis.enable = true;
+
   services.xserver = {
 
     desktopManager.session = lib.mkForce [];
-- 
cgit v1.2.3