private/hlissner: refactor; revise keybinds
+ Add +jump/* to SPC h bindings + Generalize jump-to-bookmark To use ivy/helm specific jump-to-bookmark (like counsel-bookmark), better to remap bookmark-jump from their modules. + SPC f c => open .editorconfig
This commit is contained in:
Henrik Lissner
parent
8f00b3d07a
commit
5de14cb0b0
3 changed files with 71 additions and 54 deletions
|
|
@ -82,7 +82,7 @@
|
|||
:desc "Toggle last popup" :n "~" #'doom/popup-toggle
|
||||
:desc "Eval expression" :n "`" #'eval-expression
|
||||
:desc "Blink cursor line" :n "DEL" #'+doom/blink-cursor
|
||||
:desc "Jump to bookmark" :n "RET" #'counsel-bookmark
|
||||
:desc "Jump to bookmark" :n "RET" #'bookmark-jump
|
||||
|
||||
;; C-u is used by evil
|
||||
:desc "Universal argument" :n "u" #'universal-argument
|
||||
|
|
@ -165,18 +165,19 @@
|
|||
:v "r" #'+eval:repl)
|
||||
|
||||
(:desc "file" :prefix "f"
|
||||
:desc "File file" :n "." #'find-file
|
||||
:desc "Sudo find file" :n ">" #'doom/sudo-find-file
|
||||
:desc "Find file in project" :n "/" #'projectile-find-file
|
||||
:desc "Find file from here" :n "?" #'counsel-file-jump
|
||||
:desc "Find other file" :n "a" #'projectile-find-other-file
|
||||
:desc "Find file in dotfiles" :n "d" #'+hlissner/find-in-dotfiles
|
||||
:desc "Browse dotfiles" :n "D" #'+hlissner/browse-dotfiles
|
||||
:desc "Find file in emacs.d" :n "e" #'+hlissner/find-in-emacsd
|
||||
:desc "Browse emacs.d" :n "E" #'+hlissner/browse-emacsd
|
||||
:desc "Recent files" :n "r" #'recentf
|
||||
:desc "Recent project files" :n "R" #'projectile-recentf
|
||||
:desc "Yank filename" :n "y" #'+hlissner/yank-buffer-filename)
|
||||
:desc "File file" :n "." #'find-file
|
||||
:desc "Sudo find file" :n ">" #'doom/sudo-find-file
|
||||
:desc "Find file in project" :n "/" #'projectile-find-file
|
||||
:desc "Find file from here" :n "?" #'counsel-file-jump
|
||||
:desc "Find other file" :n "a" #'projectile-find-other-file
|
||||
:desc "Open project editorconfig" :n "c" #'editorconfig-find-current-editorconfig
|
||||
:desc "Find file in dotfiles" :n "d" #'+hlissner/find-in-dotfiles
|
||||
:desc "Browse dotfiles" :n "D" #'+hlissner/browse-dotfiles
|
||||
:desc "Find file in emacs.d" :n "e" #'+hlissner/find-in-emacsd
|
||||
:desc "Browse emacs.d" :n "E" #'+hlissner/browse-emacsd
|
||||
:desc "Recent files" :n "r" #'recentf
|
||||
:desc "Recent project files" :n "R" #'projectile-recentf
|
||||
:desc "Yank filename" :n "y" #'+hlissner/yank-buffer-filename)
|
||||
|
||||
(:desc "git" :prefix "g"
|
||||
:desc "Git status" :n "s" #'magit-status
|
||||
|
|
@ -191,20 +192,24 @@
|
|||
:n "h" help-map
|
||||
:desc "Apropos" :n "a" #'apropos
|
||||
:desc "Reload theme" :n "R" #'+doom/reset-theme
|
||||
:desc "Toggle Emacs log" :n "m" #'doom/popup-toggle-messages
|
||||
:desc "Find library" :n "l" #'find-library
|
||||
:desc "Toggle Emacs log" :n "m" #'doom/popup-toggle-messages
|
||||
:desc "Command log" :n "L" #'global-command-log-mode
|
||||
:desc "Describe function" :n "f" #'describe-function
|
||||
:desc "Describe key" :n "k" #'describe-key
|
||||
:desc "Describe char" :n "c" #'describe-char
|
||||
:desc "Describe mode" :n "m" #'describe-mode
|
||||
:desc "Describe mode" :n "M" #'describe-mode
|
||||
:desc "Describe variable" :n "v" #'describe-variable
|
||||
:desc "Describe face" :n "F" #'describe-face
|
||||
:desc "Describe DOOM setting" :n "s" #'doom/describe-setting
|
||||
:desc "Describe DOOM module" :n "d" #'doom/describe-module
|
||||
:desc "What face" :n "." #'doom/what-face
|
||||
:desc "What minor modes" :n "M" #'doom/what-minor-mode
|
||||
:desc "Info" :n "i" #'info)
|
||||
:desc "Find definition" :n "." #'+jump/definition
|
||||
:desc "Find references" :n "/" #'+jump/references
|
||||
:desc "Find documentation" :n "h" #'+jump/documentation
|
||||
:desc "What face" :n "'" #'doom/what-face
|
||||
:desc "What minor modes" :n ";" #'doom/what-minor-mode
|
||||
:desc "Info" :n "i" #'info
|
||||
:desc "Toggle profiler" :n "p" #'doom/toggle-profiler)
|
||||
|
||||
(:desc "insert" :prefix "i"
|
||||
:desc "From kill-ring" :nv "y" #'counsel-yank-pop
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
(advice-add #'tramp-read-passwd :around #'+hlissner*no-authinfo-for-tramp)
|
||||
|
||||
|
||||
;;
|
||||
(after! doom-themes
|
||||
;; Since Fira Mono doesn't have an italicized variant, highlight it instead
|
||||
(set-face-attribute 'italic nil
|
||||
|
|
@ -38,32 +39,45 @@
|
|||
|
||||
;; Don't use default snippets, use mine.
|
||||
(after! yasnippet
|
||||
(setq yas-snippet-dirs (append (list '+hlissner-snippets-dir)
|
||||
(delete 'yas-installed-snippets-dir yas-snippet-dirs))))
|
||||
(setq yas-snippet-dirs
|
||||
(append (list '+hlissner-snippets-dir)
|
||||
(delete 'yas-installed-snippets-dir
|
||||
yas-snippet-dirs))))
|
||||
|
||||
|
||||
(after! mu4e
|
||||
(setq-default
|
||||
smtpmail-stream-type 'starttls
|
||||
smtpmail-default-smtp-server "smtp.gmail.com"
|
||||
smtpmail-smtp-server "smtp.gmail.com"
|
||||
smtpmail-smtp-service 587)
|
||||
;; app/irc
|
||||
(setq +irc-notifications-watch-strings '("v0" "vnought" "hlissner"))
|
||||
|
||||
(set! :email "gmail.com"
|
||||
'((mu4e-sent-folder . "/%s/Sent Mail")
|
||||
(mu4e-drafts-folder . "/%s/Drafts")
|
||||
(mu4e-trash-folder . "/%s/Trash")
|
||||
(mu4e-refile-folder . "/%s/All Mail")
|
||||
(smtpmail-smtp-user . "hlissner")
|
||||
(user-mail-address . "hlissner@gmail.com")
|
||||
(mu4e-compose-signature . "---\nHenrik")))
|
||||
(set! :irc "irc.snoonet.org"
|
||||
`(:tls t
|
||||
:nick "v0"
|
||||
:port 6697
|
||||
:sasl-username ,(+pass-get-user "irc/snoonet.org")
|
||||
:sasl-password ,(+pass-get-secret "irc/snoonet.org")
|
||||
:channels (:after-auth "#ynought")))
|
||||
|
||||
(set! :email "lissner.net"
|
||||
'((mu4e-sent-folder . "/%s/Sent Mail")
|
||||
(mu4e-drafts-folder . "/%s/Drafts")
|
||||
(mu4e-trash-folder . "/%s/Trash")
|
||||
(mu4e-refile-folder . "/%s/All Mail")
|
||||
(smtpmail-smtp-user . "henrik@lissner.net")
|
||||
(user-mail-address . "henrik@lissner.net")
|
||||
(mu4e-compose-signature . "---\nHenrik Lissner"))
|
||||
t))
|
||||
|
||||
;; app/email
|
||||
(setq smtpmail-stream-type 'starttls
|
||||
smtpmail-default-smtp-server "smtp.gmail.com"
|
||||
smtpmail-smtp-server "smtp.gmail.com"
|
||||
smtpmail-smtp-service 587)
|
||||
|
||||
(set! :email "gmail.com"
|
||||
'((mu4e-sent-folder . "/gmail.com/Sent Mail")
|
||||
(mu4e-drafts-folder . "/gmail.com/Drafts")
|
||||
(mu4e-trash-folder . "/gmail.com/Trash")
|
||||
(mu4e-refile-folder . "/gmail.com/All Mail")
|
||||
(smtpmail-smtp-user . "hlissner")
|
||||
(user-mail-address . "hlissner@gmail.com")
|
||||
(mu4e-compose-signature . "---\nHenrik")))
|
||||
|
||||
(set! :email "lissner.net"
|
||||
'((mu4e-sent-folder . "/lissner.net/Sent Mail")
|
||||
(mu4e-drafts-folder . "/lissner.net/Drafts")
|
||||
(mu4e-trash-folder . "/lissner.net/Trash")
|
||||
(mu4e-refile-folder . "/lissner.net/All Mail")
|
||||
(smtpmail-smtp-user . "henrik@lissner.net")
|
||||
(user-mail-address . "henrik@lissner.net")
|
||||
(mu4e-compose-signature . "---\nHenrik Lissner"))
|
||||
t)
|
||||
|
|
|
|||
|
|
@ -2,24 +2,22 @@
|
|||
|
||||
;; I've swapped these keys on my keyboard
|
||||
(setq x-super-keysym 'alt
|
||||
x-alt-keysym 'meta)
|
||||
x-alt-keysym 'meta
|
||||
|
||||
;; This is a special file, unique to private modules, that is loaded after DOOM
|
||||
;; core but before any module is activated, giving you an opportunity to
|
||||
;; overwrite variables or settings before initialization.
|
||||
|
||||
;; host-specific settings
|
||||
(load "~/.emacs.local.el" t t)
|
||||
|
||||
(setq user-mail-address "henrik@lissner.net"
|
||||
user-mail-address "henrik@lissner.net"
|
||||
user-full-name "Henrik Lissner")
|
||||
|
||||
;; host-specific settings
|
||||
(pcase (system-name)
|
||||
("proteus"
|
||||
(setq +doom-modeline-height 25
|
||||
+doom-font (font-spec :family "Fira Mono" :size 10)
|
||||
+doom-variable-pitch-font (font-spec :family "Fira Sans" :size 10)
|
||||
+doom-unicode-font (font-spec :family "DejaVu Sans Mono" :size 10)
|
||||
nlinum-format "%3d "))
|
||||
doom-ui-nlinum-lpad 3))
|
||||
("halimede"
|
||||
(setq +doom-modeline-height 27)))
|
||||
(setq +doom-modeline-height 27))
|
||||
;; ("nereid")
|
||||
;; ("io")
|
||||
;; ("sao")
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue