Merge remote-tracking branch 'gum/master'

6 files changed, 46 insertions, 7 deletions

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index afdeec40..62daed8b 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -22,7 +22,7 @@ with config.krebs.lib;
       source =  mapAttrs (_: mkDefault) {
         nixpkgs = {
           url = https://github.com/nixos/nixpkgs;
-          rev = "40c586b7ce2c559374df435f46d673baf711c543"; # unstable @ 2016-02-27, tested on wry
+          rev = "63b9785"; # stable @ 2016-06-01
         };
         secrets = "/home/makefu/secrets/${config.krebs.build.host.name}/";
         stockholm = "/home/makefu/stockholm";
@@ -75,7 +75,7 @@ with config.krebs.lib;
   systemd.tmpfiles.rules = [
     "d /tmp 1777 root root - -"
   ];
-
+  nix.nixPath = [ "/var/src" ];
   environment.variables = {
     NIX_PATH = mkForce "/var/src";
     EDITOR = mkForce "vim";
@@ -126,6 +126,7 @@ with config.krebs.lib;
   nixpkgs.config.packageOverrides = pkgs: {
     nano = pkgs.runCommand "empty" {} "mkdir -p $out";
     tinc = pkgs.tinc_pre;
+    gnupg1compat = super.gnupg1compat.override { gnupg = self.gnupg21; };
   };
 
   services.cron.enable = false;
diff --git a/makefu/2configs/exim-retiolum.nix b/makefu/2configs/exim-retiolum.nix
index 34943f59..910066e0 100644
--- a/makefu/2configs/exim-retiolum.nix
+++ b/makefu/2configs/exim-retiolum.nix
@@ -2,9 +2,10 @@
 
 with config.krebs.lib;
 {
+  networking.firewall.allowedTCPPorts = [ 25 ];
+
   krebs.exim-retiolum.enable = true;
   environment.systemPackages = with pkgs; [
     msmtp
   ];
-
 }
diff --git a/makefu/2configs/git/cgit-retiolum.nix b/makefu/2configs/git/cgit-retiolum.nix
index 0b69dbca..44d75948 100644
--- a/makefu/2configs/git/cgit-retiolum.nix
+++ b/makefu/2configs/git/cgit-retiolum.nix
@@ -15,6 +15,9 @@ let
     tinc_graphs = {
       desc = "Tinc Advanced Graph Generation";
     };
+    stockholm-init = {
+      desc = "Build new Stockholm hosts";
+    };
     cac-api = { };
     init-stockholm = {
       desc = "Init stuff for stockholm";
diff --git a/makefu/2configs/omo-share.nix b/makefu/2configs/omo-share.nix
index 08bdd4a4..7e9842e1 100644
--- a/makefu/2configs/omo-share.nix
+++ b/makefu/2configs/omo-share.nix
@@ -69,15 +69,15 @@ in {
         browseable = "yes";
         "guest ok" = "yes";
       };
-      usenet-rw = {
-        path = "/media/crypt0/usenet";
+      crypt0-rw = {
+        path = "/media/crypt0/";
         "read only" = "no";
         browseable = "yes";
         "guest ok" = "no";
         "valid users" = "makefu";
       };
-      emu-rw = {
-        path = "/media/crypt1/emu";
+      crypt1-rw = {
+        path = "/media/crypt1/";
         "read only" = "no";
         browseable = "yes";
         "guest ok" = "no";
diff --git a/makefu/2configs/steam.nix b/makefu/2configs/steam.nix
new file mode 100644
index 00000000..d4ec84ab
--- /dev/null
+++ b/makefu/2configs/steam.nix
@@ -0,0 +1,6 @@
+{pkgs, ...}:
+{
+  environment.systemPackages = [ pkgs.steam ];
+  hardware.opengl.driSupport32Bit = true;
+  hardware.pulseaudio.support32Bit = true;
+}
diff --git a/makefu/2configs/temp-share-samba.nix b/makefu/2configs/temp-share-samba.nix
new file mode 100644
index 00000000..5f21e3bf
--- /dev/null
+++ b/makefu/2configs/temp-share-samba.nix
@@ -0,0 +1,28 @@
+{config, ... }:{
+  users.users.smbguest = {
+    name = "smbguest";
+    uid = config.ids.uids.smbguest;
+    description = "smb guest user";
+    home = "/var/empty";
+  };
+  services.samba = {
+    enable = true;
+    shares = {
+      share-home = {
+        path = "/home/share/";
+        "read only" = "no";
+        browseable = "yes";
+        "guest ok" = "yes";
+      };
+    };
+    extraConfig = ''
+      guest account = smbguest
+      map to guest = bad user
+      # disable printing
+      load printers = no
+      printing = bsd
+      printcap name = /dev/null
+      disable spoolss = yes
+    '';
+  };
+}