Merge remote-tracking branch 'prism/master'

18 files changed, 154 insertions, 16 deletions

diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index afdefaa45..7d04827f0 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -71,8 +71,10 @@ in {
     ag
     bank
     cabal2nix
+    cholerab
     dic
     dmenu
+    font-size
     gi
     gitAndTools.qgit
     git-preview
@@ -81,6 +83,7 @@ in {
     mpv-poll
     much
     ncdu
+    nix-index
     nix-repl
     nmap
     pavucontrol
@@ -91,7 +94,6 @@ in {
     sxiv
     taskwarrior
     termite
-    thesauron
     timewarrior
     xclip
     xephyrify
diff --git a/lass/2configs/blue-host.nix b/lass/2configs/blue-host.nix
index 657234bc1..83c235f3e 100644
--- a/lass/2configs/blue-host.nix
+++ b/lass/2configs/blue-host.nix
@@ -5,6 +5,7 @@ with import <stockholm/lib>;
   imports = [
     <stockholm/lass/2configs/container-networking.nix>
   ];
+  systemd.services."container@blue".reloadIfChanged = mkForce false;
   containers.blue = {
     config = { ... }: {
       environment.systemPackages = [ pkgs.git ];
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 b985b67b3..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"
@@ -54,10 +55,21 @@ in {
   krebs.per-user.dev.packages = [
     pkgs.go
   ];
+  environment.variables.GOPATH = "$HOME/go";
 
   security.sudo.extraConfig = ''
     ${mainUser.name} ALL=(dev) NOPASSWD: ALL
   '';
 
-  services.minio.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/dunst.nix b/lass/2configs/dunst.nix
index 6d3d839bc..18a22e1da 100644
--- a/lass/2configs/dunst.nix
+++ b/lass/2configs/dunst.nix
@@ -188,21 +188,21 @@ let
     foreground = "#3B7C87"
     background = "#191311"
     #background = "#2B313C"
-    timeout = 0
+    timeout = 1
 
     [urgency_normal]
     frame_color = "#5B8234"
     foreground = "#5B8234"
     background = "#191311"
     #background = "#2B313C"
-    timeout = 0
+    timeout = 1
 
     [urgency_critical]
     frame_color = "#B7472A"
     foreground = "#B7472A"
     background = "#191311"
     #background = "#2B313C"
-    timeout = 0
+    timeout = 1
 
 
     # Every section that isn't one of the above is interpreted as a rules to
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 72cfd5e75..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";
@@ -61,6 +69,10 @@ let
       cgit.desc = "krebs deployment";
       cgit.section = "software";
     };
+    xmonad-stockholm = {
+      cgit.desc = "krebs xmonad modules";
+      cgit.section = "configuration";
+    };
   } // mapAttrs make-public-repo-silent {
     nixos-aws = {
       collaborators = [ {
diff --git a/lass/2configs/logf.nix b/lass/2configs/logf.nix
index 24b806efa..f141a94f5 100644
--- a/lass/2configs/logf.nix
+++ b/lass/2configs/logf.nix
@@ -11,7 +11,7 @@ let
     cloudkrebs = "119";
   };
   urgent = [
-    "\\blass@mors\\b"
+    "\\blass@blue\\b"
   ];
 in {
   environment.systemPackages = [
diff --git a/lass/2configs/reaktor-coders.nix b/lass/2configs/reaktor-coders.nix
index 0ce147acd..86877df7a 100644
--- a/lass/2configs/reaktor-coders.nix
+++ b/lass/2configs/reaktor-coders.nix
@@ -100,6 +100,12 @@ with import <stockholm/lib>;
           exec echo 'DID SOMEBODY SAY BLOCKCHAIN? https://paste.krebsco.de/r99pMoQq/+inline'
         '';
       })
+      (buildSimpleReaktorPlugin "shrug" {
+        pattern = "^!shrug$";
+        script = pkgs.writeDash "shrug" ''
+          exec echo '¯\_(ツ)_/¯'
+        '';
+      })
     ];
   };
 }
diff --git a/lass/2configs/repo-sync.nix b/lass/2configs/repo-sync.nix
index 615f5a728..6a07172fe 100644
--- a/lass/2configs/repo-sync.nix
+++ b/lass/2configs/repo-sync.nix
@@ -27,6 +27,7 @@ let
         user = with config.krebs.users; [
           config.krebs.users."${config.networking.hostName}-repo-sync"
           lass
+          lass-mors
           lass-shodan
         ];
         repo = [ repo ];
@@ -136,5 +137,6 @@ in {
     (sync-retiolum "stockholm")
     (sync-retiolum "wai-middleware-time")
     (sync-retiolum "xmonad-stockholm")
+    (sync-retiolum "nix-writers")
   ];
 }
diff --git a/lass/2configs/starcraft.nix b/lass/2configs/starcraft.nix
new file mode 100644
index 000000000..742b877e8
--- /dev/null
+++ b/lass/2configs/starcraft.nix
@@ -0,0 +1,53 @@
+{ config, pkgs, ... }: let
+  mainUser = config.users.extraUsers.mainUser;
+  newWine = pkgs.wineStaging;
+  #newWine = pkgs.wineStaging.overrideAttrs (old: {
+  #  name = "wine-3.7";
+  #  buildInputs = old.buildInputs ++ [
+  #    pkgs.libuuid.bin
+  #    pkgs.autoconf.out
+  #  ];
+  #  src = pkgs.fetchurl {
+  #    url = "https://dl.winehq.org/wine/source/3.x/wine-3.7.tar.xz";
+  #    sha256 = "1drbzk3y0m14lkq3vzwwkvain5shykgcbmyzh6gcb5r4sxh3givn";
+  #  };
+  #  postPatch = old.postPatch or "" + ''
+  #    patchShebangs tools
+  #    cp -r ${pkgs.fetchFromGitHub {
+  #      sha256 = "0kam73jqhah7bzji5csxxhhfdp6byhzpcph6xnzjqz2aic5xk7xi";
+  #      owner = "wine-staging";
+  #      repo = "wine-staging";
+  #      rev = "v3.7";
+  #    }}/patches .
+  #    chmod +w patches
+  #    cd patches
+  #    patchShebangs gitapply.sh
+  #    ./patchinstall.sh DESTDIR="$PWD/.." --all
+  #    cd ..
+  #  '';
+
+  #});
+  #newWine = (import (builtins.fetchGit {
+  #  url = "https://github.com/NixOS/nixpkgs";
+  #  rev = "696c6bed4e8e2d9fd9b956dea7e5d49531e9d13f";
+  #}) {}).wineStaging;
+in {
+  users.users= {
+    starcraft = {
+      isNormalUser = true;
+      extraGroups = [
+        "audio"
+        "video"
+      ];
+      packages = [
+        newWine
+        pkgs.winetricks
+        pkgs.mpg123
+      ];
+    };
+  };
+  security.sudo.extraConfig = ''
+    ${mainUser.name} ALL=(starcraft) NOPASSWD: ALL
+  '';
+}
+
diff --git a/lass/2configs/urxvt.nix b/lass/2configs/urxvt.nix
index fc4537140..90d28d650 100644
--- a/lass/2configs/urxvt.nix
+++ b/lass/2configs/urxvt.nix
@@ -5,7 +5,7 @@ with import <stockholm/lib>;
   services.urxvtd.enable = true;
 
   krebs.xresources.resources.urxvt = ''
-    URxvt*SaveLines: 4096
+    URxvt*SaveLines: 1000000
     URxvt*scrollBar:            false
     URxvt*urgentOnBell:         true
     URxvt.perl-ext-common:      default,clipboard,url-select,keyboard-select
@@ -19,6 +19,12 @@ with import <stockholm/lib>;
     URxvt.keysym.M-Escape:      perl:keyboard-select:activate
     URxvt.keysym.M-s:           perl:keyboard-select:search
 
+    URxvt.keysym.M-F1: command:\033]710;-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1\007\033]711;-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1\007
+    URxvt.keysym.M-F2: command:\033]710;xft:Monospace:size=15\007\033]711;xft:Monospace:size=15:bold\007
+    URxvt.keysym.M-F3: command:\033]710;xft:Monospace:size=20\007\033]711;xft:Monospace:size=20:bold\007
+    URxvt.keysym.M-F4: command:\033]710;xft:Monospace:size=25\007\033]711;xft:Monospace:size=25:bold\007
+    URxvt.keysym.M-F5: command:\033]710;xft:Monospace:size=30\007\033]711;xft:Monospace:size=30:bold\007
+
     URxvt.intensityStyles:      false
 
     URxvt*background:           #000000
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/virtualbox.nix b/lass/2configs/virtualbox.nix
index 8171def2d..cfb835d78 100644
--- a/lass/2configs/virtualbox.nix
+++ b/lass/2configs/virtualbox.nix
@@ -15,7 +15,7 @@ in {
       description = "user for running VirtualBox";
       home = "/home/virtual";
       useDefaultShell = true;
-      extraGroups = [ "vboxusers" "audio" ];
+      extraGroups = [ "vboxusers" "audio" "video" ];
       createHome = true;
     };
   };
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" ''
diff --git a/lass/2configs/websites/util.nix b/lass/2configs/websites/util.nix
index 816449c14..a807f7160 100644
--- a/lass/2configs/websites/util.nix
+++ b/lass/2configs/websites/util.nix
@@ -194,7 +194,7 @@ rec {
     in {
       services.nginx.virtualHosts."${domain}" = {
         enableACME = true;
-        addSSL = true;
+        forceSSL = true;
         serverAliases = domains;
         extraConfig = ''
           root /srv/http/${domain}/;
diff --git a/lass/2configs/wine.nix b/lass/2configs/wine.nix
index dd82b34eb..71a5cdda9 100644
--- a/lass/2configs/wine.nix
+++ b/lass/2configs/wine.nix
@@ -17,6 +17,7 @@ in {
       createHome = true;
       packages = [
         pkgs.wine
+        pkgs.winetricks
       ];
     };
   };