Merge branch 'master' of gitlab.com:chriscochrun/dotemacs
This commit is contained in:
Chris Cochrun
commit
03525d6c78
|
|
@ -1648,7 +1648,10 @@ If on a:
|
|||
(chris/leader-keys
|
||||
:states 'normal
|
||||
:keymaps 'override
|
||||
"om" 'mu4e))
|
||||
"om" 'mu4e)
|
||||
(general-def 'normal mu4e-view-mode-map
|
||||
"ga" 'mu4e-view-save-attachments))
|
||||
|
||||
|
||||
#+end_src
|
||||
|
||||
|
|
@ -1905,7 +1908,7 @@ Let's use pdf-tools for a lot better interaction with pdfs.
|
|||
#+begin_src emacs-lisp
|
||||
(use-package eaf
|
||||
:straight (:host github :repo "manateelazycat/emacs-application-framework"
|
||||
:files ("*"))
|
||||
:files ("*.el" "*.py" "core" "app"))
|
||||
:defer 1
|
||||
:config
|
||||
(setq eaf-browser-dark-mode t))
|
||||
|
|
|
|||
112
init.el
112
init.el
|
|
@ -2,9 +2,9 @@
|
|||
(defun chris/display-startup-time ()
|
||||
(message "Emacs loaded in %s with %d garbage collections."
|
||||
(format "%.2f seconds"
|
||||
(float-time
|
||||
(time-subtract after-init-time before-init-time)))
|
||||
gcs-done))
|
||||
(float-time
|
||||
(time-subtract after-init-time before-init-time)))
|
||||
gcs-done))
|
||||
(add-hook 'emacs-startup-hook #'chris/display-startup-time)
|
||||
|
||||
(setq inhibit-startup-message t)
|
||||
|
|
@ -39,12 +39,12 @@
|
|||
(defun chris/set-transparency ()
|
||||
"Set the frame to be transparent on Wayland compositors"
|
||||
(if (string-search "wayland" x-display-name)
|
||||
'((set-frame-parameter (selected-frame) 'alpha '(100 . 100))
|
||||
(set-frame-parameter (selected-frame) 'undecorated t)
|
||||
(add-to-list 'default-frame-alist '(undecorated . t))
|
||||
(add-to-list 'default-frame-alist '(alpha . (100 . 100)))
|
||||
(add-to-list 'initial-frame-alist '(alpha . (100 . 100)))
|
||||
(add-to-list 'initial-frame-alist '(undecorated . t)))))
|
||||
'((set-frame-parameter (selected-frame) 'alpha '(100 . 100))
|
||||
(set-frame-parameter (selected-frame) 'undecorated t)
|
||||
(add-to-list 'default-frame-alist '(undecorated . t))
|
||||
(add-to-list 'default-frame-alist '(alpha . (100 . 100)))
|
||||
(add-to-list 'initial-frame-alist '(alpha . (100 . 100)))
|
||||
(add-to-list 'initial-frame-alist '(undecorated . t)))))
|
||||
|
||||
(if (daemonp)
|
||||
(add-hook 'after-make-frame-functions
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
;; ...especially on linux
|
||||
(setq x-gtk-use-system-tooltips nil)
|
||||
|
||||
;; Favor vertical splits over horizontal ones. Screens are usually wide.
|
||||
;; Favor vertical splits over horizontal ones. Screens are usually wide.
|
||||
(setq split-width-threshold 160
|
||||
split-height-threshold nil)
|
||||
|
||||
|
|
@ -103,8 +103,8 @@
|
|||
(straight-use-package 'use-package)
|
||||
(setq use-package-verbose t)
|
||||
|
||||
(use-package command-log-mode
|
||||
:commands command-log-mode)
|
||||
(use-package command-log-mode
|
||||
:commands command-log-mode)
|
||||
|
||||
(use-package all-the-icons)
|
||||
|
||||
|
|
@ -303,19 +303,19 @@
|
|||
|
||||
;; We need to fix selectrums minibuffer handling for Emacs 28
|
||||
(defun selectrum--set-window-height (window &optional height)
|
||||
"Set window height of WINDOW to HEIGHT pixel.
|
||||
"Set window height of WINDOW to HEIGHT pixel.
|
||||
If HEIGHT is not given WINDOW will be updated to fit its content
|
||||
vertically."
|
||||
(let* ((lines (length
|
||||
(split-string
|
||||
(overlay-get selectrum--candidates-overlay 'after-string)
|
||||
"\n" t)))
|
||||
(dheight (or height
|
||||
(* lines selectrum--line-height)))
|
||||
(wheight (window-pixel-height window))
|
||||
(window-resize-pixelwise t))
|
||||
(window-resize
|
||||
window (- dheight wheight) nil nil 'pixelwise)))
|
||||
(let* ((lines (length
|
||||
(split-string
|
||||
(overlay-get selectrum--candidates-overlay 'after-string)
|
||||
"\n" t)))
|
||||
(dheight (or height
|
||||
(* lines selectrum--line-height)))
|
||||
(wheight (window-pixel-height window))
|
||||
(window-resize-pixelwise t))
|
||||
(window-resize
|
||||
window (- dheight wheight) nil nil 'pixelwise)))
|
||||
|
||||
|
||||
:general
|
||||
|
|
@ -497,7 +497,7 @@ vertically."
|
|||
|
||||
(use-package friar
|
||||
:straight (:host github :repo "warreq/friar" :branch "master"
|
||||
:files (:defaults "*.lua" "*.fnl"))
|
||||
:files (:defaults "*.lua" "*.fnl"))
|
||||
:after fennel-mode)
|
||||
|
||||
(use-package yaml-mode
|
||||
|
|
@ -843,17 +843,17 @@ vertically."
|
|||
:after org
|
||||
:init
|
||||
(setq org-super-agenda-groups '((:name "Today"
|
||||
:time-grid t
|
||||
:scheduled today)
|
||||
:time-grid t
|
||||
:scheduled today)
|
||||
(:name "Due Today"
|
||||
:deadline today)
|
||||
:deadline today)
|
||||
(:name "Important"
|
||||
:priority "A")
|
||||
:priority "A")
|
||||
(:name "Overdue"
|
||||
:time-grid t
|
||||
:scheduled today)
|
||||
:time-grid t
|
||||
:scheduled today)
|
||||
(:name "Due soon"
|
||||
:deadline future)))
|
||||
:deadline future)))
|
||||
:config
|
||||
(org-super-agenda-mode)
|
||||
(setq org-super-agenda-header-map nil))
|
||||
|
|
@ -872,7 +872,7 @@ vertically."
|
|||
org-roam-capture-templates
|
||||
'(("d" "default" plain "%?"
|
||||
:if-new (file+head "${slug}.org"
|
||||
"#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n\nj ")
|
||||
"#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n\nj ")
|
||||
:unnarrowed t)
|
||||
("b" "bible" plain "%?"
|
||||
:if-new (file+head "${slug}.org"
|
||||
|
|
@ -880,7 +880,7 @@ vertically."
|
|||
:unnarrowed t)
|
||||
("l" "TFC Lesson" plain (file ".templates/lessontemplate.org")
|
||||
:if-new (file+head "lessons/${slug}.org"
|
||||
"#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n")
|
||||
"#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n")
|
||||
:unnarrowed t))
|
||||
org-roam-dailies-capture-templates
|
||||
'(("d" "daily" plain #'org-roam-capture--get-point ""
|
||||
|
|
@ -1212,7 +1212,9 @@ If on a:
|
|||
(chris/leader-keys
|
||||
:states 'normal
|
||||
:keymaps 'override
|
||||
"om" 'mu4e))
|
||||
"om" 'mu4e)
|
||||
(general-def 'normal mu4e-view-mode-map
|
||||
"ga" 'mu4e-view-save-attachments))
|
||||
|
||||
(use-package org-msg
|
||||
:hook (mu4e-compose-mode . org-msg-edit-mode)
|
||||
|
|
@ -1378,18 +1380,18 @@ If on a:
|
|||
(add-hook 'eshell-mode-hook '(display-line-numbers-mode -1))
|
||||
|
||||
(setq eshell-command-aliases-list
|
||||
'(("q" "exit")
|
||||
("f" "find-file $1")
|
||||
("ff" "find-file $1")
|
||||
("d" "dired $1")
|
||||
("bd" "eshell-up $1")
|
||||
("rg" "rg --color=always $*")
|
||||
("ll" "ls -lah $*")
|
||||
("gg" "magit-status")
|
||||
("clear" "clear-scrollback")
|
||||
("!c" "eshell-previous-input 2")
|
||||
("yay" "paru $1")
|
||||
("yeet" "paru -Rns $1")))
|
||||
'(("q" "exit")
|
||||
("f" "find-file $1")
|
||||
("ff" "find-file $1")
|
||||
("d" "dired $1")
|
||||
("bd" "eshell-up $1")
|
||||
("rg" "rg --color=always $*")
|
||||
("ll" "ls -lah $*")
|
||||
("gg" "magit-status")
|
||||
("clear" "clear-scrollback")
|
||||
("!c" "eshell-previous-input 2")
|
||||
("yay" "paru $1")
|
||||
("yeet" "paru -Rns $1")))
|
||||
|
||||
:general
|
||||
(chris/leader-keys
|
||||
|
|
@ -1404,8 +1406,8 @@ If on a:
|
|||
|
||||
(use-package pdf-tools
|
||||
:straight (:host github
|
||||
:repo "flatwhatson/pdf-tools"
|
||||
:branch "fix-macros")
|
||||
:repo "flatwhatson/pdf-tools"
|
||||
:branch "fix-macros")
|
||||
:defer 1
|
||||
:config
|
||||
(pdf-tools-install)
|
||||
|
|
@ -1417,7 +1419,7 @@ If on a:
|
|||
:config
|
||||
|
||||
(defun chris/setup-nov-mode
|
||||
(interactive)
|
||||
(interactive)
|
||||
(visual-fill-column-mode)
|
||||
(display-line-numbers-mode -1)
|
||||
(variable-pitch-mode +1)
|
||||
|
|
@ -1428,7 +1430,7 @@ If on a:
|
|||
|
||||
(use-package eaf
|
||||
:straight (:host github :repo "manateelazycat/emacs-application-framework"
|
||||
:files ("*"))
|
||||
:files ("*.el" "*.py" "core" "app"))
|
||||
:defer 1
|
||||
:config
|
||||
(setq eaf-browser-dark-mode t))
|
||||
|
|
@ -1583,11 +1585,11 @@ interfere with the default `bongo-playlist-buffer'."
|
|||
transmission-files-mode
|
||||
transmission-info-mode
|
||||
transmission-peers-mode)))
|
||||
:general
|
||||
(chris/leader-keys
|
||||
:states 'normal
|
||||
:keymaps 'override
|
||||
"ot" 'transmission))
|
||||
:general
|
||||
(chris/leader-keys
|
||||
:states 'normal
|
||||
:keymaps 'override
|
||||
"ot" 'transmission))
|
||||
|
||||
(use-package auth-source-pass
|
||||
:defer 1
|
||||
|
|
|
|||
Loading…
Reference in a new issue