diff --git a/flake.nix b/flake.nix index 3999234..5069afd 100644 --- a/flake.nix +++ b/flake.nix @@ -39,51 +39,7 @@ { # Development environment output devShells = forAllSystems ({ pkgs }: { - default = pkgs.mkShell { - # The Nix packages provided in the environment - packages = (with pkgs; [ - # Fluff - cargo-mommy - onefetch - # Bevy - pkg-config - alsa-lib - vulkan-tools - vulkan-headers - vulkan-loader - vulkan-validation-layers - udev - clang - lld - # If using an intel GPU - pkgs.nixgl.nixVulkanIntel - # If on x11 - xorg.libX11 - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr - # If on wayland - libxkbcommon - wayland - # Rust - rustup - rustToolchain - ]) ++ pkgs.lib.optionals pkgs.stdenv.isDarwin (with pkgs; [ libiconv ]); - shellHook = '' - # Required - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pkgs.lib.makeLibraryPath [ - pkgs.alsaLib - pkgs.udev - pkgs.vulkan-loader - ]}" - # Aliases and other fluff/ease of use - alias runIntel="nixVulkanIntel cargo run" - alias runMommyIntel="nixVulkanIntel cargo mommy run" - onefetch - echo "Welcome to nix-hell uh nix-shell!" - ''; - }; + default = import ./nix/shell.nix { inherit pkgs; }; }); }; } diff --git a/nix/shell.nix b/nix/shell.nix new file mode 100644 index 0000000..dec7473 --- /dev/null +++ b/nix/shell.nix @@ -0,0 +1,47 @@ +{ pkgs ? import {} }: + pkgs.mkShell { + # The Nix packages provided in the environment + packages = (with pkgs; [ + # Fluff + cargo-mommy + onefetch + # Bevy + pkg-config + alsa-lib + vulkan-tools + vulkan-headers + vulkan-loader + vulkan-validation-layers + udev + clang + lld + # If using an intel GPU + pkgs.nixgl.nixVulkanIntel + # If on x11 + xorg.libX11 + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr + # If on wayland + libxkbcommon + wayland + # Rust + rustup + rustToolchain + ]) ++ pkgs.lib.optionals pkgs.stdenv.isDarwin (with pkgs; [ libiconv ]); + shellHook = '' + # Required + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pkgs.lib.makeLibraryPath [ + pkgs.alsaLib + pkgs.udev + pkgs.vulkan-loader + ]}" + # Aliases and other fluff/ease of use + alias runIntel="nixVulkanIntel cargo run" + alias runMommyIntel="nixVulkanIntel cargo mommy run" + onefetch + echo "Welcome to nix-hell uh nix-shell!" + ''; +} +