Compare commits

...

4 Commits

2 changed files with 22 additions and 22 deletions

View File

@ -18,19 +18,19 @@
jupyter-core jupyter-core
matplotlib matplotlib
]; ];
myRPackages = with pkgs.rPackages; [ # myRPackages = with pkgs.rPackages; [
reticulate # wanted by quarto to execute Python when using R. # reticulate # wanted by quarto to execute Python when using R.
# any other RPackages - you can reuse this list for R and RStudio # # any other RPackages - you can reuse this list for R and RStudio
]; # ];
patchedQuarto = (pkgs.quarto.override { # patchedQuarto = (pkgs.quarto.override {
extraPythonPackages = myPythonPackages; # extraPythonPackages = myPythonPackages;
extraRPackages = myRPackages; # extraRPackages = myRPackages;
}).overrideAttrs (oldAttrs: { # Remove this overrideAttrs patch when fixed. See https://github.com/NixOS/nixpkgs/issues/519484#issuecomment-4667477454 # }).overrideAttrs (oldAttrs: { # Remove this overrideAttrs patch when fixed. See https://github.com/NixOS/nixpkgs/issues/519484#issuecomment-4667477454
postPatch = (oldAttrs.postPatch or "") + '' # postPatch = (oldAttrs.postPatch or "") + ''
substituteInPlace bin/quarto.js \ # substituteInPlace bin/quarto.js \
--replace-fail "syntax-highlighting" "highlight-style" # --replace-fail "syntax-highlighting" "highlight-style"
''; # '';
}); # });
patchedPicoSdk = (pkgs.pico-sdk.override { patchedPicoSdk = (pkgs.pico-sdk.override {
withSubmodules = true; withSubmodules = true;
}); });
@ -56,6 +56,7 @@
dconf-editor dconf-editor
winetricks winetricks
libreoffice-qt libreoffice-qt
unzip
# Games # Games
eden eden
@ -76,17 +77,15 @@
gcc gcc
gcc-arm-embedded gcc-arm-embedded
arduino-ide arduino-ide
#### next generation of Rmarkdown for Python, Julia, R, and JS:
patchedQuarto
#### Your command-line Python:
(python3.withPackages (myPythonPackages)) (python3.withPackages (myPythonPackages))
#### R and RStudio: # patchedQuarto
(rWrapper.override {packages = myRPackages; }) # (rWrapper.override {packages = myRPackages; })
(rstudioWrapper.override { packages = myRPackages; })
SDL2.dev SDL2.dev
unityhub
godot
# Electronics # Electronics
qucs-s digital
kicad kicad
# Communication # Communication
@ -132,6 +131,7 @@
"com.jetpackduba.Gitnuro" "com.jetpackduba.Gitnuro"
"moe.launcher.the-honkers-railway-launcher" "moe.launcher.the-honkers-railway-launcher"
"com.obsproject.Studio" "com.obsproject.Studio"
"com.obsproject.Studio.Plugin.PipeWireAudioCapture"
# "dev.deedles.Trayscale" # "dev.deedles.Trayscale"
]; ];

View File

@ -78,11 +78,11 @@ in
}; };
"org/gnome/desktop/app-folders/folders/Programming" = { "org/gnome/desktop/app-folders/folders/Programming" = {
name = "Programmation"; name = "Programmation";
apps = [ "code.desktop" "com.jetpackduba.Gitnuro.desktop" "arduino-ide.desktop" "rstudio.desktop" ]; apps = [ "code.desktop" "com.jetpackduba.Gitnuro.desktop" "arduino-ide.desktop" "org.godotengine.Godot4.6.desktop" "unityhub.desktop" ];
}; };
"org/gnome/desktop/app-folders/folders/Electronic" = { "org/gnome/desktop/app-folders/folders/Electronic" = {
name = "Electronique"; name = "Electronique";
apps = [ "org.kicad.kicad.desktop" "org.kicad.eeschema.desktop" "org.kicad.pcbnew.desktop" "qucs-s.desktop" "org.kicad.bitmap2component.desktop" "org.kicad.pcbcalculator.desktop" "org.kicad.gerbview.desktop" ]; apps = [ "org.kicad.kicad.desktop" "org.kicad.eeschema.desktop" "org.kicad.pcbnew.desktop" "digital.desktop" "org.kicad.bitmap2component.desktop" "org.kicad.pcbcalculator.desktop" "org.kicad.gerbview.desktop" ];
}; };
"org/gnome/desktop/app-folders/folders/Art" = { "org/gnome/desktop/app-folders/folders/Art" = {
name = "Art"; name = "Art";