WIP MADDY

configs/client.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ lib, pkgs, ... }:
 {
   imports = [
     ./common.nix
@@ -15,8 +15,7 @@
       nixd
     ];
 
-    # fix for wsl, `prefer` does not work if your SSH_ASKPASS is empty/unset
+    variables.SSH_ASKPASS_REQUIRE = "prefer";
-    variables.SSH_ASKPASS_REQUIRE = if config.programs.ssh.enableAskPassword then "prefer" else "never";
   };
 
   networking = {
@@ -30,7 +29,11 @@
 
   programs = {
     nix-ld.enable = true;
-    ssh.startAgent = true;
+    ssh = {
+      startAgent = true;
+      enableAskPassword = true;
+      askPassword = lib.mkDefault "${pkgs.curses-ssh-askpass}"; # see exprs/curses-ssh-askpass.nix
+    };
   };
 
   virtualisation.docker.enable = true;

exprs/curses-ssh-askpass.nix

@@ -0,0 +1,15 @@
+{
+  lib,
+  pinentry-curses,
+  writeShellScript,
+}:
+writeShellScript "curses-ssh-askpass" ''
+  if [ -z ''${1+x} ]; then
+    prompt="GETPIN"
+  else
+    prompt="SETDESC $1\nGETPIN"
+  fi
+
+  pin=$(echo -e "$prompt" | ${lib.getExe pinentry-curses} -T /dev/pts/0 | grep D | tr -d '\n')
+  echo "''${pin:2}"
+''

exprs/overlay.nix

@@ -1,5 +1,6 @@
 inputs: final: prev: {
   idea-ultimate-fixed = prev.callPackage ./idea-fixed.nix { };
+  curses-ssh-askpass = prev.callPackage ./curses-ssh-askpass.nix { };
 
   vencord = prev.vencord.overrideAttrs (old: rec {
     version = "${old.version}+git.${inputs.vencord.shortRev}";

global/utils.nix

@@ -84,4 +84,16 @@
 
       systemd.services."${backend}-mc-${name}".serviceConfig.TimeoutSec = "300";
     };
+
+  mkFrpPassthrough = name: port: {
+    services.frp.settings.proxies = [
+      {
+        inherit name;
+        type = "tcp";
+        localIp = "localhost";
+        localPort = port;
+        remotePort = port;
+      }
+    ];
+  };
 }

systems/etna/immich.nix

@@ -1,6 +1,9 @@
-{ config, ... }:
+{ config, _utils, ... }:
+let
+  frp = _utils.mkFrpPassthrough "immich" config.services.immich.port;
+in
 {
-  cfTunnels."im.uku.moe" = "http://localhost:${builtins.toString config.services.immich.port}";
+  imports = [ frp ];
 
   services.immich = {
     enable = true;

systems/vesuvio/default.nix

@@ -4,6 +4,7 @@
     ./certificates.nix
     ./frp.nix
     ./hetzner.nix
+    ./nginx.nix
   ];
 
   environment.systemPackages = with pkgs; [

systems/vesuvio/nginx.nix

@@ -0,0 +1,20 @@
+{
+  services.nginx.virtualHosts = {
+    # immich
+    "im.uku.moe" = {
+      forceSSL = true;
+      enableACME = true;
+      locations."/" = {
+        proxyPass = "http://localhost:2283";
+        proxyWebsockets = true;
+      };
+
+      extraConfig = ''
+        client_max_body_size 5000M;
+        proxy_read_timeout 600s;
+        proxy_send_timeout 600s;
+        send_timeout 600s;
+      '';
+    };
+  };
+}