Merge remote-tracking branch 'prism/staging/jeschli'

6 files changed, 140 insertions, 68 deletions

diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix
index c5f8101e..c06c5928 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,23 @@
   services.printing.enable = true;
   services.printing.drivers = [ pkgs.postscript-lexmark ];
 
-  # Enable the X11 windowing system.
-  services.xserver.videoDrivers = [ "nvidia" ];
+  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 00000000..0a5623bf
--- /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;
+    };
+  };
+}
diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix
index 49f439a0..5a6ad765 100644
--- a/jeschli/1systems/brauerei/config.nix
+++ b/jeschli/1systems/brauerei/config.nix
@@ -1,5 +1,5 @@
 # Edit this configuration file to define what should be installed on # your system.  Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’).
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 {
   imports = [
     <stockholm/jeschli>
@@ -8,6 +8,7 @@
     <stockholm/jeschli/2configs/emacs.nix>
     <stockholm/jeschli/2configs/xdg.nix>
     <stockholm/jeschli/2configs/xserver>
+    <stockholm/jeschli/2configs/virtualbox.nix>
   ];
 
   krebs.build.host = config.krebs.hosts.brauerei;
@@ -24,9 +25,10 @@
     preLVM = true;
     allowDiscards = true;
   } ];
-  # networking.hostName = "nixos";
+#  networking.hostName = "brauerei";
   # Define your hostname.
-  networking.wireless.enable = true;
+#  networking.wireless.enable = true;
+  networking.networkmanager.enable = true;
   # Enables wireless support via wpa_supplicant.
   # Select internationalisation properties.
   # i18n = {
@@ -66,12 +68,25 @@
     chromium
     google-chrome
   # programming languages
+    elixir
+    elmPackages.elm
     exercism
     go
     gcc
     ghc
     python35
     python35Packages.pip
+    (vagrant.override {
+      bundlerEnv = bundlerEnv.override {
+        bundler = bundler.overrideAttrs (old: {
+          name = "bundler-1.16.1";
+          src = fetchurl {
+            url = "https://rubygems.org/gems/bundler-1.16.1.gem";
+            sha256 = "1s2nq4qnffxg3kwrk7cnwxcvfihlhxm9absl2l6d3qckf3sy1f22";
+          };
+        });
+      };
+    })
   # go tools
     golint
     gotools
@@ -84,6 +99,7 @@
     jetbrains.webstorm
     jetbrains.goland
   # document viewer
+    evince
     zathura
   # xorg
     xorg.xbacklight
@@ -100,33 +116,29 @@
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
 
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
+  services.xserver = {
 
-  # Enable CUPS to print documents.
-  # services.printing.enable = true;
+    # Don't install feh into systemPackages
+    # refs <nixpkgs/nixos/modules/services/x11/desktop-managers>
+    desktopManager.session = lib.mkForce [];
 
-  # Enable the X11 windowing system.
-  # services.xserver.enable = true;
-  # services.xserver.layout = "us";
-  # services.xserver.xkbOptions = "eurosign:e";
+    enable = true;
+    display = 11;
+    tty = 11;
+
+    dpi = 96;
 
-  # Enable touchpad support.
-  # services.xserver.libinput.enable = true;
+#    videoDrivers = [ "nvidia" ];
+    synaptics = {
+      enable = true;
+      twoFingerScroll = true;
+      accelFactor = "0.035";
+    };
+  };
 
-  # Enable the KDE Desktop Environment.
-  # services.xserver.displayManager.sddm.enable = true;
-  # services.xserver.desktopManager.plasma5.enable = true;
-  #  services.xserver.displayManager.sddm.enable = true;
-  #  services.xserver.windowManager.xmonad.enable = true;
-  #  services.xserver.windowManager.xmonad.enableContribAndExtras = true;
-  #
-  # Define a user account. Don't forget to set a password with ‘passwd’.
   users.extraUsers.jeschli = { # TODO: define as krebs.users
     isNormalUser = true;
+    extraGroups = ["docker" "vboxusers"];
     uid = 1000;
   };
   users.extraUsers.jamie = {
diff --git a/jeschli/2configs/vim.nix b/jeschli/2configs/vim.nix
index c13113f1..586016f6 100644
--- a/jeschli/2configs/vim.nix
+++ b/jeschli/2configs/vim.nix
@@ -11,16 +11,24 @@ let
       sha256 = "08l7ricd3j5h2bj9i566byh39v9n5wj5mj75f2c8a5dsc732b2k7";
     };
   };
