feat: stop using nixpkgs-wayland

apps/update-sources/src/app.ts

@@ -42,10 +42,6 @@ const main = async() => {
         console.log(updateFirefoxAddons());
     }
 
-    if (args['fcft']) {
-        console.log(runNixUpdate('fcft'));
-    }
-
     if (args['h'] || args['homepage']) {
         console.log(runNixUpdate('homepage'));
     }
@@ -133,7 +129,6 @@ const main = async() => {
             console.log(execution.stdout);
         };
 
-        updatePackage('fcft');
         updatePackage('homepage');
         updatePackage('jmusicbot');
         updatePackage('pam-fprint-grosshack');

flake.lock

@@ -1383,32 +1383,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-wayland": {
-      "inputs": {
-        "flake-compat": [
-          "flake-compat"
-        ],
-        "lib-aggregate": [
-          "lib-aggregate"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1743339045,
-        "narHash": "sha256-Hn33Mk/nElQV7GvT9CAJZdH744NZc0ew1wL0Q7htO2Y=",
-        "owner": "nix-community",
-        "repo": "nixpkgs-wayland",
-        "rev": "ff74c1325f0e541b991043791584b69e513ed5bd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs-wayland",
-        "type": "github"
-      }
-    },
     "nmd": {
       "inputs": {
         "nixpkgs": [
@@ -1632,7 +1606,6 @@
         "nixd": "nixd",
         "nixos-jellyfin": "nixos-jellyfin",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-wayland": "nixpkgs-wayland",
         "nurl": "nurl",
         "nvim-theme-src": "nvim-theme-src",
         "pcsd": "pcsd",

flake.nix

@@ -357,16 +357,6 @@
       repo = "nixpkgs";
       type = "github";
     };
-    nixpkgs-wayland = {
-      inputs = {
-        flake-compat.follows = "flake-compat";
-        lib-aggregate.follows = "lib-aggregate";
-        nixpkgs.follows = "nixpkgs";
-      };
-      owner = "nix-community";
-      repo = "nixpkgs-wayland";
-      type = "github";
-    };
     nurl = {
       inputs.nixpkgs.follows = "nixpkgs";
       owner = "nix-community";

inputs/default.nix

@@ -101,11 +101,6 @@ let
   };
 
   overlays = {
-    nixpkgs-wayland = mkInput {
-      owner = "nix-community";
-      repo = "nixpkgs-wayland";
-    };
-
     nix-gaming = mkInput {
       owner = "fufexan";
       repo = "nix-gaming";

modules/base/packages/default.nix

@@ -16,13 +16,7 @@ in {
         "nh"
         "nixd"
         "nurl"
-        "nixpkgs-wayland"
       ])
-      ++ [
-        (final: prev: {
-          fcft = prev.fcft.overrideAttrs {inherit (pkgs.selfPackages.fcft) version src;};
-        })
-      ]
       ++ (attrValues {
         # inherit
         #   (self.overlays)

modules/desktop/default.nix

@@ -34,7 +34,6 @@ in {
       "hyprland"
       "hyprland-plugins"
       "hyprpaper"
-      "nixpkgs-wayland"
     ];
   };
 

modules/desktop/environment/home/obs.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  inherit (lib) mkIf;
+  inherit (lib) attrValues mkIf;
 
   cfg = osConfig.roles.desktop;
 in {
@@ -12,10 +12,13 @@ in {
     programs = {
       obs-studio = {
         enable = true;
-        plugins = [
-          pkgs.waylandPkgs.obs-wlrobs
-          pkgs.obs-studio-plugins.droidcam-obs
-        ];
+        plugins = attrValues {
+          inherit
+            (pkgs.obs-studio-plugins)
+            droidcam-obs
+            wlrobs
+            ;
+        };
       };
     };
   };

packages/README.md

@@ -7,7 +7,6 @@ This directory contains every derivations for packages exposed by this flake.
 | Name | Description | Homepage |
 | ---- | ----------- | -------- |
 | `coloryou` | Get Material You colors from an image. | https://git.nelim.org/matt1432/nixos-configs/src/branch/master/packages/coloryou |
-| `fcft` | Simple library for font loading and glyph rasterization | https://codeberg.org/dnkl/fcft |
 | `gpu-screen-recorder` | Screen recorder that has minimal impact on system performance by recording a window using the GPU only. | https://git.dec05eba.com/gpu-screen-recorder/about |
 | `gsr-kms-server` | Small program giving safe KMS access to gpu-screen-recorder when recording a monitor. This is the only part of gpu-screen-recorder that could require root permissions. | https://git.dec05eba.com/gpu-screen-recorder/about |
 | `homepage` | Highly customisable dashboard with Docker and service API integrations. | https://gethomepage.dev |

packages/default.nix

@@ -6,8 +6,6 @@
   selfPackages = {
     coloryou = final.python3Packages.callPackage ./coloryou {};
 
-    fcft = final.callPackage ./fcft {};
-
     gpu-screen-recorder = final.callPackage ./gpu-screen-recorder/gpu-screen-recorder.nix {
       inherit (inputs) gpu-screen-recorder-src;
     };

packages/fcft/default.nix

@@ -1,18 +0,0 @@
-{
-  # nix build inputs
-  fetchFromGitea,
-  # deps
-  fcft,
-  ...
-}:
-fcft.overrideAttrs (o: rec {
-  version = "3.3.1";
-
-  src = fetchFromGitea {
-    domain = "codeberg.org";
-    owner = "dnkl";
-    repo = o.pname;
-    rev = version;
-    hash = "sha256-qgNNowWQhiu6pr9bmWbBo3mHgdkmNpDHDBeTidk32SE=";
-  };
-})