address the himalaya hack

features/email/himalaya-client.nix

@@ -1,4 +1,8 @@
-{ pkgs, lib, ... }: {
+{ pkgs, lib, system, inputs, ... }:
+let
+  himalaya = inputs.himalaya.outputs.defaultPackage.${system};
+in
+{
   environment.systemPackages =
     let
       # Wrap himalaya to be aware of ProtonMail's bridge cert.
@@ -6,8 +10,7 @@
         pkgs.writeScriptBin "h" ''
           #!${pkgs.stdenv.shell}
           export SSL_CERT_FILE=~/.config/protonmail/bridge/cert.pem
-          # HACK: See note in flake.nix
-          exec himalaya $*
+          exec ${himalaya}/bin/himalaya $*
         '';
       # Helper to read and display the (HTML) email message in Markdown,
       # highlighted with pager.

features/postgrest.nix

@@ -6,7 +6,7 @@ in
   # PostgreSQL itself
   services.postgresql = {
     enable = true;
-    package = pkgs.postgresql_12;
+    package = pkgs.postgresql_13;
     enableTCPIP = false;
     # https://nixos.wiki/wiki/PostgreSQL
     authentication = pkgs.lib.mkOverride 10
@@ -33,7 +33,8 @@ in
       ExecStart =
         let pgrstConf = pkgs.writeText "pgrst.conf" ''
           db-uri = "postgres://postgres@localhost/postgres"
-          db-schema = "public"
+          db-schema = "nixcloud"
+          # TODO: change when going production
           db-anon-role = "postgres"
           server-port = 7000
         '';

flake.nix

@@ -14,6 +14,8 @@
       # Make configuration for any computer I use in my home office.
       mkHomeMachine = configurationNix: extraModules: nixpkgs.lib.nixosSystem {
         inherit system;
+        # Arguments to pass to all modules.
+        specialArgs = { inherit system inputs; };
         modules = ([
           # System configuration
           configurationNix
@@ -24,11 +26,6 @@
           ./features/email
           ./features/monitor-brightness.nix
 
-          # HACK: This should really go under ./features/email
-          ({
-            environment.systemPackages = [ inputs.himalaya.outputs.defaultPackage.${system} ];
-          })
-
           # home-manager configuration
           home-manager.nixosModules.home-manager
           {