Skip to content

Commit 8ba7a19

Browse files
committed
Add few more packages
1 parent 636c7b7 commit 8ba7a19

File tree

6 files changed

+24
-20
lines changed

6 files changed

+24
-20
lines changed

.gitpod.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM yyoncho/gitpod-default:1.0.28
1+
FROM yyoncho/gitpod-default:1.1.3

docker/base/Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@ RUN ./autogen.sh
1212
RUN ./configure --with-pgtk --with-cairo --with-modules --with-native-compilation --with-json
1313
RUN NATIVE_FULL_AOT=1 make -j8
1414

15-
WORKDIR /home/gitpod/
15+
RUN sudo apt-get update && sudo apt-get install -y ripgrep fasd libtool-bin
16+
17+
COPY fonts/* /home/gitpod/.local/share/fonts/
18+
RUN mkdir -p /home/gitpod/.local/share/fonts/
1619

17-
RUN mkdir -p .local/share/fonts/
18-
COPY fonts/* .local/share/fonts/
20+
WORKDIR /home/gitpod/
1921

2022
COPY configs/install-packages.el /tmp/install-packages.el
21-
RUN ~/emacs/src/emacs --batch -l /tmp/install-packages.el
23+
RUN LSP_USE_PLISTS=true ~/emacs/src/emacs --batch -l /tmp/install-packages.el
2224

2325
USER root
2426
RUN mkdir /workspace/m2-repository/ -p
@@ -31,5 +33,3 @@ RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && ~/emacs/src/emacs --ba
3133
COPY configs/init.el /home/gitpod/.emacs.d/init.el
3234

3335
COPY fonts/* ~/.local/share/fonts/
34-
35-
RUN sudo apt-get update && sudo apt-get install -y ripgrep fasd

docker/base/configs/init.el

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
(setq native-comp-deferred-compilation nil)
2+
(setq lsp-use-plists t)
23

34
(package-initialize)
45

docker/base/configs/install-packages.el

+8-5
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,19 @@
22
(setq native-comp-deferred-compilation t)
33

44
(package-initialize)
5-
(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/") t)
5+
6+
(setq package-archives '(("melpa" . "http://www.mirrorservice.org/sites/melpa.org/packages/")
7+
("gnu" . "http://elpa.gnu.org/packages/")
8+
("nongnu" . "http://elpa.nongnu.org/nongnu/")))
9+
610
(package-refresh-contents)
711

812
(package-install 'quelpa)
913
(setq package-native-compile t)
1014

1115
(setq native-comp-async-jobs-number 8)
12-
;; with plist enabled
13-
(quelpa '(lsp-mode :repo "yyoncho/lsp-mode" :fetcher github :branch "perf2" :files ("*.el" "clients/*.el")))
14-
1516
;; with jsonc-mode
17+
1618
(quelpa '(json-mode :repo "kiennq/json-mode" :fetcher github))
1719

1820
(mapc #'package-install
@@ -21,7 +23,8 @@
2123
company-quickhelp rust-mode php-mode scala-mode dart-mode
2224
clojure-mode all-the-icons treemacs-icons-dired helm-icons
2325
lsp-java lsp-dart lsp-metals lsp-ivy lsp-sourcekit
24-
magit page-break-lines helm-projectile))
26+
magit page-break-lines helm-projectile typescript-mode
27+
csharp-mode go-mode kotlin-mode))
2528

2629
(while (not (zerop (comp-async-runnings)))
2730
(message "Waiting for native compilation to finish. %s" (comp-async-runnings))

docker/base/configs/install-servers.el

+7-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
(require 'lsp-mode)
44

5+
(require 'dap-cpptools)
6+
(dap-cpptools-setup)
7+
8+
9+
510
(defun my/wait-for-installation (server-id)
611
(lsp-install-server nil server-id)
712

@@ -13,17 +18,14 @@
1318
(accept-process-output nil 1)))
1419

1520
(my/wait-for-installation 'jdtls)
16-
(my/wait-for-installation 'ts-ls)
1721
(my/wait-for-installation 'eslint)
22+
(my/wait-for-installation 'ts-ls)
1823
(my/wait-for-installation 'json-ls)
1924
(my/wait-for-installation 'xmlls)
20-
(my/wait-for-installation 'html-ls)
2125
(my/wait-for-installation 'rust-analyzer)
26+
(my/wait-for-installation 'html-ls)
2227
(my/wait-for-installation 'css-ls)
2328
(my/wait-for-installation 'clojure-lsp)
2429

25-
(require 'dap-cpptools)
26-
(dap-cpptools-setup)
27-
2830
(require 'dap-node)
2931
(dap-node-setup)

docker/default/Dockerfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
FROM yyoncho/gitpod-base:1.0.12
2-
3-
RUN sudo apt-get install libtool-bin
1+
FROM yyoncho/gitpod-base:1.1.2
42

53
RUN mv .emacs.d vanilla
64

0 commit comments

Comments
 (0)