From 6f62dd06e3596f76bcd9a0d6d30807fb7df9873a Mon Sep 17 00:00:00 2001 From: Shawn Borton Date: Sat, 26 Jun 2021 22:36:28 -0500 Subject: [PATCH] Including Emacs files --- .bash_profile | 40 ++++--- config.el | 285 ++++++++++++++++++++++++++++++++++++++++++++++++++ packages.el | 63 +++++++++++ 3 files changed, 367 insertions(+), 21 deletions(-) create mode 100644 config.el create mode 100644 packages.el diff --git a/.bash_profile b/.bash_profile index de7b8da..3886226 100644 --- a/.bash_profile +++ b/.bash_profile @@ -1,7 +1,6 @@ # DIRECTORIES alias sites='cd /Users/shawnborton/Sites' alias Sites='cd /Users/shawnborton/Sites' -alias kboxsites='cd /Users/shawnborton/Kalabox' alias ..="cd .." alias ...="cd ../.." alias h="cd ~" @@ -9,29 +8,15 @@ alias back="cd -" alias finder='open -a 'Finder' .' alias ll='ls -l' alias lla='ls -la' +alias docks='docker ps' # FOR CHROME alias chrome='open -a "Google Chrome"' alias chrome-remote='/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome --remote-debugging-port=9222' -# PHP -alias php56='/Applications/XAMPP/bin/php' -alias php7='$(brew --prefix homebrew/php/php71)/bin/php' -alias drucc='drush cc' -alias drucca='drush cc all' -#alias drupal='$(brew --prefix homebrew/php/php71)/bin/php /usr/local/bin/drupal' -alias update-global-composer='cd ~/.composer && composer update' -alias composer-update-global='update-global-composer' -alias d8check='composer update --dry-run' -alias termcc="terminus env:clear-cache" - # PATH SHENANIGANS -export XAMPP_PHP=/Applications/XAMPP/bin -export DRUSH_PHP='/Applications/XAMPP/bin/php' -#export DRUSH_PHP='/usr/local/bin/php' -#export PATH=$PATH:$XAMPP_PHP:./node_modules/.bin:$HOME/.composer/vendor/bin -#export PATH=$XAMPP_PHP:$(brew --prefix homebrew/php/php71)/bin:$PATH:./node_modules/.bin:$HOME/.composer/vendor/bin -export PATH=$(brew --prefix homebrew/php/php71)/bin:$PATH:$XAMPP_PHP:./node_modules/.bin:$HOME/.composer/vendor/bin +# export PATH=$PATH: +export PATH="/usr/local/bin:${PATH}" #export PATH=$XAMPP_PHP:$PATH:./node_modules/.bin:$HOME/.composer/vendor/bin #export PATH=$XAMPP_PHP:/usr/local/bin:$PATH:./node_modules/.bin:$HOME/.composer/vendor/bin source "$HOME/.console/console.rc" 2>/dev/null @@ -44,11 +29,8 @@ source "$HOME/.console/console.rc" 2>/dev/null alias ga='git add' alias gb='git branch' alias gs='git status' -alias kga='kbox git add' alias gpshom='git push origin master' alias gpllom='git pull origin master' -alias kgb='kbox git branch' -alias kgs='kbox git status' alias dotconfig='/usr/bin/git --git-dir=$HOME/.myconf/ --work-tree=$HOME' @@ -70,3 +52,19 @@ flushdns() { } export PS1="\u@\h \W\[\033[32m\]\$(parse_git_branch)\[\033[00m\] $ " +# added by Anaconda3 2018.12 installer +# >>> conda init >>> +# !! Contents within this block are managed by 'conda init' !! +# __conda_setup="$(CONDA_REPORT_ERRORS=false '/Users/shawnborton/anaconda3/bin/conda' shell.bash hook 2> /dev/null)" +# if [ $? -eq 0 ]; then +# \eval "$__conda_setup" +# else +# if [ -f "/Users/shawnborton/anaconda3/etc/profile.d/conda.sh" ]; then +# . "/Users/shawnborton/anaconda3/etc/profile.d/conda.sh" +# CONDA_CHANGEPS1=false conda activate base +# else +# \export PATH="/Users/shawnborton/anaconda3/bin:$PATH" +# fi +# fi +# unset __conda_setup +# <<< conda init <<< diff --git a/config.el b/config.el new file mode 100644 index 0000000..e33e347 --- /dev/null +++ b/config.el @@ -0,0 +1,285 @@ +;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- + +;; Place your private configuration here! Remember, you do not need to run 'doom +;; sync' after modifying this file! + + +;; Some functionality uses this to identify you, e.g. GPG configuration, email +;; clients, file templates and snippets. +(setq user-full-name "Shawn Borton" + user-mail-address "shawn@shawnborton.info") + +;; Doom exposes five (optional) variables for controlling fonts in Doom. Here +;; are the three important ones: +;; +;; + `doom-font' +;; + `doom-variable-pitch-font' +;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for +;; presentations or streaming. +;; +;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd +;; font string. You generally only need these two: +;; (setq doom-font (font-spec :family "monospace" :size 12 :weight 'semi-light) +;; doom-variable-pitch-font (font-spec :family "sans" :size 13)) + +;; There are two ways to load a theme. Both assume the theme is installed and +;; available. You can either set `doom-theme' or manually load a theme with the +;; `load-theme' function. This is the default: +(use-package! all-the-icons) +(setq doom-font (font-spec :family "Fira Code" :style "Retina" :size 16) + doom-variable-pitch-font (font-spec :family "Baskerville" :size 18) + doom-big-font (font-spec :family "Fira Code" :style "Retina" :size 28)) + +(setq doom-theme 'doom-nord) +(after! doom-themes + (setq doom-themes-enable-bold t + doom-themes-enable-italic t)) +(map! :leader + :desc "Load new theme" + "h t" #'counsel-load-theme) +(setq-default major-mode 'org-mode) +(setq-default line-spacing 10) + +;; This determines the style of line numbers in effect. If set to `nil', line +;; numbers are disabled. For relative line numbers, set this to `relative'. +(setq display-line-numbers-type 'relative) + +(use-package! all-the-icons-dired) + +;; Major modes in which to display word count continuously. +;; Also applies to any derived modes. Respects `doom-modeline-enable-word-count'. +;; If it brings the sluggish issue, disable `doom-modeline-enable-word-count' or +;; remove the modes from `doom-modeline-continuous-word-count-modes'. +;; +(after! doom-modeline + (setq doom-modeline-height 18) + (setq doom-modeline-bar-width 6) + (setq doom-modeline-enable-word-count t) + (setq doom-modeline-continuous-word-count-modes '(markdown-mode org-mode))) + + +(setq evil-vsplit-window-right t + evil-split-window-below t) +(defadvice! prompt-for-buffer (&rest_) + :after '(evil-window-split evil-window-vsplit) + (+ivy/switch-buffer)) +(setq +ivy-buffer-preview t) + +;; Here are some additional functions/macros that could help you configure Doom: +;; +;; - `load!' for loading external *.el files relative to this one +;; - `use-package!' for configuring packages +;; - `after!' for running code after a package has loaded +;; - `add-load-path!' for adding directories to the `load-path', relative to +;; this file. Emacs searches the `load-path' when you load packages with +;; `require' or `use-package'. +;; - `map!' for binding new keys +;; +;; To get information about any of these functions/macros, move the cursor over +;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k'). +;; This will open documentation for it, including demos of how they are used. +;; +;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how +;; they are implemented. +;; +;; Make 'h' and 'l' go back and forward in dired. Much faster to navigate the directory structure! +(evil-define-key 'normal dired-mode-map + (kbd "h") 'dired-up-directory + (kbd "l") 'dired-open-file) ; use dired-find-file instead if not using dired-open package +(evilem-default-keybindings "SPC") + +;; EWW Stuff +(setq browse-url-browser-function 'eww-browse-url) +(map! :leader + :desc "Eww web browser" + "e w" #'eww + :leader + :desc "Eww reload page" + "e R" #'eww-reload + :leader + :desc "Search web for text between BEG/END" + "s w" #'eww-search-words) + +(after! neotree + (setq neo-smart-open t + doom-themes-neotree-enable-variable-pitch nil + neo-window-fixed-size nil)) + +(map! :leader + :desc "Toggle neotree file viewer" + "t n" #'neotree-toggle + :leader + :desc "Open directory in neotree" + "d n" #'neotree-dir) + +;; (map! :leader +;; :desc "Edit agenda file" +;; "- a" #'(lambda () (interactive) (find-file "~/Org/agenda.org")) +(map! :leader + :desc "Edit eshell aliases" + "- e" #'(lambda () (interactive) (find-file "~/.doom.d/aliases")) + :leader + :desc "Edit doom init.el" + "- i" #'(lambda () (interactive) (find-file "~/.doom.d/init.el")) + :leader + :desc "Edit doom config.el" + "- c" #'(lambda () (interactive) (find-file "~/.doom.d/config.el")) + :leader + :desc "Edit doom packages.el" + "- p" #'(lambda () (interactive) (find-file "~/.doom.d/packages.el"))) + +;; (after! mastodon + ;; (setq mastodon-auth-source-file "~/.authinfo") + ;; (setq mastodon-instance-url "https://distrotoot.com/")) + +;; TWITTER +(setq twittering-use-master-password t) +(setq twittering-icon-mode t) + +;; RSS (elfeed) +(map! :leader + :desc "Launch Elfeed" + "r r" #'elfeed + :leader + :desc "Update RSS feeds" + "r u" #'elfeed-update + :leader + :desc "Get Culture items" + "r c" #'(lambda () (interactive) (elfeed-search-set-filter "@1-week-ago +unread +culture")) + :leader + :desc "Get Writing items" + "r w" #'(lambda () (interactive) (elfeed-search-set-filter "@1-week-ago +unread +writing"))) +(after! elfeed + (elfeed-org) + (setq rmh-elfeed-org-files (list "~/Dropbox/Org/feedly.org")) + (use-package! elfeed-link)) + +(setq elfeed-search-filter "@1-week-ago +unread " + elfeed-search-title-min-width 80) + ;;elfeed-show-refresh-function #'+rss/elfeed-show-refresh--better-style) + +;;(defface elfeed-show-title-face '((t (:weight ultrabold :slant italic :height 1.5))) + ;; "title face in elfeed show buffer" + ;; :group 'elfeed) + +;; (after! elfeed-show + ;; (require 'url)) + +(defun +rss/elfeed-show-refresh--better-style () + "Update the buffer to match the selected entry, using a mail-style." + (interactive) + (let* ((inhibit-read-only t) + (title (elfeed-entry-title elfeed-show-entry)) + (date (seconds-to-time (elfeed-entry-date elfeed-show-entry))) + (author (elfeed-meta elfeed-show-entry :author)) + (link (elfeed-entry-link elfeed-show-entry)) + (tags (elfeed-entry-tags elfeed-show-entry)) + (tagsstr (mapconcat #'symbol-name tags ", ")) + (nicedate (format-time-string ("%a, %e %b %Y %T %Z" date)) + (content (elfeed-deref (elfeed-entry-content elfeed-show-entry))) + (type (elfeed-entry-content-type elfeed-show-entry)) + (feed (elfeed-entry-feed elfeed-show-entry)) + (feed-title (elfeed-feed-title feed)) + (base (and feed (elfeed-compute-base (elfeed-feed-url feed))))) + (erase-buffer) + (insert "\n"))) + ) + + +;; ⌘-b ; browse to URL in foreground +;; C-- ⌘-b ; browse to URL in background + +;; ⌘-i ; search Google in foreground +;; C-- ⌘-i ; search Google in background + +;; position cursor on a URL +;; ⌘-b + +;; select a region +;; ⌘-i + +(require 'osx-browse) +(osx-browse-mode 1) + + (defun writing-mode () + (interactive) + ;; (zen/toggle) + (buffer-face-mode) + (linum-mode 0) + (blink-cursor-mode) + (visual-line-mode 1) + (setq truncate-lines nil + global-hl-line-mode nil + display-line-numbers nil)) + +(add-hook 'markdown-mode-hook 'writing-mode) +(setq ispell-program-name "/usr/local/bin/aspell") +(setq ispell-list-command "--list") + +(defun sbinfo/org-mode-setup () + (org-indent-mode) + (org-superstar-mode 1) + (org-bullets-mode 1)) + ;; (variable-pitch-mode 1) + ;; (visual-line-mode 1)) + +(defun sbinfo/org-font-setup () + ;; Set faces for heading levels + (dolist (face '((org-level-1 . 1.2) + (org-level-2 . 1.1) + (org-level-3 . 1.05) + (org-level-4 . 1.0) + (org-level-5 . 1.0) + (org-level-6 . 1.0) + (org-level-7 . 1.0) + (org-level-8 . 1.0))) + (set-face-attribute (car face) nil :font "Courier Prime" :weight 'regular :height (cdr face)))) + ;; (set-face-attribute (car face) nil :font "Fira Code Retina" :weight 'regular :height (cdr face)))) + ;; (set-face-attribute (car face) nil :font "Source Code Pro" :weight 'regular :height (cdr face))) + + ;; Ensure that anything that should be fixed-pitch in Org files appears that way + ;; (set-face-attribute 'org-block nil :foreground nil :inherit 'fixed-pitch) + ;; (set-face-attribute 'org-code nil :inherit '(shadow fixed-pitch)) + ;; (set-face-attribute 'org-table nil :inherit '(shadow fixed-pitch)) + ;; (set-face-attribute 'org-verbatim nil :inherit '(shadow fixed-pitch)) + ;; (set-face-attribute 'org-special-keyword nil :inherit '(font-lock-comment-face fixed-pitch)) + ;; (set-face-attribute 'org-meta-line nil :inherit '(font-lock-comment-face fixed-pitch)) + ;; (set-face-attribute 'org-checkbox nil :inherit 'fixed-pitch)) + +(after! org + (add-hook 'org-mode-hook #'sbinfo/org-mode-setup) + (setq org-directory "~/Dropbox/Org/" + org-agenda-files '("agenda.org" "algopear.org" "goals.org") + org-default-notes-file (expand-file-name "notes.org" org-directory) + org-ellipsis " ▼ " + org-bullets-bullet-list '("◉" "○" "●" "○" "●" "○" "●") + org-indent-indentation-per-level 4 + org-log-done 'time + org-roam-directory "~/Org/roam/" + ;;org-journal-dir "~/Dropbox/Org/journal/" + ;;org-journal-date-format "%B %d, %Y (%A) " + ;;org-journal-file-format "%Y-%m-%d.org" + org-hide-emphasis-markers t + org-hide-leading-stars t + ;; ex. of org-link-abbrev-alist in action + ;; [[arch-wiki:Name_of_Page][Description]] + org-link-abbrev-alist ; This overwrites the default Doom org-link-abbrev-list + '(("ddg" . "https://duckduckgo.com/?q=") + ("wiki" . "https://en.wikipedia.org/wiki/")) + org-todo-keywords ; This overwrites the default Doom org-todo-keywords + '((sequence + "TODO(t)" ; A task that is ready to be tackled + "BLOG(b)" ; Blog writing assignments + "PROJ(p)" ; A project that contains other tasks + "WAIT(w)" ; Something is holding up this task + "|" ; The pipe necessary to separate "active" states and "inactive" states + "DONE(d)" ; Task has been completed + "CANCELLED(c)" ))) ; Task has been cancelled + (sbinfo/org-font-setup)) + + +;; to turn off confirmations +(setq browse-url-dwim-always-confirm-extraction nil) + +;; Todoist +(setq todoist-token "344745a4ca6497cbce38cc957cad0c59c5d91613") diff --git a/packages.el b/packages.el new file mode 100644 index 0000000..9baeaec --- /dev/null +++ b/packages.el @@ -0,0 +1,63 @@ +;; -*- no-byte-compile: t; -*- +;;; $DOOMDIR/packages.el + +;; To install a package with Doom you must declare them here and run 'doom sync' +;; on the command line, then restart Emacs for the changes to take effect -- or +;; use 'M-x doom/reload'. + + +;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: +;(package! some-package) + +;; To install a package directly from a remote git repo, you must specify a +;; `:recipe'. You'll find documentation on what `:recipe' accepts here: +;; https://github.com/raxod502/straight.el#the-recipe-format +;(package! another-package +; :recipe (:host github :repo "username/repo")) + +;; If the package you are trying to install does not contain a PACKAGENAME.el +;; file, or is located in a subdirectory of the repo, you'll need to specify +;; `:files' in the `:recipe': +;(package! this-package +; :recipe (:host github :repo "username/repo" +; :files ("some-file.el" "src/lisp/*.el"))) + +;; If you'd like to disable a package included with Doom, you can do so here +;; with the `:disable' property: +;(package! builtin-package :disable t) + +;; You can override the recipe of a built in package without having to specify +;; all the properties for `:recipe'. These will inherit the rest of its recipe +;; from Doom or MELPA/ELPA/Emacsmirror: +;(package! builtin-package :recipe (:nonrecursive t)) +;(package! builtin-package-2 :recipe (:repo "myfork/package")) + +;; Specify a `:branch' to install a package from a particular branch or tag. +;; This is required for some packages whose default branch isn't 'master' (which +;; our package manager can't deal with; see raxod502/straight.el#279) +;(package! builtin-package :recipe (:branch "develop")) + +;; Use `:pin' to specify a particular commit to install. +;(package! builtin-package :pin "1a2b3c4d5e") + + +;; Doom's packages are pinned to a specific commit and updated from release to +;; release. The `unpin!' macro allows you to unpin single packages... +;(unpin! pinned-package) +;; ...or multiple packages +;(unpin! pinned-package another-pinned-package) +;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) +;(unpin! t) +(package! all-the-icons-dired) +(package! counsel-osx-app) +(package! elfeed) +(package! elfeed-goodies) +(package! elfeed-org) +(package! org-bullets) +(package! osx-browse) +(package! reveal-in-osx-finder) +(package! todoist) +(package! twittering-mode) +(package! wc-mode) +(package! writegood-mode) +(package! wordsmith-mode)