Dev Env Tweaks

install/terminal/app-neovim.sh

@@ -9,25 +9,22 @@ cd -
 
 # Only attempt to set configuration if Neovim has never been run
 if [ ! -d "$HOME/.config/nvim" ]; then
-	# Use LazyVim
-	git clone https://github.com/LazyVim/starter ~/.config/nvim
+  # Use LazyVim
+  git clone https://github.com/LazyVim/starter ~/.config/nvim
 
-	# Disable update notification popup in starter config
-	sed -i 's/checker = { enabled = true }/checker = { enabled = true, notify = false }/g' ~/.config/nvim/lua/config/lazy.lua
+  # Disable update notification popup in starter config
+  sed -i 's/checker = { enabled = true }/checker = { enabled = true, notify = false }/g' ~/.config/nvim/lua/config/lazy.lua
 
-	# Make everything match the terminal transparency
-	mkdir -p ~/.config/nvim/plugin/after
-	cp ~/.local/share/omakub/configs/neovim/transparency.lua ~/.config/nvim/plugin/after/
+  # Make everything match the terminal transparency
+  mkdir -p ~/.config/nvim/plugin/after
+  cp ~/.local/share/omakub/configs/neovim/transparency.lua ~/.config/nvim/plugin/after/
 
-	# Default to Tokyo Night theme
-	cp ~/.local/share/omakub/themes/tokyo-night/neovim.lua ~/.config/nvim/lua/plugins/theme.lua
-
-	# Enable default extras
-	cp ~/.local/share/omakub/configs/neovim/lazyvim.json ~/.config/nvim/lazyvim.json
+  # Default to Tokyo Night theme
+  cp ~/.local/share/omakub/themes/tokyo-night/neovim.lua ~/.config/nvim/lua/plugins/theme.lua
 fi
 
 # Replace desktop launcher with one running inside Alacritty
 if [[ -d ~/.local/share/applications ]]; then
-	sudo rm -rf /usr/share/applications/nvim.desktop
-	source ~/.local/share/omakub/applications/Neovim.sh
+  sudo rm -rf /usr/share/applications/nvim.desktop
+  source ~/.local/share/omakub/applications/Neovim.sh
 fi

install/terminal/select-dev-language.sh

@@ -1,45 +1,66 @@
 # Install default programming languages
 if [[ -v OMAKUB_FIRST_RUN_LANGUAGES ]]; then
-	languages=$OMAKUB_FIRST_RUN_LANGUAGES
+  languages=$OMAKUB_FIRST_RUN_LANGUAGES
 else
-	AVAILABLE_LANGUAGES=("Ruby on Rails" "Node.js" "Go" "PHP" "Python" "Elixir" "Rust" "Java")
-	languages=$(gum choose "${AVAILABLE_LANGUAGES[@]}" --no-limit --height 10 --header "Select programming languages")
+  AVAILABLE_LANGUAGES=("Ruby on Rails" "Node.js" "Go" "PHP" "Python" "Elixir" "Rust" "Java")
+  languages=$(gum choose "${AVAILABLE_LANGUAGES[@]}" --no-limit --height 10 --header "Select programming languages")
 fi
 
+enable_lazyvim_extras() {
+  local temp_file=$(mktemp /tmp/omakub.XXXXX)
+  local extras=("$@")
+  local jq_extras=$(printf '"%s",' "${extras[@]}")
+  jq_extras="[${jq_extras%,}]"
+
+  jq --argjson extras "$jq_extras" '.extras |= (. + $extras | unique)' ~/.config/nvim/lazyvim.json >"$temp_file" &&
+    mv "$temp_file" ~/.config/nvim/lazyvim.json
+}
+
 if [[ -n "$languages" ]]; then
-	for language in $languages; do
-		case $language in
-		Ruby)
-			mise use --global ruby@3.3
-			mise x ruby -- gem install rails --no-document
-			;;
-		Node.js)
-			mise use --global node@lts
-			;;
-		Go)
-			mise use --global go@latest
-			;;
-		PHP)
-			sudo add-apt-repository -y ppa:ondrej/php
-			sudo apt -y install php8.3 php8.3-{curl,apcu,intl,mbstring,opcache,pgsql,mysql,sqlite3,redis,xml,zip}
-			php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-			php composer-setup.php --quiet && sudo mv composer.phar /usr/local/bin/composer
-			rm composer-setup.php
-			;;
-		Python)
-			mise use --global python@latest
-			;;
-		Elixir)
-			mise use --global erlang@latest
-			mise use --global elixir@latest
-			mise x elixir -- mix local.hex --force
-			;;
-		Rust)
-			bash -c "$(curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs)" -- -y
-			;;
-		Java)
-			mise use --global java@latest
-			;;
-		esac
-	done
+  for language in $languages; do
+    case $language in
+    Ruby)
+      mise use --global ruby@3.3
+      mise x ruby -- gem install rails --no-document
+      ;;
+    Node.js)
+      mise use --global node@lts
+
+      enable_lazyvim_extras "lazyvim.plugins.extras.lang.typescript"
+      ;;
+    Go)
+      mise use --global go@latest
+
+      enable_lazyvim_extras "lazyvim.plugins.extras.lang.go"
+      ;;
+    PHP)
+      sudo add-apt-repository -y ppa:ondrej/php
+      sudo apt -y install php8.3 php8.3-{curl,apcu,intl,mbstring,opcache,pgsql,mysql,sqlite3,redis,xml,zip}
+      php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+      php composer-setup.php --quiet && sudo mv composer.phar /usr/local/bin/composer
+      rm composer-setup.php
+
+      enable_lazyvim_extras "lazyvim.plugins.extras.lang.php" "lazyvim.plugins.extras.lang.typescript"
+
+      # Configure PHP's LSP to use intelephense instead of phpactor (default)
+      if ! grep -q 'php_lsp' ~/.config/nvim/lua/config/options.lua; then
+        echo 'vim.g.lazyvim_php_lsp = "intelephense"' >>~/.config/nvim/lua/config/options.lua
+      fi
+      ;;
+    Python)
+      mise use --global python@latest
+      ;;
+    Elixir)
+      mise use --global erlang@latest
+      mise use --global elixir@latest
+      mise x elixir -- mix local.hex --force
+      ;;
+    Rust)
+      bash -c "$(curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs)" -- -y
+      ;;
+    Java)
+      mise use --global java@latest
+      ;;
+    esac
+  done
 fi