feat: prepare forked nitter

_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"
+    }
+}

_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=";
+    };
+  };
+}

config/services/default.nix

@@ -8,8 +8,8 @@
     ./gitlab
     ./invidious.nix
     ./libreddit.nix
+    ./nitter.nix
     ./nginx.nix
-    ./nitter
     ./postgres.nix
     ./wakapi.nix
     ./website

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"
+        ];
       };
     };
   };

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;
+    };
+  };
+}

config/services/nitter/default.nix

@@ -1,9 +0,0 @@
-{
-  services.nginx.virtualHosts."nr.winston.sh" = {
-    forceSSL = true;
-    enableACME = false;
-    useACMEHost = "winston.sh";
-
-    locations."/".root = ./www;
-  };
-}

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": {}
+}

config/services/website/www/index.html

@@ -15,15 +15,17 @@
         <p>currently giving this website a new look & some new features.</p>
         <ul>
             <li>Discord: <a class="text-sky-500 hover:text-sky-800 dark:hover:text-sky-300"
-                    href="https://discordapp.com/users/505490445468696576">nekowinston</a></li>
+                    href="https://discordapp.com/users/505490445468696576">@nekowinston</a></li>
             <li>Matrix: <a class="text-sky-500 hover:text-sky-800 dark:hover:text-sky-300"
                     href="https://matrix.to/#/@nekowinston:matrix.org">@nekowinston:matrix.org</a></li>
+            <li>Twitter: <a class="text-sky-500 hover:text-sky-800 dark:hover:text-sky-300"
+                    href="https://twitter.com/nekowinston">@nekowinston</a></li>
             <li>GitHub: <a class="text-sky-500 hover:text-sky-800 dark:hover:text-sky-300"
-                    href="https://github.com/nekowinston">nekowinston</a></li>
+                    href="https://github.com/nekowinston">@nekowinston</a></li>
             <li>GitLab: <a class="text-sky-500 hover:text-sky-800 dark:hover:text-sky-300"
-                    href="https://gitlab.winston.sh">gitlab.winston.sh</a></li>
+                    href="https://gitlab.winston.sh/winston">gitlab.winston.sh</a></li>
         </ul>
     </div>
 </body>
 
-</html>
+</html>

flake.lock

@@ -10,11 +10,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1707830867,
+        "lastModified": 1714136352,
-        "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
+        "narHash": "sha256-BtWQ2Th/jamO1SlD+2ASSW5Jaf7JhA/JLpQHk0Goqpg=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
+        "rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e",
         "type": "github"
       },
       "original": {
@@ -30,11 +30,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709336216,
+        "lastModified": 1714641030,
-        "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
+        "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
+        "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
         "type": "github"
       },
       "original": {
@@ -48,11 +48,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1709126324,
+        "lastModified": 1710146030,
-        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -69,11 +69,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1703887061,
+        "lastModified": 1709087332,
-        "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
         "owner": "hercules-ci",
         "repo": "gitignore.nix",
-        "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
         "type": "github"
       },
       "original": {
@@ -89,11 +89,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706981411,
+        "lastModified": 1714043624,
-        "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
+        "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "652fda4ca6dafeb090943422c34ae9145787af37",
+        "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411",
         "type": "github"
       },
       "original": {
@@ -110,11 +110,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709708644,
+        "lastModified": 1714878592,
-        "narHash": "sha256-XAFOkZ6yexsqeJrCXWoHxopq0i+7ZqbwATXomMnGmr4=",
+        "narHash": "sha256-E68C03sYRsYFsK7wiGHUIJm8IsyPRALOrFoTL0glXnI=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "94a1e46434736a40f976a454f8bd3ea2144f349b",
+        "rev": "a362555e9dbd4ecff3bb98969bbdb8f79fe87f10",
         "type": "github"
       },
       "original": {
@@ -145,11 +145,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1709677081,
+        "lastModified": 1714782413,
-        "narHash": "sha256-tix36Y7u0rkn6mTm0lA45b45oab2cFLqAzDbJxeXS+c=",
+        "narHash": "sha256-tbg0MEuKaPcUrnmGCu4xiY5F+7LW2+ECPKVAJd2HLwM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "880992dcc006a5e00dd0591446fdf723e6a51a64",
+        "rev": "651b4702e27a388f0f18e1b970534162dec09aff",
         "type": "github"
       },
       "original": {
@@ -161,11 +161,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1709703039,
+        "lastModified": 1714906307,
-        "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
+        "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
+        "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588",
         "type": "github"
       },
       "original": {
@@ -190,11 +190,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708018599,
+        "lastModified": 1714478972,
-        "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=",
+        "narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431",
+        "rev": "2849da033884f54822af194400f8dff435ada242",
         "type": "github"
       },
       "original": {
@@ -226,11 +226,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694424148,
+        "lastModified": 1714795926,
-        "narHash": "sha256-1PV7sxioWWD/yLxnkLVOL6zvlTOBl98kUv4ol4p0ozo=",
+        "narHash": "sha256-PkgC9jqoN6cJ8XYzTA2PlrWs7aPJkM3BGiTxNqax0cA=",
         "owner": "nix-community",
         "repo": "steam-fetcher",
-        "rev": "2033f99c7aee506f5af18026a3cab1c93bd0439f",
+        "rev": "12f66eafb7862d91b3e30c14035f96a21941bd9c",
         "type": "github"
       },
       "original": {
@@ -277,11 +277,11 @@
         "steam-fetcher": "steam-fetcher"
       },
       "locked": {
-        "lastModified": 1702265912,
+        "lastModified": 1714797260,
-        "narHash": "sha256-ehRivrEEFLWexvm204OcwSRUMWpXi/5dDstykThGj3E=",
+        "narHash": "sha256-qKDEuiLRFOmXxpG1ENrkarhmISlCpYX0QoxAUOEshzU=",
         "owner": "aidalgol",
         "repo": "valheim-server-flake",
-        "rev": "dae86294aea11f652084df39b8c6a3f856535e9a",
+        "rev": "baced068120236bcf4f4552ff560df0624a689e3",
         "type": "github"
       },
       "original": {
@@ -300,11 +300,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709622318,
+        "lastModified": 1713958148,
-        "narHash": "sha256-bTscF0366xtoIXgH7Zq+Mn0mpX3w4h/2xKpHiYMyLNc=",
+        "narHash": "sha256-8PDNi/dgoI2kyM7uSiU4eoLBqUKoA+3TXuz+VWmuCOc=",
         "owner": "nix-community",
         "repo": "nixos-vscode-server",
-        "rev": "d0ed9b8cf1f0a71f110df9119489ab047e0726bd",
+        "rev": "fc900c16efc6a5ed972fb6be87df018bcf3035bc",
         "type": "github"
       },
       "original": {

flake.nix

@@ -54,6 +54,7 @@
 
         pre-commit = {
           check.enable = true;
+          settings.excludes = ["_sources/"];
           settings.hooks = {
             alejandra.enable = true;
             commitizen.enable = true;

hosts/main-node/default.nix

@@ -9,6 +9,8 @@
     kernelPackages = pkgs.linuxPackages_latest;
   };
 
+  zramSwap.enable = true;
+
   networking = {
     hostName = "main-node";
     nameservers = [

nvfetcher.toml

@@ -0,0 +1,3 @@
+[nitter-fork]
+src.git = "https://github.com/sekai-soft/nitter"
+fetch.github = "sekai-soft/nitter"