From 2fa3ff35c764d579552b91f8ba3ddcc502621a70 Mon Sep 17 00:00:00 2001 From: winston Date: Mon, 24 Jun 2024 00:52:50 +0200 Subject: [PATCH] feat: adjustments --- _sources/generated.json | 21 --- _sources/generated.nix | 18 --- config/services/default.nix | 1 - config/services/nitter.nix | 24 ---- config/services/nitter/nimble.lock | 198 ----------------------------- flake.lock | 51 ++++---- nvfetcher.toml | 3 - 7 files changed, 24 insertions(+), 292 deletions(-) delete mode 100644 _sources/generated.json delete mode 100644 _sources/generated.nix delete mode 100644 config/services/nitter.nix delete mode 100644 config/services/nitter/nimble.lock delete mode 100644 nvfetcher.toml diff --git a/_sources/generated.json b/_sources/generated.json deleted file mode 100644 index ffc89dc..0000000 --- a/_sources/generated.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "nitter-fork": { - "cargoLocks": null, - "extract": null, - "name": "nitter-fork", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "sekai-soft", - "repo": "nitter", - "rev": "caa43fccc39c6771127865f7e8ce811c87c27ab9", - "sha256": "sha256-cZkP7YO064mXPJqITC4W+RMhangce1L1BQwILfLfvfQ=", - "type": "github" - }, - "version": "caa43fccc39c6771127865f7e8ce811c87c27ab9" - } -} \ No newline at end of file diff --git a/_sources/generated.nix b/_sources/generated.nix deleted file mode 100644 index 39a2f73..0000000 --- a/_sources/generated.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated by nvfetcher, please do not modify it manually. -{ - fetchgit, - fetchurl, - fetchFromGitHub, -}: { - nitter-fork = { - pname = "nitter-fork"; - version = "caa43fccc39c6771127865f7e8ce811c87c27ab9"; - src = fetchFromGitHub { - owner = "sekai-soft"; - repo = "nitter"; - rev = "caa43fccc39c6771127865f7e8ce811c87c27ab9"; - fetchSubmodules = false; - sha256 = "sha256-cZkP7YO064mXPJqITC4W+RMhangce1L1BQwILfLfvfQ="; - }; - }; -} diff --git a/config/services/default.nix b/config/services/default.nix index db13b32..2e72e95 100644 --- a/config/services/default.nix +++ b/config/services/default.nix @@ -8,7 +8,6 @@ ./gitlab ./invidious.nix ./libreddit.nix - ./nitter.nix ./nginx.nix ./postgres.nix ./wakapi.nix diff --git a/config/services/nitter.nix b/config/services/nitter.nix deleted file mode 100644 index 9b5d989..0000000 --- a/config/services/nitter.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - pkgs, - inputs, - ... -}: let - nv = pkgs.callPackage ../../_sources/generated.nix {}; - - nitter-fork = pkgs.unstable.nitter.overrideAttrs (_: { - inherit (nv.nitter-fork) src version pname; - lockFile = ./nitter/nimble.lock; - }); -in { - disabledModules = ["services/misc/nitter.nix"]; - imports = ["${inputs.nixpkgs-unstable}/nixos/modules/services/misc/nitter.nix"]; - - services.nitter = { - enable = false; - package = nitter-fork; - server = { - address = "127.0.0.1"; - port = 12419; - }; - }; -} diff --git a/config/services/nitter/nimble.lock b/config/services/nitter/nimble.lock deleted file mode 100644 index 42949ab..0000000 --- a/config/services/nitter/nimble.lock +++ /dev/null @@ -1,198 +0,0 @@ -{ - "version": 2, - "packages": { - "supersnappy": { - "version": "2.1.3", - "vcsRevision": "6c94198ea0e6835dcf11e3a207542cbb6bfb1cd9", - "url": "https://github.com/guzba/supersnappy", - "downloadMethod": "git", - "dependencies": [], - "checksums": { - "sha1": "a197de45773703f7134301043e416fb5025c614d" - } - }, - "asynctools": { - "version": "0.1.1", - "vcsRevision": "a314fb8d18a08954fc7ea43e40673acb348ce7cc", - "url": "https://github.com/timotheecour/asynctools", - "downloadMethod": "git", - "dependencies": [], - "checksums": { - "sha1": "5e7df4178ee5c148532ff8c44a22015d576624d8" - } - }, - "flatty": { - "version": "0.3.4", - "vcsRevision": "e66808508b3e5a05c53039226b467404febeb7f0", - "url": "https://github.com/treeform/flatty", - "downloadMethod": "git", - "dependencies": [], - "checksums": { - "sha1": "48109ac5d2f65f9d1a61f5077ba0eb61d104a90a" - } - }, - "redis": { - "version": "0.3.0", - "vcsRevision": "d0a0e6fb3010015f0cc483ca2e540ace02446570", - "url": "https://github.com/zedeus/redis", - "downloadMethod": "git", - "dependencies": [], - "checksums": { - "sha1": "9b1a45983890db1f1775ecddc51925000d183c57" - } - }, - "sha1": { - "version": "1.1", - "vcsRevision": "92ccc5800bb0ac4865b275a2ce3c1544e98b48bc", - "url": "https://github.com/onionhammer/sha1", - "downloadMethod": "git", - "dependencies": [], - "checksums": { - "sha1": "2610d27cf248adf98fd9b86e906eb87781ba9d8c" - } - }, - "oauth": { - "version": "0.10", - "vcsRevision": "b8c163b0d9cfad6d29ce8c1fb394e5f47182ee1c", - "url": "https://github.com/CORDEA/oauth", - "downloadMethod": "git", - "dependencies": [ - "sha1" - ], - "checksums": { - "sha1": "55b2ff9c5051f3bc8712f39b942556c493b0a9a5" - } - }, - "httpbeast": { - "version": "0.4.1", - "vcsRevision": "abc13d11c210b614960fe8760e581d44cfb2e3e9", - "url": "https://github.com/dom96/httpbeast", - "downloadMethod": "git", - "dependencies": [ - "asynctools" - ], - "checksums": { - "sha1": "b23e57a401057dcb9b7fae1fb8279a6a2ce1d0b8" - } - }, - "jester": { - "version": "0.5.0", - "vcsRevision": "baca3fe328b2020b3fda3038eb626a440a7d265c", - "url": "https://github.com/dom96/jester/", - "downloadMethod": "git", - "dependencies": [ - "httpbeast", - "asynctools" - ], - "checksums": { - "sha1": "afb591b0a6cd39f4d5f2195bffb7095640e3da97" - } - }, - "jsony": { - "version": "1.1.5", - "vcsRevision": "1de1f0815e4ed6bfc36be4c96a59041e4620ebe2", - "url": "https://github.com/treeform/jsony", - "downloadMethod": "git", - "dependencies": [], - "checksums": { - "sha1": "143f6938d399f92f5bf6c7dcf4e589f2b28634db" - } - }, - "packedjson": { - "version": "0.2.2", - "vcsRevision": "9e6fbb63cb9e0ab8ff570c04bec28cc713ca1f7c", - "url": "https://github.com/Araq/packedjson", - "downloadMethod": "git", - "dependencies": [], - "checksums": { - "sha1": "8aec1ecc233e2ac4d04f0a3dd02d03c73d7b4665" - } - }, - "nimcrypto": { - "version": "0.6.0", - "vcsRevision": "a079df92424968d46a6ac258299ce9380aa153f2", - "url": "https://github.com/cheatfate/nimcrypto", - "downloadMethod": "git", - "dependencies": [], - "checksums": { - "sha1": "be9a4654dd5839b97f39d5060d98f18ba868623c" - } - }, - "ws": { - "version": "0.5.0", - "vcsRevision": "9536bf99ddf5948db221ccb7bb3663aa238a8e21", - "url": "https://github.com/treeform/ws", - "downloadMethod": "git", - "dependencies": [], - "checksums": { - "sha1": "ae4daf4ae302d0431f3c2d385ae9d2fe767a3246" - } - }, - "dotenv": { - "version": "2.0.1", - "vcsRevision": "4b8613cb4c46331729e88f594c5ae2b727381a57", - "url": "https://github.com/euantorano/dotenv.nim", - "downloadMethod": "git", - "dependencies": [], - "checksums": { - "sha1": "9a9e39544f129e6666935796610da79fbe724510" - } - }, - "karax": { - "version": "1.3.0", - "vcsRevision": "5cf360c1fd85af8a4cb71a39f626648cfa5695a3", - "url": "https://github.com/karaxnim/karax/", - "downloadMethod": "git", - "dependencies": [ - "ws", - "dotenv" - ], - "checksums": { - "sha1": "481742b3d0c0e3c92174b1bdd08a4a94853250af" - } - }, - "sass": { - "version": "0.3.0", - "vcsRevision": "7dfdd03ccfe3384c995ea70d6d727bfe886fdd4e", - "url": "https://github.com/dom96/sass", - "downloadMethod": "git", - "dependencies": [], - "checksums": { - "sha1": "21e4dcb1ab3d32d343df1d8293affa9ea9c92f70" - } - }, - "redpool": { - "version": "0.1.0", - "vcsRevision": "8b7c1db069797300425037c98b825c5d3316f752", - "url": "https://github.com/zedeus/redpool", - "downloadMethod": "git", - "dependencies": [ - "redis" - ], - "checksums": { - "sha1": "3d2665fc592c25cbe5d253957bc16e9666227c3d" - } - }, - "zippy": { - "version": "0.10.7", - "vcsRevision": "ca5989a1ba8bdba897d7906dfd6ccda2580d9a5a", - "url": "https://github.com/guzba/zippy", - "downloadMethod": "git", - "dependencies": [], - "checksums": { - "sha1": "8ec66d2af90ca93f96c0388ae933f03a60ff67d1" - } - }, - "markdown": { - "version": "0.8.6", - "vcsRevision": "158efe32b1436a9b4d7ef37f1a4733ee4252c7f4", - "url": "https://github.com/soasme/nim-markdown", - "downloadMethod": "git", - "dependencies": [], - "checksums": { - "sha1": "53b43fa57e6aa106e634ae97b793f1c6e7da7ce6" - } - } - }, - "tasks": {} -} diff --git a/flake.lock b/flake.lock index 1e4b33a..963b249 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1714136352, - "narHash": "sha256-BtWQ2Th/jamO1SlD+2ASSW5Jaf7JhA/JLpQHk0Goqpg=", + "lastModified": 1718371084, + "narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=", "owner": "ryantm", "repo": "agenix", - "rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e", + "rev": "3a56735779db467538fb2e577eda28a9daacaca6", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1714641030, - "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1714043624, - "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=", + "lastModified": 1717476296, + "narHash": "sha256-ScHe38Tr+TxGURC17kby4mIIxOG3aJvZWXzPM79UnEk=", "owner": "nix-community", "repo": "home-manager", - "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411", + "rev": "095ef64aa3b2ab4a4f1bf07f29997e21e3a5576a", "type": "github" }, "original": { @@ -110,11 +110,11 @@ ] }, "locked": { - "lastModified": 1714878592, - "narHash": "sha256-E68C03sYRsYFsK7wiGHUIJm8IsyPRALOrFoTL0glXnI=", + "lastModified": 1719111455, + "narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "a362555e9dbd4ecff3bb98969bbdb8f79fe87f10", + "rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6", "type": "github" }, "original": { @@ -145,11 +145,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714782413, - "narHash": "sha256-tbg0MEuKaPcUrnmGCu4xiY5F+7LW2+ECPKVAJd2HLwM=", + "lastModified": 1718811006, + "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "651b4702e27a388f0f18e1b970534162dec09aff", + "rev": "03d771e513ce90147b65fe922d87d3a0356fc125", "type": "github" }, "original": { @@ -161,11 +161,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1714906307, - "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { @@ -178,9 +178,6 @@ "pre-commit-hooks": { "inputs": { "flake-compat": [], - "flake-utils": [ - "flake-utils" - ], "gitignore": "gitignore", "nixpkgs": [ "nixpkgs-unstable" @@ -190,11 +187,11 @@ ] }, "locked": { - "lastModified": 1714478972, - "narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=", + "lastModified": 1718879355, + "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "2849da033884f54822af194400f8dff435ada242", + "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a", "type": "github" }, "original": { @@ -277,11 +274,11 @@ "steam-fetcher": "steam-fetcher" }, "locked": { - "lastModified": 1714797260, - "narHash": "sha256-qKDEuiLRFOmXxpG1ENrkarhmISlCpYX0QoxAUOEshzU=", + "lastModified": 1715833534, + "narHash": "sha256-ZsbjxO/F2bcn3mm0FkPJmWgu8z2XY05V4VeJ39k1Ksw=", "owner": "aidalgol", "repo": "valheim-server-flake", - "rev": "baced068120236bcf4f4552ff560df0624a689e3", + "rev": "871aac4adedb5089d94bb0fb0dbf7ba27217297f", "type": "github" }, "original": { diff --git a/nvfetcher.toml b/nvfetcher.toml deleted file mode 100644 index 23b1f3c..0000000 --- a/nvfetcher.toml +++ /dev/null @@ -1,3 +0,0 @@ -[nitter-fork] -src.git = "https://github.com/sekai-soft/nitter" -fetch.github = "sekai-soft/nitter"