diff --git a/_sources/generated.json b/_sources/generated.json new file mode 100644 index 0000000..ffc89dc --- /dev/null +++ b/_sources/generated.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 0000000..39a2f73 --- /dev/null +++ b/_sources/generated.nix @@ -0,0 +1,18 @@ +# 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 3cdef05..db13b32 100644 --- a/config/services/default.nix +++ b/config/services/default.nix @@ -8,8 +8,8 @@ ./gitlab ./invidious.nix ./libreddit.nix + ./nitter.nix ./nginx.nix - ./nitter ./postgres.nix ./wakapi.nix ./website diff --git a/config/services/gitlab/runner.nix b/config/services/gitlab/runner.nix index 10a993a..dd8f82a 100644 --- a/config/services/gitlab/runner.nix +++ b/config/services/gitlab/runner.nix @@ -8,7 +8,9 @@ in { inherit registrationConfigFile; dockerImage = "docker:stable"; dockerVolumes = ["/var/run/docker.sock:/var/run/docker.sock"]; - tagList = ["docker-images"]; + registrationFlags = [ + "--docker-network-mode host" + ]; }; }; }; diff --git a/config/services/nitter.nix b/config/services/nitter.nix new file mode 100644 index 0000000..9b5d989 --- /dev/null +++ b/config/services/nitter.nix @@ -0,0 +1,24 @@ +{ + 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/default.nix b/config/services/nitter/default.nix deleted file mode 100644 index e2d0e26..0000000 --- a/config/services/nitter/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - services.nginx.virtualHosts."nr.winston.sh" = { - forceSSL = true; - enableACME = false; - useACMEHost = "winston.sh"; - - locations."/".root = ./www; - }; -} diff --git a/config/services/nitter/nimble.lock b/config/services/nitter/nimble.lock new file mode 100644 index 0000000..42949ab --- /dev/null +++ b/config/services/nitter/nimble.lock @@ -0,0 +1,198 @@ +{ + "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/config/services/nitter/www/index.html b/config/services/nitter/www/index.html deleted file mode 100644 index 0968876..0000000 --- a/config/services/nitter/www/index.html +++ /dev/null @@ -1,18 +0,0 @@ - - -
- - -currently giving this website a new look & some new features.