update sourcesHEADmain

this time, took some adjusting to get element to build again

3 files changed, 33 insertions, 34 deletions

diff --git a/npins/sources.json b/npins/sources.json
index f2774b8..9d6d9f2 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -45,22 +45,21 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "61d865b1cb837f059bcd0b215d6f83ae33393e32",
+      "revision": "bc81eb5833227b97bda1d7c35c5feefab539d1f4",
       "url": null,
-      "hash": "0076rfb3fzb8j9mbi0xlv1fx8l0v9rvba6gfn6xydds75ahmf0bj"
+      "hash": "0c1ndlha08n5m34gmkd6kq9m9f5nc2f7qzxijadwjs2gnqkni31z"
     },
     "deploy-rs": {
       "type": "Git",
       "repository": {
-        "type": "GitHub",
-        "owner": "serokell",
-        "repo": "deploy-rs"
+        "type": "Git",
+        "url": "https://stuebinm.eu/git/forks/deploy-rs"
       },
-      "branch": "master",
+      "branch": "nom-flag",
       "submodules": false,
-      "revision": "77c906c0ba56aabdbc72041bf9111b565cdd6171",
-      "url": "https://github.com/serokell/deploy-rs/archive/77c906c0ba56aabdbc72041bf9111b565cdd6171.tar.gz",
-      "hash": "0mh86igciasvqnmm7lvdp937yi6x8n4lalss6l4rvjyv7601h2w7"
+      "revision": "9001480e03ab8c957716e2bf164bbde605472399",
+      "url": null,
+      "hash": "1iiplqa731ldha728xk2fi36n87p20hnzf35g21jli1dlknw388f"
     },
     "flake-compat": {
       "type": "GitRelease",
@@ -139,9 +138,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "bc9fb560ac2d36cd317a856ee96785ea2055fbff",
+      "revision": "cd573beb0a60d6bf0e341bcd4d2c464ed97c1a8a",
       "url": null,
-      "hash": "056w2xmc0qpkxnr53pz0hg06yf979lb7n6a4krfydr3470z53qvc"
+      "hash": "10256sywdndkw8r7dg48469ll1m4rrxpzybqrnalii7i3igfdh2m"
     },
     "lix-nixos-module": {
       "type": "Git",
@@ -190,9 +189,9 @@
       },
       "branch": "nixos-25.11",
       "submodules": false,
-      "revision": "d96b37bbeb9840f1c0ebfe90585ef5067b69bbb3",
-      "url": "https://github.com/NixOS/nixpkgs/archive/d96b37bbeb9840f1c0ebfe90585ef5067b69bbb3.tar.gz",
-      "hash": "1mxs3y7rbbnpcm3ra23z5q463ggxrwyl28pg5h1c3vvpw39zn1h5"
+      "revision": "755f5aa91337890c432639c60b6064bb7fe67769",
+      "url": "https://github.com/NixOS/nixpkgs/archive/755f5aa91337890c432639c60b6064bb7fe67769.tar.gz",
+      "hash": "1lmn8dicfwmsfdaiw18xjjys78bal6yjy3a41j02my7kw0wlb76a"
     },
     "nixpkgs-unstable": {
       "type": "Git",
@@ -203,9 +202,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "456e8a9468b9d46bd8c9524425026c00745bc4d2",
-      "url": "https://github.com/NixOS/nixpkgs/archive/456e8a9468b9d46bd8c9524425026c00745bc4d2.tar.gz",
-      "hash": "054y39pmwh2aif15dc88pnv8n27dvzbil2pqxqdkfxvb4wv61vzl"
+      "revision": "ebc08544afa77957cc348ba72dc490ec73b87f68",
+      "url": "https://github.com/NixOS/nixpkgs/archive/ebc08544afa77957cc348ba72dc490ec73b87f68.tar.gz",
+      "hash": "1i7bgzikndk273nx5x8cz9y53b8j5hxhz6anl16zcdb4z5nw17kp"
     },
     "ntfy-matrix-bot": {
       "type": "Git",
@@ -313,9 +312,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "d98b91b1feae7ef07fa2ccb3aa3f83f11abfae54",
-      "url": "https://github.com/oxalica/rust-overlay/archive/d98b91b1feae7ef07fa2ccb3aa3f83f11abfae54.tar.gz",
-      "hash": "00apaq28hia8gwkxh7xjy7bqm65wj37876xaqyjzm3rqy81qdmfq"
+      "revision": "ff88db34cfa486fc4964a6991cab1678d82eee8c",
+      "url": "https://github.com/oxalica/rust-overlay/archive/ff88db34cfa486fc4964a6991cab1678d82eee8c.tar.gz",
+      "hash": "0jzymzyw4i83llgzk6c2rcyrs2vwwxdqkdvxml9pg047wda78fhy"
     },
     "showrt": {
       "type": "Git",
@@ -338,9 +337,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "de5f2d596eb896a5728afcd15f823f59cb9ecfdb",
-      "url": "https://github.com/Mic92/sops-nix/archive/de5f2d596eb896a5728afcd15f823f59cb9ecfdb.tar.gz",
-      "hash": "0jia98vc61ccpna3gihjxcp4cxsfs0pxp4y4548dr58cqgwbzh2m"
+      "revision": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5",
+      "url": "https://github.com/Mic92/sops-nix/archive/8eaee5c45428b28b8c47a83e4c09dccec5f279b5.tar.gz",
+      "hash": "1ha37kyn11dj5k38nbasybp4fnmm6iy1lbzvxfydlk4f55j9kkvd"
     },
     "tracktrain": {
       "type": "Git",
@@ -350,9 +349,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "3cd83d99fe477e78639c795a6b8ff4c844eb34a1",
+      "revision": "5fa550010cd0d9293d253d9528a4029db26ced54",
       "url": null,
-      "hash": "143ijhqir43a054abaagsjngxlc9j6vm0wfqw3gfwkhm5m9nic2c"
+      "hash": "1l4zb1d56zzgk4j3w1i0ylxwsjnzshv98kjdksk50j7cm7p1vyby"
     },
     "traveltext": {
       "type": "Git",
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index abd3da2..bbbf3fb 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -59,7 +59,7 @@ in
   ];
   });
 
