From 739f38e2157af8d6a52ca7579ac7c33d5b9579ce Mon Sep 17 00:00:00 2001 From: William Date: Fri, 12 Jul 2024 11:37:38 -0300 Subject: [PATCH] Got rid of yousable --- flake.lock | 57 +------------- flake.nix | 10 +-- hosts/servers/alexandria/default.nix | 1 - hosts/servers/alexandria/yousable.nix | 108 -------------------------- 4 files changed, 3 insertions(+), 173 deletions(-) delete mode 100644 hosts/servers/alexandria/yousable.nix diff --git a/flake.lock b/flake.lock index 64b8336..6391504 100644 --- a/flake.lock +++ b/flake.lock @@ -117,24 +117,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -329,8 +311,7 @@ "nix-minecraft": "nix-minecraft", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable", - "yousable": "yousable" + "nixpkgs-stable": "nixpkgs-stable" } }, "systems": { @@ -378,21 +359,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "inputs": { "systems": "systems_2" @@ -410,27 +376,6 @@ "repo": "flake-utils", "type": "github" } - }, - "yousable": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717580432, - "narHash": "sha256-x9l7LZULkj80kUKTV8RYTows8LHh8JfN0+bQVg1FFmA=", - "owner": "t184256", - "repo": "yousable", - "rev": "1158bc83eef3f83e08c06bc952f023f769f925f7", - "type": "github" - }, - "original": { - "owner": "t184256", - "repo": "yousable", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 1d82dd9..ceac2b0 100644 --- a/flake.nix +++ b/flake.nix @@ -37,11 +37,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - yousable = { - url = "github:t184256/yousable"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nix-index-db = { url = "github:nix-community/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; @@ -49,7 +44,7 @@ }; outputs = inputs@{ self, nixpkgs, home-manager, nixpkgs-stable, deploy-rs - , agenix, nixos-generators, homepage, nix-minecraft, yousable, impermanence + , agenix, nixos-generators, homepage, nix-minecraft, impermanence , nix-index-db, ... }: { nixosConfigurations = { rotterdam = nixpkgs.lib.nixosSystem { @@ -73,7 +68,7 @@ agenix.nixosModules.default home-manager.nixosModules.default impermanence.nixosModules.impermanence - nix-index-db.nixosModules.default + nix-index-db.nixosModules.nix-index { nixpkgs.overlays = [ agenix.overlays.default ]; } ]; }; @@ -84,7 +79,6 @@ modules = [ ./hosts/servers/alexandria.nix agenix.nixosModules.default - yousable.nixosModules.default self.nixosModules.qbittorrent ({ config, pkgs, ... }: let diff --git a/hosts/servers/alexandria/default.nix b/hosts/servers/alexandria/default.nix index a9ed358..808c15e 100644 --- a/hosts/servers/alexandria/default.nix +++ b/hosts/servers/alexandria/default.nix @@ -20,6 +20,5 @@ ./users.nix ./variables.nix ./vaultwarden.nix - ./yousable.nix ]; } diff --git a/hosts/servers/alexandria/yousable.nix b/hosts/servers/alexandria/yousable.nix deleted file mode 100644 index f0e980c..0000000 --- a/hosts/servers/alexandria/yousable.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ inputs, config, pkgs, lib, ... }: - -let - configyaml = pkgs.writeTextFile { - name = "config.yaml"; - text = '' - paths: - meta: /data/yousable/meta - out: /data/yousable/out - tmp: /data/yousable/tmp - live: /data/yousable/live - x_accel: /out - - secrets: ~ - authorization: ~ - - profiles: - default: - video: false - container: opus - download: - format: 'ba[vcodec=none]' - format_sort: [ 'acodec:opus' ] - live: - audio: - format_sort: [ 'acodec:opus' ] - - feed_defaults: - load_entries: 10 # query only the last L videos from youtube - keep_entries: 10 # keep at least the last K videos on disk - keep_entries_seconds: 1000000000 # keep videos that are less than M seconds old - live_slice_seconds: 1200 # fill paths.live with fragments N seconds long - poll_seconds: 21600 # look for new videos roughly P seconds often - profiles: [ default ] - - feeds: - TL: - url: https://www.youtube.com/channel/UCeeFfhMcJa1kjtfZAGskOCA/videos - sponsorblock_remove: [ sponsor ] - overrides: - title: TechLinked - GL: - url: https://www.youtube.com/channel/UCHDxYLv8iovIbhrfl16CNyg/videos - sponsorblock_remove: [ sponsor ] - overrides: - title: GameLinked - JS: - url: https://www.youtube.com/channel/UC-2YHgc363EdcusLIBbgxzg/videos - sponsorblock_remove: [ sponsor ] - overrides: - title: Answers with Joe - HOTU: - url: https://www.youtube.com/channel/UCtRFmSyL4fSLQkn-wMqlmdA/videos - sponsorblock_remove: [ sponsor ] - overrides: - title: History of the Universe - SEA: - url: https://www.youtube.com/channel/UCG9ShGbASoiwHwFcLcAh9EA/videos - sponsorblock_remove: [ sponsor ] - overrides: - title: SEA - TH: - url: https://www.youtube.com/channel/UCSwFnHpDt-lZgR_7Sqisi6A/videos - sponsorblock_remove: [ sponsor ] - overrides: - title: The Histocrat - L1T: - url: https://www.youtube.com/channel/UC4w1YQAJMWOz4qtxinq55LQ/videos - sponsorblock_remove: [ sponsor ] - overrides: - title: Level 1 News - TSR: - url: https://www.youtube.com/channel/UCeMcDx6-rOq_RlKSPehk2tQ/videos - sponsorblock_remove: [ sponsor ] - overrides: - title: The Space Race - ''; - }; - -in { - services = { - yousable = { - enable = true; - port = lib.toInt "${config.ports.yousable}"; - configFile = "${configyaml}"; - }; - - nginx.virtualHosts."yousable.baduhai.dev" = { - useACMEHost = "baduhai.dev"; - forceSSL = true; - kTLS = true; - locations."/".proxyPass = "http://127.0.0.1:${config.ports.yousable}"; - extraConfig = '' - gzip off; - gzip_proxied off; - proxy_cache off; - proxy_buffering off; - ''; - locations."/out" = { - root = "/data/yousable"; - extraConfig = '' - autoindex off; - internal; - ''; - }; - }; - }; -}