nix: fused redundant devShells into one for carbon

This consolidates multiple devShells, and make all these packages
available for carbon
This commit is contained in:
Primrose 2024-09-21 13:21:01 +02:00
parent 3a28f076ff
commit 77363cc53a
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
4 changed files with 85 additions and 104 deletions

View file

@ -5,32 +5,6 @@
{ pkgs, lib, ... }:
{
devShells = rec {
alo = pkgs.mkShell {
name = "ALO";
packages = [
# https://github.com/NixOS/nixpkgs/issues/338165
# https://discord.com/channels/568306982717751326/1269736687387414642
(pkgs.jdk17.override { enableJavaFX = true; })
pkgs.maven
];
};
forgejo = pkgs.mkShell {
name = "forgejo";
packages = [
pkgs.sqlite
pkgs.go
pkgs.gopls
pkgs.golangci-lint
pkgs.golangci-lint-langserver
pkgs.gofumpt
pkgs.nodejs_20
pkgs.gnumake
];
};
go-xrr-gamma = pkgs.mkShell {
name = "forgejo";
packages = [
@ -49,59 +23,18 @@
tokei = pkgs.mkShell {
name = "tokei";
packages = [
pkgs.cargo
pkgs.rustc
pkgs.rust-analyzer
pkgs.iconv
] ++ (pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.darwin.Security ]);
};
planning-sup = pkgs.mkShell {
name = "planning-sup";
packages = [ pkgs.nodejs ];
};
typst-mutilate = pkgs.mkShell {
name = "typst-mutilate";
packages = [
pkgs.cargo
pkgs.rustc
pkgs.rust-analyzer
];
};
typstyle = pkgs.mkShell {
name = "typstyle";
packages = [
pkgs.cargo
pkgs.rustc
pkgs.rust-analyzer
];
};
qmk = pkgs.mkShell {
name = "qmk";
packages = [ pkgs.clang-tools ];
packages = pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.darwin.Security ];
};
starship = pkgs.mkShell {
name = "starship";
packages =
[
pkgs.cargo
pkgs.rustc
pkgs.rust-analyzer
pkgs.rustfmt
pkgs.iconv
pkgs.cmake
]
# https://www.reddit.com/r/NixOS/comments/e3xee4/newbie_linking_to_cocoa_frameworks/
++ (pkgs.lib.optionals pkgs.stdenv.isDarwin [
pkgs.lib.optionals pkgs.stdenv.isDarwin [
pkgs.darwin.Security
pkgs.swiftPackages.Foundation
pkgs.darwin.apple_sdk.frameworks.Cocoa
]);
];
};
xev = pkgs.mkShell {
@ -120,9 +53,7 @@
pkgs.automake115x
];
};
xrandr = xev.overrideAttrs (_: {
name = "xrandr";
});
xrandr = xev.overrideAttrs { name = "xrandr"; };
coreutils = pkgs.mkShellNoCC {
name = "coreutils";