mastodon: use pkg directly from master

flake.lock

@@ -404,6 +404,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-master": {
+      "locked": {
+        "lastModified": 1707937360,
+        "narHash": "sha256-ddAUDSv9DKbme8bYkkm6yGV8HNr+f3Aj+6jO3J2ydp8=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "c2507ad16ba743d62e6b67691e7b69e06229116e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1702780907,
@@ -474,6 +490,7 @@
         "nixos-hardware": "nixos-hardware",
         "nixos-unstable": "nixos-unstable",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-master": "nixpkgs-master",
         "pre-commit-hooks-nix": "pre-commit-hooks-nix",
         "treefmt-nix": "treefmt-nix"
       }

flake.nix

@@ -2,7 +2,7 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small";
-    # nixpkgs-master.url = "github:nixos/nixpkgs/master";
+    nixpkgs-master.url = "github:nixos/nixpkgs/master";
 
     # Tools
 

home/programs/nvim/default.nix

@@ -72,7 +72,7 @@ in
             p.html
             p.http
             p.java
-            p.javascript
+            #p.javascript
             p.jsdoc
             p.json
             p.kotlin
@@ -89,8 +89,8 @@ in
             p.sql
             p.svelte
             p.toml
-            p.tsx
+            #p.tsx
-            p.typescript
+            #p.typescript
             p.vim
             p.yaml
           ])).dependencies;

system/flakes/tanker.nix

@@ -3,13 +3,13 @@
 let
   default-system = "x86_64-linux";
 
-  # overlay-master = _: _: { pkgs-master = import inputs.nixpkgs-master { system = default-system; }; };
+  overlay-master = _: _: { pkgs-master = import inputs.nixpkgs-master { system = default-system; }; };
   # overlay-unstable = _: _: { pkgs-unstable = import inputs.nixpkgs { system = default-system; }; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
     overlays = [
-      # overlay-master
+      overlay-master
       # overlay-unstable
       overlay-nifoc
     ];

system/nixos/mastodon.nix

@@ -3,25 +3,7 @@
 let
   web-domain = "mastodon.kempkens.io";
 
-  pkg-base = pkgs.mastodon.override {
+  pkg-base = pkgs.pkgs-master.mastodon;
-    srcOverride =
-      let
-        version = "4.2.5";
-      in
-      (
-        pkgs.applyPatches {
-          src = pkgs.fetchFromGitHub {
-            owner = "mastodon";
-            repo = "mastodon";
-            rev = "v${version}";
-            hash = "sha256-dgC5V/CVE9F1ORTjPWUWc/JVcWCEj/pb4eWpDV0WliY=";
-          };
-          patches = [ ];
-        }) // {
-        inherit version;
-        yarnHash = "sha256-qoLesubmSvRsXhKwMEWHHXcpcqRszqcdZgHQqnTpNPE=";
-      };
-  };
 
   pkg-mastodon = pkg-base.overrideAttrs (_: {
     mastodonModules = pkgs.mastodon.mastodonModules.overrideAttrs (oldMods: