diff options
| -rw-r--r-- | .config/emacs/init.el | 18 | ||||
| -rw-r--r-- | .config/emacs/modules/bd--browse.el | 25 | ||||
| -rw-r--r-- | .config/emacs/modules/bd--buffers.el | 25 | ||||
| -rw-r--r-- | .config/emacs/modules/bd--devel.el | 50 | ||||
| -rw-r--r-- | .config/emacs/modules/bd--gpg.el | 4 | ||||
| -rw-r--r-- | .config/guix/modules/base.scm | 5 | ||||
| -rw-r--r-- | .config/guix/modules/ymir.scm | 5 |
7 files changed, 73 insertions, 59 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 80edf5a..d51a47a 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -25,25 +25,25 @@ (setopt warning-minimum-level :error - inhibit-startup-message t + inhibit-startup-message t initial-major-mode 'eshell-mode initial-scratch-message nil - text-scale-mode-step 1.1 + text-scale-mode-step 1.1 - set-mark-command-repeat-pop t + set-mark-command-repeat-pop t - kill-whole-line t - kill-ring-max 1000 - undo-limit 320000 + kill-whole-line t + kill-ring-max 1000 + undo-limit 320000 - sentence-end-double-space nil + sentence-end-double-space nil next-line-add-newlines t scroll-up-aggressively '0.50 scroll-down-aggressively '0.50 - scroll-step 1 + scroll-step 1 - use-short-answers t + use-short-answers t vc-follow-symlinks t completion-ignore-case t read-buffer-completion-ignore-case t) diff --git a/.config/emacs/modules/bd--browse.el b/.config/emacs/modules/bd--browse.el index ab61fa8..d6a09e4 100644 --- a/.config/emacs/modules/bd--browse.el +++ b/.config/emacs/modules/bd--browse.el @@ -14,7 +14,8 @@ icecat, or eww." (pcase pref (0 (eww url)) (1 (start-process "torbrowser" nil "torbrowser" "--new-window" url)) - (_ (start-process "icecat" nil "icecat" "--new-window" url)))) + (2 (start-process "icecat" nil "icecat" "--new-window" url)) + (_ (start-process "librewolf" nil "librewolf" "--new-window" url)))) (setopt browse-url-browser-function 'bd/browse) (defun bd/selector-bookmarks () @@ -57,10 +58,10 @@ icecat, or eww." (interactive "sURL or search string: ") (message "Ludu %s" url) (start-process "rip" nil - "mpv" "--force-window=yes" - (concat (if (string-match "https://.*" url) - "ytdl://" - "ytdl://ytsearch:") url))) + "mpv" "--force-window=yes" + (concat (if (string-match "https://.*" url) + "ytdl://" + "ytdl://ytsearch:") url))) (setopt browse-url-handlers `((,(regexp-opt '("youtube.com" "youtu.be" "deezer.page")) . @@ -71,8 +72,8 @@ icecat, or eww." :defer t :config (setopt shr-use-fonts t - shr-cookie-policy nil - shr-max-width 85)) + shr-cookie-policy nil + shr-max-width 85)) (use-package elpher :bind @@ -93,9 +94,9 @@ icecat, or eww." (t (funcall original url new-window)))) (advice-add 'eww :around 'bd/elpher) (setopt elpher-default-url-type "gemini" - elpher-connection-timeout 120 - elpher-gemini-max-fill-width 85 - elpher-use-emacs-bookmark-menu t)) + elpher-connection-timeout 120 + elpher-gemini-max-fill-width 85 + elpher-use-emacs-bookmark-menu t)) (use-package eww :hook @@ -104,8 +105,8 @@ icecat, or eww." (fill-column-mode)))) :config (setopt eww-search-prefix "https://duckduckgo.com/html/?q=" - eww-auto-rename-buffer 'title - eww-use-browse-url (regexp-opt '("mailto:" + eww-auto-rename-buffer 'title + eww-use-browse-url (regexp-opt '("mailto:" "youtube.com" "youtu.be")))) diff --git a/.config/emacs/modules/bd--buffers.el b/.config/emacs/modules/bd--buffers.el index 986a932..a082dc8 100644 --- a/.config/emacs/modules/bd--buffers.el +++ b/.config/emacs/modules/bd--buffers.el @@ -10,30 +10,27 @@ (global-auto-revert-mode) :config (setopt global-auto-revert-non-file-buffers t - auto-revert-interval 30)) + auto-revert-interval 30)) (use-package shackle :demand t :config (shackle-mode) (setopt 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) - ("^\\*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-rules + '( + ;; native + (compilation-mode :select nil :align bottom :size 0.2) + (completion-list-mode :select nil :align bottom :size 0.1) + ("^\\*Async Shell Command\\*.*$" :regexp t :ignore t) + ;; emms + (emms-playlist-mode :select t :align left :size 0.2) + ))) (defun bd/layout--do-with-haste (f) (let* ((args (transient-args 'bd/layout-dispatcher)) - (haste (if (member "haste" args) 3 1))) + (haste (if (member "haste" args) 3 1))) (funcall f haste))) (transient-define-prefix bd/layout-dispatcher () ["Dispatcher > Layout\n" diff --git a/.config/emacs/modules/bd--devel.el b/.config/emacs/modules/bd--devel.el index fda79a9..96f5bb1 100644 --- a/.config/emacs/modules/bd--devel.el +++ b/.config/emacs/modules/bd--devel.el @@ -18,7 +18,7 @@ (use-package prog-mode :hook ((js-mode . (lambda () - (add-to-list 'prettify-symbols-alist '("function" . ?ƒ)))) + (add-to-list 'prettify-symbols-alist '("function" . ?ƒ)))) (prog-mode . (lambda () (font-lock-add-keywords nil '(("\\<\\(FIX\\(ME\\)?\\|TODO\\)" @@ -50,8 +50,8 @@ :hook ((compilation-filter . ansi-color-compilation-filter)) :config (setopt compilation-always-kill t - compilation-scroll-output 'first-error - compilation-ask-about-save nil) + compilation-scroll-output 'first-error + compilation-ask-about-save nil) (defun bd/compile-dwim (f) (let ((default-directory (bd/get-directory-dwim))) (call-interactively f))) @@ -75,21 +75,23 @@ (use-package flymake :bind (("C-c f f" . #'flymake-mode) - :map flymake-mode-map - ("C-c f s" . #'flymake-start) - ("C-c f n" . #'flymake-goto-next-error) - ("C-c f p" . #'flymake-goto-prev-error) - ("C-c f b" . #'flymake-show-buffer-diagnostics) - ("C-c f p" . #'flymake-show-project-diagnostics)) + :map flymake-mode-map + ("C-c f s" . #'flymake-start) + ("C-c f n" . #'flymake-goto-next-error) + ("C-c f p" . #'flymake-goto-prev-error) + ("C-c f b" . #'flymake-show-buffer-diagnostics) + ("C-c f p" . #'flymake-show-project-diagnostics)) :config (setopt flymake-no-changes-timeout nil - flymake-start-on-flymake-mode t - flymake-start-on-save-buffer t - flymake-proc-compilation-prevents-syntax-check t - flymake-wrap-around nil - flymake-show-diagnostics-at-end-of-line nil)) + flymake-start-on-flymake-mode t + flymake-start-on-save-buffer t + flymake-proc-compilation-prevents-syntax-check t + flymake-wrap-around nil + flymake-show-diagnostics-at-end-of-line nil)) -(use-package geiser-guile) +(require 'geiser) +(require 'geiser-mode) +(require 'geiser-guile) (use-package yasnippet :hook ((text-mode @@ -102,21 +104,29 @@ (use-package paren :config (setopt show-paren-delay 0 - show-paren-highlight-openparen t - show-paren-context-when-offscreen t - show-paren-when-point-in-periphery t - show-paren-when-point-inside-paren t)) + show-paren-highlight-openparen t + show-paren-context-when-offscreen t + show-paren-when-point-in-periphery t + show-paren-when-point-inside-paren t)) (use-package rainbow-delimiters :hook prog-mode) (use-package paredit :hook (ielm-mode - emacs-lisp-mode + emacs-lisp-mode + eshell-mode lisp-mode scheme-mode lisp-interaction-mode) :config + (defun bd/paredit-preserve-repl (f &rest args) + "Wrapper around F (paredit-RET, discarding ARGS." + (pcase (cons major-mode (eolp)) + ('(inferior-emacs-lisp-mode . t) (ielm-return)) + ('(eshell-mode . t) (eshell-send-input)) + (_ (funcall f)))) + (advice-add #'paredit-RET :around #'bd/paredit-preserve-repl) (eldoc-add-command 'paredit-backward-delete 'paredit-close-round)) diff --git a/.config/emacs/modules/bd--gpg.el b/.config/emacs/modules/bd--gpg.el index 2c5dca8..83fa4c1 100644 --- a/.config/emacs/modules/bd--gpg.el +++ b/.config/emacs/modules/bd--gpg.el @@ -54,7 +54,7 @@ (selector (list (bd/selector-passwords)))) (use-package pinentry - :defer t + :defer 1 :config (pinentry-start) (defun pinentry-toggle () @@ -64,7 +64,7 @@ for a bug I've encountered." (pinentry-stop) (pinentry-start)) (setopt enable-recursive-minibuffers t - pinentry-popup-prompt-window nil)) + pinentry-popup-prompt-window nil)) (provide 'bd--gpg) diff --git a/.config/guix/modules/base.scm b/.config/guix/modules/base.scm index dfbdf69..60fecd8 100644 --- a/.config/guix/modules/base.scm +++ b/.config/guix/modules/base.scm @@ -47,6 +47,7 @@ image ;; flameshot imagemagick ;; imagemagick image-viewers ;; nsxiv + librewolf ;; librewolf linux ;; sysstat mail ;; offlineimap man ;; man-pages @@ -115,6 +116,7 @@ graphviz icecat imagemagick + librewolf mgba mpv mupen64plus-audio-sdl @@ -192,7 +194,8 @@ (service home-bash-service-type (home-bash-configuration - (aliases '(("cp" . "cp -i") + (aliases '(("auth" . "echo $pwd >> $HOME/.config/guix/shell-authorized-directories") + ("cp" . "cp -i") ("grep" . "grep --color=auto") ("guix-rcfg" . "sudo guix system -L ${HOME}/.config/guix/ reconfigure ${HOME}/.config/guix/${HOSTNAME}.scm") ("ll" . "ls -l") diff --git a/.config/guix/modules/ymir.scm b/.config/guix/modules/ymir.scm index 4a889ce..aec5aad 100644 --- a/.config/guix/modules/ymir.scm +++ b/.config/guix/modules/ymir.scm @@ -28,7 +28,10 @@ (operating-system (host-name "ymir") (locale "en_US.utf8") - (timezone "America/New_York") + (timezone + (if #f + "America/New_York" + "America/Denver")) (keyboard-layout (keyboard-layout "us")) (kernel-arguments (delete "quiet" |