From dc89c399c0cfc72c11da17fe81bfae11d7231286 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Tue, 1 Apr 2025 08:25:42 -0400
Subject: [PATCH] feat: stop using nixpkgs-wayland
---
apps/update-sources/src/app.ts | 5 -----
flake.lock | 27 ------------------------
flake.nix | 10 ---------
inputs/default.nix | 5 -----
modules/base/packages/default.nix | 6 ------
modules/desktop/default.nix | 1 -
modules/desktop/environment/home/obs.nix | 13 +++++++-----
packages/README.md | 1 -
packages/default.nix | 2 --
packages/fcft/default.nix | 18 ----------------
10 files changed, 8 insertions(+), 80 deletions(-)
delete mode 100644 packages/fcft/default.nix
diff --git a/apps/update-sources/src/app.ts b/apps/update-sources/src/app.ts
index 62686ab7..e93cd920 100644
--- a/apps/update-sources/src/app.ts
+++ b/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');
diff --git a/flake.lock b/flake.lock
index 06092d0e..3e68c4c0 100644
--- a/flake.lock
+++ b/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",
diff --git a/flake.nix b/flake.nix
index fa9c1ba6..e235e407 100644
--- a/flake.nix
+++ b/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";
diff --git a/inputs/default.nix b/inputs/default.nix
index 5613aa24..e30f3dd5 100644
--- a/inputs/default.nix
+++ b/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";
diff --git a/modules/base/packages/default.nix b/modules/base/packages/default.nix
index c8c8238b..fe029041 100644
--- a/modules/base/packages/default.nix
+++ b/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)
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 221555d7..e4290f87 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -34,7 +34,6 @@ in {
"hyprland"
"hyprland-plugins"
"hyprpaper"
- "nixpkgs-wayland"
];
};
diff --git a/modules/desktop/environment/home/obs.nix b/modules/desktop/environment/home/obs.nix
index d97c0ca0..3dee8adf 100644
--- a/modules/desktop/environment/home/obs.nix
+++ b/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
+ ;
+ };
};
};
};
diff --git a/packages/README.md b/packages/README.md
index 81884f4d..3c2700a9 100644
--- a/packages/README.md
+++ b/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 |
diff --git a/packages/default.nix b/packages/default.nix
index 25f78151..bbbeae7d 100644
--- a/packages/default.nix
+++ b/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;
};
diff --git a/packages/fcft/default.nix b/packages/fcft/default.nix
deleted file mode 100644
index 8b2a9878..00000000
--- a/packages/fcft/default.nix
+++ /dev/null
@@ -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=";
- };
-})