-   customPlugins.vim-jsx = pkgs.vimUtils.buildVimPlugin {
-     name = "vim-jsx";
-     src = pkgs.fetchFromGitHub {
-       owner = "mxw";
-       repo = "vim-jsx";
-       rev = "5b968dfa512c57c38ad7fe420f3e8ab75a73949a";
-       sha256 = "1z3yhhbmbzfw68qjzyvpbmlyv2a1p814sy5q2knn04kcl30vx94a";
-     };
-   };
-
+  customPlugins.vim-jsx = pkgs.vimUtils.buildVimPlugin {
+    name = "vim-jsx";
+    src = pkgs.fetchFromGitHub {
+      owner = "mxw";
+      repo = "vim-jsx";
+      rev = "5b968dfa512c57c38ad7fe420f3e8ab75a73949a";
+      sha256 = "1z3yhhbmbzfw68qjzyvpbmlyv2a1p814sy5q2knn04kcl30vx94a";
+    };
+  };
+  customPlugins.vim-fileline = pkgs.vimUtils.buildVimPlugin {
+    name = "file-line-1.0";
+    src = pkgs.fetchFromGitHub {
+      owner = "bogado";
+      repo = "file-line";
+      rev = "1.0";
+      sha256 = "0z47zq9rqh06ny0q8lpcdsraf3lyzn9xvb59nywnarf3nxrk6hx0";
+    };
+  };
 in {
   environment.systemPackages = [
     (pkgs.vim_configurable.customize {
@@ -33,6 +41,8 @@ in {
         setStatements = ''
           set autowrite
           set clipboard=unnamedplus
+          set listchars=trail:¶
+          set mouse=a
           set nocompatible
           set path+=**
           set ruler
@@ -40,7 +50,6 @@ in {
           set undofile                 "turn on the feature
           set wildignore+=*.o,*.class,*.hi,*.dyn_hi,*.dyn_o
           set wildmenu
-          set listchars=trail:¶
         '';
         remapStatements = ''
           imap jk <Esc>
@@ -91,13 +100,14 @@ in {
          { names = [
             "ctrlp"
             "easymotion"
+            "elm-vim"
+            "vim-fileline"
             "molokai"
             "nerdtree"
             "snipmate"
             "surround"
             "Syntastic"
             "undotree"
-            "elm-vim"
            ];
          }
          { names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; }
diff --git a/jeschli/2configs/xserver/default.nix b/jeschli/2configs/xserver/default.nix
index 748d1225..ec3977c7 100644
--- a/jeschli/2configs/xserver/default.nix
+++ b/jeschli/2configs/xserver/default.nix
@@ -34,26 +34,6 @@ in {
     };
   };
 
-  services.xserver = {
-  
-    # Don't install feh into systemPackages
-    # refs <nixpkgs/nixos/modules/services/x11/desktop-managers>
-    desktopManager.session = mkForce [];
-  
-    enable = true;
-    display = 11;
-    tty = 11;
-
-    dpi = 200;
-  
-    videoDrivers = [ "nvidia" ];
-    synaptics = {
-      enable = true;
-      twoFingerScroll = true;
-      accelFactor = "0.035";
-    };
-  };
-
   systemd.services.display-manager.enable = false;
 
   systemd.services.xmonad = {
diff --git a/jeschli/5pkgs/simple/xmonad-jeschli/default.nix b/jeschli/5pkgs/simple/xmonad-jeschli/default.nix
index 60dbbc50..5aa3c2f9 100644
--- a/jeschli/5pkgs/simple/xmonad-jeschli/default.nix
+++ b/jeschli/5pkgs/simple/xmonad-jeschli/default.nix
@@ -90,7 +90,7 @@ mainNoArgs = do
             , startupHook = do
                 setWMName "LG3D"
                 whenJustM (liftIO (lookupEnv "XMONAD_STARTUP_HOOK"))
-                          (\path -> forkFile path [] Nothing)
+                          (\path -> forkFile path [] Nothing) <+> setWMName "LG3D"  
             , normalBorderColor  = "#1c1c1c"
             , focusedBorderColor = "#f000b0"
             , handleEventHook = handleShutdownEvent
@@ -130,13 +130,16 @@ spawnTermAt ws = do
     let env' = ("XMONAD_SPAWN_WORKSPACE", ws) : env
     forkFile urxvtcPath [] (Just env')
 
+
 myKeys :: XConfig Layout -> Map (KeyMask, KeySym) (X ())
 myKeys conf = Map.fromList $
     [ ((_4  , xK_Escape ), forkFile "/run/wrappers/bin/slock" [] Nothing)
     , ((_4S , xK_c      ), kill)
 
-    , ((_4  , xK_p      ), forkFile "${pkgs.pass}/bin/passmenu" ["--type"] Nothing)
-
+   , ((_4  , xK_p      ), spawn "${pkgs.writeDash "my-dmenu" ''
+      export PATH=$PATH:${pkgs.dmenu}/bin
+      exec dmenu_run "$@"
+   ''}")
     , ((_4  , xK_x      ), chooseAction spawnTermAt)
     , ((_4C , xK_x      ), spawnRootTerm)