diff --git a/flake.lock b/flake.lock index 9a479cc..5936914 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1668797197, - "narHash": "sha256-0w6iD3GSSQbIeSFVDzAAQZB+hDq670ZTms3d9XI+BtM=", + "lastModified": 1672327199, + "narHash": "sha256-pFlngSHXKBhAmbaKZ4FYtu57LLunG+vWdL7a5vw1RvQ=", "owner": "serokell", "repo": "deploy-rs", - "rev": "2a3c5f70eee04a465aa534d8bd4fcc9bb3c4a8ce", + "rev": "a5619f5660a00f58c2b7c16d89058e92327ac9b8", "type": "github" }, "original": { @@ -25,11 +25,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1648199409, - "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", "type": "github" }, "original": { @@ -138,11 +138,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1671831633, - "narHash": "sha256-tANQOkJnlqK4M83KvvXFMFrIbR0xkloqXY5ruqzR3kE=", + "lastModified": 1672980560, + "narHash": "sha256-Pzx7az57SiUS1xhvKesTb1rhO9w9lWy9mecIqVjcKzo=", "owner": "nix-community", "repo": "home-manager", - "rev": "d7eee202e597bc7789498a8664082cf0ffedaa8f", + "rev": "1786883425208d3bf726ab6a1889beddeb46cdbc", "type": "github" }, "original": { @@ -175,27 +175,27 @@ }, "nixpkgs-fixed": { "locked": { - "lastModified": 1671722432, - "narHash": "sha256-ojcZUekIQeOZkHHzR81st7qxX99dB1Eaaq6PU5MNeKc=", + "lastModified": 1672791794, + "narHash": "sha256-mqGPpGmwap0Wfsf3o2b6qHJW1w2kk/I6cGCGIU+3t6o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "652e92b8064949a11bc193b90b74cb727f2a1405", + "rev": "9813adc7f7c0edd738c6bdd8431439688bb0cb3d", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "652e92b8064949a11bc193b90b74cb727f2a1405", + "rev": "9813adc7f7c0edd738c6bdd8431439688bb0cb3d", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1671722432, - "narHash": "sha256-ojcZUekIQeOZkHHzR81st7qxX99dB1Eaaq6PU5MNeKc=", + "lastModified": 1672791794, + "narHash": "sha256-mqGPpGmwap0Wfsf3o2b6qHJW1w2kk/I6cGCGIU+3t6o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "652e92b8064949a11bc193b90b74cb727f2a1405", + "rev": "9813adc7f7c0edd738c6bdd8431439688bb0cb3d", "type": "github" }, "original": { @@ -207,11 +207,11 @@ }, "nur": { "locked": { - "lastModified": 1671893061, - "narHash": "sha256-ZtG0t7+AoviY+eUTVUJK1kiKtNx8XVet3+gMNq44MnU=", + "lastModified": 1672994937, + "narHash": "sha256-GX6ckwdZ7LYLnfWnAMQ96mfPD4cNzoZsoYMnm/aL6t0=", "owner": "nix-community", "repo": "NUR", - "rev": "898adb55e324245bd32bd5702decda4aa6471f7d", + "rev": "2e00830769413534be969673c7ef618d73e22f04", "type": "github" }, "original": { @@ -255,11 +255,11 @@ }, "utils": { "locked": { - "lastModified": 1648297722, - "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d7b1278..37528c1 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ tree-input.inputs.nixpkgs.follows = "nixpkgs-unstable"; # update whenever - nixpkgs-fixed.url = "github:nixos/nixpkgs/?branch=nixos-unstable&rev=652e92b8064949a11bc193b90b74cb727f2a1405"; + nixpkgs-fixed.url = "github:nixos/nixpkgs/?branch=nixos-unstable&rev=9813adc7f7c0edd738c6bdd8431439688bb0cb3d"; nur.url = "github:nix-community/NUR"; diff --git a/home/apps/mpv.nix b/home/apps/mpv.nix index c15eb9b..28d9ee6 100644 --- a/home/apps/mpv.nix +++ b/home/apps/mpv.nix @@ -7,7 +7,7 @@ in { home.packages = with pkgs; [ffmpeg yt-dlp]; programs.mpv = { enable = true; - scripts = with pkgs.mpvScripts; [ mpris ]; + scripts = with pkgs.mpvScripts; [mpris]; config = { script-opts = "ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp"; slang = "en"; diff --git a/overlay/misskey/browser-search-support.patch b/overlay/misskey/browser-search-support.patch index 2d8b457..6931128 100644 --- a/overlay/misskey/browser-search-support.patch +++ b/overlay/misskey/browser-search-support.patch @@ -47,42 +47,3 @@ index 0c3c5c9..b472cff 100644 link(rel='prefetch' href='https://xn--931a.moe/assets/info.jpg') link(rel='prefetch' href='https://xn--931a.moe/assets/not-found.jpg') link(rel='prefetch' href='https://xn--931a.moe/assets/error.jpg') -diff --git a/packages/client/src/pages/search.vue b/packages/client/src/pages/search.vue -index c080b76..f9aac2d 100644 ---- a/packages/client/src/pages/search.vue -+++ b/packages/client/src/pages/search.vue -@@ -12,12 +12,34 @@ import { computed } from 'vue'; - import XNotes from '@/components/MkNotes.vue'; - import { i18n } from '@/i18n'; - import { definePageMetadata } from '@/scripts/page-metadata'; -+import * as os from '@/os'; -+import { mainRouter } from '@/router'; - - const props = defineProps<{ - query: string; - channel?: string; - }>(); - -+const query = props.query; -+ -+if (localStorage.getItem('account') != null) { -+ if (query.startsWith('https://') || (query.startsWith('@') && !query.includes(' '))) { -+ const promise = os.api('ap/show', { -+ uri: props.query, -+ }); -+ -+ os.promiseDialog(promise, null, null, i18n.ts.fetchingAsApObject); -+ -+ const res = await promise; -+ -+ if (res.type === 'User') { -+ mainRouter.replace(`/@${res.object.username}@${res.object.host}`); -+ } else if (res.type === 'Note') { -+ mainRouter.replace(`/notes/${res.object.id}`); -+ } -+ } -+} -+ - const pagination = { - endpoint: 'notes/search' as const, - limit: 10, diff --git a/overlay/misskey/copy-link-non-monospace.patch b/overlay/misskey/copy-link-non-monospace.patch index 70982d6..3f3a168 100644 --- a/overlay/misskey/copy-link-non-monospace.patch +++ b/overlay/misskey/copy-link-non-monospace.patch @@ -1,7 +1,7 @@ -diff --git a/packages/client/src/scripts/copy-to-clipboard.ts b/packages/client/src/scripts/copy-to-clipboard.ts +diff --git a/packages/frontend/src/scripts/copy-to-clipboard.ts b/packages/frontend/src/scripts/copy-to-clipboard.ts index ab13cab..6dc5b74 100644 ---- a/packages/client/src/scripts/copy-to-clipboard.ts -+++ b/packages/client/src/scripts/copy-to-clipboard.ts +--- a/packages/frontend/src/scripts/copy-to-clipboard.ts ++++ b/packages/frontend/src/scripts/copy-to-clipboard.ts @@ -2,32 +2,27 @@ * Clipboardに値をコピー(TODO: 文字列以外も対応) */ diff --git a/overlay/misskey/default.nix b/overlay/misskey/default.nix index 87a5911..0d9b0b9 100644 --- a/overlay/misskey/default.nix +++ b/overlay/misskey/default.nix @@ -21,9 +21,10 @@ in # some of my own personal patches patches = [ # Nya! - ./browser-search-support.patch - ./copy-link-non-monospace.patch - ./reorder-note-menu.patch + # ./browser-search-support.patch | Already Merged + # ./remote-search-support.patch + # ./copy-link-non-monospace.patch + # ./reorder-note-menu.patch | Broken ]; installPhase = '' diff --git a/overlay/misskey/remote-search-support.patch b/overlay/misskey/remote-search-support.patch new file mode 100644 index 0000000..8b6d1c0 --- /dev/null +++ b/overlay/misskey/remote-search-support.patch @@ -0,0 +1,39 @@ +diff --git a/packages/frontend/src/pages/search.vue b/packages/frontend/src/pages/search.vue +index c080b76..f9aac2d 100644 +--- a/packages/frontend/src/pages/search.vue ++++ b/packages/frontend/src/pages/search.vue +@@ -12,12 +12,34 @@ import { computed } from 'vue'; + import XNotes from '@/components/MkNotes.vue'; + import { i18n } from '@/i18n'; + import { definePageMetadata } from '@/scripts/page-metadata'; ++import * as os from '@/os'; ++import { mainRouter } from '@/router'; + + const props = defineProps<{ + query: string; + channel?: string; + }>(); + ++const query = props.query; ++ ++if (localStorage.getItem('account') != null) { ++ if (query.startsWith('https://') || (query.startsWith('@') && !query.includes(' '))) { ++ const promise = os.api('ap/show', { ++ uri: props.query, ++ }); ++ ++ os.promiseDialog(promise, null, null, i18n.ts.fetchingAsApObject); ++ ++ const res = await promise; ++ ++ if (res.type === 'User') { ++ mainRouter.replace(`/@${res.object.username}@${res.object.host}`); ++ } else if (res.type === 'Note') { ++ mainRouter.replace(`/notes/${res.object.id}`); ++ } ++ } ++} ++ + const pagination = { + endpoint: 'notes/search' as const, + limit: 10, diff --git a/overlay/misskey/reorder-note-menu.patch b/overlay/misskey/reorder-note-menu.patch index 9e14bce..e2b15ee 100644 --- a/overlay/misskey/reorder-note-menu.patch +++ b/overlay/misskey/reorder-note-menu.patch @@ -1,7 +1,7 @@ -diff --git a/packages/client/src/scripts/get-note-menu.ts b/packages/client/src/scripts/get-note-menu.ts +diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts index 4826cd7..0d928a4 100644 ---- a/packages/client/src/scripts/get-note-menu.ts -+++ b/packages/client/src/scripts/get-note-menu.ts +--- a/packages/frontend/src/scripts/get-note-menu.ts ++++ b/packages/frontend/src/scripts/get-note-menu.ts @@ -169,7 +169,7 @@ export function getNoteMenu(props: { function share(): void { navigator.share({ diff --git a/overlay/piped/frontend/yarn.nix b/overlay/piped/frontend/yarn.nix index 963eaf2..09096c5 100644 --- a/overlay/piped/frontend/yarn.nix +++ b/overlay/piped/frontend/yarn.nix @@ -872,11 +872,11 @@ }; } { - name = "_eslint_eslintrc___eslintrc_1.3.3.tgz"; + name = "_eslint_eslintrc___eslintrc_1.4.1.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_1.3.3.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz"; - sha512 = "uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg=="; + name = "_eslint_eslintrc___eslintrc_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz"; + sha512 = "XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA=="; }; } { @@ -920,11 +920,11 @@ }; } { - name = "_humanwhocodes_config_array___config_array_0.11.6.tgz"; + name = "_humanwhocodes_config_array___config_array_0.11.8.tgz"; path = fetchurl { - name = "_humanwhocodes_config_array___config_array_0.11.6.tgz"; - url = "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.6.tgz"; - sha512 = "jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg=="; + name = "_humanwhocodes_config_array___config_array_0.11.8.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz"; + sha512 = "UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g=="; }; } { @@ -944,11 +944,11 @@ }; } { - name = "_iconify_json___json_2.1.155.tgz"; + name = "_iconify_json___json_2.2.3.tgz"; path = fetchurl { - name = "_iconify_json___json_2.1.155.tgz"; - url = "https://registry.yarnpkg.com/@iconify/json/-/json-2.1.155.tgz"; - sha512 = "Zr0809RkIKB/0pX3jFfLX4TI8fv1aW6+FHXlfRiDhFKQSmhcs2x5xYhtxI5GUzl+9o6Le544uUCljmHBYJUFrA=="; + name = "_iconify_json___json_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/@iconify/json/-/json-2.2.3.tgz"; + sha512 = "9o15HUqjUg/4VaT5webZAf0mJftToRkyzI2AI1AVjV+hffrJxkUx6Cbj8psHaMIfy4d369bnxksVBFwKKwOlAw=="; }; } { @@ -2024,11 +2024,11 @@ }; } { - name = "dompurify___dompurify_2.4.1.tgz"; + name = "dompurify___dompurify_2.4.2.tgz"; path = fetchurl { - name = "dompurify___dompurify_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.1.tgz"; - sha512 = "ewwFzHzrrneRjxzmK6oVz/rZn9VWspGFRDb4/rRtIsM1n36t9AKma/ye8syCpcw+XJ25kOK/hOG7t1j2I2yBqA=="; + name = "dompurify___dompurify_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.2.tgz"; + sha512 = "ckbbxcGpfTJ7SNHC2yT2pHSCYxo2oQgSfdoDHQANzMzQyGzVmalF9W/B+X97Cdik5xFwWtwJP232gIP2+1kNEA=="; }; } { @@ -2272,11 +2272,11 @@ }; } { - name = "eslint_config_prettier___eslint_config_prettier_8.5.0.tgz"; + name = "eslint_config_prettier___eslint_config_prettier_8.6.0.tgz"; path = fetchurl { - name = "eslint_config_prettier___eslint_config_prettier_8.5.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz"; - sha512 = "obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q=="; + name = "eslint_config_prettier___eslint_config_prettier_8.6.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz"; + sha512 = "bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA=="; }; } { @@ -2344,11 +2344,11 @@ }; } { - name = "eslint___eslint_8.29.0.tgz"; + name = "eslint___eslint_8.31.0.tgz"; path = fetchurl { - name = "eslint___eslint_8.29.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-8.29.0.tgz"; - sha512 = "isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg=="; + name = "eslint___eslint_8.31.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-8.31.0.tgz"; + sha512 = "0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA=="; }; } { @@ -2640,11 +2640,11 @@ }; } { - name = "globals___globals_13.17.0.tgz"; + name = "globals___globals_13.19.0.tgz"; path = fetchurl { - name = "globals___globals_13.17.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-13.17.0.tgz"; - sha512 = "1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw=="; + name = "globals___globals_13.19.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.19.0.tgz"; + sha512 = "dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ=="; }; } { @@ -3088,11 +3088,11 @@ }; } { - name = "json5___json5_2.2.1.tgz"; + name = "json5___json5_2.2.3.tgz"; path = fetchurl { - name = "json5___json5_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz"; - sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; + name = "json5___json5_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz"; + sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; }; } { @@ -3487,14 +3487,6 @@ sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; } - { - name = "pathe___pathe_0.3.9.tgz"; - path = fetchurl { - name = "pathe___pathe_0.3.9.tgz"; - url = "https://registry.yarnpkg.com/pathe/-/pathe-0.3.9.tgz"; - sha512 = "6Y6s0vT112P3jD8dGfuS6r+lpa0qqNrLyHPOwvXMnyNTQaYiwgau2DP3aNDsR13xqtGj7rrPo+jFUATpU6/s+g=="; - }; - } { name = "pathe___pathe_1.0.0.tgz"; path = fetchurl { @@ -4296,11 +4288,11 @@ }; } { - name = "vite_plugin_pwa___vite_plugin_pwa_0.14.0.tgz"; + name = "vite_plugin_pwa___vite_plugin_pwa_0.14.1.tgz"; path = fetchurl { - name = "vite_plugin_pwa___vite_plugin_pwa_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/vite-plugin-pwa/-/vite-plugin-pwa-0.14.0.tgz"; - sha512 = "3wZx47PLWTckOQhc8Y6YZjAbNZ89Ovh4TdCT97MGhgl7aFd2LUekVnAmIgFwgMqyxzJ93nmkPF/ALpEW/i2qCg=="; + name = "vite_plugin_pwa___vite_plugin_pwa_0.14.1.tgz"; + url = "https://registry.yarnpkg.com/vite-plugin-pwa/-/vite-plugin-pwa-0.14.1.tgz"; + sha512 = "5zx7yhQ8RTLwV71+GA9YsQQ63ALKG8XXIMqRJDdZkR8ZYftFcRgnzM7wOWmQZ/DATspyhPih5wCdcZnAIsM+mA=="; }; } { diff --git a/overlay/piped/meta.json b/overlay/piped/meta.json index f5084d9..b812f2f 100644 --- a/overlay/piped/meta.json +++ b/overlay/piped/meta.json @@ -1,14 +1,14 @@ { "frontend": { - "rev": "bffc08127f352fa17f12930b0167a7e63726e58b", - "sha256": "sha256-r3taWU2EsMtwqp6rXaNAkh6Jt/LyEqK1UIXCRtqHzAc=" + "rev": "0e308014546f81d07b5915e4cadd8a7b60764483", + "sha256": "sha256-MAUl5/jPxEbH6pQxNpcL7h//oB7LQyCUeacqP7fpYrc=" }, "backend": { - "rev": "3b4f5274e66fe7ba35ef8ddc979d4ff19b9a102b", - "sha256": "sha256-5rOEm9C1mTXAm6ZPSD7fU4lxH2zA0OaIlCmO3o/0dng=" + "rev": "09d538d355139da3619893d879b481b241e057b2", + "sha256": "sha256-4gCcYDagc0qPrZH8YDj5l3Okhtzm4rhF1w4jCJu47YE=" }, "proxy": { - "rev": "b77dd3f259d5b8cd647d5906c737632928b1c69b", - "sha256": "sha256-DhSPnqBWcdCclH7+jQEgBX0pJsJdb13PmockU8fLMIA=" + "rev": "55ee78f88e50664c67f9809dbbce778381792623", + "sha256": "sha256-z7dIQ+GPbhrvE4Luxo+h9DVyns6w2wQE4UfvqlzLxHg=" } }