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

This commit is contained in:
James Patrick 2020-12-08 22:05:16 -05:00
commit 6c638715c5
6 changed files with 23 additions and 14 deletions

View File

@ -1,4 +1,5 @@
;;; init.el -*- lexical-binding: t; -*- ;;; init.el -*- lexical-binding: t; -*-
(require 'org)
(custom-set-variables '(org-directory "~/org/")) (custom-set-variables '(org-directory "~/org/"))
(setq (setq

View File

@ -35,10 +35,15 @@
doom ; what makes DOOM look the way it does doom ; what makes DOOM look the way it does
doom-dashboard ; a nifty splash screen for Emaclints doom-dashboard ; a nifty splash screen for Emaclints
doom-quit ; DOOM quit-message prompts when you quit Emacs doom-quit ; DOOM quit-message prompts when you quit Emacs
;;(emoji +unicode) ; 🙂
fill-column ; a `fill-column' indicator fill-column ; a `fill-column' indicator
hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
hydra ;;hydra
;;indent-guides ; highlighted indent columns ;;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.
(:if IS-LINUX +fira) ; Fira is kind of what I'm used to.
)
;;minimap ; show a map of the code on the side ;;minimap ; show a map of the code on the side
modeline ; snazzy, Atom-inspired modeline, plus API modeline ; snazzy, Atom-inspired modeline, plus API
nav-flash ; blink the current line after jumping nav-flash ; blink the current line after jumping
@ -47,16 +52,12 @@
(popup ; tame sudden yet inevitable temporary windows (popup ; tame sudden yet inevitable temporary windows
+all ; catch all popups that start with an asterix +all ; catch all popups that start with an asterix
+defaults) ; default popup rules +defaults) ; default popup rules
(pretty-code ; replace bits of code with pretty symbols ;;tabs ; an tab bar for Emacs
(: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 treemacs ; a project drawer, like neotree but cooler
unicode ; extended unicode support for various languages unicode ; extended unicode support for various languages
vc-gutter ; vcs diff in the fringe vc-gutter ; vcs diff in the fringe
vi-tilde-fringe ; fringe tildes to mark beyond EOB 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 workspaces ; tab emulation, persistence & separate workspaces
;;zen ; distraction-free coding or writing ;;zen ; distraction-free coding or writing
@ -67,7 +68,7 @@
(format +onsave) ; automated prettiness (format +onsave) ; automated prettiness
;;god ; run Emacs commands without modifier keys ;;god ; run Emacs commands without modifier keys
;;lispy ; vim for lisp, for people who don't like vim ;;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 ;;objed ; text object editing for the innocent
;;parinfer ; turn lisp into python, sort of ;;parinfer ; turn lisp into python, sort of
rotate-text ; cycle region at point between text candidates rotate-text ; cycle region at point between text candidates
@ -110,12 +111,14 @@
+xwidget) +xwidget)
lsp lsp
;;macos ; MacOS-specific commands ;;macos ; MacOS-specific commands
magit ; a git porcelain for Emacs (magit ; a git porcelain for Emacs
make ; run make tasks from Emacs +forge)
;make ; run make tasks from Emacs
pass ; password manager for nerds pass ; password manager for nerds
;;pdf ; pdf enhancements ;;pdf ; pdf enhancements
;;prodigy ; FIXME managing external services & code builders ;;prodigy ; FIXME managing external services & code builders
rgb ; creating color strings rgb ; creating color strings
taskrunner ; for running task™
;;terraform ; infrastructure as code ;;terraform ; infrastructure as code
;;tmux ; an API for interacting with tmux ;;tmux ; an API for interacting with tmux
;;upload ; map local to remote projects via ssh/ftp ;;upload ; map local to remote projects via ssh/ftp
@ -153,7 +156,7 @@
;;factor ;;factor
;;ledger ; an accounting system in Emacs ;;ledger ; an accounting system in Emacs
;;lua ; one-based indices? one-based indices ;;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 ;;nim ; python + lisp at the speed of c
;;nix ; I hereby declare "nix geht mehr!" ;;nix ; I hereby declare "nix geht mehr!"
;;ocaml ; an objective camel ;;ocaml ; an objective camel
@ -165,6 +168,7 @@
+pandoc ; export-with-pandoc support +pandoc ; export-with-pandoc support
+pomodoro ; be fruitful with the tomato technique +pomodoro ; be fruitful with the tomato technique
+present ; using org-mode for presentations +present ; using org-mode for presentations
+pretty
+roam) ; Enables org-roam integration. +roam) ; Enables org-roam integration.
;;perl ; write code no one else can comprehend ;;perl ; write code no one else can comprehend
;;php ; perl's insecure younger brother ;;php ; perl's insecure younger brother
@ -180,7 +184,9 @@
(ruby ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} (ruby ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
+lsp ; LSP really do make things easier huh? +lsp ; LSP really do make things easier huh?
+rails ; ruby != rails but rails == ruby +rails ; ruby != rails but rails == ruby
+chruby) ; The easier version (:if IS-MAC +rbenv) ;
(:if IS-LINUX +chruby) ;
)
;;rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() ;;rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
;;scala ; java, but good ;;scala ; java, but good
;;scheme ; a fully conniving family of lisps ;;scheme ; a fully conniving family of lisps

View File

@ -5,3 +5,5 @@
[core] [core]
pager = diff-so-fancy | less -FXRi pager = diff-so-fancy | less -FXRi
editor = vim editor = vim
[github]
user = jamesepatrick

View File

@ -21,7 +21,6 @@ PASSWORD_STORE_DIR="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
cmd_get_pass_usage() { cmd_get_pass_usage() {
cat <<-_EOF cat <<-_EOF
TODO:
Usage: Usage:
$PROGRAM get_pass pass_name $PROGRAM get_pass pass_name
Grabs the pass based on rules for Browserpass. Grabs the pass based on rules for Browserpass.

View File

@ -21,7 +21,6 @@ PASSWORD_STORE_DIR="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
cmd_get_user_usage() { cmd_get_user_usage() {
cat <<-_EOF cat <<-_EOF
TODO:
Usage: Usage:
$PROGRAM get_user pass_name $PROGRAM get_user pass_name
Grabs the username based on rules for Browserpass. Grabs the username based on rules for Browserpass.

View File

@ -1,7 +1,9 @@
export GOPATH="${HOME}/.go" export GOPATH="${HOME}/.go"
export PSQLAPP="/Applications/Postgres.app/Contents/Versions/latest/bin" export PSQLAPP="/Applications/Postgres.app/Contents/Versions/latest/bin"
export JAVA_HOME=$(/usr/libexec/java_home -v 14)
path=( path=(
$GOPATH $GOPATH
$PSQLAPP $PSQLAPP
$JAVA_HOME/bin
$path) $path)