182 current 2024-06-23 23:25:38 24.11.20240618.c00d587 6.9.3-zen1 *

customPackages/default.nix

@@ -1,6 +1,6 @@
 { pkgs }: rec{
   # discord = nixpkgs.callPackage ./discord { };
-  discord = pkgs.callPackage ./discord/default.nix { inherit vencord; };
+  discord = pkgs.callPackage ./discord/default.nix { };
   vesktop = pkgs.callPackage ./vesktop/default.nix { inherit vencord; };
-  vencord = pkgs.callPackage ./vencord/default.nix { };
+  vencord = pkgs.callPackage ./vencord/package.nix { };
 }

customPackages/discord/default.nix

@@ -1,5 +1,6 @@
-{vencord, branch ? "stable", callPackage, fetchurl, lib, stdenv }:
+{ branch ? "stable", pkgs, callPackage, fetchurl, lib, stdenv }:
 let
+  vencord = (import ./..{ inherit pkgs; }).vencord;
   versions =
     if stdenv.isLinux then {
       stable = "0.0.53";

customPackages/vencord/package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "vencord",
-    "version": "1.9.0",
+    "version": "1.9.1",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "vencord",
-            "version": "1.9.0",
+            "version": "1.9.1",
             "license": "GPL-3.0-or-later",
             "dependencies": {
                 "@sapphi-red/web-noise-suppressor": "0.3.3",
@@ -15,7 +15,7 @@
                 "eslint-plugin-simple-header": "^1.0.2",
                 "fflate": "^0.7.4",
                 "gifenc": "github:mattdesl/gifenc#64842fca317b112a8590f8fef2bf3825da8f6fe3",
-                "monaco-editor": "^0.43.0",
+                "monaco-editor": "^0.50.0",
                 "nanoid": "^4.0.2",
                 "virtual-merge": "^1.0.1"
             },
@@ -894,9 +894,9 @@
             "dev": true
         },
         "node_modules/@types/node": {
-            "version": "18.19.36",
+            "version": "18.19.39",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.36.tgz",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.39.tgz",
-            "integrity": "sha512-tX1BNmYSWEvViftB26VLNxT6mEr37M7+ldUtq7rlKnv4/2fKYsJIOmqJAjT6h1DNuwQjIKgw3VJ/Dtw3yiTIQw==",
+            "integrity": "sha512-nPwTRDKUctxw3di5b4TfT3I0sWDiWoPQCZjXhvdkINntwr8lcoVCKsTgnXeRubKIlfnV+eN/HYk6Jb40tbcEAQ==",
             "dev": true,
             "dependencies": {
                 "undici-types": "~5.26.4"
@@ -3299,12 +3299,15 @@
             "dev": true
         },
         "node_modules/is-core-module": {
-            "version": "2.13.1",
+            "version": "2.14.0",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz",
-            "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+            "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==",
             "dev": true,
             "dependencies": {
-                "hasown": "^2.0.0"
+                "hasown": "^2.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -3796,9 +3799,9 @@
             }
         },
         "node_modules/monaco-editor": {
-            "version": "0.43.0",
+            "version": "0.50.0",
-            "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.43.0.tgz",
+            "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.50.0.tgz",
-            "integrity": "sha512-cnoqwQi/9fml2Szamv1XbSJieGJ1Dc8tENVMD26Kcfl7xGQWp7OBKMjlwKVGYFJ3/AXJjSOGvcqK7Ry/j9BM1Q=="
+            "integrity": "sha512-8CclLCmrRRh+sul7C08BmPBP3P8wVWfBHomsTcndxg5NRCEPfu/mc2AGU8k37ajjDVXcXFc12ORAMUkmk+lkFA=="
         },
         "node_modules/ms": {
             "version": "2.1.2",
@@ -5549,9 +5552,9 @@
             }
         },
         "node_modules/typescript": {
-            "version": "5.4.5",
+            "version": "5.5.2",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz",
-            "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+            "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==",
             "dev": true,
             "bin": {
                 "tsc": "bin/tsc",

customPackages/vencord/package.nix

@@ -5,8 +5,8 @@
 , buildWebExtension ? false
 }:
 let
-  version = "1.9.0";
+  version = "1.9.1";
-  gitHash = "3505ada";
+  gitHash = "3d46f19";
 in
 buildNpmPackage rec {
   pname = "vencord";
@@ -16,11 +16,11 @@ buildNpmPackage rec {
     owner = "Vendicated";
     repo = "Vencord";
     rev = "v${version}";
-    hash = "sha256-akCuZcB7psZlMAnDKJU3bK1K++ACjHxTUFxl5DRdtQ4=";
+    hash = "sha256-mq0gUKH7zmMzi497zru0bfjHPT69kWhIVhSO4GNdNKc=";
   };
 
   ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: {
-    version = "1.9.0";
+    version = "1.9.1";
     src = fetchFromGitHub {
       owner = "evanw";
       repo = "esbuild";
@@ -34,7 +34,7 @@ buildNpmPackage rec {
   npmRebuildFlags = [ "|| true" ];
 
   makeCacheWritable = true;
-  npmDepsHash = "sha256-YyLT7M0T9f5SfyPARDXsavqKLisJSUqAxopBpo9FPps=";
+  npmDepsHash = "sha256-Y7Z7efGVDu0mFS1uTPF+A4lBfR+B2/ZVMqTHxB37RJc=";
   npmFlags = [ "--legacy-peer-deps" ];
   npmBuildScript = if buildWebExtension then "buildWeb" else "build";
   npmBuildFlags = [ "--" "--standalone" "--disable-updater" ];
@@ -60,6 +60,6 @@ buildNpmPackage rec {
     description = "Vencord web extension";
     homepage = "https://github.com/Vendicated/Vencord";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ FlafyDev fwam NotAShelf Scrumplex ];
+    maintainers = with maintainers; [ FlafyDev NotAShelf Scrumplex ];
   };
 }

customPackages/vencord/test.bak

@@ -1,108 +0,0 @@
-{
-    "name": "vencord",
-    "private": "true",
-    "version": "1.8.6",
-    "description": "The cutest Discord client mod",
-    "homepage": "https://github.com/Vendicated/Vencord#readme",
-    "bugs": {
-        "url": "https://github.com/Vendicated/Vencord/issues"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/Vendicated/Vencord.git"
-    },
-    "license": "GPL-3.0-or-later",
-    "author": "Vendicated",
-    "directories": {
-        "doc": "docs"
-    },
-    "scripts": {
-        "build": "node --require=./scripts/suppressExperimentalWarnings.js scripts/build/build.mjs",
-        "buildStandalone": "pnpm build --standalone",
-        "buildWeb": "node --require=./scripts/suppressExperimentalWarnings.js scripts/build/buildWeb.mjs",
-        "watch": "pnpm build --watch",
-        "generatePluginJson": "tsx scripts/generatePluginList.ts",
-        "generateTypes": "tspc --emitDeclarationOnly --declaration --outDir packages/vencord-types",
-        "inject": "node scripts/runInstaller.mjs",
-        "uninject": "node scripts/runInstaller.mjs",
-        "lint": "eslint . --ext .js,.jsx,.ts,.tsx --ignore-pattern src/userplugins",
-        "lint-styles": "stylelint \"src/**/*.css\" --ignore-pattern src/userplugins",
-        "lint:fix": "pnpm lint --fix",
-        "test": "pnpm buildStandalone && pnpm lint && pnpm lint-styles && pnpm testTsc && pnpm generatePluginJson",
-        "testWeb": "pnpm lint && pnpm buildWeb && pnpm testTsc",
-        "testTsc": "tsc --noEmit"
-    },
-    "dependencies": {
-        "@sapphi-red/web-noise-suppressor": "0.3.3",
-        "@vap/core": "0.0.12",
-        "@vap/shiki": "0.10.5",
-        "eslint-plugin-simple-header": "^1.0.2",
-        "fflate": "^0.7.4",
-        "gifenc": "github:mattdesl/gifenc#64842fca317b112a8590f8fef2bf3825da8f6fe3",
-        "monaco-editor": "^0.43.0",
-        "nanoid": "^4.0.2",
-        "virtual-merge": "^1.0.1"
-    },
-    "devDependencies": {
-        "@types/chrome": "^0.0.246",
-        "@types/diff": "^5.0.3",
-        "@types/lodash": "^4.14.194",
-        "@types/node": "^18.16.3",
-        "@types/react": "^18.2.0",
-        "@types/react-dom": "^18.2.1",
-        "@types/yazl": "^2.4.2",
-        "@typescript-eslint/eslint-plugin": "^5.59.1",
-        "@typescript-eslint/parser": "^5.59.1",
-        "diff": "^5.1.0",
-        "discord-types": "^1.3.26",
-        "esbuild": "^0.15.18",
-        "eslint": "^8.46.0",
-        "eslint-import-resolver-alias": "^1.1.2",
-        "eslint-plugin-path-alias": "^1.0.0",
-        "eslint-plugin-simple-import-sort": "^10.0.0",
-        "eslint-plugin-unused-imports": "^2.0.0",
-        "highlight.js": "10.6.0",
-        "html-minifier-terser": "^7.2.0",
-        "moment": "^2.29.4",
-        "puppeteer-core": "^19.11.1",
-        "standalone-electron-types": "^1.0.0",
-        "stylelint": "^15.6.0",
-        "stylelint-config-standard": "^33.0.0",
-        "ts-patch": "^3.1.2",
-        "tsx": "^3.12.7",
-        "type-fest": "^3.9.0",
-        "typescript": "^5.4.5",
-        "typescript-transform-paths": "^3.4.7",
-        "zip-local": "^0.3.5"
-    },
-    "packageManager": "pnpm@9.1.0",
-    "pnpm": {
-        "patchedDependencies": {
-            "eslint-plugin-path-alias@1.0.0": "patches/eslint-plugin-path-alias@1.0.0.patch",
-            "eslint@8.46.0": "patches/eslint@8.46.0.patch"
-        },
-        "peerDependencyRules": {
-            "ignoreMissing": [
-                "eslint-plugin-import",
-                "eslint"
-            ]
-        },
-        "allowedDeprecatedVersions": {
-            "source-map-resolve": "*",
-            "resolve-url": "*",
-            "source-map-url": "*",
-            "urix": "*"
-        }
-    },
-    "webExt": {
-        "artifactsDir": "./dist",
-        "build": {
-            "overwriteDest": true
-        },
-        "sourceDir": "./dist/firefox-unpacked"
-    },
-    "engines": {
-        "node": ">=18",
-        "pnpm": ">=8"
-    }
-}

customPackages/vencord/update.sh

@@ -17,9 +17,17 @@ npm install --legacy-peer-deps -f
 npmDepsHash=$(prefetch-npm-deps ./package-lock.json)
 popd
 
+# FIXME: why doesnt this work
 # update-source-version vencord "${latestTag#v}"
+set -x
 
-perl -i -pe "s/(?<=gitHash = \")\w{7}(?=\";)/${gitHash:0:7}/" ./default.nix
+perl -i -pe "s/(?<=gitHash = \")\w{7}(?=\";)/${gitHash:0:7}/" ./package.nix
-perl -i -pe "s/(?<=npmDepsHash = \")sha256-.*(?=\";)/${npmDepsHash}/" ./default.nix
+perl -i -pe "s#(?<=npmDepsHash = \")sha256-.*(?=\";)#${npmDepsHash}#" ./package.nix
-perl -i -pe "s/(?<=version = \")(\d.?){0,4}(?=\")/${latestTag:1}/" ./default.nix
+perl -i -pe "s/(?<=version = \")(\d.?){0,4}(?=\")/${latestTag:1}/" ./package.nix
 cp "$tempDir/package-lock.json" "$pkgDir/package-lock.json"
+td=$(mktemp -d)
+pushd "$td"
+git clone https://github.com/Vendicated/Vencord.git 
+Hash=$(nix-hash ./Vencord --type sha256 --sri)
+popd
+perl -i -pe "s~(src.{0,120}hash = \")(.{0,70})(\")~\1${Hash}\3~s" ./package.nix

dotfiles/kitty/kitty.conf

@@ -4,6 +4,8 @@ font_family ComicShannsMono Nerd Font
 bold_font        auto
 italic_font      auto
 bold_italic_font auto
+#MAPS
+map ctrl+f launch --type=overlay --stdin-source=@screen_scrollback fzf --no-sort --no-mouse --exact -i
 
 font_size 15
 # background_opacity 0.8