Merge branch 'master' of git.jpatrick.io:james/dotfiles

dockerfile

@@ -0,0 +1,19 @@
+FROM alpine:latest
+
+RUN apk add vim \
+  zsh \
+  make \
+  git \
+  openssh-client \
+  perl
+
+ARG USER=test
+ENV HOME /home/$USER
+
+RUN adduser -D -s /bin/zsh $USER
+USER $USER
+WORKDIR $HOME
+
+CMD git clone https://git.jpatrick.io/james/dotfiles.git \
+  && cd dotfile \
+  && make install

emacs/doom.d/config.el

@@ -1,21 +1,23 @@
 ;;; ~/.doom.d/config.el -*- lexical-binding: t; -*-
 
 ;; Set font
-(setq doom-font (font-spec :family "FuraCode NF" :size 15))
+(setq doom-font (font-spec :family "FuraCode NF" :size 12))
-
+(pcase (system-name)
+  ("zuk"
+   (font-put doom-font :size 15)) ;; Wayland support for high HDPI scaling has some issues. Increasing the font size works
+)
 ;; Orgmode
-;; Set orgmode dir
 (custom-set-variables '(org-directory "~/org"))
-;; Default location for image location.
 (setq-default org-download-image-dir "~/org/resources/")
-;; Enable word wrap
+(add-hook 'org-mode-hook #'visual-line-mode) ;; Enable word wrap
-(add-hook 'org-mode-hook #'visual-line-mode)
+(eval-after-load "org" '(require 'ox-md nil t)) ;; allow md export
-;; Orgmode: Enable md export
-(eval-after-load "org" '(require 'ox-md nil t))
-;; Deft:    Set path to Org-mope Directory
 (setq deft-directory "~/org/")
 
+;; org-journal-file-format
+(customize-set-variable 'org-journal-date-format "%A, %d %B %Y")
+
+
 ;; Have projectile automatically check code.
-(setq projectile-project-search-path '("~/code/"))
+(setq projectile-project-search-path '("~/code/" "~/Code/"))
 
 (setq doom-localleader-key ",")

emacs/doom.d/init.el

@@ -90,7 +90,7 @@
        ;;ansible
        ;;debugger              ; FIXME stepping through code, to help you add bugs
        ;;direnv
-       ;;docker
+       (docker +lsp)
        editorconfig            ; let someone else argue about tabs vs spaces
        ;;ein                   ; tame Jupyter notebooks with emacs
        (eval +overlay)         ; run code, run (also, repls)
@@ -144,6 +144,7 @@
        ;;nix                   ; I hereby declare "nix geht mehr!"
        ;;ocaml                 ; an objective camel
        (org                    ; organize your plain life in plain text
+        +journal
         +dragndrop             ; drag & drop files/images into org buffers
         ;;+hugo                ; use Emacs for hugo blogging
         ;;+jupyter             ; ipython/jupyter support for babel