From 3ea968fb9b3d4161aa7e48e24c2a74b9d2fa5ebd Mon Sep 17 00:00:00 2001
From: Dylan Baker <dylan@pnwbakers.com>
Date: Sat, 5 Sep 2026 18:35:46 +0000
Subject: [PATCH 1/2] devcontainer: Remove flat-manager-client, pylint, and
 pylance

I rather like pylance, but it doesn't work with pydanitc, it needs the mypy
extension. Pylint I'm over, it's just ruff from now on. And the
flat-manager-client is unnecessary.
---
 .devcontainer/debian-install.sh | 9 ---------
 .devcontainer/devcontainer.json | 8 +-------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/.devcontainer/debian-install.sh b/.devcontainer/debian-install.sh
index 070c320..1ddc28b 100644
--- a/.devcontainer/debian-install.sh
+++ b/.devcontainer/debian-install.sh
@@ -7,9 +7,6 @@ apt install -y \
     appstream \
     flatpak-builder \
     python3-pip \
-    rustup \
-    libglib2.0-dev \
-    libostree-dev \
     ;
 
 apt clean -y
@@ -23,9 +20,3 @@ pip install --break-system-packages \
     tomlkit \
     pydantic \
     ;
-
-rustup default stable
-
-cargo install --git https://github.com/flatpak/flat-manager flat-manager-client
-
-flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d2322c2..5d541ed 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -26,21 +26,15 @@
         "EditorConfig.EditorConfig",
         "charliermarsh.ruff",
         "ms-python.mypy-type-checker",
-        "ms-python.pylint",
         "ms-python.python",
-        "ms-python.vscode-pylance",
         "njpwerner.autodocstring",
         "tamasfe.even-better-toml",
       ]
     }
   },
 
-  "remoteEnv": {
-    "PATH": "${containerEnv:PATH}:~/.cargo/bin",
-  },
-
   "onCreateCommand": "sudo sh .devcontainer/debian-install.sh",
 
   // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-  "remoteUser": "root",
+  // "remoteUser": "root",
 }

From 09a04c7a7e636c7ca75e4a214301285277f008ab Mon Sep 17 00:00:00 2001
From: Dylan Baker <dylan@pnwbakers.com>
Date: Sat, 5 Sep 2026 18:40:49 +0000
Subject: [PATCH 2/2] devcontainer: Further simplify with use of features

---
 .devcontainer/debian-install.sh | 13 -------------
 .devcontainer/devcontainer.json |  8 +++++---
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/.devcontainer/debian-install.sh b/.devcontainer/debian-install.sh
index 1ddc28b..553774d 100644
--- a/.devcontainer/debian-install.sh
+++ b/.devcontainer/debian-install.sh
@@ -1,21 +1,8 @@
 set -exo pipefail
 
-apt update -y
-
-apt install -y \
-    python3 \
-    appstream \
-    flatpak-builder \
-    python3-pip \
-    ;
-
-apt clean -y
-
 pip install --break-system-packages \
     flit \
     mypy \
-    packaging \
-    requirements-parser \
     ruff \
     tomlkit \
     pydantic \
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 5d541ed..a0d691d 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -12,9 +12,11 @@
   "runArgs": ["--device=/dev/fuse"],
 
   // Features to add to the dev container. More info: https://containers.dev/features.
-  // "features": {
-  //  "ghcr.io/devcontainer-config/features/dot-config:4": {}
-  // },
+  "features": {
+    "ghcr.io/devcontainers-extra/features/apt-packages": {
+      "packages": "python3,python-is-python3,appstream,flatpak-builder,python3-pip"
+    }
+  },
 
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   // "forwardPorts": [],