From 5d7bd80d41e7affbff5fe1ea342a7864d53c40fa Mon Sep 17 00:00:00 2001
From: Ollie <Ollie>
Date: Tue, 11 Jun 2024 15:32:26 +1000
Subject: [PATCH] Move back to Code - OSS

---
 .../User/settings.json                        | 14 ++++++--
 justfile                                      | 36 +++++++++----------
 2 files changed, 29 insertions(+), 21 deletions(-)
 rename code/.config/{VSCodium => Code - OSS}/User/settings.json (63%)

diff --git a/code/.config/VSCodium/User/settings.json b/code/.config/Code - OSS/User/settings.json
similarity index 63%
rename from code/.config/VSCodium/User/settings.json
rename to code/.config/Code - OSS/User/settings.json
index 0b4c384..4f711b4 100644
--- a/code/.config/VSCodium/User/settings.json
+++ b/code/.config/Code - OSS/User/settings.json	
@@ -6,6 +6,9 @@
         "editor.tabSize": 2
     },
     "breadcrumbs.enabled": false,
+    "editor.codeActionsOnSave": {
+        "source.organizeImports": "always"
+    },
     "editor.fontFamily": "'FiraCode Nerd Font', monospace",
     "editor.fontLigatures": true,
     "editor.fontSize": 16,
@@ -14,15 +17,20 @@
     "editor.minimap.enabled": false,
     "editor.tabSize": 4,
     "livePreview.openPreviewTarget": "External Browser",
+    "python.analysis.diagnosticMode": "workspace",
+    "python.analysis.inlayHints.callArgumentNames": "all",
+    "python.analysis.inlayHints.functionReturnTypes": true,
+    "python.analysis.inlayHints.variableTypes": true,
+    "python.analysis.typeCheckingMode": "standard",
+    "python.analysis.nodeExecutable": "/usr/bin/node",
+    "python.createEnvironment.trigger": "prompt",
+    "python.languageServer": "Jedi",
     "redhat.telemetry.enabled": false,
     "terminal.integrated.cursorBlinking": true,
     "terminal.integrated.cursorStyle": "line",
     "terminal.integrated.enablePersistentSessions": false,
     "terminal.integrated.hideOnStartup": "always",
     "update.showReleaseNotes": false,
-    "vscode-pets.petSize": "medium",
-    "vscode-pets.position": "explorer",
-    "vscode-pets.throwBallWithMouse": true,
     "window.restoreWindows": "one",
     "window.zoomLevel": 2,
     "workbench.iconTheme": "material-icon-theme",
diff --git a/justfile b/justfile
index 8a860b5..466c9b4 100644
--- a/justfile
+++ b/justfile
@@ -5,7 +5,7 @@ default:
   @just --list --justfile {{justfile()}}
 
 install-code:
-  paru -S vscodium-bin-marketplace
+  paru -S code-marketplace
 
 install-codecs:
   sudo pacman -S gst-libav gst-plugin-va gst-plugins-bad gst-plugins-base gst-plugins-good gstreamer
@@ -32,7 +32,7 @@ install-docker:
   sudo systemctl enable docker.socket
 
 install-essentials-cli:
-  sudo pacman -S base-devel btop curl eza fastfetch ffmpeg flatpak fwupd fzf hunspell hunspell-en_au hunspell-en_us nvtop openssh p7zip ripgrep unrar vim vulkan-tools xdg-user-dirs yt-dlp
+  sudo pacman -S base-devel btop curl eza fastfetch ffmpeg flatpak fwupd fzf hunspell hunspell-en_au hunspell-en_us man-db man-pages nvtop openssh p7zip ripgrep unrar vim vulkan-tools xdg-user-dirs yt-dlp
 
 install-essentials-gui:
   sudo pacman -S blue-utils firefox gamemode gimp goverlay libva-vdpau-driver libva-utils libvdpau-va-gl mangohud mesa-vdpau mpv power-profiles-daemon steam syncthing ttf-firacode-nerd ttf-liberation wine wine-gecko wine-mono winetricks wqy-zenhei
@@ -58,22 +58,22 @@ setup-aur:
 
 # Installs VSCodium extensions
 setup-code:
-  vscodium --install-extension davidanson.vscode-markdownlint
-  vscodium --install-extension enkia.tokyo-night
-  vscodium --install-extension irongeek.vscode-env
-  vscodium --install-extension kokakiwi.vscode-just
-  vscodium --install-extension ms-dotnettools.csdevkit
-  vscodium --install-extension ms-python.python
-  vscodium --install-extension ms-vscode.live-server
-  vscodium --install-extension naumovs.color-highlight
-  vscodium --install-extension pkief.material-icon-theme
-  vscodium --install-extension redhat.vscode-yaml
-  vscodium --install-extension rust-lang.rust-analyzer
-  vscodium --install-extension serayuzgur.crates
-  vscodium --install-extension spgoding.datapack-language-server
-  vscodium --install-extension tamasfe.even-better-toml
-  vscodium --install-extension tonybaloney.vscode-pets
-  vscodium --install-extension usernamehw.errorlens
+  code-oss --install-extension davidanson.vscode-markdownlint
+  code-oss --install-extension irongeek.vscode-env
+  code-oss --install-extension kokakiwi.vscode-just
+  code-oss --install-extension ms-dotnettools.csdevkit
+  code-oss --install-extension ms-python.black-formatter
+  code-oss --install-extension ms-python.pylint
+  code-oss --install-extension ms-python.python
+  code-oss --install-extension ms-vscode.live-server
+  code-oss --install-extension naumovs.color-highlight
+  code-oss --install-extension pkief.material-icon-theme
+  code-oss --install-extension redhat.vscode-yaml
+  code-oss --install-extension rust-lang.rust-analyzer
+  code-oss --install-extension serayuzgur.crates
+  code-oss --install-extension spgoding.datapack-language-server
+  code-oss --install-extension tamasfe.even-better-toml
+  code-oss --install-extension usernamehw.errorlens
 
 setup-flatpak:
   flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo