1 files changed, 1 insertions, 54 deletions

diff --git a/bragi.nix b/bragi.nix
index 2cb560d9..3b634767 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -33,9 +33,6 @@ in rec {
           inherit
             (lib.mapAttrs (name: oldPkgs.haskell.lib.dontCheck) super)
             Glob filelock;
-          inherit
-            (self.callPackage ./custom/thermoprint { inherit (self) Glob; inherit (pkgs) runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); })
-            thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode;
         };
       };
 
@@ -43,7 +40,7 @@ in rec {
 
       mpd = oldPkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; };
       
-      inherit (haskellPackages) trivmix thermoprint-server thermoprint-webgui tprint;
+      inherit (haskellPackages) trivmix;
     };
 
   nixpkgs.config.allowUnfree = true;
@@ -315,41 +312,6 @@ in rec {
         openssh.authorizedKeys.keyFiles = template.openssh.authorizedKeys.keyFiles;
       };
 
-  users.extraUsers."thermoprint" = {
-    name = "thermoprint";
-    group = "lp";
-    isSystemUser = true;
-    createHome = true;
-    home = "/var/lib/thermoprint";
-  };
-
-  systemd.services."thermoprint" = {
-    environment = {
-      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 = "~";
-    };
-  };
-
-  systemd.services."thermoprint-webgui" = {
-    wantedBy = [ "default.target" ];
-    serviceConfig = {
-      Type = "simple";
-      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";
@@ -424,17 +386,6 @@ in rec {
         listen *:80;
         server_name _;
 
-        location /thermoprint/api/ {
-          proxy_pass http://[::1]:8080/;
-          proxy_http_version 1.1;
-          proxy_set_header Upgrade $http_upgrade;
-          proxy_set_header Connection "upgrade";
-        }
-
-        location /thermoprint/ {
-          proxy_pass http://localhost:8081/;
-        }
-
         location /bar/ {
           proxy_pass http://[::1]:8082/;
         }
@@ -450,10 +401,6 @@ in rec {
       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;