wip
parent
26ee1a6059
commit
b241728201
14
flake.lock
14
flake.lock
|
@ -246,17 +246,13 @@
|
||||||
"nixpkgs-yuzuru": {
|
"nixpkgs-yuzuru": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1631208211,
|
"lastModified": 1631208211,
|
||||||
"narHash": "sha256-swoOJ7FC5vQMpHw00X3nBPdChhrEwCLzfqesdUzlsKw=",
|
"narHash": "sha256-rJ9Pwd4Ayp5euCLTDkYpfDbaZN/Syz0sY1me90oXqBo=",
|
||||||
"owner": "sbruder",
|
"type": "git",
|
||||||
"repo": "nixpkgs",
|
"url": "file:///home/simon/src/nixpkgs"
|
||||||
"rev": "3f4b6302832647bb26517cd0b13289fe1f52dd1f",
|
|
||||||
"type": "github"
|
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "sbruder",
|
"type": "git",
|
||||||
"ref": "invidious",
|
"url": "file:///home/simon/src/nixpkgs"
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
|
|
|
@ -6,7 +6,8 @@
|
||||||
|
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-21.05";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-21.05";
|
||||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
nixpkgs-yuzuru.url = "github:sbruder/nixpkgs/invidious";
|
#nixpkgs-yuzuru.url = "github:sbruder/nixpkgs/invidious";
|
||||||
|
nixpkgs-yuzuru.url = "/home/simon/src/nixpkgs";
|
||||||
|
|
||||||
home-manager.url = "github:nix-community/home-manager/release-21.05";
|
home-manager.url = "github:nix-community/home-manager/release-21.05";
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
From 04a1f0eaebdfe1fdd1df0629a93a2187091ee0f0 Mon Sep 17 00:00:00 2001
|
From 3c692fc4fd5ea7faefc6b6ef63c9b6b20205a1cb Mon Sep 17 00:00:00 2001
|
||||||
From: Simon Bruder <simon@sbruder.de>
|
From: Simon Bruder <simon@sbruder.de>
|
||||||
Date: Thu, 9 Sep 2021 16:56:57 +0200
|
Date: Thu, 9 Sep 2021 16:56:57 +0200
|
||||||
Subject: [PATCH 2/2] Prefer opus audio streams in listen mode
|
Subject: [PATCH] Prefer opus audio streams in listen mode
|
||||||
|
|
||||||
---
|
---
|
||||||
src/invidious/views/components/player.ecr | 10 ++++++++++
|
src/invidious/views/components/player.ecr | 10 ++++++++++
|
||||||
1 file changed, 10 insertions(+)
|
1 file changed, 10 insertions(+)
|
||||||
|
|
||||||
diff --git a/src/invidious/views/components/player.ecr b/src/invidious/views/components/player.ecr
|
diff --git a/src/invidious/views/components/player.ecr b/src/invidious/views/components/player.ecr
|
||||||
index c520fb5a..590cf6c5 100644
|
index 6418f66b..73524cfd 100644
|
||||||
--- a/src/invidious/views/components/player.ecr
|
--- a/src/invidious/views/components/player.ecr
|
||||||
+++ b/src/invidious/views/components/player.ecr
|
+++ b/src/invidious/views/components/player.ecr
|
||||||
@@ -7,6 +7,16 @@
|
@@ -7,6 +7,16 @@
|
|
@ -12,8 +12,7 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.invidious.overrideAttrs (o: o // {
|
package = pkgs.invidious.overrideAttrs (o: o // {
|
||||||
patches = (o.patches or [ ]) ++ [
|
patches = (o.patches or [ ]) ++ [
|
||||||
./patches/0001-Link-to-patches-in-footer.patch
|
./0001-Prefer-opus-audio-streams-in-listen-mode.patch
|
||||||
./patches/0002-Prefer-opus-audio-streams-in-listen-mode.patch
|
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
nginx.enable = true;
|
nginx.enable = true;
|
||||||
|
@ -36,6 +35,7 @@
|
||||||
disable_proxy = [ "downloads" ]; # legal precaution
|
disable_proxy = [ "downloads" ]; # legal precaution
|
||||||
local = true; # no external requests
|
local = true; # no external requests
|
||||||
use_pubsub_feeds = true;
|
use_pubsub_feeds = true;
|
||||||
|
modified_source_code_url = "https://github.com/sbruder/invidious/tree/patches";
|
||||||
};
|
};
|
||||||
extraSettingsFile = config.sops.secrets.invidious-extra-settings.path;
|
extraSettingsFile = config.sops.secrets.invidious-extra-settings.path;
|
||||||
};
|
};
|
||||||
|
@ -44,12 +44,6 @@
|
||||||
locations = {
|
locations = {
|
||||||
"/robots.txt".return = "200 'User-agent: *\\nDisallow: /'";
|
"/robots.txt".return = "200 'User-agent: *\\nDisallow: /'";
|
||||||
"/privacy".return = "301 'https://sbruder.xyz/#privacy'";
|
"/privacy".return = "301 'https://sbruder.xyz/#privacy'";
|
||||||
"/patches/" = {
|
|
||||||
alias = "${./patches}/";
|
|
||||||
extraConfig = ''
|
|
||||||
autoindex on;
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,24 +0,0 @@
|
||||||
From 69c63df2aea003eb6e5dc787ed1bb7d881194d55 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Simon Bruder <simon@sbruder.de>
|
|
||||||
Date: Thu, 9 Sep 2021 18:46:38 +0200
|
|
||||||
Subject: [PATCH 1/2] Link to patches in footer
|
|
||||||
|
|
||||||
---
|
|
||||||
src/invidious/views/template.ecr | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/src/invidious/views/template.ecr b/src/invidious/views/template.ecr
|
|
||||||
index 7be95959..5b0d6ca1 100644
|
|
||||||
--- a/src/invidious/views/template.ecr
|
|
||||||
+++ b/src/invidious/views/template.ecr
|
|
||||||
@@ -120,6 +120,7 @@
|
|
||||||
<a href="https://github.com/iv-org/invidious">
|
|
||||||
<%= translate(locale, "Released under the AGPLv3 on Github.") %>
|
|
||||||
</a>
|
|
||||||
+ (<a href="/patches/">Patches</a>)
|
|
||||||
</div>
|
|
||||||
<div class="pure-u-1 pure-u-md-1-3">
|
|
||||||
<i class="icon ion-ios-wallet"></i>
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
These are the patches aplied to this invidious instance.
|
|
||||||
|
|
||||||
They are licensed under the GNU Affero General Public License version 3 as
|
|
||||||
published by the Free Software Foundation. Its text can be found under
|
|
||||||
https://www.gnu.org/licenses/agpl-3.0.en.html
|
|
Loading…
Reference in New Issue