Merge remote-tracking branch 'gum/master'

5 files changed, 18 insertions, 14 deletions

diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index f6ca0c0ac..54a16a931 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -12,7 +12,6 @@ with import <stockholm/lib>;
       <stockholm/makefu/2configs/main-laptop.nix>
       <stockholm/makefu/2configs/extra-fonts.nix>
       <stockholm/makefu/2configs/tools/all.nix>
-      <stockholm/makefu/2configs/tools/mic92.nix>
 
       <stockholm/makefu/2configs/laptop-backup.nix>
       # <stockholm/makefu/2configs/dnscrypt/client.nix>
diff --git a/makefu/2configs/deployment/events-publisher/default.nix b/makefu/2configs/deployment/events-publisher/default.nix
index a09554e6a..37d74c282 100644
--- a/makefu/2configs/deployment/events-publisher/default.nix
+++ b/makefu/2configs/deployment/events-publisher/default.nix
@@ -2,12 +2,13 @@
 with import <stockholm/lib>;
 let
   shack-announce = pkgs.callPackage (builtins.fetchTarball {
-    url = "https://github.com/makefu/events-publisher/archive/4cef900ba10348050208367af6b2035f5a0ef8b6.tar.gz";
-    sha256 = "137vsibr289p3xxlw37xhizi309sygki95919hmj02dxgwmy1k74";
+    url = "https://github.com/makefu/events-publisher/archive/c5218195e6afdc646cb7682d8f355a7ec2b90716.tar.gz";
+    sha256 = "0xk74q7gah3l5zy3bkvih3k9fr1hclvf71rm3ixcmslhicl7khav";
   }) {} ;
   home = "/var/lib/shackannounce";
   user = "shackannounce";
   creds = (toString <secrets>) + "/shack-announce.json";
+  LOL = "DEBUG";
 in
 {
   users.users.${user}= {
@@ -32,14 +33,14 @@ in
         if test ! -e announce.state; then
           echo "initializing state"
           announce-daemon \
-            --lol INFO \
+            --lol ${LOL} \
             --creds creds.json \
             --state announce.state \
             --clean --init
         fi
         echo "Running announce"
         announce-daemon \
-           --lol INFO \
+           --lol ${LOL} \
            --creds creds.json \
            --state announce.state
       '';
diff --git a/makefu/2configs/gui/xpra.nix b/makefu/2configs/gui/xpra.nix
new file mode 100644
index 000000000..2384acbaa
--- /dev/null
+++ b/makefu/2configs/gui/xpra.nix
@@ -0,0 +1,3 @@
+{
+  services.xserver.displayManager.xpra.enable = true;
+}
diff --git a/makefu/2configs/pyload.nix b/makefu/2configs/pyload.nix
new file mode 100644
index 000000000..3aa5048a4
--- /dev/null
+++ b/makefu/2configs/pyload.nix
@@ -0,0 +1,10 @@
+{pkgs, ... }:
+{
+  nixpkgs.config.unfreeRedistributable = true;
+  users.users.makefu.packages = with pkgs;[
+      pyload
+      spidermonkey
+      tesseract
+  ];
+
+}
diff --git a/makefu/2configs/tools/mic92.nix b/makefu/2configs/tools/mic92.nix
deleted file mode 100644
index 176e461c7..000000000
--- a/makefu/2configs/tools/mic92.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-{
-  nixpkgs.overlays = [
-    (import <mic92/nixos/overlays/mypackages>)
-  ];
-  users.users.makefu.packages = [
-    pkgs.nix-review
-  ];
-}