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

@ -8,6 +8,9 @@ in
imports = [
./browser.nix
./wm.nix
# system-wide language servers, build tools, compilers
./dev.nix
];
home.packages = [
@ -30,31 +33,14 @@ in
pkgs.evolution
pkgs.teams-for-linux
pkgs.qmk
pkgs.wally-cli
myPkgs.typst-mutilate
pkgs.vscode-fhs
pkgs.jetbrains.idea-community
pkgs.prop-solveur
];
programs.java = {
enable = true;
package = pkgs.jdk17;
};
programs = {
kitty.enable = true;
password-store.enable = true;
};
programs.neovim.extraPackages = [
myPkgs.fish-lsp
pkgs.typescript
pkgs.nodePackages.typescript-language-server
];
}

View file

@ -0,0 +1,64 @@
{ pkgs, ... }:
let
inherit (pkgs) myPkgs;
in
{
home.packages = [
# IDEs
pkgs.vscode-fhs
pkgs.jetbrains.idea-community
# keyboard
pkgs.clang-tools
pkgs.qmk
pkgs.wally-cli
# golang
pkgs.go
pkgs.golangci-lint
pkgs.gofumpt
# typescript
pkgs.typescript
pkgs.nodejs_20
# rust
pkgs.cargo
pkgs.rustc
pkgs.rustfmt
# java
pkgs.maven
pkgs.gnumake
pkgs.cmake
pkgs.iconv
pkgs.sqlite
];
programs.neovim.extraPackages = [
# fish
myPkgs.fish-lsp
# golang
pkgs.gopls
pkgs.golangci-lint-langserver
# typescript
pkgs.nodePackages.typescript-language-server
# rust
pkgs.rust-analyzer
# java
pkgs.jdt-language-server
];
programs.java = {
enable = true;
package = pkgs.jdk17.override { enableJavaFX = true; };
};
}