diff --git a/configurations/nixos/pureintent/containers.nix b/configurations/nixos/pureintent/containers.nix new file mode 100644 index 00000000..b0be69f3 --- /dev/null +++ b/configurations/nixos/pureintent/containers.nix @@ -0,0 +1,32 @@ +# TODO(refactor): decompose +{ flake, pkgs, ... }: + +let + inherit (flake) inputs; + actualism-app = inputs.actualism-app.packages.${pkgs.system}.default; + app-port = 3000; + app-domain = "actualism.app"; +in +{ + containers.actualism-app = { + autoStart = true; + config = { lib, ... }: { + systemd.services.actualism-app = { + description = "actualism-app"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${lib.getExe actualism-app}"; + Restart = "always"; + }; + }; + }; + }; + + # TODO: cloudflare tunnels + services.nginx = { + enable = true; + virtualHosts.${app-domain} = { + locations."/".proxyPass = "http://localhost:${builtins.toString app-port}"; + }; + }; +} diff --git a/configurations/nixos/pureintent/default.nix b/configurations/nixos/pureintent/default.nix index 862a322a..c435f78f 100644 --- a/configurations/nixos/pureintent/default.nix +++ b/configurations/nixos/pureintent/default.nix @@ -11,6 +11,7 @@ in imports = [ self.nixosModules.default ./configuration.nix + ./containers.nix ]; services.openssh.enable = true; @@ -22,9 +23,6 @@ in programs.nix-ld.enable = true; # for vscode server - environment.systemPackages = with pkgs; [ - ]; - # Workaround the annoying `Failed to start Network Manager Wait Online` error on switch. # https://github.com/NixOS/nixpkgs/issues/180175 systemd.services.NetworkManager-wait-online.enable = false; diff --git a/flake.lock b/flake.lock index 57803d4c..f2b017e5 100644 --- a/flake.lock +++ b/flake.lock @@ -2,20 +2,20 @@ "nodes": { "actualism-app": { "inputs": { - "cargo-doc-live": "cargo-doc-live", "flake-parts": "flake-parts", + "fourmolu-nix": "fourmolu-nix", + "haskell-flake": "haskell-flake", + "htmx": "htmx", + "nixos-unified": "nixos-unified", "nixpkgs": "nixpkgs", - "process-compose-flake": "process-compose-flake", - "rust-flake": "rust-flake", - "systems": "systems_2", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1719282578, - "narHash": "sha256-Ah9Pikv4gQY9X+dfKsAZXkGuNkYzlbBBJUcqb6GgBD8=", + "lastModified": 1731511273, + "narHash": "sha256-WyhJUyqpYTE/zgUI/VAJhVNVUr7I/aeU57QFpdLkn4g=", "owner": "srid", "repo": "actualism-app", - "rev": "5bcabb1e24687a6630cf5ce4ddfd3f6ed9ba9e02", + "rev": "f4f829186819f96f27fda04d270d15cd23de7d16", "type": "github" }, "original": { @@ -32,7 +32,7 @@ "ragenix", "nixpkgs" ], - "systems": "systems_9" + "systems": "systems_7" }, "locked": { "lastModified": 1707830867, @@ -123,7 +123,7 @@ "home-manager": "home-manager", "looper": "looper", "necrork": "necrork", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "opt-env-conf": "opt-env-conf", "pre-commit-hooks": "pre-commit-hooks", "safe-coloured-text": "safe-coloured-text", @@ -160,45 +160,7 @@ "type": "github" } }, - "cargo-doc-live": { - "locked": { - "lastModified": 1717704203, - "narHash": "sha256-U6r0Af8/JGiV+gzQGEjLLc34sT6MZllUUrRe0NbUiAA=", - "owner": "srid", - "repo": "cargo-doc-live", - "rev": "0a32dcc5a281dc03d5b24218641a70d4ac1236e5", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "cargo-doc-live", - "type": "github" - } - }, "crane": { - "inputs": { - "nixpkgs": [ - "actualism-app", - "rust-flake", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1707685877, - "narHash": "sha256-XoXRS+5whotelr1rHiZle5t5hDg9kpguS5yk8c8qzOc=", - "owner": "ipetkov", - "repo": "crane", - "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e", - "type": "github" - } - }, - "crane_2": { "inputs": { "nixpkgs": [ "omnix", @@ -220,7 +182,7 @@ "type": "github" } }, - "crane_3": { + "crane_2": { "inputs": { "nixpkgs": [ "ragenix", @@ -440,14 +402,17 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": [ + "actualism-app", + "nixpkgs" + ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -458,7 +423,7 @@ }, "flake-parts_2": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { "lastModified": 1726153070, @@ -518,25 +483,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_5" + "systems": "systems_3" }, "locked": { "lastModified": 1681202837, @@ -552,9 +499,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_6" + "systems": "systems_4" }, "locked": { "lastModified": 1726560853, @@ -570,9 +517,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_7" + "systems": "systems_5" }, "locked": { "lastModified": 1681202837, @@ -588,9 +535,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { - "systems": "systems_10" + "systems": "systems_8" }, "locked": { "lastModified": 1705309234, @@ -606,6 +553,21 @@ "type": "github" } }, + "fourmolu-nix": { + "locked": { + "lastModified": 1707266073, + "narHash": "sha256-tCFzZQJicDdYjnuJiNK4hiiRAH7c2wQzMhOCdUMbVKE=", + "owner": "jedimahdi", + "repo": "fourmolu-nix", + "rev": "717f5a91b0d7b97b1be7ecc3a0fd42d37ffe1c9b", + "type": "github" + }, + "original": { + "owner": "jedimahdi", + "repo": "fourmolu-nix", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": [ @@ -717,9 +679,24 @@ "type": "github" } }, + "haskell-flake": { + "locked": { + "lastModified": 1729428816, + "narHash": "sha256-PA3LR2aFS7GDaViGEl4gAbohwGLzU3dvykLCfNTLi+Y=", + "owner": "srid", + "repo": "haskell-flake", + "rev": "688cc5757af330c9c2c53b23a00fec6664ff8852", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "haskell-flake", + "type": "github" + } + }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1726989464, @@ -799,6 +776,22 @@ "type": "github" } }, + "htmx": { + "flake": false, + "locked": { + "lastModified": 1727469457, + "narHash": "sha256-+ZQd5PNy6oA4j7+0oZPLEhfxZQv7xp7+GWFwC45OmLI=", + "owner": "JonathanLorimer", + "repo": "htmx", + "rev": "c6c3fd80dd7a2b2d7e91b05722fdf6390ec034fe", + "type": "github" + }, + "original": { + "owner": "JonathanLorimer", + "repo": "htmx", + "type": "github" + } + }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -836,9 +829,9 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "pre-commit-hooks": "pre-commit-hooks_2", - "systems": "systems_3", + "systems": "systems", "xdph": "xdph" }, "locked": { @@ -1085,7 +1078,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_2" }, "locked": { "lastModified": 1730717277, @@ -1197,6 +1190,21 @@ } }, "nixos-unified": { + "locked": { + "lastModified": 1729436561, + "narHash": "sha256-cSFLo7vAlH5lMk9FB88dy34oGgf2sLGv1dVkGgH7/dI=", + "owner": "srid", + "repo": "nixos-unified", + "rev": "4f4262884605abc62f396f3f39b29ac427be2179", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "nixos-unified", + "type": "github" + } + }, + "nixos-unified_2": { "locked": { "lastModified": 1729697921, "narHash": "sha256-gqcmWE+4Vr5/l6AoQc2jIbJHCAXAY+qWPC0ruoAHV1Q=", @@ -1213,8 +1221,8 @@ }, "nixos-vscode-server": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_7" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1684517665, @@ -1232,11 +1240,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", + "lastModified": 1729265718, + "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", + "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", "type": "github" }, "original": { @@ -1247,18 +1255,6 @@ } }, "nixpkgs-lib": { - "locked": { - "lastModified": 1717284937, - "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" - } - }, - "nixpkgs-lib_2": { "locked": { "lastModified": 1725233747, "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", @@ -1303,22 +1299,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1725194671, - "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1708655239, "narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=", @@ -1334,7 +1314,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1680945546, "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", @@ -1351,22 +1331,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1706487304, - "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1716542732, "narHash": "sha256-0Y9fRr0CUqWT4KgBITmaGwlnNIGMYuydu2L8iLTfHU4=", @@ -1382,7 +1346,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1728740863, "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", @@ -1398,7 +1362,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1719082008, "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", @@ -1414,7 +1378,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1730785428, "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", @@ -1430,7 +1394,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1682526928, "narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=", @@ -1443,7 +1407,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1731139594, "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", @@ -1459,7 +1423,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1701436327, "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", @@ -1473,6 +1437,22 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1725194671, + "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", @@ -1503,8 +1483,8 @@ }, "nuenv": { "inputs": { - "nixpkgs": "nixpkgs_9", - "rust-overlay": "rust-overlay_2" + "nixpkgs": "nixpkgs_8", + "rust-overlay": "rust-overlay" }, "locked": { "lastModified": 1720763591, @@ -1523,7 +1503,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -1554,9 +1534,9 @@ "nix-systems-aarch64-linux": "nix-systems-aarch64-linux", "nix-systems-x86_64-darwin": "nix-systems-x86_64-darwin", "nix-systems-x86_64-linux": "nix-systems-x86_64-linux", - "nixpkgs": "nixpkgs_10", - "rust-flake": "rust-flake_2", - "systems": "systems_8", + "nixpkgs": "nixpkgs_9", + "rust-flake": "rust-flake", + "systems": "systems_6", "treefmt-nix": "treefmt-nix_3" }, "locked": { @@ -1594,7 +1574,7 @@ "inputs": { "flake-compat": "flake-compat", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -1635,28 +1615,13 @@ "type": "github" } }, - "process-compose-flake": { - "locked": { - "lastModified": 1718031437, - "narHash": "sha256-+RrlkAVZx0QhyeHAGFJnjST+/7Dc3zsDU3zAKXoDXaI=", - "owner": "Platonic-Systems", - "repo": "process-compose-flake", - "rev": "9344fac44edced4c686721686a6ad904d067c546", - "type": "github" - }, - "original": { - "owner": "Platonic-Systems", - "repo": "process-compose-flake", - "type": "github" - } - }, "ragenix": { "inputs": { "agenix": "agenix", - "crane": "crane_3", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_11", - "rust-overlay": "rust-overlay_4" + "crane": "crane_2", + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_10", + "rust-overlay": "rust-overlay_3" }, "locked": { "lastModified": 1718869541, @@ -1685,9 +1650,9 @@ "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", - "nixos-unified": "nixos-unified", + "nixos-unified": "nixos-unified_2", "nixos-vscode-server": "nixos-vscode-server", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nixvim": "nixvim", "nuenv": "nuenv", "omnix": "omnix", @@ -1698,35 +1663,11 @@ "rust-flake": { "inputs": { "crane": "crane", - "nixpkgs": [ - "actualism-app", - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1718720277, - "narHash": "sha256-Ex4xYWKVt/JfspCp0UluhXQkSYuRgjOwfUds9QhaJSw=", - "owner": "juspay", - "repo": "rust-flake", - "rev": "944a06430cca1f57922ad7abd469572fb85e07b8", - "type": "github" - }, - "original": { - "owner": "juspay", - "ref": "extraBuildArgs", - "repo": "rust-flake", - "type": "github" - } - }, - "rust-flake_2": { - "inputs": { - "crane": "crane_2", "nixpkgs": [ "omnix", "nixpkgs" ], - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1730771644, @@ -1744,26 +1685,7 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1715480255, - "narHash": "sha256-gEZl8nYidQwqJhOigJ91JDjoBFoPEWVsd82AKnaE7Go=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "d690205a4f01ec0930303c4204e5063958e51255", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { - "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nuenv", "nixpkgs" @@ -1783,7 +1705,7 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_2": { "flake": false, "locked": { "lastModified": 1725243956, @@ -1799,7 +1721,7 @@ "type": "github" } }, - "rust-overlay_4": { + "rust-overlay_3": { "inputs": { "flake-utils": [ "ragenix", @@ -1858,20 +1780,20 @@ }, "systems": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, - "systems_10": { + "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1886,7 +1808,7 @@ "type": "github" } }, - "systems_2": { + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1901,21 +1823,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, "systems_4": { "locked": { "lastModified": 1681028828, @@ -1991,21 +1898,6 @@ "type": "github" } }, - "systems_9": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -2014,11 +1906,11 @@ ] }, "locked": { - "lastModified": 1719243788, - "narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=", + "lastModified": 1729242555, + "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf", + "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5", "type": "github" }, "original": { @@ -2071,7 +1963,7 @@ }, "treefmt-nix_4": { "inputs": { - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1689243103,