From f6a7b25125236439fc6698e40e72af6c8cb3329d Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 27 Nov 2020 15:57:55 -0500 Subject: [PATCH 01/12] import org for faster run of emacs batch eval We can run emacs -batch -l ~/.doom.d/+org.el -eval '(org-batch-agenda-csv "t")' Which is significantly faster than booting up all of doom. --- emacs/+org.el | 1 + 1 file changed, 1 insertion(+) diff --git a/emacs/+org.el b/emacs/+org.el index 7ddf476..768137f 100644 --- a/emacs/+org.el +++ b/emacs/+org.el @@ -1,4 +1,5 @@ ;;; init.el -*- lexical-binding: t; -*- +(require 'org) (custom-set-variables '(org-directory "~/org/")) (setq From d911851b9b34884b6805fb156e3bb006411359f3 Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 27 Nov 2020 16:07:37 -0500 Subject: [PATCH 02/12] Pretty-code moved to ligatures See 7081d83. --- emacs/init.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/emacs/init.el b/emacs/init.el index ed96fc9..221e24c 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -39,6 +39,10 @@ hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW hydra ;;indent-guides ; highlighted indent columns + (ligatures ; replace bits of code with pretty symbols + (:if IS-MAC +hasklig) ; Pretty-code doesn't work with Fira on OSX. Falling back to hasklig. + (:if IS-LINUX +fira) ; Fira is kind of what I'm used to. + ) ;;minimap ; show a map of the code on the side modeline ; snazzy, Atom-inspired modeline, plus API nav-flash ; blink the current line after jumping @@ -47,10 +51,6 @@ (popup ; tame sudden yet inevitable temporary windows +all ; catch all popups that start with an asterix +defaults) ; default popup rules - (pretty-code ; replace bits of code with pretty symbols - (:if IS-MAC +hasklig) ; Pretty-code doesn't work with Fira on OSX. Falling back to hasklig. - (:if IS-LINUX +fira) - ) tabs ; an tab bar for Emacs treemacs ; a project drawer, like neotree but cooler unicode ; extended unicode support for various languages From cad3533153af8a6b77d23717d6c02e9bccdb2369 Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 27 Nov 2020 16:12:10 -0500 Subject: [PATCH 03/12] Adding forge --- emacs/init.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/emacs/init.el b/emacs/init.el index 221e24c..d0f4292 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -110,8 +110,9 @@ +xwidget) lsp ;;macos ; MacOS-specific commands - magit ; a git porcelain for Emacs make ; run make tasks from Emacs + (magit ; a git porcelain for Emacs + +forge) pass ; password manager for nerds ;;pdf ; pdf enhancements ;;prodigy ; FIXME managing external services & code builders From 09eeee079d04eba65c6769ab9cc4cc002632fec0 Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 27 Nov 2020 16:13:42 -0500 Subject: [PATCH 04/12] Added java to paths --- zsh/environment/host/wok/zshenv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zsh/environment/host/wok/zshenv b/zsh/environment/host/wok/zshenv index 5556551..d8cb7af 100644 --- a/zsh/environment/host/wok/zshenv +++ b/zsh/environment/host/wok/zshenv @@ -1,7 +1,9 @@ export GOPATH="${HOME}/.go" export PSQLAPP="/Applications/Postgres.app/Contents/Versions/latest/bin" +export JAVA_HOME=$(/usr/libexec/java_home -v 14) path=( $GOPATH $PSQLAPP + $JAVA_HOME/bin $path) From b8e41ca49183a009a1c4a7d544eb79f2f4eff60e Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 27 Nov 2020 16:46:00 -0500 Subject: [PATCH 05/12] Use chruby on linux and rbenv on mac --- emacs/init.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/emacs/init.el b/emacs/init.el index d0f4292..270e598 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -181,7 +181,9 @@ (ruby ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} +lsp ; LSP really do make things easier huh? +rails ; ruby != rails but rails == ruby - +chruby) ; The easier version + (:if IS-MAC +rbenv) ; + (:if IS-LINUX +chruby) ; + ) ;;rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() ;;scala ; java, but good ;;scheme ; a fully conniving family of lisps From 4b5034f705a601d8e7303e73524567e4afa2d6dd Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 27 Nov 2020 16:49:06 -0500 Subject: [PATCH 06/12] Added comments --- emacs/init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emacs/init.el b/emacs/init.el index 270e598..775f127 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -40,7 +40,7 @@ hydra ;;indent-guides ; highlighted indent columns (ligatures ; replace bits of code with pretty symbols - (:if IS-MAC +hasklig) ; Pretty-code doesn't work with Fira on OSX. Falling back to hasklig. + (:if IS-MAC +hasklig) ; Firacode doesn't work on OSX. Fallback to hasklig. (:if IS-LINUX +fira) ; Fira is kind of what I'm used to. ) ;;minimap ; show a map of the code on the side From 679437e9ad8c084b45e12306e900dc2407ff56ad Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 27 Nov 2020 16:53:24 -0500 Subject: [PATCH 07/12] Define github name --- git/gitconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git/gitconfig b/git/gitconfig index 18e7211..84570dd 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -5,3 +5,5 @@ [core] pager = diff-so-fancy | less -FXRi editor = vim +[github] + user = jamesepatrick From c298ca53769dc2733e0b784f89d96b087272ac2f Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 27 Nov 2020 16:53:49 -0500 Subject: [PATCH 08/12] This is required after pretty-code -> ligatures. --- emacs/init.el | 1 + 1 file changed, 1 insertion(+) diff --git a/emacs/init.el b/emacs/init.el index 775f127..2382090 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -166,6 +166,7 @@ +pandoc ; export-with-pandoc support +pomodoro ; be fruitful with the tomato technique +present ; using org-mode for presentations + +pretty +roam) ; Enables org-roam integration. ;;perl ; write code no one else can comprehend ;;php ; perl's insecure younger brother From c7eb2179d9668d3d4cd0b9620b6717b7c1e3d929 Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 27 Nov 2020 16:55:27 -0500 Subject: [PATCH 09/12] Make's UI is weird in emacs. Its easier just to run it in the command line. --- emacs/init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emacs/init.el b/emacs/init.el index 2382090..52ad695 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -110,9 +110,9 @@ +xwidget) lsp ;;macos ; MacOS-specific commands - make ; run make tasks from Emacs (magit ; a git porcelain for Emacs +forge) + ;make ; run make tasks from Emacs pass ; password manager for nerds ;;pdf ; pdf enhancements ;;prodigy ; FIXME managing external services & code builders From 1780abde72ff2a6f0f0a8ed5a388a7db1b7645c9 Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 27 Nov 2020 16:56:11 -0500 Subject: [PATCH 10/12] Run the tasks. --- emacs/init.el | 1 + 1 file changed, 1 insertion(+) diff --git a/emacs/init.el b/emacs/init.el index 52ad695..ce7c12d 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -117,6 +117,7 @@ ;;pdf ; pdf enhancements ;;prodigy ; FIXME managing external services & code builders rgb ; creating color strings + taskrunner ; for running task™ ;;terraform ; infrastructure as code ;;tmux ; an API for interacting with tmux ;;upload ; map local to remote projects via ssh/ftp From 6bc4a7849ded62cb1dd8abc06de10dea84de8352 Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 27 Nov 2020 17:14:16 -0500 Subject: [PATCH 11/12] Updated and cleared doom modules. --- emacs/init.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/emacs/init.el b/emacs/init.el index 8aa6485..c469f6f 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -35,9 +35,10 @@ doom ; what makes DOOM look the way it does doom-dashboard ; a nifty splash screen for Emaclints doom-quit ; DOOM quit-message prompts when you quit Emacs + ;;(emoji +unicode) ; 🙂 fill-column ; a `fill-column' indicator hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW - hydra + ;;hydra ;;indent-guides ; highlighted indent columns (ligatures ; replace bits of code with pretty symbols (:if IS-MAC +hasklig) ; Firacode doesn't work on OSX. Fallback to hasklig. @@ -51,12 +52,12 @@ (popup ; tame sudden yet inevitable temporary windows +all ; catch all popups that start with an asterix +defaults) ; default popup rules - tabs ; an tab bar for Emacs + ;;tabs ; an tab bar for Emacs treemacs ; a project drawer, like neotree but cooler unicode ; extended unicode support for various languages vc-gutter ; vcs diff in the fringe vi-tilde-fringe ; fringe tildes to mark beyond EOB - ;;window-select ; visually switch windows + window-select ; visually switch windows workspaces ; tab emulation, persistence & separate workspaces ;;zen ; distraction-free coding or writing @@ -67,7 +68,7 @@ (format +onsave) ; automated prettiness ;;god ; run Emacs commands without modifier keys ;;lispy ; vim for lisp, for people who don't like vim - multiple-cursors ; editing in many places at once + ;;multiple-cursors ; editing in many places at once ;;objed ; text object editing for the innocent ;;parinfer ; turn lisp into python, sort of rotate-text ; cycle region at point between text candidates @@ -155,7 +156,7 @@ ;;factor ;;ledger ; an accounting system in Emacs ;;lua ; one-based indices? one-based indices - (markdown +grip) ; writing docs for people to ignore + markdown ; 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 From 73e9b85d7d465825c0595719e5625e4de47d6f6b Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 27 Nov 2020 17:14:31 -0500 Subject: [PATCH 12/12] removed todo --- pass/extensions/get_pass.bash | 1 - pass/extensions/get_user.bash | 1 - 2 files changed, 2 deletions(-) diff --git a/pass/extensions/get_pass.bash b/pass/extensions/get_pass.bash index fe17654..2ac1098 100755 --- a/pass/extensions/get_pass.bash +++ b/pass/extensions/get_pass.bash @@ -21,7 +21,6 @@ PASSWORD_STORE_DIR="${PASSWORD_STORE_DIR:-$HOME/.password-store}" cmd_get_pass_usage() { cat <<-_EOF -TODO: Usage: $PROGRAM get_pass pass_name Grabs the pass based on rules for Browserpass. diff --git a/pass/extensions/get_user.bash b/pass/extensions/get_user.bash index 0085b71..c308734 100755 --- a/pass/extensions/get_user.bash +++ b/pass/extensions/get_user.bash @@ -21,7 +21,6 @@ PASSWORD_STORE_DIR="${PASSWORD_STORE_DIR:-$HOME/.password-store}" cmd_get_user_usage() { cat <<-_EOF -TODO: Usage: $PROGRAM get_user pass_name Grabs the username based on rules for Browserpass.