From c95e0680e6cab80c44f7a7d2d035156016cbd5e6 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Tue, 5 Nov 2024 15:31:42 +0100 Subject: [PATCH] overlays: add wf-recorder ffmpeg fix, remove sway, graphical: hardware.opengl renamed to hardware.graphics --- modules/graphical/default.nix | 2 +- overlays/default.nix | 2 +- overlays/sway.nix | 28 ---------------------------- overlays/wf-recorder.nix | 12 ++++++++++++ 4 files changed, 14 insertions(+), 30 deletions(-) delete mode 100644 overlays/sway.nix create mode 100644 overlays/wf-recorder.nix diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix index 83fad0e9..0f08d522 100644 --- a/modules/graphical/default.nix +++ b/modules/graphical/default.nix @@ -26,7 +26,7 @@ in }; config = { - hardware.opengl.enable = true; + hardware.graphics.enable = true; environment = { systemPackages = with pkgs; [ diff --git a/overlays/default.nix b/overlays/default.nix index 0c4fb167..f955d5ae 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -36,8 +36,8 @@ (import ./mdbook-multilang.nix inputs) (import ./nix-index.nix) (import ./prr.nix) - (import ./sway.nix inputs) (import ./neovim-plugins.nix) + (import ./wf-recorder.nix) ]; } ); diff --git a/overlays/sway.nix b/overlays/sway.nix deleted file mode 100644 index 87d5136b..00000000 --- a/overlays/sway.nix +++ /dev/null @@ -1,28 +0,0 @@ -inputs: final: prev: -let - unstable = import inputs.unstable { - system = prev.system; - }; -in -{ - sway-unwrapped = - (unstable.sway-unwrapped.override { wlroots = unstable.wlroots_0_18; }).overrideAttrs - ( - finalAttrs: prevAttrs: { - version = "1.10"; - src = prevAttrs.src.override { - hash = "sha256-PzeU/niUdqI6sf2TCG19G2vNgAZJE5JCyoTwtO9uFTk="; - }; - - mesonFlags = - let - inherit (final.lib.strings) mesonEnable mesonOption; - sd-bus-provider = if finalAttrs.systemdSupport then "libsystemd" else "basu"; - in - [ - (mesonOption "sd-bus-provider" sd-bus-provider) - (mesonEnable "tray" finalAttrs.trayEnabled) - ]; - } - ); -} diff --git a/overlays/wf-recorder.nix b/overlays/wf-recorder.nix new file mode 100644 index 00000000..e6361353 --- /dev/null +++ b/overlays/wf-recorder.nix @@ -0,0 +1,12 @@ +final: prev: { + wf-recorder = prev.wf-recorder.overrideAttrs (oldAttrs: rec { + inherit (oldAttrs) pname; + src = prev.fetchFromGitHub { + owner = "ammen99"; + repo = pname; + rev = "560bb92d3ddaeb31d7af77d22d01b0050b45bebe"; + hash = "sha256-goWNRg286Cp6UUqyJyqk7UysumMCt9GtNpF7O5ahKtI="; + }; + version = "unstable-2024-11-05"; + }); +}