1 files changed, 86 insertions, 71 deletions

diff --git a/bragi.nix b/bragi.nix
index fe447e2d..f0817580 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -3,6 +3,7 @@
 let
   trivmixService = opts: (pkgs.callPackage ./custom/trivmix-service.nix opts).out;
   thermoprint-servant = (pkgs.callPackage ./custom/thermoprint {}).thermoprint-servant;
+  inherit (pkgs) lib;
 in rec {
   imports =
     [ ./musnix
@@ -31,29 +32,22 @@ in rec {
           overrides = self: super: let
             callPackage = pkgs.lib.callPackageWith ( pkgs // self );
           in {
-            trivmix = callPackage ./custom/trivmix.nix {};
-            # filelock = callPackage ./custom/filelock.nix {};
+            trivmix = callPackage ./custom/trivmix {};
           };
         }
       );
 
       jack2Full = pkgs.jack2Full.override { dbus = null; };
 
-      mpd = pkgs.symlinkJoin {
-        name = "mpd";
-        paths = [ (pkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; }) ];
-        buildInputs = [ pkgs.makeWrapper ];
-        postBuild = ''
-          wrapProgram $out/bin/mpd \
-            --run "umask 0"
-        '';
-      };
+      mpd = pkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; };
       
-      inherit (pkgs.callPackage ./custom/thermoprint {}) thermoprint-server thermoprint-webgui tprint;
+      inherit (pkgs.callPackage ./custom/thermoprint { extraPackages = (p: with p; [ persistent-postgresql ]); }) thermoprint-server thermoprint-webgui tprint;
 
       inherit (haskellPackages) trivmix;
     };
 
+  nixpkgs.config.allowUnfree = true;
+
   environment.systemPackages = with pkgs; [
     git
     mosh
@@ -124,17 +118,20 @@ in rec {
     };
   };
 
-  systemd.services."mpdmix0" = trivmixService { name = "mpdmix0"; connectOut = "system:playback_3"; group = "mpd"; };
-  systemd.services."mpdmix1" = trivmixService { name = "mpdmix1"; connectOut = "system:playback_4"; group = "mpd"; };
+  systemd.services."mpdmix0" = trivmixService { name = "mpdmix0"; connectOut = "system:playback_3"; group = "mpd"; initial = "-35dB"; };
+  systemd.services."mpdmix1" = trivmixService { name = "mpdmix1"; connectOut = "system:playback_4"; group = "mpd"; initial = "-35dB"; };
+
+  systemd.services."passmix0" = trivmixService { name = "passmix0"; connectOut = "system:playback_3"; connectIn = "system:capture_5"; group = "vali_out"; initial = "-20dB"; };
+  systemd.services."passmix1" = trivmixService { name = "passmix1"; connectOut = "system:playback_4"; connectIn = "system:capture_6"; group = "vali_out"; initial = "-20dB"; };
 
-  systemd.services."passmix0" = trivmixService { name = "passmix0"; connectOut = "system:playback_3"; connectIn = "system:capture_5"; group = "vali_out"; };
-  systemd.services."passmix1" = trivmixService { name = "passmix1"; connectOut = "system:playback_4"; connectIn = "system:capture_6"; group = "vali_out"; };
+  systemd.services."passmix2" = trivmixService { name = "passmix2"; connectOut = "system:playback_5"; connectIn = "system:capture_1"; group = "vali_in"; initial = "1"; };
+  systemd.services."passmix3" = trivmixService { name = "passmix3"; connectOut = "system:playback_6"; connectIn = "system:capture_1"; group = "vali_in"; initial = "1"; };
 
-  systemd.services."passmix2" = trivmixService { name = "passmix2"; connectOut = "system:playback_5"; connectIn = "system:capture_1"; group = "vali_in"; };
-  systemd.services."passmix3" = trivmixService { name = "passmix3"; connectOut = "system:playback_6"; connectIn = "system:capture_1"; group = "vali_in"; };
+  systemd.services."passmix4" = trivmixService { name = "passmix4"; connectOut = "system:playback_3"; connectIn = "system:capture_7"; group = "hel_out"; initial = "-17.5dB"; };
+  systemd.services."passmix5" = trivmixService { name = "passmix5"; connectOut = "system:playback_4"; connectIn = "system:capture_8"; group = "hel_out"; initial = "-17.5dB"; };
 
