From d372768dd743b7682ec128a8de6adbbe7c6690d6 Mon Sep 17 00:00:00 2001
From: Jeff LANCE <jeff.lance@mala.fr>
Date: Thu, 14 Aug 2025 18:01:18 +0200
Subject: [PATCH] up

---
 .../run_once_after_10-asdf-config.sh.tmpl       | 10 ----------
 .../run_once_after_30-quarto-config.sh.tmpl     | 14 +++-----------
 scripts/manjaro.sh                              | 17 ++++++++++++-----
 3 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/home/.chezmoiscripts/run_once_after_10-asdf-config.sh.tmpl b/home/.chezmoiscripts/run_once_after_10-asdf-config.sh.tmpl
index 7685d78..0626307 100644
--- a/home/.chezmoiscripts/run_once_after_10-asdf-config.sh.tmpl
+++ b/home/.chezmoiscripts/run_once_after_10-asdf-config.sh.tmpl
@@ -17,8 +17,6 @@ plugins=(
   ['opam']='https://github.com/asdf-community/asdf-opam.git'
   ['ruby']='https://github.com/asdf-vm/asdf-ruby.git'
   ['rust']='https://github.com/code-lever/asdf-rust.git'
-  ['julia']='https://github.com/rkyleg/asdf-julia.git'
-  ['r']='https://github.com/asdf-community/asdf-r.git'
 )
 
 
@@ -41,14 +39,6 @@ for plugin in ${!plugins[@]}; do
   fi
 done
 
-  if [[ ! $(asdf plugin list | grep "^python$") ]]; then
-    inf "installing python..."
-    asdf plugin add python https://github.com/asdf-community/asdf-python.git
-    asdf install python latest:3.12
-    asdf set python latest:3.12
-    asdf reshim python
-  fi
-
 inf "initializing opam..."
 opam init -n
 
diff --git a/home/.chezmoiscripts/run_once_after_30-quarto-config.sh.tmpl b/home/.chezmoiscripts/run_once_after_30-quarto-config.sh.tmpl
index 7d3f0b2..85179d6 100644
--- a/home/.chezmoiscripts/run_once_after_30-quarto-config.sh.tmpl
+++ b/home/.chezmoiscripts/run_once_after_30-quarto-config.sh.tmpl
@@ -16,20 +16,12 @@ title="IDE's configuration"
       quarto install tinytex
     fi
 
-    inf "install python dependencies for Quarto"
-    python3 -Im pip install jupyter jupyterlab ipykernel matplotlib plotly pandas
- 
-    asdf reshim python
-
-    inf "install and register Jupyter kernels"
-    JUPYTER_BIN="$(asdf which jupyter)"
-
-    python3 -Im ipykernel install --user --name python-asdf --display-name "Python (asdf)"
+    python3 -Im ipykernel install --user --name python-local --display-name "Python (local)"
 
     Rscript -e "install.packages('IRkernel', repos='https://cloud.r-project.org')" \
-            -e "Sys.setenv(JUPYTER=\"$JUPYTER_BIN\"); IRkernel::installspec(user = TRUE)"
+            -e "IRkernel::installspec(user = TRUE)"
 
-    julia -e "ENV[\"JUPYTER\"]=\"${JUPYTER_BIN}\"; using Pkg; Pkg.add(\"IJulia\"); Pkg.build(\"IJulia\")"
+    julia -e "using Pkg; Pkg.add(\"IJulia\"); Pkg.build(\"IJulia\")"
 
     log "${title} done"
 
diff --git a/scripts/manjaro.sh b/scripts/manjaro.sh
index 1de71a1..daded36 100644
--- a/scripts/manjaro.sh
+++ b/scripts/manjaro.sh
@@ -20,8 +20,10 @@ install_default() {
     packages=(
       base-devel
       curl
+      gcc-fortran
       git
       pkgfile
+      python-pip
       trash-cli
       unzip
       wl-clipboard
@@ -49,7 +51,6 @@ install_base() {
 
 install_devel() {
     packages+=(
-      gcc-fortran
       go
       nodejs
       npm
@@ -59,12 +60,10 @@ install_devel() {
 
 install_nvim() {
     packages+=(
-      fd
       neovim
-      python-cairosvg
-      python-pip
-      python-jupyter-client
+      # lua51
       python-pynvim
+      fd
       ripgrep
       tree-sitter-cli
     )
@@ -99,6 +98,14 @@ install_ide() {
     packages+=(
       code
       quarto-cli-bin
+      python-jupyter
+      python-jupyter-client
+      python-matplotlib
+      python-plotly
+      python-cairosvg
+      python-pandas
+      r
+      julia
     )
 }