diff options
-rw-r--r-- | .config/emacs/init.el | 10 | ||||
-rw-r--r-- | .config/emacs/modules/bd--buffers.el | 31 | ||||
-rw-r--r-- | .config/emacs/modules/bd--devel.el | 2 | ||||
-rw-r--r-- | .config/emacs/modules/bd--files.el | 15 | ||||
-rw-r--r-- | .config/emacs/modules/bd--minibuffer.el | 2 | ||||
-rw-r--r-- | .config/emacs/modules/bd--notes.el | 20 | ||||
-rw-r--r-- | .config/emacs/modules/bd--org.el | 6 | ||||
-rw-r--r-- | .config/guix/modules/base.scm | 5 |
8 files changed, 52 insertions, 39 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 3bfc73e..38e6c1c 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -16,8 +16,6 @@ backup-directory-alist `(("." . ,(expand-file-name "tmp/backups/" user-emacs-directory)))) (make-directory (expand-file-name "tmp/auto_saves/" user-emacs-directory) t) -;;;; display type -(setq display (getenv "XDG_SESSION_TYPE")) ;;;; path (setenv "PATH" (format "%s:%s" (expand-file-name "~/.local/bin/") (getenv "PATH"))) @@ -46,14 +44,14 @@ completion-ignore-case t read-buffer-completion-ignore-case t) (setq-default tab-width 8) -(menu-bar-mode -1) -(tool-bar-mode -1) -(scroll-bar-mode -1) (fringe-mode '(0 . 0)) -(tooltip-mode -1) (global-hl-line-mode 1) (global-visual-line-mode t) +(menu-bar-mode -1) (minibuffer-depth-indicate-mode 1) +(scroll-bar-mode -1) +(tool-bar-mode -1) +(tooltip-mode -1) ;;;; gnus diff --git a/.config/emacs/modules/bd--buffers.el b/.config/emacs/modules/bd--buffers.el index 9250870..8b07591 100644 --- a/.config/emacs/modules/bd--buffers.el +++ b/.config/emacs/modules/bd--buffers.el @@ -3,8 +3,6 @@ ;;; Code: -(require 'selector) - ;; dedication (defun toggle-current-window-dedication () "Adds or revokes dedicated window status from a buffer. A @@ -28,8 +26,7 @@ dedicated buffer will never be automatically orphaned." (follow-mode 1)) (defun set-frame-alpha (value) - "Sets the transparency of the frame background. 0=transparent/100=opaque -Due to a bug with guix-packaged emacs, only uses true-transparency on wayland." + "Sets the transparency of the frame background. 0=transparent/100=opaque." (interactive "nTransparency Value (30 - 100 opaque): ") (setq value (max 30 (min value 100))) (set-frame-parameter (selected-frame) 'alpha `(,value . ,value)) @@ -43,35 +40,31 @@ Due to a bug with guix-packaged emacs, only uses true-transparency on wayland." (global-auto-revert-non-file-buffers t) (auto-revert-interval 30)) -(add-to-list 'display-buffer-alist - (cons "\\*Async Shell Command\\*.*" (cons #'display-buffer-no-window nil))) +(use-package visual-fill-column + :hook ((org-mode . visual-fill-column-mode) + (eww-after-render . visual-fill-column-mode)) + :custom + (visual-fill-column-center-text t) + (visual-fill-column-width 120)) + (use-package shackle :demand t :config (shackle-mode) :custom + (switch-to-buffer-obey-display-actions t) (shackle-rules '( ;; native (compilation-mode :select nil :align bottom :size 0.2) (completion-list-mode :select nil :align bottom :size 0.1) - ;; info - (help-mode :noselect t :align left :size 0.3) - (Info-mode :select t :align left :size 0.4) - ("^\\*slime-description.*\\*$" :regexp t :select t :align left) - ;; repls - (geiser-repl-mode :select t :align right) - (slime-repl-mode :select t :align right) - ;; shells - (".*eshell.*\\*$" :regexp t :select t :align above :size 0.3) - (".*shell.*\\*$" :regexp t :select t :align above :size 0.3) - ("^\\*term.*\\*$" :regexp t :select t :align above :size 0.3) - ;; magit + ("^\\*Async Shell Command\\*.*$" :regexp t :ignore t) + ;; magit (magit-status-mode :select t :align bottom :size 0.3) (magit-diff-mode :select nil :align right :size 0.3) ;; emms (emms-playlist-mode :select t :align left :size 0.2) )) - (shackle-default-rule '(:select t))) + (shackle-default-rule '(:same t :inhibit-window-quit t))) (provide 'bd--buffers) diff --git a/.config/emacs/modules/bd--devel.el b/.config/emacs/modules/bd--devel.el index 3f77a58..36b73a5 100644 --- a/.config/emacs/modules/bd--devel.el +++ b/.config/emacs/modules/bd--devel.el @@ -36,9 +36,11 @@ to.") (autoformat-mode 1)) (use-package compile + :hook ((compilation-filter . ansi-color-compilation-filter)) :custom (compilation-always-kill t) (compilation-scroll-output 'first-error) + (compilation-ask-about-save nil) :config (defun bd/compile-dwim (f) (let ((default-directory diff --git a/.config/emacs/modules/bd--files.el b/.config/emacs/modules/bd--files.el index a39f21c..f050132 100644 --- a/.config/emacs/modules/bd--files.el +++ b/.config/emacs/modules/bd--files.el @@ -3,17 +3,22 @@ ;;; Code: -(require 'recentf) - +(use-package recentf + :init + (recentf-mode 1) + :custom + (recentf-max-saved-items 2000) + (recentf-keep '(recentf-keep-default-predicate remote-file-p)) + (recentf-auto-cleanup 300)) (defun bd/zathura (file) - "Open FILE with zathura" + "Open FILE with zathura." (start-process "zathura" nil "zathura" (expand-file-name file))) (defun bd/mpv (file) - "Open FILE with mpv" + "Open FILE with mpv." (start-process "mpv" nil "mpv" "--force-window=yes" (expand-file-name file))) (defun bd/nsxiv (file) - "Open FILE with nsxiv" + "Open FILE with nsxiv." (start-process "nsxiv" nil "nsxiv" (expand-file-name file))) (defun bd/external-find-file-wrapper (f &rest args) diff --git a/.config/emacs/modules/bd--minibuffer.el b/.config/emacs/modules/bd--minibuffer.el index 29ec75e..844f7b3 100644 --- a/.config/emacs/modules/bd--minibuffer.el +++ b/.config/emacs/modules/bd--minibuffer.el @@ -3,7 +3,7 @@ ;;; Code: -(defvar bd/navigate-recent-display-number 3 +(defvar bd/navigate-recent-display-number 6 "The number of recent buffers that show up in bd/navigate.") (defvar bd/blacklisted-buffer-regexp-list '( diff --git a/.config/emacs/modules/bd--notes.el b/.config/emacs/modules/bd--notes.el index fafc56a..b83b71e 100644 --- a/.config/emacs/modules/bd--notes.el +++ b/.config/emacs/modules/bd--notes.el @@ -3,6 +3,24 @@ ;;; Code: +(defun bd/send-to-scratch () + "Creates/switches to the scratch for `major-mode', +then pastes the active region." + (interactive) + (let* ((mode major-mode) + (name (format "*Scratch for %s*" mode)) + (contents (when (region-active-p) + (buffer-substring-no-properties + (region-beginning) (region-end)))) + (buf (get-buffer name))) + (pop-to-buffer + (with-current-buffer (get-buffer-create name) + (funcall mode) + (when contents + (insert (format "\n\n%s" contents))) + (current-buffer))))) +(keymap-global-set "C-c s" #'bd/send-to-scratch) + (use-package denote :hook ((dired-mode . denote-dired-mode-in-directories)) @@ -13,7 +31,7 @@ :config (require 'denote-journal-extras) - ;;;; skribe +;;;; skribe (defvar bd/denote-skribe-front-matter "(post :title \"%s\" diff --git a/.config/emacs/modules/bd--org.el b/.config/emacs/modules/bd--org.el index d1d7da4..b59327d 100644 --- a/.config/emacs/modules/bd--org.el +++ b/.config/emacs/modules/bd--org.el @@ -5,12 +5,6 @@ (defvar-local agenda-file "~/dc/agenda/agenda_tasks.org") -(use-package visual-fill-column - :hook (org-mode . visual-fill-column-mode) - :custom - (visual-fill-column-center-text t) - (visual-fill-column-width 120)) - (use-package org :bind (("C-c n a" . org-agenda) diff --git a/.config/guix/modules/base.scm b/.config/guix/modules/base.scm index 9aa6d5d..a182951 100644 --- a/.config/guix/modules/base.scm +++ b/.config/guix/modules/base.scm @@ -53,9 +53,10 @@ man ;; man-pages package-management ;; stow password-utils ;; pass-otp, password-store - pdf ;; xpdf + pdf ;; xpdf, pdfgrep rsync ;; rsync screen ;; screen + rust-apps ;; ripgrep texlive ;; texlive tex ;; texlive-dvipng tor-browsers ;; tor-browser @@ -88,7 +89,9 @@ man-pages netcat nsxiv + pdfgrep recutils + ripgrep rsync stow sysstat |