-  systemd.services."passmix4" = trivmixService { name = "passmix4"; connectOut = "system:playback_3"; connectIn = "system:capture_7"; group = "hel_out"; };
-  systemd.services."passmix5" = trivmixService { name = "passmix5"; connectOut = "system:playback_4"; connectIn = "system:capture_8"; group = "hel_out"; };
+  systemd.services."passmix6" = trivmixService { name = "passmix6"; connectOut = "system:playback_7"; connectIn = "system:capture_1"; group = "hel_in"; initial = "1"; };
+  systemd.services."passmix7" = trivmixService { name = "passmix7"; connectOut = "system:playback_8"; connectIn = "system:capture_1"; group = "hel_in"; initial = "1"; };
 
   services.mpd = {
     enable = true;
@@ -159,6 +156,9 @@ in rec {
   systemd.services."mpd".requires = [ "jack.service" ];
   systemd.services."mpd".serviceConfig = {
       LimitMEMLOCK = "infinity";
+      Nice = "-5";
+      LimitRTPRIO = "95:95";
+      UMask = "0000";
   };
 
   users.extraUsers.jack = {
@@ -167,7 +167,7 @@ in rec {
     group = "audio";
   };
 
-  security.setuidPrograms = ["mount.nfs"];
+  security.wrappers = { "mount.nfs".source = "${pkgs.nfs-utils}/bin/mount.nfs"; };
 
   programs.bash.promptInit = ''
     PROMPT_COLOR="1;31m"
@@ -208,6 +208,7 @@ in rec {
     allowPing = true;
     allowedTCPPorts = [ 22 # SSH
                         80 # HTTP
+                        5432 # PostgreSQL
                         6600 # MPD
                       ];
     allowedUDPPortRanges = [ { from = 60000; to = 61000; } # mosh
@@ -220,7 +221,14 @@ in rec {
     '';
   };
 
-  services.dhcpd = {
+  networking.defaultMailServer = {
+    directDelivery = true;
+    hostName = "ymir.niflheim.yggdrasil";
+    useSTARTTLS = true;
+    setSendmail = true;
+  };
+
+  services.dhcpd4 = {
     enable = true;
     interfaces = [ "enp1s0"
                  ];
@@ -249,14 +257,6 @@ in rec {
     '';
   };
 
-  services.ntp = {
-    enable = false;
-  };
-
-  services.chrony = {
-    enable = true;
-  };
-
   users.extraUsers.root = let
     template = (import users/gkleen.nix);
     in {
@@ -272,56 +272,19 @@ in rec {
     home = "/var/lib/thermoprint";
   };
 
-  environment.etc."thermoprint-server/thermoprint-server.hs" = {
-    text = ''
-      {-# LANGUAGE OverloadedStrings  #-}
-      {-# LANGUAGE ImpredicativeTypes #-}
-
-      module Main (main) where
-
-      import Thermoprint.Server
-
-      import Thermoprint.Server.Printer.Generic
-
-      import Control.Monad.Trans.Resource
-      import Control.Monad.Logger
-      import Control.Monad.Reader
-
-      import Database.Persist.Sqlite
-    
-      import qualified Network.Wai.Handler.Warp as Warp
-
-      main :: IO ()
-      main = thermoprintServer True (Nat runSqlite) $ (\c -> c { queueManagers = queueManagers, warpSettings = wSettings }) <$> def `withPrinters` printers
-        where
-          runSqlite :: ReaderT ConnectionPool (LoggingT IO) a -> IO a
-          runSqlite = runStderrLoggingT . withSqlitePool "${users.extraUsers."thermoprint".home}/thermoprint.sqlite" 1 . runReaderT
-
-          printers = [ (pure $ genericPrint "/dev/usb/lp0", def :: QMConfig (ResourceT (ReaderT ConnectionPool (LoggingT IO))))
-                     ]
-
-          queueManagers _ = QMConfig
-            { manager = union [ limitHistorySize 100
-                              , limitHistoryAge 3600
-                              ]
-            , collapse = standardCollapse
-            }
-
-          wSettings = Warp.setHost "127.0.0.1" . Warp.setPort 8080 $ Warp.defaultSettings 
-    '';
-  };
-
   systemd.services."thermoprint" = {
     environment = {
-      THERMOPRINT_CONFIG = "/etc/thermoprint-server";
+      THERMOPRINT_CONFIG = ./bragi/thermoprint-server;
       THERMOPRINT_CACHE = ''${users.extraUsers."thermoprint".home}/dyre'';
     };
+    requires = [ "postgresql.service" ];
     wantedBy = [ "default.target" ];
     serviceConfig = {
       Type = "simple";
       ExecStart = ''${pkgs.thermoprint-server}/bin/thermoprint-server --force-reconf'';
       User = users.extraUsers."thermoprint".name;
       Group = users.extraUsers."thermoprint".group;
+      WorkingDirectory = "~";
     };
   };
 
@@ -332,6 +295,35 @@ in rec {
       ExecStart = ''${pkgs.thermoprint-webgui}/bin/thermoprint-webgui -P 80 -A localhost -F /thermoprint/api/ -a "localhost" -p 8081'';
       User = users.extraUsers."thermoprint".name;
       Group = users.extraUsers."thermoprint".group;
+      WorkingDirectory = "~";
+    };
+  };
+
+  users.extraUsers."bar" = {
+    name = "bar";
+    group = "nogroup";
+    isSystemUser = true;
+    createHome = true;
+    home = "/var/lib/bar";
+  };
+
+  systemd.services."bar" = let
+    ghc = pkgs.haskellPackages.ghcWithPackages (p: with p; [yesod persistent-postgresql]);
+  in {
+    environment = {
+      PORT = "8082";
+      HOST = "::1";
+    };
+    requires = [ "postgresql.service" ];
+    wantedBy = [ "default.target" ];
+    serviceConfig = {
+      Type = "simple";
+      ExecStart = ''
+        ${pkgs.callPackage ./bragi/bar {}}/bin/bar
+      '';
+      User = users.extraUsers."bar".name;
+      Group = users.extraUsers."bar".group;
+      WorkingDirectory = "~";
     };
   };
 
@@ -379,7 +371,7 @@ in rec {
         server_name _;
 
         location /thermoprint/api/ {
-          proxy_pass http://localhost:8080/;
+          proxy_pass http://[::1]:8080/;
           proxy_http_version 1.1;
           proxy_set_header Upgrade $http_upgrade;
           proxy_set_header Connection "upgrade";
@@ -388,10 +380,33 @@ in rec {
         location /thermoprint/ {
           proxy_pass http://localhost:8081/;
         }
+
+        location /bar/ {
+          proxy_set_header AppRoot "http://$host/bar";
+          proxy_pass http://[::1]:8082/;
+        }
       }
     '';
   };
 
+  services.postgresql = {
+    enable = true;
+    enableTCPIP = true;
+    authentication = lib.mkForce ''
+      local all all peer
+      host all all 10.141.0.0/16 md5
+    '';
+    initialScript = pkgs.writeText "schema.sql" ''
+      CREATE USER thermoprint;
+      CREATE DATABASE thermoprint WITH OWNER = thermoprint;
+      GRANT ALL ON DATABASE thermoprint TO thermoprint;
+
+      CREATE USER bar;
+      CREATE DATABASE bar WITH OWNER = bar;
+      GRANT ALL ON DATABASE bar TO bar;
+    '';
+  };
+
   nix = {
     daemonIONiceLevel = 3;
     daemonNiceLevel = 10;