diff --git a/flake.lock b/flake.lock index 5882ce2..05a6699 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1777218285, - "narHash": "sha256-d2FY71SBVKVbT1PsfXA71jz0vD520NijS4lrcvUMeGk=", + "lastModified": 1777258755, + "narHash": "sha256-EC07KwADRE2LdIk7vEDyAaD3I0ZUq24T9jQF9L0iEPk=", "owner": "nix-community", "repo": "home-manager", - "rev": "c55c498c9aa205b16cca78b57a7275625726d532", + "rev": "7f8bbc93d63401e41368d6ddc46a4f631610fa90", "type": "github" }, "original": { @@ -304,11 +304,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1777227673, - "narHash": "sha256-nORN5YGU0T2PnvgpMc7ukPWza27oVtTTquCGOhpEV+A=", + "lastModified": 1777248628, + "narHash": "sha256-3RoogdcCOknnzMCNw4MxQBHlAL0qXZw/Jk1fN4Hm8jE=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "84d45bd13acce0b16c8f86e83144f22b18d9398e", + "rev": "80763b13ff9b8abb94654d9f5ca635003c0b5d84", "type": "github" }, "original": { @@ -718,11 +718,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1777079905, - "narHash": "sha256-TvYEXwkZnRFQRuFyyqTNSfPnU2tMdhtiBOXSk2AWLJA=", + "lastModified": 1777253304, + "narHash": "sha256-XqSHEKEW5pSAx9MoMo8mKPgkjoy4FEhZ4x0a6hGYrSI=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "a50c92167c8d438000270f7eca36f6eea74f388e", + "rev": "6773c4750a12c9e9af9c4ce2365e083f1d0d0ad8", "type": "github" }, "original": { @@ -741,11 +741,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1776585574, - "narHash": "sha256-j35EWhKoGhKrfcXcAOpoRVgXEPQt41Eukji/h59cnjk=", + "lastModified": 1777167795, + "narHash": "sha256-VHdtmxVX7oF2+FxYQQPARQmtaHw23FoTBiTaH6ucOEg=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "75d180c28a9ab4470e980f3d6f706ad6c5213add", + "rev": "697db4c14e27d841956ff76887fc312443e6fb17", "type": "github" }, "original": { diff --git a/hosts/marty-thinkpad/options.nix b/hosts/marty-thinkpad/options.nix index a135e32..9d6dec8 100644 --- a/hosts/marty-thinkpad/options.nix +++ b/hosts/marty-thinkpad/options.nix @@ -21,7 +21,7 @@ apps = { audio = { base.enable = true; - media.enable = false; + media.enable = true; editing.enable = false; }; development = { diff --git a/modules/apps/audio/default.nix b/modules/apps/audio/default.nix index 572eef2..8322050 100644 --- a/modules/apps/audio/default.nix +++ b/modules/apps/audio/default.nix @@ -24,8 +24,16 @@ [ pavucontrol playerctl + ] + else + [ ] + ) + ++ ( + if (config.apps.audio.media.enable) then + [ streamrip gst_all_1.gstreamer + sendspin-go ] else [ ] diff --git a/modules/apps/gaming/default.nix b/modules/apps/gaming/default.nix index 72a4372..200aa5f 100644 --- a/modules/apps/gaming/default.nix +++ b/modules/apps/gaming/default.nix @@ -22,7 +22,29 @@ if (config.apps.gaming.enable) then [ cartridges - lutris + (pkgs.lutris.override { + # Intercept buildFHSEnv to modify target packages + buildFHSEnv = + args: + pkgs.buildFHSEnv ( + args + // { + multiPkgs = + envPkgs: + let + # Fetch original package list + originalPkgs = args.multiPkgs envPkgs; + + # Disable tests for openldap + customLdap = envPkgs.openldap.overrideAttrs (_: { + doCheck = false; + }); + in + # Replace broken openldap with the custom one + builtins.filter (p: (p.pname or "") != "openldap") originalPkgs ++ [ customLdap ]; + } + ); + }) ] else [ ]