ctucx.git: nixfiles

pkgs/gotosocial: update to 0.5.0-rc3, replace logo in header of websites

diff --git a/pkgs/gotosocial/0002-Armadillo-logo.patch b/pkgs/gotosocial/0002-Armadillo-logo.patch
@@ -0,0 +1,61 @@
+From a3fbec23f8893c86a7e174e203aa6b2234f2ab02 Mon Sep 17 00:00:00 2001
+From: Leah (ctucx) <git@ctu.cx>
+Date: Sun, 25 Sep 2022 12:26:59 +0200
+Subject: [PATCH] Armadillo logo but no title in header
+
+---
+ web/assets/armadillo.svg | 23 +++++++++++++++++++++++
+ web/template/header.tmpl |  7 +------
+ 2 files changed, 24 insertions(+), 6 deletions(-)
+ create mode 100644 web/assets/armadillo.svg
+
+diff --git a/web/assets/armadillo.svg b/web/assets/armadillo.svg
+new file mode 100644
+index 00000000..e60ba068
+--- /dev/null
++++ b/web/assets/armadillo.svg
+@@ -0,0 +1,23 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Created with Inkscape (http://www.inkscape.org/) -->
++<svg width="545.36" height="233.66" version="1.1" viewBox="0 0 545.36 233.66" xmlns="http://www.w3.org/2000/svg">
++ <g>
++  <g>
++   <path d="m424.47 231.52c-4.4-1.4514-13.696-3.8283-20.658-5.2821-6.9621-1.4537-13.294-3.171-14.072-3.816-0.77724-0.64506-3.1726-6.5371-5.323-13.093s-4.65-12.401-5.5546-12.987c-0.90467-0.58666-7.4989-5.2233-14.654-10.304-22.657-16.087-29.685-18.588-49.605-17.652-12.876 0.60498-20.334 2.1825-32.267 6.8251-4.7411 1.8446-7.191 3.3811-7.1737 4.4993 0.0145 0.93397 1.1219 6.0069 2.461 11.273l2.4347 9.5751 10.606 1.777c21.462 3.5961 28.206 6.7834 28.206 13.332 0 3.9582-3.8294 8.9408-6.8715 8.9408-0.89932 0-6.1842-1.1819-11.744-2.6266-11.082-2.8793-29.063-5.385-46.451-6.4731-6.722-0.42064-12.156-1.3082-13.592-2.2198-1.3155-0.83544-6.2143-7.2246-10.886-14.198-8.2334-12.289-8.6352-12.702-13.075-13.423-6.295-1.0222-16.445-5.9863-22.034-10.776-3.1714-2.7181-5.0671-3.6742-5.9531-3.0024-22.118 16.769-54.095 27.892-91.598 31.86-7.5192 0.79554-9.3987 2.256-14.145 1.9203-28.139-1.9898-91.612 27.105-81.421-23.072 1.7469-6.5686 5.5655-10.826 12.976-14.466 9.7897-4.8094 19.737-6.3566 48.084-7.4787 34.396-1.3616 47.569-4.1491 70.639-14.947 10.906-5.1048 24.99-13.961 28.591-17.979 1.7905-1.9978 1.8565-2.7528 0.67161-7.6918-1.9078-7.9528-0.84991-13.725 4.545-24.797 11.756-24.128 36.4-51.066 62.131-67.914 16.101-10.543 35.264-18.692 55.318-23.525 32.21-7.7631 78.565-3.3381 112.49 10.738 23.582 9.7856 40.123 20.729 58.596 38.767 4.84 4.7258 8.8 8.0152 8.8 7.3099s1.4694-2.0422 3.2653-2.971c2.634-1.3621 3.96-1.4593 6.8584-0.50275 4.0747 1.3448 16.413 13.083 20.414 19.421l2.659 4.2121 7.135-10.374c8.2103-11.937 11.543-14.92 15.546-13.916 5.8192 1.4605 9.1727 8.724 11.393 24.678 1.4356 10.313 0.63874 18.867-2.6743 28.708l-2.4889 7.3928 2.1078 4.8738c3.2607 7.5396 6.145 19.697 7.8243 32.981 0.84185 6.6591 3.2926 17.939 5.4462 25.067 2.1536 7.1276 3.9246 15.119 3.9356 17.759 0.0386 9.258-6.0595 15.939-15.365 16.833-9.8516 0.94661-11.768-0.0111-23.637-11.813-8.2718-8.2247-14.586-13.232-25.796-20.455l-14.843-9.5645-2.2234 3.0881c-9.8864 13.732-19.432 22.055-30.144 26.286-5.25 2.0733-8.2369 2.4616-19.278 2.5063-7.1863 0.0291-13.059 0.29288-13.05 0.58622 0.0573 1.9549 2.6286 3.1773 10.116 4.8095 13.334 2.9065 25.372 6.926 28 9.3494 4.608 4.2489 2.185 12.752-4 14.038-1.4667 0.30489-6.2667-0.63315-10.667-2.0845zm-160.27-31.712c-0.27624-0.73334-1.3754-5.0533-2.4425-9.6-1.3215-5.6306-2.4347-8.2667-3.491-8.2667-0.85291 0-5.765 0.5611-10.916 1.2469l-9.3651 1.2469 10.481 15.533 6.1368 0.38497c3.3753 0.21174 7.0282 0.47574 8.1176 0.58668 1.1934 0.12151 1.7811-0.32831 1.4785-1.1316zm266.94-2e-3c0-0.14758-1.9356-6.9876-4.3014-15.2-2.5092-8.7104-4.9959-20.487-5.9684-28.265-2.6766-21.408-8.405-35.863-17.065-43.062-3.1625-2.6291-3.5011-2.6896-6.5478-1.1697-2.3688 1.1817-3.9368 1.3275-5.9686 0.55503-2.9931-1.138-3.4386-2.4351-4.3334-12.617-0.32351-3.6814-1.3709-8.2414-2.3275-10.133-2.23-4.4103-10.015-14.64-11.142-14.64-0.47373 0-1.435 2.76-2.1362 6.1333-1.9104 9.1909-0.72369 20.534 3.3058 31.596 3.3471 9.1893 3.4132 9.6985 2.2857 17.6-0.63864 4.4753-2.3668 12.217-3.8404 17.204l-2.6792 9.0667 2.8926 2.4329c1.5909 1.3381 7.2126 5.1553 12.493 8.4827 15.068 9.4954 20.704 13.886 29.867 23.267 7.023 7.1904 9.1469 8.7615 12 8.8769 1.9067 0.0771 3.4667 0.0194 3.4667-0.12817zm-467.2-9.3723c14.373-0.51562 31.653-1.6741 38.4-2.5744 30.034-4.0078 61.026-15.251 75.972-27.56l2.9048-2.3925-2.1592-3.1826c-1.1876-1.7504-3.3925-5.5826-4.8998-8.516s-2.8796-5.4901-3.0496-5.6817c-0.16993-0.19161-3.663 2.0911-7.7624 5.0728-9.8646 7.1749-29.493 17.131-41.927 21.266-18.865 6.2742-27.14 7.5692-55.455 8.6782-25.005 0.97939-38.528 2.6616-43.961 5.4686-7.0192 3.6264-7.9275 7.8387-2.5963 12.04 10.117 4.1268 35.532-2.2824 44.533-2.6185zm366.76-3.5637c16.674-8.5733 28.787-29.336 33.307-57.095 0.83753-5.1432 0.57652-6.7582-2.4133-14.933-2.9884-8.1712-3.3903-10.656-3.7017-22.882l-0.34929-13.715-4.3683-5.2175c-6.9383-8.2871-20.846-20.719-30.768-27.502-8.3542-5.7117-27.554-16.116-29.74-16.116-1.2192 0-10.825 18.538-15.475 29.867-11.197 27.274-18.189 55.463-21.548 86.865-1.2732 11.903-1.3226 15.042-0.24786 15.753 0.73823 0.48834 3.0222 1.9321 5.0756 3.2084s7.3333 5.0136 11.733 8.3052c13.723 10.266 20.341 13.719 31.467 16.421 1.1733 0.28487 6.4533 0.39515 11.733 0.24504 8.0458-0.22872 10.522-0.74707 15.296-3.2016zm-175.68-18.104c6.1873-1.4616 21.184-6.8354 21.184-7.5909 0-0.14981-1.4396-3.4473-3.199-7.3277-4.0095-8.8428-8.9732-26.026-11.143-38.573-3.7301-21.573-3.2273-49.722 1.3998-78.374 1.0445-6.4678 1.7936-11.76 1.6646-11.76-1.0825 0-18.429 8.7611-23.923 12.082-17.074 10.322-39.771 31.629-50.841 47.725-7.558 10.99-14.225 23.938-14.225 27.626 0 3.3748 5.4027 19.452 8.7935 26.168 3.8775 7.6794 12.838 19.835 17.267 23.425 5.9207 4.7989 12.828 8.1351 18.543 8.956 6.6891 0.9608 26.034-0.36109 34.479-2.3561zm39.379-13.491 3.795-1.0542-2.4811-9.8414c-4.3951-17.434-5.9328-33.372-5.3293-55.238 0.61648-22.336 2.662-37.91 7.6708-58.4l3.4548-14.133h-2.4889c-5.279 0-18.685 3.594-19.56 5.2438-1.3831 2.6079-5.3172 28.807-6.5694 43.748-1.7584 20.982 0.4315 46.578 5.5572 64.955 2.9291 10.502 9.4095 25.788 10.929 25.78 0.67466-3e-3 2.9344-0.48035 5.0216-1.0602zm47.335-2.4005c0.27715-1.32 1.0391-7.44 1.6931-13.6 3.58-33.716 13.581-68.455 28.772-99.945l7.3062-15.145-3.3839-1.0952c-3.4798-1.1262-20.991-5.3948-22.186-5.4082-1.9015-0.0212-10.036 24.259-14.152 42.241-5.152 22.509-6.4456 34.517-6.4803 60.152-0.0359 26.542 0.69249 33.739 3.4894 34.475 3.6302 0.95626 4.447 0.67932 4.9414-1.6754zm-21.502-22.933c-0.91007-36.92 3.8874-69.1 15.282-102.51 2.0711-6.0721 3.6137-11.183 3.428-11.357-0.1857-0.17399-5.3871-0.65573-11.559-1.0705l-11.221-0.75415-2.3353 7.3107c-12.506 39.15-14.128 90.6-3.9708 125.98l1.6078 5.6h9.3399zm195.45-29.333c0.35237-1.9067 0.49412-7.2228 0.315-11.814l-0.32568-8.347-10.967 16.987 4.4168 3.2336c2.4292 1.7785 4.755 3.2726 5.1685 3.3202 0.41341 0.0476 1.04-1.4734 1.3923-3.3801z" stroke-width="1.0667"/>
++   <g fill-rule="evenodd">
++    <path d="m264.43 24.368c-8.2172 3.8933-16.459 7.8277-24.273 12.498-17.197 10.887-32.193 25.01-45.28 40.534-7.3079 9.1419-13.477 19.241-18.227 29.938-1.2011 2.669-2.0502 5.6732-0.97785 8.5443 2.3595 8.6628 5.3053 17.244 9.4536 25.223 4.3605 7.2992 9.2014 14.426 15.164 20.519 6.1079 5.4251 13.757 9.5483 21.954 10.474 9.6209 0.38069 19.287-0.37468 28.804-1.7818 8.6437-1.5809 17-4.5532 25.032-8.0635 1.5192-1.1599-0.22892-3.1385-0.5099-4.5219-9.4622-21.432-14.778-44.739-15.251-68.163-0.56061-19.847 1.6154-39.695 4.7608-59.272-4e-3 -1.8844 1.1592-4.0022 0.25731-5.7491-0.3013-0.06377-0.57925-0.33261-0.90636-0.17757z" fill="#cdc3b6" opacity=".98"/>
++    <path d="m299.36 15.742c-6.0003 0.299-11.926 1.7684-17.551 3.8358-1.5528 0.59688-3.414 1.4129-3.6086 3.3082-2.2552 9.7584-3.4645 19.725-4.7854 29.644-1.8756 13.87-2.489 27.915-1.5486 41.886 1.1443 17.394 4.0329 34.886 10.867 51.019 1.6625 3.7424 3.0058 7.7368 5.4807 11.039 1.0929 1.5465 3.0722 0.21242 4.5288 0.0845 1.8975-0.49868 3.8448-0.86609 5.6862-1.5464 1.1817-1.0357-0.0922-2.6436-0.1417-3.909-2.4965-9.6764-4.7546-19.443-5.8677-29.376-1.6742-14.536-1.4093-29.22-0.69124-43.828 0.89812-16.634 3.6282-33.097 7.7251-49.228 0.89818-3.9228 1.9825-7.8362 2.8217-11.767-0.16865-1.4181-1.9164-1.1123-2.915-1.1615z" fill="#9a9389" opacity=".98"/>
++    <path d="m315.62 13.606c-1.2831 2.7306-1.8956 5.7909-2.888 8.6603-8.5522 27.415-11.319 56.407-10.03 85.024 0.68224 14.915 3.0666 29.753 7.3138 44.073 0.30692 1.0819 0.50106 2.751 1.9939 2.6655 2.9617 0.14543 5.9686 0.16305 8.911 0.0248 1.4392-0.55973 0.50615-2.513 0.69782-3.6887-0.412-14.718-0.78144-29.482-0.26129-44.171 1.197-25.941 5.9601-51.728 14.294-76.346 1.4133-4.5151 3.0634-8.9776 4.1528-13.582-0.16602-1.6154-2.2491-1.1125-3.3684-1.3917-6.7755-0.56142-13.587-1.2278-20.365-1.4082-0.15043 0.04679-0.30086 0.09357-0.45128 0.14036z" fill="#cdc3b6" opacity=".98"/>
++    <path d="m354.11 16.915c-1.9332 0.30804-2.402 2.6373-3.218 4.1-4.5086 11.019-7.7978 22.499-10.792 34.009-4.5338 17.896-7.6068 36.277-7.4521 54.785-0.0424 11.718-0.20928 23.447 0.2582 35.158 0.43941 3.2329 0.40841 6.827 2.3325 9.6047 1.4415 1.1789 3.5723 1.5227 5.3748 1.1645 2.1272-0.74574 1.9824-3.4833 2.3736-5.2999 1.4419-11.709 2.5728-23.468 4.9049-35.021 5.3408-27.722 14.576-54.631 27.119-79.939 1.7228-3.7125 3.6584-7.3465 5.1982-11.133-0.22527-1.6604-2.4261-1.4075-3.6082-1.9972-7.3116-1.9595-14.625-3.9877-22.06-5.4184-0.1428-0.01279-0.28657-0.01956-0.42987-0.01177z" fill="#9a9389" opacity=".98"/>
++    <path d="m392.28 28.572c-2.3769 2.2371-3.6133 5.4129-5.259 8.1881-7.3408 13.66-13.45 27.971-18.207 42.732-7.9818 24.397-12.795 49.789-14.843 75.362 6.8e-4 2.2758-0.56125 4.7225 0.27072 6.8976 1.8229 2.0228 4.4942 3.0342 6.6421 4.6715 10.741 7.0441 20.404 15.973 32.372 20.976 3.6955 1.3825 7.4368 2.9229 11.381 3.3775 6.1028 0.20642 12.24 0.23338 18.323-0.35053 7.3275-1.3748 13.809-5.6986 19.059-10.849 9.9364-9.4949 15.883-22.36 19.652-35.395 1.556-5.7743 3.0233-11.628 3.5555-17.596 0.19497-5.7482-2.756-10.953-4.256-16.358-2.1528-6.1139-1.8801-12.684-2.2117-19.044-0.1875-4.3592-0.14407-8.7563-0.43037-13.092-2.0278-2.907-4.5085-5.5691-6.8798-8.2368-8.7696-9.3209-18.357-17.941-28.896-25.223-8.451-5.4562-17.21-10.469-26.278-14.827-1.2832-0.49069-2.5946-1.2849-3.9926-1.2319z" fill="#cdc3b6" opacity=".98"/>
++   </g>
++  </g>
++  <g fill="#9a9389" fill-rule="evenodd">
++   <path d="m473.51 74.763c-2.0441 0.57174-1.955 3.2959-2.6234 4.9499-2.3584 10.525-1.051 21.593 2.4545 31.713 1.6341 5.0642 3.9377 10.202 3.115 15.659-0.91082 10.081-4.092 19.72-6.6825 29.45 1.0113 2.4351 3.7478 3.6199 5.6759 5.2549 12.039 8.4987 25.273 15.513 35.772 26.02 4.3756 3.9279 8.1789 8.5635 13.02 11.937 2.2184 1.1734 5.0088 1.3434 7.3816 0.79908 0.61855-1.9115-0.81479-3.9369-1.0986-5.8884-4.0166-13.677-7.559-27.546-9.3339-41.738-2.0205-12.278-4.5978-25.14-12.291-35.263-2.4098-2.6362-4.665-5.8577-8.0835-7.2178-3.1328-0.35622-5.9076 2.8839-9.1006 1.4915-2.9957-0.78742-2.8948-4.3887-3.3643-6.8463-0.88767-6.5101-1.073-13.595-5.1901-19.075-2.6797-3.8051-5.2305-7.8465-8.691-10.989-0.28667-0.17415-0.62206-0.28027-0.96-0.25588z" opacity=".98"/>
++   <path d="m514.59 80.652c-3.4752 5.4099-7.0375 10.77-10.395 16.253-0.19795 1.8648 2.2976 2.3969 3.3594 3.563 2.1912 1.2775 4.0156 3.5568 6.5803 4.0183 2.4215-0.36907 2.1682-3.5741 2.4182-5.416 0.21636-5.9528 0.47678-11.949-0.20162-17.881-0.19438-0.84515-1.1317-1.1244-1.7609-0.53703z" opacity=".98"/>
++   <path d="m170.5 139.86c-7.5285 4.7467-14.645 10.176-22.612 14.197-13.202 7.0332-27.033 12.995-41.598 16.394-16.007 3.9508-32.804 3.6332-49.302 4.698-10.733 0.76646-21.67 0.97509-32.088 3.9249-3.9764 1.2873-8.5569 3.6-9.6387 7.9975-0.29555 4.0665 3.5993 7.3018 7.3951 7.7577 6.6061 0.47211 13.301 0.1611 19.881-0.64084 8.8557-1.2024 17.675-2.8994 26.624-3.1299 16.82-0.91188 33.772-1.5549 50.24-5.4092 18.159-4.1164 36.179-9.9839 52.187-19.661 3.4866-2.2149 6.9305-4.6254 9.928-7.4445 0.48427-2.1486-1.815-3.7133-2.589-5.5479-2.7183-4.1862-4.616-8.8915-7.4574-12.976-0.26621-0.27271-0.64516-0.15182-0.96987-0.15846z" opacity=".98"/>
++   <path d="m255.38 182.03c-5.4223 0.7593-11.792-0.069-16.604 2.6106 1.5534 5.8368 6.5951 10.536 9.4904 15.849 4.9664 0.75698 10.736 1.2609 15.756 0.45866 0.60365-5.4111-2.2785-11.006-3.6117-16.283-0.48333-2.788-2.5902-2.8965-5.0312-2.6351z" opacity=".98"/>
++  </g>
++  <ellipse cx="515.18" cy="146.43" rx="2.5547" ry="3.2428" stroke="#000" stroke-dashoffset="8.6721" stroke-linecap="round" stroke-width="7.4038"/>
++ </g>
++</svg>
+diff --git a/web/template/header.tmpl b/web/template/header.tmpl
+index 560b10f1..c0ce6d02 100644
+--- a/web/template/header.tmpl
++++ b/web/template/header.tmpl
+@@ -29,12 +29,7 @@
+ 	<div class="page">
+ 		<header>
+ 			<a aria-label="instance homepage" href="/" class="nounderline header">
+-				<img src="/assets/logo.png" alt="Instance Logo"/>
+-				<div>
+-					<h1>
+-						{{.instance.Title}}
+-					</h1>
+-				</div>
++				<img src="/assets/armadillo.svg" alt="Instance Logo" style="margin-left: -3em;"/>
+ 			</a>
+ 		</header>
+ 		<div class="content">
+-- 
+2.37.3
+

diff --git a/pkgs/gotosocial/default.nix b/pkgs/gotosocial/default.nix
@@ -2,13 +2,13 @@
 
 let
   pname   = "gotosocial";
-  version = "0.5.0-rc2";
+  version = "0.5.0-rc3";
 
   src = fetchFromGitHub {
     owner  = "superseriousbusiness";
     repo   = "gotosocial";
     rev    = "v${version}";
-    sha256 = "sha256-HSpelOS5UMMmxVU6NOAz6iYqtboAY0yTmK7/73RtpME";
+    sha256 = "sha256-4L6TkKrHBq33Yu7a/lJ7NaXxHjlz7ymBXKfDUtvLHkI";
   };
 
   frontend-assets =  mkYarnPackage {

@@ -40,6 +40,7 @@ in buildGo118Module rec {
 
   patches = [
    ./0001-footer-remove-contact-addresses-add-federation-count.patch
+   ./0002-Armadillo-logo.patch
   ];
 
   ldflags = ["-s" "-w" "-extldflags '-static'" "-X 'main.Commit=${version}'" "-X 'main.Version=${version}'"];

@@ -59,10 +60,11 @@ in buildGo118Module rec {
   '';
 
   postInstall = ''
-    mkdir -p $out/share/web
+    mkdir -p $out/share/web/assets
 
-    cp -r ./web/template     $out/share/web/
-    ln -sf ${frontend-assets} $out/share/web/assets
+    cp -r  ./web/template             $out/share/web/
+    cp -rf ${frontend-assets}/.       $out/share/web/assets
+    cp -r  ./web/assets/armadillo.svg $out/share/web/assets
 
     installShellCompletion --cmd gotosocial \
       --bash <($out/bin/gotosocial completion bash) \