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.el16
-rw-r--r--.emacs.d/rul-lisp/packages/rul-io.el5
-rw-r--r--.emacs.d/rul-lisp/packages/rul-mail.el6
-rw-r--r--.emacs.d/rul-lisp/packages/rul-modeline.el4
-rw-r--r--.emacs.d/rul-lisp/packages/rul-org.el10
-rw-r--r--.emacs.d/rul-lisp/packages/rul-prog.el3
-rw-r--r--.emacs.d/rul-lisp/packages/rul-terminals.el9
-rw-r--r--.emacs.d/rul-lisp/packages/rul-wm.el15
-rw-r--r--.emacs.d/rul-lisp/packages/rul-write.el17
10 files changed, 94 insertions, 13 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 8395292..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
@@ -22,6 +27,11 @@
:default-weight semilight
:default-height 230
:bold-weight extrabold)
+ (writing
+ :default-height 140
+ :default-family "Lato"
+ :variable-pitch-family "Regular"
+ )
(t
:default-family "Iosevka"
:default-weight regular
@@ -29,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..50e5a68 100644
--- a/.emacs.d/rul-lisp/packages/rul-io.el
+++ b/.emacs.d/rul-lisp/packages/rul-io.el
@@ -14,6 +14,9 @@
("SomaFM - Metal" . "https://somafm.com/metal.pls")
("SomaFM - Lush" . "https://somafm.com/lush130.pls")
("KCSM Jazz 91" . "http://ice5.securenetsystems.net/KCSM")
- )))
+ ("KSUA 91.5 FM" . "https://stream.radio.co/se776fab22/listen")
+ ))
+ (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 dbf9c9b..6206118 100644
--- a/.emacs.d/rul-lisp/packages/rul-mail.el
+++ b/.emacs.d/rul-lisp/packages/rul-mail.el
@@ -13,7 +13,11 @@
notmuch-hello-auto-refresh t
notmuch-hello-recent-searches-max 20
notmuch-hello-thousands-separator ""
- notmuch-show-all-tags-list t)
+ notmuch-show-all-tags-list t
+ notmuch-show-text/html-blocked-images nil
+ )
+
+ (setq notmuch-draft-folder "current/Drafts")
;; Keymaps
(defun rul/capture-mail()
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 9439b86..bfa70cc 100644
--- a/.emacs.d/rul-lisp/packages/rul-org.el
+++ b/.emacs.d/rul-lisp/packages/rul-org.el
@@ -51,10 +51,8 @@
(global-set-key (kbd "C-c c") #'org-capture)
(global-set-key (kbd "C-c s") #'org-schedule)
-
(global-set-key (kbd "<f9>") 'bh/punch-in)
(global-set-key (kbd "<f10>") 'bh/punch-out)
-(global-set-key (kbd "<f11>") 'org-clock-goto)
(global-set-key (kbd "<f12>") 'org-agenda)
;; ORG STATES ;;
@@ -77,6 +75,7 @@
(setq org-log-done (quote time))
(setq org-log-redeadline (quote time))
(setq org-log-reschedule (quote time))
+(setq org-log-into-drawer t)
;; CAPTURE ;;
(setq org-capture-templates
@@ -101,13 +100,12 @@
("L" "Web Link" entry
(file+headline org-refile-path "Read later")
- "* %?[[%:link][%:description]] \"\")\n %:initial\n \nCaptured On: %U"
+ "* %?[[%:link][%:description]]\n %:initial\n \nCaptured On: %U"
)
("l" "Web Link with Selection" entry
(file+headline org-refile-path "Read later")
- "* [[%:link][%:description]] \n %:initial\n \nCaptured On: %U")
-
+ "* [[%:link][%:description]]\n %:initial\n \nCaptured On: %U")
)))
;; REFILE ;;
@@ -173,4 +171,6 @@
;; Honor ATTR_ORG attribute. Defaults to image's width if not set.
(setq org-image-actual-width nil)
+(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 581dbc1..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,7 +36,6 @@
;; Python
(use-package blacken :ensure t :defer t)
-(add-hook 'python-mode-hook 'py-autopep8-enable-on-save)
;; 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 5a2293c..d33bcdb 100644
--- a/.emacs.d/rul-lisp/packages/rul-wm.el
+++ b/.emacs.d/rul-lisp/packages/rul-wm.el
@@ -6,6 +6,14 @@
(or (derived-mode-p 'org-mode 'org-agenda-mode)
(member (buffer-file-name) (org-agenda-files)))))
+;; Side window for dictionary
+(setq switch-to-buffer-obey-display-actions t)
+(add-to-list 'display-buffer-alist
+ '("^\\*Dictionary\\*" display-buffer-in-side-window
+ (side . bottom)
+ (window-height . 12)
+ ))
+
;;;; tab-bar.el
(let ((map global-map))
(define-key map (kbd "C-<next>") 'tab-bar-switch-to-next-tab)
@@ -129,4 +137,11 @@ With optional argument FRAME, return the list of buffers of FRAME."
(add-to-list 'consult-buffer-sources 'beframe-consult-source)))
+(defun kill-project-buffers-and-close-frame ()
+ (interactive)
+ (project-kill-buffers)
+ (delete-frame (selected-frame)))
+
+(define-key global-map (kbd "C-x p K") 'kill-project-buffers-and-close-frame)
+
(provide 'rul-wm)
diff --git a/.emacs.d/rul-lisp/packages/rul-write.el b/.emacs.d/rul-lisp/packages/rul-write.el
index 719baaf..4160d2f 100644
--- a/.emacs.d/rul-lisp/packages/rul-write.el
+++ b/.emacs.d/rul-lisp/packages/rul-write.el
@@ -1,5 +1,5 @@
;;;; `dictionary'
-(setq dictionary-server "dict.org"
+(setq dictionary-server "localhost"
dictionary-default-popup-strategy "lev"
dictionary-create-buttons nil
dictionary-use-single-buffer t)
@@ -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