Merge branch 'master' of prism:stockholm

7 files changed, 67 insertions, 8 deletions

diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix
index 3030d8faf..272169e92 100644
--- a/lass/2configs/browsers.nix
+++ b/lass/2configs/browsers.nix
@@ -90,7 +90,7 @@ in {
     }
     ( createQuteUser "qb" [ "audio" ] 20 )
     ( createFirefoxUser "ff" [ "audio" ] 10 )
-    ( createChromiumUser "cr" [ "audio" ] 9 )
+    ( createChromiumUser "cr" [ "audio" "video" ] 9 )
     ( createChromiumUser "gm" [ "video" "audio" ] 8 )
     ( createChromiumUser "wk" [ "audio" ] 0 )
     ( createChromiumUser "fb" [ "audio" ] 0 )
diff --git a/lass/2configs/dcso-dev.nix b/lass/2configs/dcso-dev.nix
index 62a601dc3..4d8d308fb 100644
--- a/lass/2configs/dcso-dev.nix
+++ b/lass/2configs/dcso-dev.nix
@@ -9,7 +9,7 @@ in {
     dev = {
       name = "dev";
       uid = genid "dev";
-      extraGroups = [ "docker" ];
+      extraGroups = [ "docker" "vboxusers" ];
       description = "user for collaborative development";
       home = "/home/dev";
       useDefaultShell = true;
@@ -17,6 +17,7 @@ in {
       openssh.authorizedKeys.keys = [
         config.krebs.users.lass.pubkey
         config.krebs.users.lass-android.pubkey
+        config.krebs.users.lass-mors.pubkey
         config.krebs.users.jeschli-bln.pubkey
         config.krebs.users.jeschli-brauerei.pubkey
         "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1T5+2epslFARSnETdr4wdolA6ocJaD4H9tmz6BZFQKXlwIq+OMp+sSEdwYwW3Lu9+mNbBHPxVVJDWg/We9DXB0ezXPM5Bs1+FcehmkoGwkmgKaFCDt0sL+CfSnog/3wEkN21O/rQxVFqMmiJ7WUDGci6IKCFZ5ZjOsmmfHg5p3LYxU9xv33fNr2v+XauhrGbFtQ7eDz4kSywxN/aw73LN4d8em0V0UV8VPI3Qkw7MamDFwefA+K1TfK8pBzMeruU6N7HLuNkpkAp7kS+K4Zzd72aQtR37a5qMiFUbOxQ9B7iFypuPx0iu6ZwY1s/sM8t3kLmcDJ9O4FOTzlbpneet3as6iJ+Ckr/TlfKor2Tl5pWcXh2FXHoG8VUu5bYmIViJBrKihAlAQfQN0mJ9fdFTnCXVTtbYTy11s4eEVHgUlb7oSpgBnx5bnBONgApbsOX9zyoo8wz8KkZBcf1SQpkV5br8uUAHCcZtHuY6I3kKlv+8lJmgUipiYzMdTi7+dHa49gVEcEKL4ZnJ0msQkl4XT7JjKETLvumC4/TIqVuRu48wuYalkCR9OzxCsTXQ/msBJBztPdYLrEOXVb2HfzuCT+43UuMQ5rP/EoPy0TWQO9BaqfEXqvbOvWjVxj/GMvglQ2ChZTwHxwwTKB8qRVvJLnbZQwizQiSrkzjb6hRJfQ== u0_a165@localhost"
@@ -60,8 +61,15 @@ in {
     ${mainUser.name} ALL=(dev) NOPASSWD: ALL
   '';
 
-  services.rabbitmq.enable = true;
   networking.interfaces.et0.ipv4.addresses = [
     { address = "10.99.23.1"; prefixLength = 24; }
   ];
+  virtualisation.docker.enable = true;
+  environment.etc."docker/daemon.json".source = pkgs.writeText "daemon.json" ''
+    {
+      "bip": "172.25.0.1/16"
+    }
+  '';
+  services.rabbitmq.enable = true;
+  services.postgresql.enable = true;
 }
diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix
index 371f20885..db6bda005 100644
--- a/lass/2configs/exim-smarthost.nix
+++ b/lass/2configs/exim-smarthost.nix
@@ -83,6 +83,7 @@ with import <stockholm/lib>;
       { from = "elitedangerous@lassul.us"; to = lass.mail; }
       { from = "boardgamegeek@lassul.us"; to = lass.mail; }
       { from = "qwertee@lassul.us"; to = lass.mail; }
+      { from = "zazzle@lassul.us"; to = lass.mail; }
     ];
     system-aliases = [
       { from = "mailer-daemon"; to = "postmaster"; }
diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index 707796dd9..829e62269 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -30,6 +30,14 @@ let
   rules = concatMap make-rules (attrValues repos);
 
   public-repos = mapAttrs make-public-repo {
+    cholerab = {
+      cgit.desc = "krebs thesauron & enterprise-patterns";
+      cgit.section = "documentation";
+    };
+    disko = {
+      cgit.desc = "take a description of your disk layout and produce a format script";
+      cgit.section = "software";
+    };
     news = {
       cgit.desc = "take a rss feed and a timeout and print it to stdout";
       cgit.section = "software";
diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index 6014fd082..823d9a8ca 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -2,6 +2,12 @@
 
 with import <stockholm/lib>;
 let
+  unstable_nixpkgs = import (pkgs.fetchFromGitHub {
+    owner = "NixOS";
+    repo = "nixpkgs";
+    rev = "a8c71037e041725d40fbf2f3047347b6833b1703";
+    sha256 = "1z4cchcw7qgjhy0x6mnz7iqvpswc2nfjpdynxc54zpm66khfrjqw";
+  }) {};
   out = {
     environment.systemPackages = [
       (hiPrio vim)
@@ -9,6 +15,10 @@ let
       (pkgs.writeDashBin "govet" ''
         go vet "$@"
       '')
+      (hiPrio (unstable_nixpkgs.python3.withPackages (ps: [
+        ps.python-language-server
+        ps.pyls-isort
+      ])))
     ];
 
     environment.etc.vimrc.source = vimrc;
@@ -68,11 +78,17 @@ let
     au BufRead,BufNewFile /dev/shm/* set nobackup nowritebackup noswapfile
 
     "Syntastic config
-    let g:syntastic_python_checkers=['flake8']
-    let g:syntastic_python_flake8_post_args='--ignore=E501'
+    "let g:syntastic_python_checkers=['flake8']
+    "let g:syntastic_python_flake8_post_args='--ignore=E501'
 
-    let g:go_metalinter_autosave = 1
-    let g:go_metalinter_deadline = "10s"
+    nnoremap <F5> :call LanguageClient_contextMenu()<CR>
+    set hidden
+    let g:LanguageClient_serverCommands = {
+        \ 'python': ['pyls'],
+        \ 'go': ['~/go/bin/go-langserver']
+        \ }
+
+    let g:LanguageClient_diagnosticsDisplay = { 2: { "signText": "W" } }
 
     nmap <esc>q :buffer 
     nmap <M-q> :buffer 
@@ -115,9 +131,11 @@ let
   extra-runtimepath = concatMapStringsSep "," (pkg: "${pkg.rtp}") [
     pkgs.vimPlugins.ack-vim
     pkgs.vimPlugins.Gundo
-    pkgs.vimPlugins.Syntastic
+    #pkgs.vimPlugins.Syntastic
     pkgs.vimPlugins.undotree
     pkgs.vimPlugins.vim-go
+    pkgs.vimPlugins.fzf-vim
+    unstable_nixpkgs.vimPlugins.LanguageClient-neovim
     (pkgs.vimUtils.buildVimPlugin {
       name = "file-line-1.0";
       src = pkgs.fetchFromGitHub {
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index e4f50e2d1..d19f534fe 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -119,6 +119,7 @@ in {
       { from = "ms@ubikmedia.eu"; to = "ms"; }
       { from = "ubik@ubikmedia.eu"; to = "domsen, jms, ms"; }
       { from = "akayguen@freemonkey.art"; to ="akayguen"; }
+      { from = "bui@freemonkey.art"; to ="bui"; }
 
       { from = "testuser@lassul.us"; to = "testuser"; }
       { from = "testuser@ubikmedia.eu"; to = "testuser"; }
@@ -183,5 +184,12 @@ in {
     createHome = true;
   };
 
+  users.users.bui = {
+    uid = genid_signed "bui";
+    home = "/home/bui";
+    useDefaultShell = true;
+    createHome = true;
+  };
+
 }
 
diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index 53f1eea5c..f60a66952 100644
--- a/lass/2configs/websites/lassulus.nix
+++ b/lass/2configs/websites/lassulus.nix
@@ -66,6 +66,22 @@ in {
     locations."/tinc".extraConfig = ''
       alias ${config.krebs.tinc_graphs.workingDir}/external;
     '';
+    locations."/urlaubyay2018".extraConfig = ''
+      autoindex on;
+      alias /srv/http/lassul.us-media/india2018;
+      auth_basic "Restricted Content";
+      auth_basic_user_file ${pkgs.writeText "pics-user-pass" ''
+        paolo:$apr1$aQ6mYNR3$ho.aJ7icqSO.y.xKo3GQf0
+      ''};
+    '';
+    locations."/heilstadt".extraConfig = ''
+      autoindex on;
+      alias /srv/http/lassul.us-media/grabowsee2018;
+      auth_basic "Restricted Content";
+      auth_basic_user_file ${pkgs.writeText "pics-user-pass" ''
+        c-base:$apr1$aQ6mYNR3$ho.aJ7icqSO.y.xKo3GQf0
+      ''};
+    '';
     # TODO make this work!
     locations."= /ddate".extraConfig = let
       script = pkgs.writeBash "test" ''