From cf2833d567ee0a9e47ce1e67b67aff55b2751903 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Wed, 26 Mar 2025 01:14:13 +0530 Subject: [PATCH] feat: Don't try to do conditional imports (infinite recursion issue) --- home/apps/bambu-studio.nix | 21 +++++++++++---------- home/apps/default.nix | 6 +++++- home/apps/guitarix.nix | 8 ++++++-- home/apps/obs-studio.nix | 2 +- home/apps/vlc.nix | 8 ++++++-- home/apps/zathura.nix | 8 ++++++-- home/apps/zed.nix | 8 ++++++-- 7 files changed, 41 insertions(+), 20 deletions(-) diff --git a/home/apps/bambu-studio.nix b/home/apps/bambu-studio.nix index cb074b97..d4be5102 100644 --- a/home/apps/bambu-studio.nix +++ b/home/apps/bambu-studio.nix @@ -1,12 +1,13 @@ {pkgs, ...}: { - home.packages = with pkgs; [ - (bambu-studio.overrideAttrs (oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.cudatoolkit]; - buildInputs = oldAttrs.buildInputs ++ [pkgs.cudatoolkit]; - })) - (orca-slicer.overrideAttrs (oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.cudatoolkit]; - buildInputs = oldAttrs.buildInputs ++ [pkgs.cudatoolkit]; - })) - ]; + home.packages = with pkgs; + lib.optionals pkgs.stdenv.isLinux [ + (bambu-studio.overrideAttrs (oldAttrs: { + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.cudatoolkit]; + buildInputs = oldAttrs.buildInputs ++ [pkgs.cudatoolkit]; + })) + (orca-slicer.overrideAttrs (oldAttrs: { + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.cudatoolkit]; + buildInputs = oldAttrs.buildInputs ++ [pkgs.cudatoolkit]; + })) + ]; } diff --git a/home/apps/default.nix b/home/apps/default.nix index 4f06330b..3f68546b 100644 --- a/home/apps/default.nix +++ b/home/apps/default.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + pkgs, + lib, + ... +}: { imports = [ ./guitarix.nix ./bambu-studio.nix diff --git a/home/apps/guitarix.nix b/home/apps/guitarix.nix index 6cffeacf..0b99f35c 100644 --- a/home/apps/guitarix.nix +++ b/home/apps/guitarix.nix @@ -1,5 +1,9 @@ -{pkgs, ...}: { - home.packages = [ +{ + pkgs, + lib, + ... +}: { + home.packages = lib.optionals pkgs.stdenv.isLinux [ pkgs.guitarix ]; } diff --git a/home/apps/obs-studio.nix b/home/apps/obs-studio.nix index 475c23e2..a1c48bb0 100644 --- a/home/apps/obs-studio.nix +++ b/home/apps/obs-studio.nix @@ -1,6 +1,6 @@ {pkgs, ...}: { programs.obs-studio = { - enable = true; + enable = pkgs.stdenv.isLinux; # enableVirtualCamera = true; plugins = [pkgs.obs-studio-plugins.wlrobs]; }; diff --git a/home/apps/vlc.nix b/home/apps/vlc.nix index 9355740d..38b10924 100644 --- a/home/apps/vlc.nix +++ b/home/apps/vlc.nix @@ -1,5 +1,9 @@ -{pkgs, ...}: { - home.packages = [ +{ + pkgs, + lib, + ... +}: { + home.packages = lib.optionals pkgs.stdenv.isLinux [ pkgs.vlc ]; } diff --git a/home/apps/zathura.nix b/home/apps/zathura.nix index 19c19245..99ad538b 100644 --- a/home/apps/zathura.nix +++ b/home/apps/zathura.nix @@ -1,5 +1,9 @@ -{pkgs, ...}: { - home.packages = [ +{ + pkgs, + lib, + ... +}: { + home.packages = lib.optionals pkgs.stdenv.isLinux [ pkgs.zathura ]; } diff --git a/home/apps/zed.nix b/home/apps/zed.nix index ac284f5b..fd8ddaaa 100644 --- a/home/apps/zed.nix +++ b/home/apps/zed.nix @@ -1,5 +1,9 @@ -{pkgs, ...}: { - home.packages = [ +{ + pkgs, + lib, + ... +}: { + home.packages = lib.optionals pkgs.stdenv.isLinux [ pkgs.zed-editor ]; }