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

emacs/doom.d/init.el

@@ -117,14 +117,14 @@
        ;;(haskell +intero) ; a language that's lazier than I am
        ;;hy                ; readability of scheme w/ speed of python
        ;;idris             ;
-       ;;(java +meghanada) ; the poster child for carpal tunnel syndrome
+       (java +lsp)         ; the poster child for carpal tunnel syndrome
        javascript          ; all(hope(abandon(ye(who(enter(here))))))
        ;;julia             ; a better, faster MATLAB
        ;;kotlin            ; a better, slicker Java(Script)
        ;;latex             ; writing papers in Emacs has never been so fun
        ;;ledger            ; an accounting system in Emacs
        ;;lua               ; one-based indices? one-based indices
-       markdown            ; writing docs for people to ignore
+       (markdown +grip)    ; writing docs for people to ignore
        ;;nim               ; python + lisp at the speed of c
        ;;nix               ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel

tridactyl/themes/onedark.css

@@ -1,4 +1,5 @@
-:root {    /* Onedark by Chris Kempson (http://chriskempson.com) */
+:root {
+  /* Onedark by Chris Kempson (http://chriskempson.com) */
   --base00: #282c34;
   --base01: #353b45;
   --base02: #3e4451;
@@ -99,7 +100,11 @@
   width: 100%;
 }
 
-#completions table tr td.prefix,#completions table tr td.privatewindow,#completions table tr td.container,#completions table tr td.icon {    display: none;
+#completions table tr td.prefix,
+#completions table tr td.privatewindow,
+#completions table tr td.container,
+#completions table tr td.icon {
+  display: none;
 }
 
 #completions .BufferCompletionSource table {
@@ -123,7 +128,8 @@
   display: none;
 }
 
-#cmdline_iframe {    position: fixed !important;
+#cmdline_iframe {
+  position: fixed !important;
   box-shadow: rgba(0, 0, 0, 0.5) 20px !important;
 }
 
@@ -138,11 +144,8 @@
   position: fixed !important;
 }
 
-.TridactylModeignore{
+.TridactylModeignore {
   background: var(--base0A) !important;
   border: 1px var(--base0A) solid !important;
   color: var(--tridactyl-of-fg) !important;
 }
-
-.TridactylModenormal{
-}

zsh/environment/host/wok/zshenv

@@ -0,0 +1,3 @@
+export GOPATH="${HOME}/.go"
+PSQLAPP="/Applications/Postgres.app/Contents/Versions/latest"
+export PATH="$PATH:${GOPATH}/bin:${PSQLAPP}/bin"

zsh/makefile

@@ -11,6 +11,7 @@ init:
 ifeq ($(shell [ ! -e $(ZPLUG_DIR) ] $(return_val_truthy) ), true)
 	export ZPLUG_HOME=$(ZPLUG_DIR) \
   ; git clone https://github.com/zplug/zplug $(ZPLUG_DIR) \
+  ; source ~/.zplug/init.zsh && zplug update --self \
   ; $(report) "zplug installed"
 endif
 	$(mk_link) $(SRC) ~/.zsh

zsh/zplug

@@ -60,7 +60,7 @@ zplug "${ZDIR}/modules/alias/", \
       from:local, \
       as:plugin
 
-if [ -z "$SSH_CONNECTION" ] ; then
+if [ -n "$SSH_CONNECTION" ] ; then
       zplug "${ZDIR}/modules/prompt/",\
             from:local,\
             use:uncommon.zsh, \