# HG changeset patch # User Richard Westhaver # Date 1723513844 14400 # Node ID 8bd50ea9a54613f2ccb337bee9e66f78cf66eba6 # Parent 5fd0502a32314cd54d95a2d1527e6e243f573d63 zor updates diff -r 5fd0502a3231 -r 8bd50ea9a546 .bash_profile --- a/.bash_profile Thu Jul 04 20:40:22 2024 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -# .bash_profile --- bash profile - -export PYTHON=python3.11 -export PYENV_ROOT="$HOME/.pyenv" -export PATH="$PYENV_ROOT/bin:$PATH" -export PATH="$HOME/go/bin:$HOME/.nimble/bin:$HOME/.cargo/bin:$HOME/.local/bin:$HOME/bin:$PATH" - -if ! shopt -oq posix; then - if [ -f /usr/share/bash-completion/bash_completion ]; then - . /usr/share/bash-completion/bash_completion - elif [ -f /etc/bash_completion ]; then - . /etc/bash_completion - fi -fi - -eval "$(pyenv init --path)" -if command -v rhg>>/dev/null; then alias hg='rhg';fi diff -r 5fd0502a3231 -r 8bd50ea9a546 .bashrc --- a/.bashrc Thu Jul 04 20:40:22 2024 -0400 +++ b/.bashrc Mon Aug 12 21:50:44 2024 -0400 @@ -1,6 +1,24 @@ # .bashrc --- bash configuration # Set prompt PS1="\u [\!]:\t:\w\n >> \[\e[0m\]" + +export PYTHON=python3.11 +export PYENV_ROOT="$HOME/.pyenv" +export PATH="$PYENV_ROOT/bin:$PATH" +export PATH="$HOME/go/bin:$HOME/.nimble/bin:$HOME/.cargo/bin:$HOME/.local/bin:$HOME/bin:$PATH" + +if ! shopt -oq posix; then + if [ -f /usr/share/bash-completion/bash_completion ]; then + . /usr/share/bash-completion/bash_completion + elif [ -f /etc/bash_completion ]; then + . /etc/bash_completion + fi +fi + +eval "$(pyenv init --path)" +if command -v rhg>>/dev/null; then alias hg='rhg';fi +. "$HOME/.cargo/env" + # default Envs export LISP='sbcl' export ESHELL='/usr/bin/bash' diff -r 5fd0502a3231 -r 8bd50ea9a546 .emacs.d/ellis.el --- a/.emacs.d/ellis.el Thu Jul 04 20:40:22 2024 -0400 +++ b/.emacs.d/ellis.el Mon Aug 12 21:50:44 2024 -0400 @@ -1,4 +1,4 @@ -;;; ellis.el --- Richard's custom Emacs config -*- lexical-binding: t; -*- +;;; ellis.el --- Richard's custom Emacs config ;; Copyright (C) 2024 @@ -562,18 +562,22 @@ files) files)) -(defvar org-agenda-directories (list org-directory user-lab-directory) +(defvar org-agenda-directories (list org-directory + (join-paths user-lab-directory "org") + (join-paths company-source-directory "org/*")) "List of directories containing org files.") (defvar org-agenda-extensions '(".org") "List of extensions of agenda files") (defun org-set-agenda-files () (interactive) - (setq org-agenda-files (org-list-files - org-agenda-directories - org-agenda-extensions))) + (setq org-agenda-files + (org-list-files + org-agenda-directories + org-agenda-extensions))) -(add-hook 'after-init-hook 'org-set-agenda-files) +(with-eval-after-load 'org + (org-set-agenda-files)) ;;; Skel Config (use-package skel @@ -734,5 +738,18 @@ (auto-insert-mode t) (keymap-set skel-minor-mode-map "C-" 'company-tempo)) +;;; dictionary +;; requires dictd server running +(setq dictionary-server "compiler.company") +;;; ispell +;; requires aspell and a hunspell dictionary (hunspell-en_us) +(setq-default ispell-program-name "aspell") +(add-hook 'mail-send-hook #'ispell-message) +;;; glossary +(with-eval-after-load 'org-glossary + (setq org-glossary-collection-root (join-paths company-source-directory "org/meta/")) + (cl-pushnew '("Terms" . glossary) org-glossary-headings) + (cl-pushnew '("Acronyms" . acronym) org-glossary-headings)) + (provide 'ellis) ;;; ellis.el ends here diff -r 5fd0502a3231 -r 8bd50ea9a546 .profile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.profile Mon Aug 12 21:50:44 2024 -0400 @@ -0,0 +1,7 @@ +# if running bash +if [ -n "$BASH_VERSION" -a -n "$PS1" ]; then + # include .bashrc if it exists + if [ -f "$HOME/.bashrc" ]; then + . "$HOME/.bashrc" + fi +fi diff -r 5fd0502a3231 -r 8bd50ea9a546 .skelrc --- a/.skelrc Thu Jul 04 20:40:22 2024 -0400 +++ b/.skelrc Mon Aug 12 21:50:44 2024 -0400 @@ -1,5 +1,6 @@ ;;; .skelrc @ 2023-10-12.02:58:08 -*- mode: skel; -*- -:name "Richard Westhaver " +:name "Richard Westhaver" +:email "richard.westhaver@gmail.com" :user "ellis" :version "0.1.0" :tags ("auto") @@ -8,13 +9,8 @@ :auto-insert t :license :mpl2 :log-level :info -:shed ".shed" :stash ".stash" -:scratch ".stash/scratch" -:cache ".cache" -:registry "~/.data/skel/registry" +;; :scratch ".stash/scratch" +:cache ".stash/cache" +:registry ".data/skel/registry" :scripts ("/usr/local/share/stash/scripts" "~/stash/scripts") -:alias-list -(("p" "vc push") - ("P" "vc pull") - ("ci" "vc commit")) diff -r 5fd0502a3231 -r 8bd50ea9a546 .stumpwm.d/init.lisp --- a/.stumpwm.d/init.lisp Thu Jul 04 20:40:22 2024 -0400 +++ b/.stumpwm.d/init.lisp Mon Aug 12 21:50:44 2024 -0400 @@ -2,28 +2,66 @@ (in-package :stumpwm) -(defvar *stumpwm-port* 4004) -(ql:quickload :swank) -(require :swank) -(swank-loader:init) -(ignore-errors - (swank:create-server :port *stumpwm-port* - :style swank:*communication-style*)) +;; (ql:quickload :swank) +;; (require :swank) + +;; (defvar *stumpwm-port* 4040) +;; (swank-loader:init) +;; (swank:create-server :port *stumpwm-port* +;; :style swank:*communication-style*) + +(defcommand load-std () () + (ql:quickload :std)) + +(defcommand load-prelude () () + (ql:quickload :prelude)) + +(defcommand load-core () () + (ql:quickload :core)) + +(defcommand load-user () () + (ql:quickload :user)) (setq *mouse-focus-policy* :sloppy *float-window-modifier* :SUPER *startup-message* "Greetings, stranger.") -;; (set-font "CommitMono") +(set-font "-*-terminal") (set-module-dir "/usr/share/stupmwm/contrib/") (init-load-path *module-dir*) +(set-fg-color "#ffffff") +(set-bg-color "#000000") +(set-border-color "#7E5D90") +(set-focus-color "#170F14") +(set-unfocus-color "#232731") +(set-win-bg-color "#22272F") +(set-float-focus-color "#8ED3A1") +(set-float-unfocus-color "#232731") + +(setf *mode-line-background-color* "#161613") +(setf *mode-line-foreground-color* "#FFFFFF") +(setf *mode-line-border-color* "#28394c") +(setf *mode-line-position* :bottom) + +(setf *colors* (list "#010101" ; 0 black + "#BF616A" ; 1 red + "#A3BE8C" ; 2 green + "#EBCB8B" ; 3 yellow + "#5E81AC" ; 4 blue + "#9D5AAF" ; 5 magenta + "#8FBCBB" ; 6 cyan + "#FEFEFE")) ; 7 white + (setf *window-format* "%m%n%s%c") (setf *screen-mode-line-format* (list "[^B%n^b] %W^>%d")) - +(set-normal-gravity :center) +(set-maxsize-gravity :center) +(set-transient-gravity :center) (setf *time-modeline-string* "%a %b %e %k:%M") (setq *mode-line-timeout* 4) +(which-key-mode) (when *initializing* (run-shell-command "sh ~/.fehbg") @@ -32,8 +70,6 @@ (dolist (s stumpwm:*screen-list*) (enable-mode-line s (car (screen-heads s)) t))) -(which-key-mode) - (defcommand term (&optional program) () (sb-thread:make-thread (lambda ()