Fix doom support

Author: yyoncho

.gitpod.Dockerfile

@@ -1 +1 @@
-FROM yyoncho/gitpod-default:1.0.22
+FROM yyoncho/gitpod-default:1.0.28

README.md

@@ -14,9 +14,9 @@ You can replace `PROJECT` and `URL` with any `github` project. Once you login yo
 
 ## Features
 * Fully preconfigured ready-to-code Emacs Based IDE. There are several preconfigured
-  - `Vanilla`
-  - `Spacemacs`
-  - `Doom` (TBA)
+  - `vanilla`
+  - `spacemacs`
+  - `doom`
   - Your custom config (TBA)
 * The following servers are preinstalled on the image(more to come):
   - `jdtls`
@@ -28,6 +28,7 @@ You can replace `PROJECT` and `URL` with any `github` project. Once you login yo
   - `rust-analyzer`
   - `css-ls`
   - `clojure-lsp`
+  - `clangd`
 
 ## Tips
 

docker/base/configs/install-servers.el

@@ -24,3 +24,6 @@
 
 (require 'dap-cpptools)
 (dap-cpptools-setup)
+
+(require 'dap-node)
+(dap-node-setup)

docker/default/Dockerfile

@@ -1,16 +1,13 @@
 FROM yyoncho/gitpod-base:1.0.12
 
-USER root
-RUN chown gitpod:gitpod /workspace
-
-USER gitpod
+RUN sudo apt-get install libtool-bin
 
 RUN mv .emacs.d vanilla
 
 COPY .emacs-profiles.el /home/gitpod/.emacs-profiles.el
 RUN git clone --depth 1 https://github.com/plexus/chemacs2 /home/gitpod/.emacs.d/
 
-COPY --from=yyoncho/gitpod-doom:1.0.0 /home/gitpod/.emacs.d /home/gitpod/doom
+COPY --from=yyoncho/gitpod-doom:1.0.5 /home/gitpod/doom /home/gitpod/doom
 
 COPY --from=yyoncho/gitpod-spacemacs:1.0.12 /home/gitpod/.emacs.d /home/gitpod/spacemacs
 COPY --from=yyoncho/gitpod-spacemacs:1.0.12 /home/gitpod/.spacemacs.d /home/gitpod/.spacemacs.d
@@ -30,11 +27,10 @@ RUN ln -s /home/gitpod/spacemacs/eln-cache /home/gitpod/.emacs.d/
 COPY .bashrc-ex /home/gitpod/.bashrc-ex
 RUN echo 'source ~/.bashrc-ex' >> ~/.bashrc
 
-COPY --from=yyoncho/gitpod-doom:1.0.0 /home/gitpod/.config/doom /home/gitpod/.config/doom
-
-RUN sudo apt-get install libtool-bin
+COPY --from=yyoncho/gitpod-doom:1.0.5 /home/gitpod/.config/doom /home/gitpod/.config/doom
 
 COPY startup.el /home/gitpod/
 RUN sudo rm /home/gitpod/.spacemacs.d/*
 RUN sudo ln -s /workspace/lsp-gitpod/docker/spacemacs/spacemacs.d/init.el /home/gitpod/.spacemacs.d/
 RUN sudo chown gitpod:gitpod /home/gitpod/.spacemacs.d -R
+COPY vterm-module.so /home/gitpod/spacemacs/.elpa/28.0/develop/vterm*/

docker/default/startup.el

@@ -39,12 +39,13 @@
         (lsp-load-vscode-workspace (car workspaces)))
     (lsp-workspace-folders-add directory)))
 
+(require 'f)
+
 (let* ((org (getenv "ORG"))
        (project (getenv "PROJECT"))
        (root (f-parent (getenv "GITPOD_REPO_ROOT")))
        (directory (expand-file-name project root)))
   (when (and org project)
-    (require 'f)
     (if (f-exists-p directory)
         (progn
           (message "Project %s/%s is already cloned in %s" org project directory)

docker/spacemacs/vterm-module.so renamed to docker/default/vterm-module.so

@@ -2,13 +2,12 @@ FROM yyoncho/gitpod-base:1.0.9
 
 USER gitpod
 
-RUN rm -rf ~/.emacs.d
 # Doom
 ## Clone and set the DOOMDIR folder
 
-RUN git clone --depth 1 https://github.com/hlissner/doom-emacs /home/gitpod/.emacs.d/ --branch develop
+RUN git clone --depth 1 https://github.com/hlissner/doom-emacs /home/gitpod/doom/ --branch develop
 COPY configs /home/gitpod/.config/doom
 
 ## Sync to install modules and packages
 RUN ulimit -n 9000
-RUN EMACS=~/emacs/src/emacs ~/.emacs.d/bin/doom sync
+RUN EMACS=~/emacs/src/emacs ~/doom/bin/doom sync

docker/doom/Dockerfile

@@ -6,3 +6,5 @@
       user-mail-address "[email protected]")
 (setq doom-theme 'doom-one)
 (setq display-line-numbers-type t)
+
+(load "~/startup.el")