aboutsummaryrefslogtreecommitdiff
path: root/.emacs.d/rul-lisp
diff options
context:
space:
mode:
Diffstat (limited to '.emacs.d/rul-lisp')
-rw-r--r--.emacs.d/rul-lisp/packages/rul-dashboard.el22
-rw-r--r--.emacs.d/rul-lisp/packages/rul-fonts.el11
-rw-r--r--.emacs.d/rul-lisp/packages/rul-io.el4
-rw-r--r--.emacs.d/rul-lisp/packages/rul-mail.el2
-rw-r--r--.emacs.d/rul-lisp/packages/rul-modeline.el4
-rw-r--r--.emacs.d/rul-lisp/packages/rul-org.el12
-rw-r--r--.emacs.d/rul-lisp/packages/rul-prog.el9
-rw-r--r--.emacs.d/rul-lisp/packages/rul-terminals.el9
-rw-r--r--.emacs.d/rul-lisp/packages/rul-wm.el5
-rw-r--r--.emacs.d/rul-lisp/packages/rul-write.el15
10 files changed, 79 insertions, 14 deletions
diff --git a/.emacs.d/rul-lisp/packages/rul-dashboard.el b/.emacs.d/rul-lisp/packages/rul-dashboard.el
new file mode 100644
index 0000000..67bd188
--- /dev/null
+++ b/.emacs.d/rul-lisp/packages/rul-dashboard.el
@@ -0,0 +1,22 @@
+(use-package page-break-lines :ensure t)
+
+(use-package dashboard
+ :ensure t
+
+ :config
+ (dashboard-setup-startup-hook)
+
+ :custom
+ (dashboard-center-content t)
+ (dashboard-startup-banner 3)
+ (dashboard-items '((recents . 5)
+ (bookmarks . 5)
+ (projects . 5)
+ (agenda . 5)
+ ))
+ (dashboard-icon-type 'nerd-icons)
+ (dashboard-set-heading-icons t)
+ (dashboard-set-file-icons t)
+)
+
+(provide 'rul-dashboard)
diff --git a/.emacs.d/rul-lisp/packages/rul-fonts.el b/.emacs.d/rul-lisp/packages/rul-fonts.el
index fdc4cd3..d491605 100644
--- a/.emacs.d/rul-lisp/packages/rul-fonts.el
+++ b/.emacs.d/rul-lisp/packages/rul-fonts.el
@@ -1,5 +1,8 @@
;;; rul-fonts.el --- Fonts configuration
+(defun rul-wayland-session-p ()
+ (string= (getenv "XDG_SESSION_TYPE") "wayland"))
+
(use-package fontaine
:ensure t
:config
@@ -9,7 +12,9 @@
(small
:default-height 120)
(medium
- :default-height 140)
+ :default-height 150)
+ (wayland-medium
+ :default-height 320)
(large
:default-weight semilight
:default-height 180
@@ -34,6 +39,8 @@
:variable-pitch-family "Iosevka Aile")))
;; Set desired style from `fontaine-presets'
- (fontaine-set-preset 'medium))
+ (if (rul-wayland-session-p)
+ (fontaine-set-preset 'wayland-medium)
+ (fontaine-set-preset 'medium)))
(provide 'rul-fonts)
diff --git a/.emacs.d/rul-lisp/packages/rul-io.el b/.emacs.d/rul-lisp/packages/rul-io.el
index eb2c1c7..5614295 100644
--- a/.emacs.d/rul-lisp/packages/rul-io.el
+++ b/.emacs.d/rul-lisp/packages/rul-io.el
@@ -14,6 +14,8 @@
("SomaFM - Metal" . "https://somafm.com/metal.pls")
("SomaFM - Lush" . "https://somafm.com/lush130.pls")
("KCSM Jazz 91" . "http://ice5.securenetsystems.net/KCSM")
- )))
+ ))
+ (setq empv-fd-binary "fdfind")
+ )
(provide 'rul-io)
diff --git a/.emacs.d/rul-lisp/packages/rul-mail.el b/.emacs.d/rul-lisp/packages/rul-mail.el
index 15354d0..6206118 100644
--- a/.emacs.d/rul-lisp/packages/rul-mail.el
+++ b/.emacs.d/rul-lisp/packages/rul-mail.el
@@ -17,6 +17,8 @@
notmuch-show-text/html-blocked-images nil
)
+ (setq notmuch-draft-folder "current/Drafts")
+
;; Keymaps
(defun rul/capture-mail()
"Capture mail to org mode."
diff --git a/.emacs.d/rul-lisp/packages/rul-modeline.el b/.emacs.d/rul-lisp/packages/rul-modeline.el
index e20bb2c..32c6048 100644
--- a/.emacs.d/rul-lisp/packages/rul-modeline.el
+++ b/.emacs.d/rul-lisp/packages/rul-modeline.el
@@ -105,10 +105,14 @@ Specific to the current window's mode line.")
mode-line-front-space
mode-line-buffer-identification
mode-line-front-space
+ mode-line-percent-position
+ mode-line-front-space
rul-modeline-major-mode
prot-modeline-eglot
mode-line-format-right-align
rul-modeline-misc-info
+ mode-line-front-space
+ mode-line-front-space
))
(provide 'rul-modeline)
diff --git a/.emacs.d/rul-lisp/packages/rul-org.el b/.emacs.d/rul-lisp/packages/rul-org.el
index 409517e..97cced7 100644
--- a/.emacs.d/rul-lisp/packages/rul-org.el
+++ b/.emacs.d/rul-lisp/packages/rul-org.el
@@ -171,4 +171,16 @@
;; Honor ATTR_ORG attribute. Defaults to image's width if not set.
(setq org-image-actual-width nil)
+(use-package org-clock-agenda-daytime-mode
+ :ensure t
+ :config
+ (setq
+ org-clock-agenda-daytime-target-work-time-minutes 300
+ org-clock-agenda-daytime-maximum-work-time-minutes 480
+ )
+ (org-clock-agenda-daytime-mode)
+ )
+
+(setq org-clock-mode-line-total 'today)
+
(provide 'rul-org)
diff --git a/.emacs.d/rul-lisp/packages/rul-prog.el b/.emacs.d/rul-lisp/packages/rul-prog.el
index 316736b..72625cb 100644
--- a/.emacs.d/rul-lisp/packages/rul-prog.el
+++ b/.emacs.d/rul-lisp/packages/rul-prog.el
@@ -9,9 +9,7 @@
(progn
(bind-key [remap find-tag] #'godef-jump))
:config
- (add-hook 'go-mode-hook #'yas-minor-mode)
(add-hook 'go-mode-hook 'electric-pair-mode)
- (add-hook 'go-mode-hook 'my-go-mode-hook)
(add-hook 'before-save-hook 'gofmt-before-save))
(use-package go-eldoc
@@ -38,13 +36,6 @@
;; Python
(use-package blacken :ensure t :defer t)
-(with-eval-after-load 'lsp-mode
- (lsp-register-client
- (make-lsp-client
- :new-connection (lsp-stdio-connection '("ruff" "server"))
- :activation-fn (lsp-activate-on "python")
- :server-id 'ruff-lsp)))
-(add-hook 'python-mode-hook #'lsp)
;; Terraform
(use-package terraform-mode :ensure t :defer t)
diff --git a/.emacs.d/rul-lisp/packages/rul-terminals.el b/.emacs.d/rul-lisp/packages/rul-terminals.el
index 9678b55..bbbcd10 100644
--- a/.emacs.d/rul-lisp/packages/rul-terminals.el
+++ b/.emacs.d/rul-lisp/packages/rul-terminals.el
@@ -1,3 +1,12 @@
+(use-package vterm
+ :ensure t
+ :config
+ ;; Standard vterm keybindings
+ (define-key vterm-mode-map (kbd "C-c C-t") 'vterm-copy-mode)
+ (define-key vterm-mode-map (kbd "C-c C-c") (lambda () (interactive) (vterm-send-string "\C-c")))
+ (define-key vterm-mode-map (kbd "C-l") 'vterm-clear)
+ )
+
(use-package multi-vterm
:ensure t
:init
diff --git a/.emacs.d/rul-lisp/packages/rul-wm.el b/.emacs.d/rul-lisp/packages/rul-wm.el
index 6c671f7..d33bcdb 100644
--- a/.emacs.d/rul-lisp/packages/rul-wm.el
+++ b/.emacs.d/rul-lisp/packages/rul-wm.el
@@ -10,8 +10,9 @@
(setq switch-to-buffer-obey-display-actions t)
(add-to-list 'display-buffer-alist
'("^\\*Dictionary\\*" display-buffer-in-side-window
- (side . left)
- (window-width . 80)))
+ (side . bottom)
+ (window-height . 12)
+ ))
;;;; tab-bar.el
(let ((map global-map))
diff --git a/.emacs.d/rul-lisp/packages/rul-write.el b/.emacs.d/rul-lisp/packages/rul-write.el
index de16e98..4160d2f 100644
--- a/.emacs.d/rul-lisp/packages/rul-write.el
+++ b/.emacs.d/rul-lisp/packages/rul-write.el
@@ -54,6 +54,21 @@ Else create a new file."
;; auto-fill mode
(add-hook 'text-mode-hook 'turn-on-auto-fill)
+(use-package electric
+ :init
+ (setq electric-quote-replace-double t)
+ :hook
+ (message-mode . electric-quote-local-mode))
+
+(use-package message
+ :hook
+ (message-mode . my/message-mode-setup))
+
+(defun my/message-mode-setup ()
+ (setq fill-column 72
+ sentence-end-double-space nil)
+ (auto-fill-mode 1))
+
;; Flycheck
(use-package flycheck
:ensure t
nihil fit ex nihilo