Merge remote-tracking branch 'lass/master'

7 files changed, 84 insertions, 2 deletions

diff --git a/lass/1systems/iso.nix b/lass/1systems/iso.nix
index 4431a702c..0b048a2b1 100644
--- a/lass/1systems/iso.nix
+++ b/lass/1systems/iso.nix
@@ -88,6 +88,7 @@ with import <stockholm/lib>;
         aria2
 
       #neat utils
+        hashPassword
         krebspaste
         pciutils
         pop
diff --git a/lass/1systems/skynet/config.nix b/lass/1systems/skynet/config.nix
new file mode 100644
index 000000000..a48df02b9
--- /dev/null
+++ b/lass/1systems/skynet/config.nix
@@ -0,0 +1,59 @@
+{ config, pkgs, ... }:
+with import <stockholm/lib>;
+{
+  imports = [
+    <stockholm/lass>
+    <stockholm/lass/2configs/hw/x220.nix>
+    <stockholm/lass/2configs/boot/stock-x220.nix>
+
+    <stockholm/lass/2configs/retiolum.nix>
+    #<stockholm/lass/2configs/exim-retiolum.nix>
+    <stockholm/lass/2configs/fetchWallpaper.nix>
+    <stockholm/lass/2configs/backups.nix>
+    {
+      # discordius config
+      services.xserver.enable = true;
+      users.users.discordius = {
+        uid = genid "discordius";
+        home = "/home/discordius";
+        group = "users";
+        createHome = true;
+        extraGroups = [
+          "audio"
+          "networkmanager"
+        ];
+        useDefaultShell = true;
+      };
+      networking.networkmanager.enable = true;
+      networking.wireless.enable = mkForce false;
+      hardware.pulseaudio = {
+        enable = true;
+        systemWide = true;
+      };
+      environment.systemPackages = with pkgs; [
+        pavucontrol
+        firefox
+        hexchat
+        networkmanagerapplet
+      ];
+      services.xserver.desktopManager.gnome3 = {
+        enable = true;
+      };
+    }
+  ];
+
+  krebs.build.host = config.krebs.hosts.daedalus;
+
+  #fileSystems = {
+  #  "/bku" = {
+  #    device = "/dev/mapper/pool-bku";
+  #    fsType = "btrfs";
+  #    options = ["defaults" "noatime" "ssd" "compress=lzo"];
+  #  };
+  #};
+
+  services.udev.extraRules = ''
+    SUBSYSTEM=="net", ATTR{address}=="10:0b:a9:a6:44:04", NAME="wl0"
+    SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:d1:90:fc", NAME="et0"
+  '';
+}
diff --git a/lass/1systems/skynet/source.nix b/lass/1systems/skynet/source.nix
new file mode 100644
index 000000000..2aa627f5c
--- /dev/null
+++ b/lass/1systems/skynet/source.nix
@@ -0,0 +1,4 @@
+import <stockholm/lass/source.nix> {
+  name = "skynet";
+  secure = true;
+}
diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix
index fe3aa20bf..a43dfa215 100644
--- a/lass/2configs/exim-smarthost.nix
+++ b/lass/2configs/exim-smarthost.nix
@@ -36,6 +36,9 @@ with import <stockholm/lib>;
       { from = "shack@lassul.us"; to = lass.mail; }
       { from = "nix@lassul.us"; to = lass.mail; }
       { from = "c-base@lassul.us"; to = lass.mail; }
+      { from = "paypal@lassul.us"; to = lass.mail; }
+      { from = "patreon@lassul.us"; to = lass.mail; }
+      { from = "steam@lassul.us"; to = lass.mail; }
     ];
     system-aliases = [
       { from = "mailer-daemon"; to = "postmaster"; }
diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix
index 9f5e3d523..fe82fea59 100644
--- a/lass/2configs/mail.nix
+++ b/lass/2configs/mail.nix
@@ -65,8 +65,15 @@ let
     ''} %r |"
 
     virtual-mailboxes \
-        "INBOX"     "notmuch://?query=tag:inbox and NOT tag:killed"\
+        "INBOX"     "notmuch://?query=tag:inbox \
+                     and NOT tag:killed \
+                     and NOT to:shackspace \
+                     and NOT to:c-base \
+                     and NOT to:nix-devel"\
         "Unread"    "notmuch://?query=tag:unread"\
+        "shack"     "notmuch://?query=to:shackspace"\
+        "c-base"    "notmuch://?query=to:c-base"\
+        "nix"       "notmuch://?query=to:nix-devel"\
         "TODO"      "notmuch://?query=tag:TODO"\
         "Starred"   "notmuch://?query=tag:*"\
         "Archive"   "notmuch://?query=tag:archive"\
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 3e1ad6638..b0e5375c7 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -125,6 +125,7 @@ in {
       { from = "dominik@apanowicz.de"; to = "dominik_a@gmx.de"; }
       { from = "dma@ubikmedia.de"; to = "domsen"; }
       { from = "dma@ubikmedia.eu"; to = "domsen"; }
+      { from = "bruno@apanowicz.de"; to = "bruno"; }
       { from = "mail@jla-trading.com"; to = "jla-trading"; }
       { from = "jms@ubikmedia.eu"; to = "jms"; }
       { from = "ms@ubikmedia.eu"; to = "ms"; }
@@ -151,6 +152,13 @@ in {
     createHome = true;
   };
 
+  users.users.bruno = {
+    uid = genid_signed "bruno";
+    home = "/home/bruno";
+    useDefaultShell = true;
+    createHome = true;
+  };
+
   users.users.jla-trading = {
     uid = genid_signed "jla-trading";
     home = "/home/jla-trading";
diff --git a/lass/source.nix b/lass/source.nix
index 63adbd95c..1d64e3059 100644
--- a/lass/source.nix
+++ b/lass/source.nix
@@ -19,6 +19,6 @@ in
       #   87a4615 & 334ac4f
       # + acme permissions for groups
       #   fd7a8f1
-      ref = "d486531";
+      ref = "a732dcf";
     };
   }