diff --git a/flake.lock b/flake.lock index 2e1f017..258496e 100644 --- a/flake.lock +++ b/flake.lock @@ -1164,15 +1164,16 @@ "tabler-icons-hs": "tabler-icons-hs" }, "locked": { - "lastModified": 1757192130, - "narHash": "sha256-bIW3bceLbFq9XhIbixg47hPQHYjq0JfWxNXmJ4viOEU=", + "lastModified": 1757210792, + "narHash": "sha256-0zYOvVuoJCJ2WxZ0j7tMfRmsfkVw/FGjdEInqTK5sek=", "owner": "juspay", "repo": "vira", - "rev": "cc2a402fc4dc0e5f1e439e03d23a9aba349b1a63", + "rev": "a04d70b44bed44fa7d5533bdb436e685cd3f8dd3", "type": "github" }, "original": { "owner": "juspay", + "ref": "rich-commit", "repo": "vira", "type": "github" } diff --git a/flake.nix b/flake.nix index 72d7ea6..1984b8e 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,7 @@ flake-parts.follows = "flake-parts"; }; try.url = "github:tobi/try"; - vira.url = "github:juspay/vira"; + vira.url = "github:juspay/vira/rich-commit"; # Neovim nixvim.url = "github:nix-community/nixvim"; diff --git a/modules/nixos/linux/vira.nix b/modules/nixos/linux/vira.nix index 38bc089..b616d84 100644 --- a/modules/nixos/linux/vira.nix +++ b/modules/nixos/linux/vira.nix @@ -19,27 +19,33 @@ in initialState = { repositories = { - devour-flake = "https://github.com/srid/devour-flake.git"; - mealmacro = "https://github.com/srid/mealmacro.git"; + nixos-config = "https://github.com/srid/nixos-config.git"; + haskell-flake = "https://github.com/srid/haskell-flake.git"; + vira = "https://github.com/juspay/vira.git"; }; }; }; # Configure nginx reverse proxy for vira with SSL - services.nginx.virtualHosts."pureintent" = { - forceSSL = true; - enableACME = false; - sslCertificate = "/var/lib/acme/pureintent/cert.pem"; - sslCertificateKey = "/var/lib/acme/pureintent/key.pem"; - locations."/vira/" = { - proxyPass = "http://127.0.0.1:5001/"; - proxyWebsockets = true; - extraConfig = '' - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - ''; + services.nginx = { + enable = true; + recommendedProxySettings = true; + recommendedTlsSettings = true; + virtualHosts."pureintent" = { + forceSSL = true; + enableACME = false; + sslCertificate = "/var/lib/acme/pureintent/cert.pem"; + sslCertificateKey = "/var/lib/acme/pureintent/key.pem"; + locations."/vira/" = { + proxyPass = "http://127.0.0.1:5001/"; + proxyWebsockets = true; + extraConfig = '' + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + ''; + }; }; };