From 070bef1d0e3bb28fc82b0f965015486cb4e31b84 Mon Sep 17 00:00:00 2001
From: Mario1159 <mario@1159.cl>
Date: Tue, 12 Sep 2023 16:04:44 -0300
Subject: [PATCH] Solve pcell parameter problem

---
 README.md                        |  2 +-
 base/arch.Dockerfile             | 11 ++++++++++-
 scripts/wsl_start.ps1 => run.ps1 |  8 +++++---
 scripts/klayout                  | 11 +++++++++++
 stacks/analog-xk/arch.Dockerfile |  3 +++
 5 files changed, 30 insertions(+), 5 deletions(-)
 rename scripts/wsl_start.ps1 => run.ps1 (92%)
 create mode 100644 scripts/klayout

diff --git a/README.md b/README.md
index 76b2275..1f8701b 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ These scripts automate the binding of graphics environment variables to the cont
 
 Execute the next script in powershell.
 ```pwsh
-& ([scriptblock]::Create((irm https://git.1159.cl/Mario1159/osic-stacks/raw/branch/main/scripts/wsl_start.ps1))) -remote
+& ([scriptblock]::Create((irm https://git.1159.cl/Mario1159/osic-stacks/raw/branch/main/run.ps1))) -remote
 ```
  This script will run the container inside wsl and bind the enviroments variables for [wslg](https://github.com/microsoft/wslg/blob/main/samples/container/Containers.md).
 
diff --git a/base/arch.Dockerfile b/base/arch.Dockerfile
index 86c7f0e..1f0816b 100644
--- a/base/arch.Dockerfile
+++ b/base/arch.Dockerfile
@@ -6,7 +6,7 @@ FROM greyltc/archlinux-aur:paru
 RUN pacman -Syuq --noconfirm
 
 # Install packages
-RUN aur-install sudo git python python-pipx xz gnu-free-fonts vim
+RUN aur-install sudo git python python-pip python-pipx xz gnu-free-fonts vim ngspice gedit 
 
 # Clean cache
 RUN pacman -Scc
@@ -21,5 +21,14 @@ ENV PATH="${PATH}:/home/designer/.local/bin"
 RUN pipx install volare
 WORKDIR /home/designer
 
+# PDK Environment variables
+ENV PDK_ROOT /home/designer/.volare
+ENV USER designer
+
+# Add scripts
+RUN mkdir -p .scripts
+COPY --chown=designer:designer --chmod=755 scripts/klayout /home/designer/.scripts
+ENV PATH="/home/designer/.scripts:${PATH}"
+
 # Initialize the enviroment keeping container alive
 CMD ["sleep", "infinity"]
\ No newline at end of file
diff --git a/scripts/wsl_start.ps1 b/run.ps1
similarity index 92%
rename from scripts/wsl_start.ps1
rename to run.ps1
index 208958c..5af7a64 100644
--- a/scripts/wsl_start.ps1
+++ b/run.ps1
@@ -30,19 +30,21 @@ $imagename = $imageoptions[$imageindex]
 $containername = Read-Host -Prompt "Container instance name [default=$imagename]"
 if (!$containername) { $containername = $imagename }
 
+$additionaloptions = ''
 if($remote) {
     $image = "git.1159.cl/mario1159/$imagename"
+    $additionaloptions = '--pull always' 
 } else {
     $image = $imagename
 }
 
 $response = Read-Host "Do you want to bind the container home directory into a windows directory? [N/y]"
 
-$additionaloptions = ''
+
 if ($response -eq 'y') {
     $directory = Read-Host "Write the windows directory destination relative to WSL, for example `"/mnt/c/Users/Username/Desktop/ExampleFolder`"`n"
     mkdir -Force $directory | Out-Null
-    $additionaloptions = "-v ${directory}:/home/designer/shared"
+    $additionaloptions = -join($additionaloptions, "-v ${directory}:/home/designer/shared")
 }
 
 $response = Read-Host -Prompt "Do you want to set additional arguments for the container instantiation? [N/y]"
@@ -54,7 +56,7 @@ if ($response -eq 'y') {
 
 Write-Host ""
 
-$dockercommand = ("docker run -d --pull always " +
+$dockercommand = ("docker run -d " +
     "--name $containername " +
     "-v /tmp/.X11-unix:/tmp/.X11-unix " +
     "-v /mnt/wslg:/mnt/wsl " +
diff --git a/scripts/klayout b/scripts/klayout
new file mode 100644
index 0000000..2c2066f
--- /dev/null
+++ b/scripts/klayout
@@ -0,0 +1,11 @@
+#!/usr/bin/bash
+export KLAYOUT_HOME=$PDK_ROOT/$PDK/libs.tech/klayout
+if [[ $PDK = gf180mcu* ]]; then
+        if [[ ! -d $KLAYOUT_HOME/pymacros/cells ]]; then
+                mv $KLAYOUT_HOME/pymacros/* $KLAYOUT_HOME/pymacros/cells | mkdir $KLAYOUT_HOME/pymacros/cells
+        fi
+	if [[ ! -f $KLAYOUT_HOME/pymacros/gf180mcu.lym ]]; then
+		mv $KLAYOUT_HOME/tech/gf180mcu.lym $KLAYOUT_HOME/pymacros
+	fi
+fi
+klayout $@
\ No newline at end of file
diff --git a/stacks/analog-xk/arch.Dockerfile b/stacks/analog-xk/arch.Dockerfile
index 5b4256e..b00b39e 100644
--- a/stacks/analog-xk/arch.Dockerfile
+++ b/stacks/analog-xk/arch.Dockerfile
@@ -8,6 +8,9 @@ RUN sudo pacman -Syuq --noconfirm
 # Install packages
 RUN sudo aur-install xschem klayout
 
+RUN pip install gdsfactory --break-system-packages
+RUN pip install gf180 --upgrade --break-system-packages
+
 # Clean cache
 RUN sudo pacman -Scc