@m14i/sith 1.8.0 → 1.8.1

package/dist/index.js

@@ -35737,10 +35737,8 @@ async function runShell() {
         `${process.cwd()}:${_config_js__WEBPACK_IMPORTED_MODULE_5__/* .DOCKER_CONFIG */ .e6.workspaceMount}`,
         "-e",
         `GITHUB_TOKEN=${process.env.GITHUB_TOKEN || ""}`,
-        "--entrypoint",
-        "nix-shell",
         _config_js__WEBPACK_IMPORTED_MODULE_5__/* .DOCKER_CONFIG */ .e6.imageName,
-        _config_js__WEBPACK_IMPORTED_MODULE_5__/* .DOCKER_CONFIG */ .e6.shellEntrypoint,
+        "bash",
     ];
     try {
         await (0,execa__WEBPACK_IMPORTED_MODULE_6__/* .execa */ .Ho)("docker", dockerArgs, {

package/docker/Dockerfile

@@ -9,10 +9,11 @@
 # ============================================================================
 FROM nixos/nix:2.19.2 AS builder
 
-# Configuration Nix pour permettre les builds
+# Configuration Nix pour permettre les builds et activer flakes
 # Note: sandbox=false required for Docker-in-Docker compatibility
 RUN echo "sandbox = false" >> /etc/nix/nix.conf && \
-    echo "filter-syscalls = false" >> /etc/nix/nix.conf
+    echo "filter-syscalls = false" >> /etc/nix/nix.conf && \
+    echo "experimental-features = nix-command flakes" >> /etc/nix/nix.conf
 
 # Copier les fichiers de configuration des skills
 COPY docker/skills/rtk-config.toml /opt/sith/skills/rtk-config.toml
@@ -24,9 +25,10 @@ COPY docker/nix/ /opt/sith/nix/
 # Configurer npm pour utiliser le registry public
 RUN echo "registry=https://registry.npmjs.org/" > /root/.npmrc
 
-# Pré-charger l'environnement Nix (installe tous les packages)
-# Cela cache les dépendances dans le layer Docker
-RUN nix-shell /opt/sith/nix/shell.nix --run "echo '✅ Environment cached'"
+# Generate flake.lock and pre-build environment
+RUN cd /opt/sith/nix && \
+    nix flake lock && \
+    nix develop --command echo '✅ Flake environment cached'
 
 # Installer OpenCode CLI via script officiel
 RUN nix-shell /opt/sith/nix/shell.nix --run " \
@@ -46,10 +48,11 @@ LABEL description="OpenCode CI/CD avec Nix, GitHub Copilot et skills d'optimisat
 LABEL version="2.3.0"
 LABEL org.opencontainers.image.source="https://github.com/MerzoukeMansouri/sith"
 
-# Configuration Nix pour permettre les builds
+# Configuration Nix pour permettre les builds et activer flakes
 # Note: sandbox=false required for Docker-in-Docker compatibility
 RUN echo "sandbox = false" >> /etc/nix/nix.conf && \
-    echo "filter-syscalls = false" >> /etc/nix/nix.conf
+    echo "filter-syscalls = false" >> /etc/nix/nix.conf && \
+    echo "experimental-features = nix-command flakes" >> /etc/nix/nix.conf
 
 # Copier les fichiers de configuration des skills depuis builder
 COPY --from=builder /opt/sith/ /opt/sith/
@@ -99,13 +102,13 @@ ENV CAVEMAN_AUTO=true
 # Healthcheck pour vérifier que l'environnement est prêt
 # Note: RTK check is conditional on RTK_ENABLED to avoid false failures
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-    CMD nix-shell /opt/sith/nix/shell.nix --run "opencode --version && ([ \"\$RTK_ENABLED\" = \"false\" ] || command -v rtk)" || exit 1
+    CMD cd /opt/sith/nix && nix develop --command sh -c "opencode --version && ([ \"\$RTK_ENABLED\" = \"false\" ] || command -v rtk)" || exit 1
 
 # Répertoire de travail pour les projets
 WORKDIR /workspace
 
-# Point d'entrée via nix-shell
-ENTRYPOINT ["nix-shell", "/opt/sith/nix/shell.nix", "--run"]
+# Point d'entrée via nix develop (flakes)
+ENTRYPOINT ["sh", "-c", "cd /opt/sith/nix && nix develop --command"]
 
 # Commande par défaut
 CMD ["opencode --help"]

package/docker/nix/flake.nix

@@ -0,0 +1,56 @@
+{
+  description = "Sith - OpenCode Docker Environment";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+
+        # Load packages from config
+        packagesConfig = builtins.fromJSON (builtins.readFile ./nix-config/packages.json);
+
+        allPackages = pkgs.lib.flatten (
+          pkgs.lib.mapAttrsToList (category: config: config.packages) packagesConfig.categories
+        );
+
+        resolvePkg = pkgPath:
+          let
+            parts = pkgs.lib.splitString "." pkgPath;
+          in
+            if pkgs.lib.length parts == 1
+            then builtins.getAttr (pkgs.lib.head parts) pkgs
+            else if pkgs.lib.length parts == 2
+            then builtins.getAttr (pkgs.lib.elemAt parts 1) (builtins.getAttr (pkgs.lib.head parts) pkgs)
+            else throw "Package path too deep: ${pkgPath}";
+
+        packages = map resolvePkg allPackages;
+      in
+      {
+        devShells.default = pkgs.mkShell {
+          name = "opencode-ci-environment";
+
+          buildInputs = packages;
+
+          shellHook = ''
+            # Source external setup script
+            if [ -f /opt/sith/nix/nix-scripts/setup.sh ]; then
+              source /opt/sith/nix/nix-scripts/setup.sh
+            fi
+          '';
+
+          LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
+          LANG = "en_US.UTF-8";
+          LC_ALL = "en_US.UTF-8";
+          LC_CTYPE = "en_US.UTF-8";
+
+          SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
+          NIX_SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
+        };
+      }
+    );
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@m14i/sith",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "Turn your context to the dark side. Standardize and share your OpenCode setup with a fully dockerized environment, designed for seamless collaboration and CI integration.",
   "type": "module",
   "repository": {