Compare commits

...

4 Commits

@ -29,59 +29,63 @@ RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
libxpm-dev libpng-dev zlib1g-dev libgmp-dev autoconf pkg-config \
p11-kit libp11-kit-dev nettle-dev libgnutls28-dev libtool \
libncurses-dev bash cmake htop net-tools dnsutils libgtk-3-dev wget \
libmagickwand-dev imagemagick libacl1-dev libxml2-dev
libmagickwand-dev imagemagick libacl1-dev libxml2-dev libgccjit-11-dev
RUN wget https://ftp.gnu.org/gnu/emacs/emacs-28.2.tar.gz \
RUN wget https://ftp.gnu.org/gnu/emacs/emacs-29.1.tar.gz \
-O /tmp/emacs.tar.gz
WORKDIR /tmp/emacs
RUN tar --strip-components=1 -xf /tmp/emacs.tar.gz
RUN CC="gcc-11" ./autogen.sh
RUN ./configure
RUN ./configure --with-native-compilation
RUN sed -i 's!static unsigned char sigsegv_stack\[SIGSTKSZ\]!static max_align_t sigsegv_stack\[(64 * 1024 + sizeof (max_align_t) - 1) / sizeof (max_align_t)\]!g' ./src/sysdep.c
RUN make install
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
libreadline8 bash-completion sudo tzdata libtool-bin
libreadline8 bash-completion sudo tzdata libtool-bin software-properties-common
RUN add-apt-repository ppa:ondrej/php
RUN apt-get update && apt-get -y install \
php8.1-memcached \
php8.2-memcached \
php-redis \
php8.1-bcmath \
php8.1-bz2 \
php8.1-cli \
php8.1-common \
php8.1-curl \
php8.1-gmp \
php8.1-intl \
php8.2-bcmath \
php8.2-bz2 \
php8.2-cli \
php8.2-common \
php8.2-curl \
php8.2-gmp \
php8.2-intl \
php-json \
php8.1-mbstring \
php8.1-mysql \
php8.1-odbc \
php8.1-opcache \
php8.1-pgsql \
php8.1-readline \
php8.1-tidy \
php8.1-xml \
php8.1-xsl \
php8.1-zip \
php8.1-gd \
php8.2-mbstring \
php8.2-mysql \
php8.2-odbc \
php8.2-opcache \
php8.2-pgsql \
php8.2-readline \
php8.2-tidy \
php8.2-xml \
php8.2-xsl \
php8.2-zip \
php8.2-gd \
php-bcmath \
php-apcu \
php-cli \
php-imagick \
php-intl \
php-xdebug
php-xdebug \
php-amqp
WORKDIR /tmp
RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
&& php -r "if (hash_file('sha384', 'composer-setup.php') === '55ce33d7678c5a611085589f1f3ddf8b3c52d662cd01d4ba75c0ee0459970c2200a51f492d557530c71c15d8dba01eae') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
&& php -r "if (hash_file('sha384', 'composer-setup.php') === 'e21205b207c3ff031906575712edab6f13eb0b361f2085f1f1237b7126d785e826a450292b6cfd1d64d92e6563bbde02') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
&& php composer-setup.php \
&& php -r "unlink('composer-setup.php');"
RUN mv composer.phar /usr/bin/composer
@ -138,7 +142,6 @@ RUN GOPATH=/usr/local/gopkg /bin/bash -c 'for package in \
# Protobuf
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install protobuf-compiler
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install html2text wkhtmltopdf pandoc texlive-latex-base texlive-fonts-recommended texlive-fonts-extra texlive-latex-extra ispell idutch irussian ienglish-common offlineimap3 maildir-utils
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install mariadb-client iputils-ping unzip
@ -158,6 +161,10 @@ RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install cargo
# Matrix stuff
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install libolm-dev libclang-dev
# Writing stuff
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install html2text wkhtmltopdf pandoc pandoc-citeproc texlive-latex-base texlive-fonts-recommended texlive-fonts-extra texlive-latex-extra texlive-bibtex-extra ispell idutch irussian ienglish-common offlineimap3 maildir-utils
ADD . /opt/workspace-repo
WORKDIR /opt/workspace-repo
RUN /usr/local/go/bin/go build .

