Merge branch 'nixos-unstable'

fmway · Sep 3, 2024 · a2940fa · a2940fa
2 parents bb479b4 + d231a9c
commit a2940fa
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 4 deletions.
diff --git a/home-manager/fmway/desktop/wayland/sway/default.nix b/home-manager/fmway/desktop/wayland/sway/default.nix
@@ -3,9 +3,7 @@
   enable = true;
   wrapperFeatures.gtk = true;
   checkConfig = false;
-  package = pkgs.swayfx-unwrapped.override {
-    trayEnabled = false;
-  };
+  package = pkgs.custom.swayfx;
   catppuccin.enable = true;
   catppuccin.flavor = "macchiato";
 }
diff --git a/programs/extra/custom.nix b/programs/extra/custom.nix
@@ -1,4 +1,4 @@
-{ super, self, ... }:
+{ super, lib, self, ... }:
 {
   git = super.git.override { withLibsecret = true; };
   obs-studio = self.wrapOBS {
@@ -8,4 +8,7 @@
       obs-pipewire-audio-capture
     ];
   };
+  swayfx = (self.swayfx-unwrapped.override {
+    trayEnabled = false;
+  });
 }
diff --git a/programs/extra/scenefx.nix b/programs/extra/scenefx.nix
@@ -0,0 +1,14 @@
+# required for swayfx
+{ self, super, ... }: let
+  pkgs = self;
+in super.scenefx.overrideAttrs (old: {
+  buildInputs = old.buildInputs ++ (with pkgs; [
+    cmake
+    wayland-scanner
+  ]);
+
+  nativeBuildInputs = old.nativeBuildInputs ++ (with pkgs;[
+    wayland-scanner
+    cmake
+  ]);
+})
diff --git a/programs/extra/swaylock-effects.nix b/programs/extra/swaylock-effects.nix
@@ -0,0 +1,13 @@
+{ self, super, ... }: let
+  pkgs = self;
+in super.swaylock-effects.overrideAttrs (old: {
+  buildInputs = old.buildInputs ++ (with pkgs; [
+    cmake
+    wayland-scanner
+  ]);
+
+  nativeBuildInputs = old.nativeBuildInputs ++ (with pkgs;[
+    wayland-scanner
+    cmake
+  ]);
+})