diff --git a/flake.lock b/flake.lock index 11802d8..3090ec3 100644 --- a/flake.lock +++ b/flake.lock @@ -244,6 +244,22 @@ "type": "github" } }, + "multitask": { + "flake": false, + "locked": { + "lastModified": 1634895861, + "narHash": "sha256-YJomiL8l4YhA5FhjGrSBRnJafAkSPldzETuNubUg1c8=", + "owner": "powercord-community", + "repo": "multitask", + "rev": "0582f00e41e2a0b48003b3817d03d84a5b7619be", + "type": "github" + }, + "original": { + "owner": "powercord-community", + "repo": "multitask", + "type": "github" + } + }, "neovim-flake": { "inputs": { "flake-utils": "flake-utils", @@ -520,6 +536,7 @@ "fix-user-popouts": "fix-user-popouts", "home-manager": "home-manager", "linux-tkg": "linux-tkg", + "multitask": "multitask", "neovim-nightly": "neovim-nightly", "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index 1cf13de..f963dfd 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,7 @@ channel-typing = { url = "github:powercord-community/channel-typing"; flake = false; }; discord-tweaks = { url = "github:NurMarvin/discord-tweaks"; flake = false; }; fix-user-popouts = { url = "github:cyyynthia/fix-user-popouts"; flake = false; }; + multitask = { url = "github:powercord-community/multitask"; flake = false; }; no-double-back-pc = { url = "github:the-cord-plug/no-double-back-pc"; flake = false; }; powercord-popout-fix = { url = "github:Nexure/PowerCord-Popout-Fix"; flake = false; }; rolecolor-everywhere = { url = "github:powercord-community/rolecolor-everywhere"; flake = false; }; diff --git a/users/rin/packages.nix b/users/rin/packages.nix index 74e0082..f2236d0 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -1,11 +1,24 @@ { config, enableGUI, inputs, pkgs, ... }: let + mediaKeyPatch = pkgs.fetchurl { + url = "https://github.com/powercord-org/powercord/commit/6c9e57de7fcbd50e473c6d9b1c81e56fef85fa93.diff"; + sha256 = "16jy1qkkbjxmylqpjfm3y47nf40hw5anq284aj6kc9z3n3323pic"; + }; discord = pkgs.discord-plugged.override { + powercord = pkgs.powercord.override { + powercord-unwrapped = pkgs.powercord.unwrapped.overrideAttrs(old: { + patches = (if (old ? patches) then old.patches else []) ++ [ + mediaKeyPatch + ./powercordMediaKeyPatchPatch.patch + ]; + }); + }; plugins = [ inputs.better-status-indicators inputs.channel-typing inputs.discord-tweaks inputs.fix-user-popouts + inputs.multitask inputs.no-double-back-pc inputs.powercord-popout-fix inputs.rolecolor-everywhere diff --git a/users/rin/powercordMediaKeyPatchPatch.patch b/users/rin/powercordMediaKeyPatchPatch.patch new file mode 100644 index 0000000..d43290c --- /dev/null +++ b/users/rin/powercordMediaKeyPatchPatch.patch @@ -0,0 +1,14 @@ +diff --git a/src/patcher.js b/src/patcher.js +index d1609554029..780740d7423 100644 +--- a/src/patcher.js ++++ b/src/patcher.js +@@ -22,7 +22,8 @@ console.log('Hello from Powercord!'); + + let disableMediaHandling = false; + try { +- settings = require(join(__dirname, '../settings/pc-general.json')); ++ const { SETTINGS_FOLDER } = require('./fake_node_modules/powercord/constants'); ++ settings = require(join(SETTINGS_FOLDER, 'pc-general.json')); + disableMediaHandling = settings.disableMediaHandling; + } catch (e) {} +