-  akkoma = (self.callPackage ./akkoma {}).overrideAttrs {
+  akkoma = (super.akkoma).overrideAttrs {
     patches = [ ./patches/akkoma-toki-pona.patch ];
   };
 
@@ -172,10 +172,10 @@ in
       };
     in ''
       ln -sf ${TwemojiMozilla-colr} \
-        res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2
+        apps/web/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2
       ln -sf ${TwemojiMozilla-sbix} \
-        res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2
-      substituteInPlace src/stores/room-list/ListLayout.ts \
+        apps/web/res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2
+      substituteInPlace apps/web/src/stores/room-list/ListLayout.ts \
         --replace "TILE_HEIGHT_PX = 44" "TILE_HEIGHT_PX = 32"
     '';
   };
diff --git a/pkgs/patches/element-css.patch b/pkgs/patches/element-css.patch
index 4123bab..e445203 100644
--- a/pkgs/patches/element-css.patch
+++ b/pkgs/patches/element-css.patch
@@ -2,7 +2,7 @@ diff --git a/res/css/dings.custom.css b/res/css/dings.custom.css
 new file mode 100644
 index 000000000..48ae3414f
 --- /dev/null
-+++ b/res/css/dings.custom.css
++++ b/apps/web/res/css/dings.custom.css
 @@ -0,0 +1,104 @@
 +
 +.mx_RoomTile .mx_RoomTile_titleContainer .mx_RoomTile_title {
@@ -110,8 +110,8 @@ index 000000000..48ae3414f
 +
 diff --git a/src/vector/index.html b/src/vector/index.html
 index f5213701c..50e0729d9 100644
---- a/src/vector/index.html
-+++ b/src/vector/index.html
+--- a/apps/web/src/vector/index.html
++++ b/apps/web/src/vector/index.html
 @@ -48,6 +48,7 @@
             <link rel="stylesheet" href="<%= file %>">
          <% }
@@ -122,8 +122,8 @@ index f5213701c..50e0729d9 100644
          let path = tag.attributes && tag.attributes.href;
 diff --git a/webpack.config.js b/webpack.config.js
 index d7dc5ffa0..00f751ed8 100644
---- a/webpack.config.js
-+++ b/webpack.config.js
+--- a/apps/web/webpack.config.ts
++++ b/apps/web/webpack.config.ts
 @@ -365,6 +365,24 @@ module.exports = (env, argv) => {
                              },
                          },