From 5d615e8a4d0956ff15eb657b3bdfaf79519c2bfa Mon Sep 17 00:00:00 2001 From: prescientmoon Date: Sat, 9 Nov 2024 12:55:39 +0100 Subject: [PATCH] Go back to old invidious Neither versions works (youtube managed to block both for now), but the old one built (at least) --- home/calypso.nix | 1 + home/features/neovim/config/lazy-lock.json | 55 +++++++++++++++++++++- home/features/neovim/default.nix | 6 --- hosts/nixos/lapetus/services/invidious.nix | 10 +--- 4 files changed, 56 insertions(+), 16 deletions(-) diff --git a/home/calypso.nix b/home/calypso.nix index 0ca4f48..ae8be15 100644 --- a/home/calypso.nix +++ b/home/calypso.nix @@ -49,6 +49,7 @@ # google-chrome # Not my primary browser, but sometimes needed in webdev # plover.dev # steno engine overskride # Bluetooth client + freetube # youtube client # }}} # {{{ Media playing/recording mpv # Video player diff --git a/home/features/neovim/config/lazy-lock.json b/home/features/neovim/config/lazy-lock.json index 26f6a97..67ddf0b 100644 --- a/home/features/neovim/config/lazy-lock.json +++ b/home/features/neovim/config/lazy-lock.json @@ -1,4 +1,57 @@ { "catppuccin": { "branch": "main", "commit": "4fd72a9ab64b393c2c22b168508fd244877fec96" }, - "clipboard-image": { "branch": "main", "commit": "4ab6f7f1fa4ea97866c0e0f6160f6a36ef174438" } + "clipboard-image": { "branch": "main", "commit": "4ab6f7f1fa4ea97866c0e0f6160f6a36ef174438" }, + "cmp": { "branch": "main", "commit": "7e348da6e5085ac447144a2ef4b637220ba27209" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, + "cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "conform": { "branch": "master", "commit": "cd75be867f2331b22905f47d28c0c270a69466aa" }, + "crates": { "branch": "main", "commit": "c3fd47391de6999f4c939af89494d08443f71916" }, + "dressing": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" }, + "fidget": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, + "flash": { "branch": "main", "commit": "d0799ae43a581d9f190e182e2a1f389d2887c42a" }, + "ftft": { "branch": "master", "commit": "f3e43c9584e14b27f04c27a95a9d9f0e58dfec02" }, + "github-actions": { "branch": "master", "commit": "728374ef59b11a5f5991ea2560d149a4ae33fd22" }, + "gitlinker": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" }, + "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" }, + "haskell-tools": { "branch": "master", "commit": "92e097c6832405fb64e4c44a7ce8bebe7836cae6" }, + "hyprland": { "branch": "main", "commit": "71760fe0cad972070657b0528f48456f7e0027b2" }, + "idris": { "branch": "main", "commit": "8bff02984a33264437e70fd9fff4359679d910da" }, + "indent-blankline": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, + "just": { "branch": "main", "commit": "cd11f4bb51ae576daae48a27c1c0f98afd59e52c" }, + "lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" }, + "lean": { "branch": "main", "commit": "182703184edb866d7bfe878be358295e189c8223" }, + "live-command": { "branch": "main", "commit": "d460067d47948725a6f25b20f31ea8bbfdfe4622" }, + "lspconfig": { "branch": "master", "commit": "216deb2d1b5fbf24398919228208649bbf5cbadf" }, + "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, + "luasnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, + "mini.ai": { "branch": "main", "commit": "45587078f323eaf41b9f701bbc04f8d1ab008979" }, + "mini.comment": { "branch": "main", "commit": "080f00bb91fea4bab799820bd2ce835a88d0703a" }, + "mini.files": { "branch": "main", "commit": "acfc4e46f6722a0690ce640632c5b5515ddade70" }, + "mini.operators": { "branch": "main", "commit": "7d30c0bc5baaa1f0d3a63dd18b35c8581bc164f4" }, + "mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" }, + "mini.statusline": { "branch": "main", "commit": "ec7e2c509c7262fef85a28a772f60ebe146297db" }, + "mini.surround": { "branch": "main", "commit": "57caca9525cec0ea771a67326b0ee637d056078a" }, + "navigator": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" }, + "neoconf": { "branch": "main", "commit": "23f24edab5f78465a0bc3320678e038664b9aa6e" }, + "neodev": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, + "neotest": { "branch": "master", "commit": "6d6ad113f56edc7c3f2a77a0836ea8c1b955ebea" }, + "neotest-haskell": { "branch": "master", "commit": "10cd953fb7c81de82ce8dc618e0614e0ab5fa1e3" }, + "nui": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, + "null-ls": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, + "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, + "plenary": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "purescript": { "branch": "main", "commit": "82348352e6568fcc0385bd7c99a8ead3a479feea" }, + "quicker.nvim": { "branch": "master", "commit": "183041a46d6c908eefb1c23ea02cce9c8f41256e" }, + "rustacean": { "branch": "master", "commit": "5c0c44149e43b907dae2e0fe053284ad56226eb7" }, + "rzip": { "branch": "master", "commit": "f65400fed27b27c7cff7ef8d428c4e5ff749bf28" }, + "scrap": { "branch": "main", "commit": "cc8453ed613932c744c3d1ec42f379b78bd8b92c" }, + "telescope": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, + "typst": { "branch": "main", "commit": "4d18ced62599ffe5b3c0e5e49566d5456121bc02" }, + "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" }, + "wakatime": { "branch": "master", "commit": "3cb40867cb5a3120f9bef76eff88edc7f1dc1a23" }, + "web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" } } \ No newline at end of file diff --git a/home/features/neovim/default.nix b/home/features/neovim/default.nix index 5255f00..e5b1791 100644 --- a/home/features/neovim/default.nix +++ b/home/features/neovim/default.nix @@ -1491,12 +1491,6 @@ let }; }; # }}} - # {{{ justfile support - just = { - package = "NoahTheDuke/vim-just"; - event = "VeryLazy"; - }; - # }}} # }}} # {{{ external # These plugins integrate neovim with external services diff --git a/hosts/nixos/lapetus/services/invidious.nix b/hosts/nixos/lapetus/services/invidious.nix index 06b0b14..fa80f77 100644 --- a/hosts/nixos/lapetus/services/invidious.nix +++ b/hosts/nixos/lapetus/services/invidious.nix @@ -32,14 +32,6 @@ db.user = "invidious"; }; - package = pkgs.invidious.overrideAttrs (_oldAttrs: { - src = pkgs.fetchFromGitHub { - owner = "iv-org"; - repo = "invidious"; - fetchSubmodules = true; - rev = "b173d4acf21563d47d26718eca7932878fb424e6"; - sha256 = "04z11yai4yrjpd9im38dgx1p2qnh8px1zq28m1ay9jjk2s143j4r"; - }; - }); + package = pkgs.invidious; }; }