Merge remote-tracking branch 'prism/master'

5 files changed, 21 insertions, 23 deletions

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 27b74a30..22a7b1c1 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -6,7 +6,6 @@ with import <stockholm/lib>;
     ../2configs/binary-cache/client.nix
     ../2configs/gc.nix
     ../2configs/mc.nix
-    ../2configs/nixpkgs.nix
     ../2configs/vim.nix
     ../2configs/monitoring/client.nix
     ./htop.nix
@@ -36,6 +35,7 @@ with import <stockholm/lib>;
           extraGroups = [
             "audio"
             "fuse"
+            "wheel"
           ];
           openssh.authorizedKeys.keys = [
             config.krebs.users.lass.pubkey
@@ -71,16 +71,7 @@ with import <stockholm/lib>;
   krebs = {
     enable = true;
     search-domain = "r";
-    build = {
-      user = config.krebs.users.lass;
-      source = let inherit (config.krebs.build) host; in {
-        nixos-config.symlink = "stockholm/lass/1systems/${host.name}.nix";
-        secrets.file =
-          if getEnv "dummy_secrets" == "true"
-            then toString <stockholm/lass/2configs/tests/dummy-secrets>
-            else "/home/lass/secrets/${host.name}";
-      };
-    };
+    build.user = config.krebs.users.lass;
   };
 
   nix.useSandbox = true;
diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index 5f686e26..4137c482 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -65,7 +65,7 @@ let
         server = "ni.r";
         verbose = config.krebs.build.host.name == "prism";
         # TODO define branches in some kind of option per repo
-        branches = [ "master" ];
+        branches = [ "master" "staging*" ];
       };
     };
   };
diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix
index e39c09b8..9f5e3d52 100644
--- a/lass/2configs/mail.nix
+++ b/lass/2configs/mail.nix
@@ -43,14 +43,26 @@ let
     set nm_record = yes
     set nm_record_tags = "-inbox me archive"
     set virtual_spoolfile=yes                    # enable virtual folders
-    set sendmail="${msmtp}/bin/msmtp"                         # enables parsing of outgoing mail
+
+
+    set sendmail="${msmtp}/bin/msmtp"            # enables parsing of outgoing mail
     set from="lassulus@lassul.us"
+    alternates ^.*@lassul\.us$ ^.*@.*\.r$
     set use_from=yes
     set envelope_from=yes
+    set reverse_name
 
     set sort=threads
 
-    set index_format="%4C %Z %?GI?%GI& ? %[%d/%b]  %-16.15F %?M?(%3M)&     ? %s %> %?g?%g?"
+    set index_format="${pkgs.writeDash "mutt-index" ''
+      # http://www.mutt.org/doc/manual/#formatstrings
+      recipent="$(echo $1 | sed 's/[^,]*<\([^>]*\)[^,]*/ \1/g')"
+      #     output to mutt
+      #           V
+      echo "%4C %Z %?GI?%GI& ? %[%d/%b] %-20.20a %?M?(%3M)& ? %s %> $recipent %?g?%g?%"
+      # args to mutt-index dash script
+      # V
+    ''} %r |"
 
     virtual-mailboxes \
         "INBOX"     "notmuch://?query=tag:inbox and NOT tag:killed"\
diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
deleted file mode 100644
index 151242e4..00000000
--- a/lass/2configs/nixpkgs.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }:
-
-{
-  krebs.build.source.nixpkgs.git = {
-    url = https://cgit.lassul.us/nixpkgs;
-    ref = "2e983f1";
-  };
-}
diff --git a/lass/2configs/wine.nix b/lass/2configs/wine.nix
index ee688e18..d4a91e64 100644
--- a/lass/2configs/wine.nix
+++ b/lass/2configs/wine.nix
@@ -13,7 +13,10 @@ in {
       description = "user for running wine";
       home = "/home/wine";
       useDefaultShell = true;
-      extraGroups = [ "audio" ];
+      extraGroups = [
+        "audio"
+        "video"
+      ];
       createHome = true;
     };
   };