bash: add env vars for pyenv and rustup

dot_bash_profile.tmpl

@@ -61,6 +61,12 @@ export NPM_CONFIG_USERCONFIG="${XDG_CONFIG_HOME}/npm/npmrc"
 export PYTHONSTARTUP="${XDG_CONFIG_HOME}/python/pythonrc"
 export PYTHONPYCACHEPREFIX="${XDG_CACHE_HOME}/python"
 export PYTHONUSERBASE="${XDG_DATA_HOME}/python"
+export PYENV_ROOT="${XDG_DATA_HOME}/pyenv"
+[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
+eval "$(pyenv init -)"
+
+# rust
+export RUSTUP_HOME="${XDG_DATA_HOME}/rustup"
 
 # wine
 export WINEPREFIX="${XDG_DATA_HOME}/wine"

dot_config/emacs/early-init.el.tmpl

@@ -31,7 +31,28 @@
 
 ;;; Code:
 
-;; Relocate emacs-user-directory to XDG_DATA_HOME
+;; Disable `package.el'
+(setq package-enable-at-startup nil)
+
+;; Ensure other defaults are loaded
+(setq inhibit-default-init nil)
+
+;; Avoid `garbage-collect' during init
+(setq gc-cons-percentage 1
+      gc-cons-threshold most-positive-fixnum)
+
+;; Skip regexp checking by `find-file-name-handler' during init
+(defvar default-file-name-handler-alist file-name-handler-alist)
+(setq file-name-handler-alist nil)
+
+;; Restore `garbage-collect' and `file-name-handler-alist' settings
+(add-hook 'emacs-startup-hook
+ (lambda ()
+   (setq file-name-handler-alist default-file-name-handler-alist
+         gc-cons-percentage 0.1
+         gc-cons-threshold (* 1024 1024 8))))
+
+;; Relocate `emacs-user-directory' to XDG_DATA_HOME
 (setq user-emacs-directory
       (expand-file-name "emacs/" (or (getenv "XDG_DATA_HOME") "~/.local/share/")))
 
@@ -41,18 +62,12 @@
 (unless (file-directory-p xdg_cache_home)
   (make-directory xdg_cache_home))
 
-;; Move eln-cache to XDG_CACHE_HOME
+;; Move `eln-cache' to XDG_CACHE_HOME
 (when (fboundp 'startup-redirect-eln-cache)
   (if (< emacs-major-version 29)
       (push (expand-file-name "eln-cache/" xdg_cache_home) native-comp-eln-load-path)
     (startup-redirect-eln-cache (expand-file-name "eln-cache/" xdg_cache_home))))
 
-;; Disable package.el
-(setq package-enable-at-startup nil)
-
-;; Ensure other default libs are loaded
-(setq inhibit-default-init nil)
-
 ;; Load newest byte code
 (setq load-prefer-newer t)
 
@@ -61,19 +76,22 @@
   (setq native-comp-deferred-compilation t
         native-comp-async-report-warnings-errors nil))
 
-;; Raise garbage collection threshold
-(setq gc-cons-threshold 500000000
-      gc-cons-percentage 0.1)
-
 ;; Don't advertise instructions for frame exit
 (setq server-client-instructions nil)
 
 ;; Don't implicitly resize the frame
 (setq frame-inhibit-implied-resize t)
 
+;; Allow frames to increase/decrease by one pixel
+(setq frame-resize-pixelwise t)
+
 ;; Disable startup screen
 (setq inhibit-startup-screen t)
 
+;; Start in `fundamental-mode' instead of `lisp-interaction-mode' to avoid
+;; loading unnecessary packages via hooks
+(setq initial-major-mode 'fundamental-mode)
+
 ;; Visible bell only
 (setq visible-bell t)
 
@@ -94,6 +112,8 @@
 (push '(menu-bar-lines . 0) default-frame-alist)
 (push '(tool-bar-lines . 0) default-frame-alist)
 (push '(vertical-scroll-bars) default-frame-alist)
+(push '(background-color . "#282828") default-frame-alist)
+(push '(foreground-color . "#C6C6C6") default-frame-alist)
 
 ;; Make lsp-mode use plists
 (setenv "LSP_USE_PLISTS" "true")

dot_config/emacs/lisp/init-org.el

@@ -0,0 +1,102 @@
+;;; org-mode.el --- org-mode customizations -*- lexical-binding: t -*-
+
+;; Author: Andrew Scott <git at andyscott dot me>
+;; Keywords: org, convenience, tools
+;; URL: https://codeberg.org/andyscott/dotfiles
+
+;; This file is not part of GNU Emacs
+
+;; Copyright (c) 2024 Andrew Scott
+
+;; MIT No Attribution
+
+;; Permission is hereby granted, free of charge, to any person obtaining a copy of this
+;; software and associated documentation files (the "Software"), to deal in the Software
+;; without restriction, including without limitation the rights to use, copy, modify,
+;; merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+;; permit persons to whom the Software is furnished to do so.
+
+;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+;; INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+;; PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+;; HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+;; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+;;; Commentary:
+
+;; My org-mode customizations.
+
+;;; Code:
+
+(use-package org
+  :bind
+  (:map global-map
+        ("C-c a" . org-agenda)
+        ("C-c c" . org-capture)
+        ("C-c l" . org-store-link))
+  :config
+  (setopt org-agenda-files (list (concat org-directory "/personal")
+                                 (concat org-directory "/projects")
+                                 (concat org-directory "/work"))
+          org-hide-emphasis-markers t
+          org-log-done 'time
+          org-return-follows-link t
+          org-todo-keywords '((sequence "TODO(t)" "IN-PROGRESS(i@/!)" "|"
+                                        "DONE(d!)" "BLOCKED(b@)" "WONT-DO(w@/!)" ))
+          org-todo-keyword-faces '(("TODO"  . (icon-button))
+                                   ("IN-PROGRESS" . (tool-bar))
+                                   ("BLOCKED" . (match))
+                                   ("WONT-DO" . (org-done))))
+  (setopt org-capture-templates
+        `(
+          ("m" "Personal")
+          ("mj" "Log Entry"
+           entry (file+datetree ,(concat org-directory "/personal/log.org"))
+           "* %?"
+           :empty-lines 1)
+
+          ("mn" "Note"
+           entry (file+headline ,(concat org-directory "/personal/notes.org") "Note to self...")
+           "* %?"
+           :empty-lines 1)
+
+          ("mt" "Todo"
+           entry (file+headline  ,(concat org-directory "/personal/todo.org") "Personal Tasks")
+           "* TODO [#B] %?\n:Created: %T\n "
+           :empty-lines 1)
+
+          ("p" "Projects")
+          ("pn" "Note"
+           entry (file+headline ,(concat org-directory "/projects/notes.org") "Project Notes")
+           "** %?"
+           :empty-lines 1)
+
+          ("pt" "Todo"
+           entry (file+headline ,(concat org-directory "/projects/todo.org") "Project Tasks")
+           "* TODO [#B] %?\n:Created: %T\n%i\n%a\nNotes: "
+           :empty-lines 0)
+
+          ("w" "Work")
+          ("wn" "Note"
+           entry (file+headline "~/Nextcloud/Documents/org/work/notes.org" "Work notes")
+           "** %?"
+           :empty-lines 0)
+
+          ("wt" "Todo"
+           entry (file+headline  "~/Nextcloud/Documents/org/work/todo.org" "Work tasks")
+           "* TODO [#B] %?\n:Created: %T\n%i\n%a\nNotes: "
+           :empty-lines 0)))
+  :hook (org-mode . org-indent-mode)
+  :init
+  (setopt org-directory "~/Nextcloud/Documents/org")
+  ;; (bind-keys :prefix-map as/org-prefix-map
+  ;;            :prefix "C-c o"
+  ;;            ("d" . org-priority-down)
+  ;;            ("u" . org-priority-up)
+  ;;            ("r" . org-shiftmetaright)
+  ;;            ("l" . org-shiftmetaleft))
+  )
+
+(provide 'init-org)
+;;; org-mode.el ends here

dot_config/river/executable_init.tmpl

@@ -257,7 +257,6 @@ riverctl map-switch normal lid close 'waylock-launcher'
 riverctl focus-output DP-1
 {{- end }}
 
-{{ if eq .chezmoi.hostname "helix" }}
 # Initial tags: $((1 << ("WORKSPACE" - 1)))
 riverctl rule-add -app-id 'firefox' tags 1
 riverctl rule-add -app-id 'chromium' tags 2
@@ -272,6 +271,22 @@ riverctl rule-add -app-id 'kitty' -title 'weechat' tags $((1 << 7))
 riverctl rule-add -app-id 'Mattermost' tags $((1 << 7))
 riverctl rule-add -app-id 'thunderbird' tags $((1 << 8))
 riverctl rule-add -app-id 'tutanota-desktop' tags $((1 << 8))
+
+{{ if eq .chezmoi.hostname "hydrus" -}}
+# Initial tags: $((1 << ("WORKSPACE" - 1)))
+riverctl rule-add -app-id 'firefox' output 'DP-1'
+riverctl rule-add -app-id 'chromium' output 'DP-1'
+riverctl rule-add -app-id 'thunar' output 'DP-1' 
+riverctl rule-add -app-id 'evince' output 'DP-1'
+riverctl rule-add -app-id 'libreoffice*' output 'DP-1'
+riverctl rule-add -app-id 'Alacritty' output 'DP-2'
+riverctl rule-add -app-id 'foot' output 'DP-2'
+riverctl rule-add -app-id 'kitty' output 'DP-2'
+riverctl rule-add -app-id 'emacs' output 'DP-2'
+riverctl rule-add -app-id 'kitty' -title 'weechat' output 'DP-1'
+riverctl rule-add -app-id 'Mattermost' output 'DP-1'
+riverctl rule-add -app-id 'thunderbird' output 'DP-2'
+riverctl rule-add -app-id 'tutanota-desktop' output 'DP-2'
 {{- end }}
 
 # Start floating