nix develop changes

This commit is contained in:
cnst
2024-09-15 11:29:28 +02:00
parent ab240de51c
commit dee673f212
3 changed files with 18 additions and 24 deletions

View File

@@ -11,7 +11,7 @@
]; ];
perSystem = {pkgs, ...}: { perSystem = {pkgs, ...}: {
devShells = import ./system/nix/shell {inherit pkgs;}; devShells = import ./system/nix/shell {inherit pkgs inputs;};
formatter = pkgs.alejandra; formatter = pkgs.alejandra;
packages.cleanup-boot = pkgs.buildFHSUserEnv { packages.cleanup-boot = pkgs.buildFHSUserEnv {

View File

@@ -1,32 +1,15 @@
{ {
pkgs,
inputs, inputs,
pkgs,
... ...
}: { }: {
nixpkgs.overlays = [inputs.fenix.overlays.default]; nixpkgs.overlays = [inputs.fenix.overlays.default];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(fenix.complete.withComponents [
"cargo"
"clippy"
"rust-src"
"rustc"
"rustfmt"
])
rust-analyzer-nightly
# Wayland-specific dependencies
wayland # Wayland client library
wayland-protocols # Wayland protocols (essential for building against Wayland)
pkg-config # Helps to manage libraries during compilation
# Aquamarine: Hyprland's new compositor library
aquamarine # Aquamarine compositor library for Wayland
# Language servers, other utilities and tools # Language servers, other utilities and tools
gcc gcc
rust-analyzer-nightly
lua-language-server lua-language-server
nixd nixd
openssl
php php
php84Packages.php-cs-fixer php84Packages.php-cs-fixer
phpactor phpactor
@@ -38,7 +21,6 @@
marksman marksman
pyright pyright
nodePackages_latest.intelephense nodePackages_latest.intelephense
helix-gpt
# Formatters # Formatters
alejandra alejandra

View File

@@ -1,7 +1,19 @@
{pkgs ? import <nixpkgs> {}, ...}: { {
inputs,
pkgs ? import <nixpkgs> {},
...
}: {
default = pkgs.mkShell { default = pkgs.mkShell {
NIX_CONFIG = "extra-experimental-features = nix-command flakes"; # Add Rust toolchain from Fenix and rust-analyzer-nightly
RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}"; packages = [
(inputs.fenix.packages.${pkgs.stdenv.hostPlatform.system}.complete.withComponents [
"cargo"
"clippy"
"rust-src"
"rustc"
"rustfmt"
])
];
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
# Build tools # Build tools