@ -11,7 +11,7 @@
'(deft-extensions '("kotl" "txt" "text" "md" "markdown" "org"))
'(emcn-host "famthun.nl")
'(package-selected-packages
'(company kind-icon corfu yasnippet protobuf-mode lsp-ui lsp-mode exwm ement plz ts quelpa deft hyperbole phps-mode telega gnus-desktop-notify xclip ix docker-compose-mode docker muse writeroom-mode vscode-icon mastodon smtpmail-multi vterm pyvenv pyenv-mode python-mode markdown-mode+ websocket sql-indent company-lsp flymake-go noflet ido-vertical-mode counsel swiper typescript-mode flymake-shellcheck omnisharp plantuml-mode all-the-icons-dired all-the-icons dired-sidebar irony-eldoc irony go-eldoc go-mode webpaste emojify csv csv-mode js2-mode company-tern php-mode xmlgen request-deferred auto-package-update web-mode magit powerline nginx-mode cpanfile-mode dotenv-mode mustache-mode htmlize dockerfile-mode indent-tools markdown-mode yaml-mode))
'(svg-tag-mode stripes emacs-gc-stats company kind-icon corfu yasnippet protobuf-mode lsp-ui lsp-mode exwm ement plz ts quelpa deft hyperbole phps-mode telega gnus-desktop-notify xclip ix docker-compose-mode docker muse writeroom-mode vscode-icon mastodon smtpmail-multi vterm pyvenv pyenv-mode python-mode markdown-mode+ websocket sql-indent company-lsp flymake-go noflet ido-vertical-mode counsel swiper typescript-mode flymake-shellcheck omnisharp plantuml-mode all-the-icons-dired all-the-icons dired-sidebar irony-eldoc irony go-eldoc go-mode webpaste emojify csv csv-mode js2-mode company-tern php-mode xmlgen request-deferred auto-package-update web-mode magit powerline nginx-mode cpanfile-mode dotenv-mode mustache-mode htmlize dockerfile-mode indent-tools markdown-mode yaml-mode))
'(php-lineup-cascaded-calls t)
'(php-mode-coding-style 'symfony2)
'(php-mode-lineup-cascaded-calls t)

@ -31,7 +31,8 @@
(require 'flyspell)
(add-hook 'prog-mode-hook 'flyspell-prog-mode)
(add-hook 'prog-mode-hook 'linum-mode)
;;(add-hook 'prog-mode-hook 'linum-mode)
(add-hook 'prog-mode-hook 'display-line-numbers-mode)
(add-hook 'prog-mode-hook 'show-paren-mode)
(add-hook 'prog-mode-hook 'display-fill-column-indicator-mode)
@ -52,7 +53,13 @@
(tab-bar-mode)
;; enable flycheck everywhere
(global-flycheck-mode)
(when (require 'flycheck nil t)
(global-flycheck-mode)
(add-to-list 'flycheck-disabled-checkers 'javascript-jshint)
(add-to-list 'flycheck-disabled-checkers 'json-jsonlist)
(setq flycheck-emacs-lisp-load-path 'inherit)
(flycheck-add-mode 'javascript-eslint 'web-mode))
;; Save minibuffer history between sessions
(savehist-mode 1)
@ -136,13 +143,17 @@
(setq auth-sources '("~/.authinfo.gpg"))
(put 'erase-buffer 'disabled nil)
(setq flycheck-emacs-lisp-load-path 'inherit)
(add-to-list 'load-path "~/projects/phpinspect.el")
(add-to-list 'load-path "~/projects/qtoot")
(add-to-list 'load-path "~/projects/emcn.el")
(add-to-list 'load-path "~/projects/notes-list")
(when (file-directory-p "~/projects/el-config/enabled")
(dolist (file (directory-files "~/projects/el-config/enabled" t "^[^.]"))
(load file t nil t)))
(when (require 'qtoot nil 'noerror)
(setq qtoot-enable-drafts t))
@ -196,14 +207,9 @@
;;;;;;;;;;;;;;;;;;;;;;
;;;;; JAVASCRIPT ;;;;;
;;;;;;;;;;;;;;;;;;;;;;
(require 'flycheck)
(add-to-list 'auto-mode-alist '("\\.jsx?$" . web-mode))
(setq web-mode-content-types-alist '(("jsx" . "\\.js[x]?\\'")))
(add-to-list 'flycheck-disabled-checkers 'javascript-jshint)
(add-to-list 'flycheck-disabled-checkers 'json-jsonlist)
(flycheck-add-mode 'javascript-eslint 'web-mode)
(defun hugot-javascript-web-mode-hook ()
(when (or (string-match "\\.svelte$" (buffer-name)) (string-match "\\.js$" (buffer-name)))
@ -320,8 +326,7 @@
;;;;;;;;;;;;;;
(require 'go-mode)
;;(require 'company-go)
(require 'go-eldoc)
(require 'flycheck)
(defvar hugot-go-mode-expand-list
'(("ern" "if err != nil {\n\n}\n" (17))
@ -339,6 +344,7 @@
(require 'lsp-mode)
(require 'lsp-ui)
(require 'expand)
(require 'go-eldoc)
(expand-add-abbrevs go-mode-abbrev-table hugot-go-mode-expand-list)
(abbrev-mode 1)
@ -623,7 +629,7 @@ See `yank' for documentation of ARG."
;; END IDO
(require 'hyperbole)
;(require 'hyperbole)
;(eval-after-load 'kotl-mode '(require 'hugot-kotl-mode))
;; Emoji support

Loading…
Cancel
Save