summaryrefslogtreecommitdiffhomepage
path: root/init.el
diff options
context:
space:
mode:
Diffstat (limited to 'init.el')
-rw-r--r--init.el43
1 files changed, 27 insertions, 16 deletions
diff --git a/init.el b/init.el
index 245a33b..eb710f8 100644
--- a/init.el
+++ b/init.el
@@ -110,7 +110,8 @@
(dolist (p '("/Applications/Emacs.app/Contents/MacOS/bin-arm64-11"
"/Applications/Emacs.app/Contents/MacOS/libexec-arm64-11"
"/opt/homebrew/sbin"
- "/opt/homebrew/bin"))
+ "/opt/homebrew/bin"
+ "~/.local/bin"))
(jao-exec-path p))
(add-to-list 'Info-directory-list "/opt/homebrew/share/info"))
@@ -165,8 +166,7 @@
(setq use-short-answers t)
(setq inhibit-startup-message t)
-(setq visible-bell t)
-(jao-when-darwin (setq ring-bell-function (lambda () (message "Ding!"))))
+(setq visible-bell (jao-is-linux))
;;;; server
(setenv "EDITOR" "emacsclient")
@@ -329,9 +329,9 @@
(use-package tmr
:ensure t
:init
- (jao-when-linux
- (setq tmr-sound-file
- "/usr/share/sounds/freedesktop/stereo/message.oga")))
+ (setq tmr-sound-file
+ (jao-when-linux "/usr/share/sounds/freedesktop/stereo/message.oga"))
+ :config (tmr-mode-line-mode 1))
;;; Crypto
;;;; PGP, EPG, passwords
@@ -433,13 +433,20 @@
(setq custom-theme-directory
(expand-file-name "lib/themes" jao-emacs-dir))
-(require 'jao-themes)
-
(defvar jao-theme-dark 'jao-dark)
(defvar jao-theme-light 'jao-light)
(defvar jao-theme-term-dark 'modus-vivendi)
(defvar jao-theme-term-light 'jao-light-term)
+(use-package jao-themes
+ :demand t
+ :init
+ (setq jao-themes-default-family (jao-d-l "Inconsolata LGC" "Hack")
+ jao-themes-default-size (jao-d-l 10 9)
+ jao-themes-default-variable-pitch-family
+ (jao-d-l "Helvetica" "Iosevka Etoile")
+ jao-themes-default-variable-pitch-size (jao-d-l 12 9)))
+
(defun jao-themes-setup ()
(let* ((dark (jao-colors-scheme-dark-p))
(theme (cond ((and dark window-system) jao-theme-dark)
@@ -1147,7 +1154,6 @@
;;;; afio
(use-package jao-afio
- ;; :if (jao-is-linux)
:demand t
:config
(jao-afio-setup (not window-system))
@@ -1164,11 +1170,13 @@
'face 'font-lock-warning-face))
(jao-minibuffer-add-variable '(jao-current--frame-id) 100)
+ (jao-when-linux
+ (global-set-key (kbd "C-c t") #'jao-afio-goto-chats))
+
:bind (("C-c f" . 'jao-afio-goto-main)
("C-c g" . 'jao-afio-goto-mail)
("C-c w" . 'jao-afio-goto-www)
("C-c z" . 'jao-afio-goto-docs)
- ("C-c t" . 'jao-afio-goto-chats)
("C-c 0" . 'jao-afio-goto-scratch)
("M-o" . 'jao-afio-toggle)))
@@ -1616,6 +1624,11 @@
(setq widget-image-enable nil)
;;; Network
+;;;; r2e
+
+(use-package jao-r2e
+ :init (setq jao-r2e-confirm-toggle nil))
+
;;;; nm applet
(jao-when-linux
(jao-shell-def-exec jao-nm-applet "nm-applet")
@@ -1665,6 +1678,7 @@
(jao-when-linux (jao-shell-running-p "river")))
(jao-when-darwin
+ (defvar jao-sway-enabled nil)
(defun jao-wayland-enabled-p () nil)
(defun jao-river-enabled-p () nil))
@@ -1700,15 +1714,12 @@
("/" "open note" jao-org-notes-open)
("\\" "open note by tags" jao-org-notes-consult-tags)
("g" "ripgrep notes" jao-org-notes-consult-ripgrep)]
- ["Timers"
- ("t t" "set new" tmr)
- ("t c" "cancel" tmr-cancel)
- ("t l" "list" tmr-list-timers)]
["Network"
- ("s" "ssh" jao-ssh)]
+ ("s" "ssh" jao-ssh)
+ ("r" "r2e" jao-r2e)]
["Utilities"
("l" "packages" jao-list-packages)
- ("r" "translate" reverso)
+ ("R" "translate" reverso)
("f" "copy buffer file name" copy-buffer-file-name-as-kill)]])
(transient-define-prefix jao-transient-utils ()
"Global operations."