Emacs config additions
Load custom file if exists Add ligature support Setup auth sources (pass and secret store)
This commit is contained in:
parent
b8bdbd1675
commit
6bf31c8a89
|
|
@ -1,6 +1,10 @@
|
||||||
|
(setq custom-file (locate-user-emacs-file "custom.el"))
|
||||||
|
(when (and custom-file (file-exists-p custom-file))
|
||||||
|
(load custom-file nil 'nomessage))
|
||||||
|
|
||||||
(setq user-full-name "Evie Litherland-Smith"
|
(setq user-full-name "Evie Litherland-Smith"
|
||||||
user-mail-address "evie@xenia.me.uk"
|
user-mail-address "evie@xenia.me.uk"
|
||||||
custom-file (locate-user-emacs-file "custom.el")
|
use-short-answers t
|
||||||
load-prefer-newer t
|
load-prefer-newer t
|
||||||
indent-tabs-mode nil
|
indent-tabs-mode nil
|
||||||
global-auto-revert-non-file-buffers t
|
global-auto-revert-non-file-buffers t
|
||||||
|
|
@ -50,6 +54,81 @@
|
||||||
("stable" . 70)
|
("stable" . 70)
|
||||||
("melpa" . 0))))
|
("melpa" . 0))))
|
||||||
|
|
||||||
|
(when (require 'auth-source nil :noerror)
|
||||||
|
(setq auth-sources '("secrets:Login"))
|
||||||
|
(auth-source-pass-enable))
|
||||||
|
|
||||||
|
(use-package ligature
|
||||||
|
:ensure t
|
||||||
|
:config
|
||||||
|
;; Enable the "www" ligature in every possible major mode
|
||||||
|
(ligature-set-ligatures 't '("www"))
|
||||||
|
;; Enable traditional ligature support in eww-mode, if the
|
||||||
|
;; `variable-pitch' face supports it
|
||||||
|
(ligature-set-ligatures 'eww-mode '("ff" "fi" "ffi"))
|
||||||
|
;; Enable all Cascadia and Fira Code ligatures in programming modes
|
||||||
|
(ligature-set-ligatures 'prog-mode
|
||||||
|
'(;; == === ==== => =| =>>=>=|=>==>> ==< =/=//=// =~
|
||||||
|
;; =:= =!=
|
||||||
|
("=" (rx (+ (or ">" "<" "|" "/" "~" ":" "!" "="))))
|
||||||
|
;; ;; ;;;
|
||||||
|
(";" (rx (+ ";")))
|
||||||
|
;; && &&&
|
||||||
|
("&" (rx (+ "&")))
|
||||||
|
;; !! !!! !. !: !!. != !== !~
|
||||||
|
("!" (rx (+ (or "=" "!" "\." ":" "~"))))
|
||||||
|
;; ?? ??? ?: ?= ?.
|
||||||
|
("?" (rx (or ":" "=" "\." (+ "?"))))
|
||||||
|
;; %% %%%
|
||||||
|
("%" (rx (+ "%")))
|
||||||
|
;; |> ||> |||> ||||> |] |} || ||| |-> ||-||
|
||||||
|
;; |->>-||-<<-| |- |== ||=||
|
||||||
|
;; |==>>==<<==<=>==//==/=!==:===>
|
||||||
|
("|" (rx (+ (or ">" "<" "|" "/" ":" "!" "}" "\]"
|
||||||
|
"-" "=" ))))
|
||||||
|
;; \\ \\\ \/
|
||||||
|
("\\" (rx (or "/" (+ "\\"))))
|
||||||
|
;; ++ +++ ++++ +>
|
||||||
|
("+" (rx (or ">" (+ "+"))))
|
||||||
|
;; :: ::: :::: :> :< := :// ::=
|
||||||
|
(":" (rx (or ">" "<" "=" "//" ":=" (+ ":"))))
|
||||||
|
;; // /// //// /\ /* /> /===:===!=//===>>==>==/
|
||||||
|
("/" (rx (+ (or ">" "<" "|" "/" "\\" "\*" ":" "!"
|
||||||
|
"="))))
|
||||||
|
;; .. ... .... .= .- .? ..= ..<
|
||||||
|
("\." (rx (or "=" "-" "\?" "\.=" "\.<" (+ "\."))))
|
||||||
|
;; -- --- ---- -~ -> ->> -| -|->-->>->--<<-|
|
||||||
|
("-" (rx (+ (or ">" "<" "|" "~" "-"))))
|
||||||
|
;; *> */ *) ** *** ****
|
||||||
|
("*" (rx (or ">" "/" ")" (+ "*"))))
|
||||||
|
;; www wwww
|
||||||
|
("w" (rx (+ "w")))
|
||||||
|
;; <> <!-- <|> <: <~ <~> <~~ <+ <* <$ </ <+> <*>
|
||||||
|
;; <$> </> <| <|| <||| <|||| <- <-| <-<<-|-> <->>
|
||||||
|
;; <<-> <= <=> <<==<<==>=|=>==/==//=!==:=>
|
||||||
|
;; << <<< <<<<
|
||||||
|
("<" (rx (+ (or "\+" "\*" "\$" "<" ">" ":" "~" "!"
|
||||||
|
"-" "/" "|" "="))))
|
||||||
|
;; >: >- >>- >--|-> >>-|-> >= >== >>== >=|=:=>>
|
||||||
|
;; >> >>> >>>>
|
||||||
|
(">" (rx (+ (or ">" "<" "|" "/" ":" "=" "-"))))
|
||||||
|
;; #: #= #! #( #? #[ #{ #_ #_( ## ### #####
|
||||||
|
("#" (rx (or ":" "=" "!" "(" "\?" "\[" "{" "_(" "_"
|
||||||
|
(+ "#"))))
|
||||||
|
;; ~~ ~~~ ~= ~- ~@ ~> ~~>
|
||||||
|
("~" (rx (or ">" "=" "-" "@" "~>" (+ "~"))))
|
||||||
|
;; __ ___ ____ _|_ __|____|_
|
||||||
|
("_" (rx (+ (or "_" "|"))))
|
||||||
|
;; Fira code: 0xFF 0x12
|
||||||
|
("0" (rx (and "x" (+ (in "A-F" "a-f" "0-9")))))
|
||||||
|
;; Fira code:
|
||||||
|
"Fl" "Tl" "fi" "fj" "fl" "ft"
|
||||||
|
;; The few not covered by the regexps.
|
||||||
|
"{|" "[|" "]#" "(*" "}#" "$>" "^="))
|
||||||
|
;; Enables ligature checks globally in all buffers. You can also do it
|
||||||
|
;; per mode with `ligature-mode'.
|
||||||
|
(global-ligature-mode t))
|
||||||
|
|
||||||
(setq org-directory "~/Org"
|
(setq org-directory "~/Org"
|
||||||
org-default-notes-file (expand-file-name "notes.org" org-directory)
|
org-default-notes-file (expand-file-name "notes.org" org-directory)
|
||||||
org-pretty-entities-include-sub-superscripts t
|
org-pretty-entities-include-sub-superscripts t
|
||||||
|
|
@ -140,7 +219,7 @@
|
||||||
;; (set-frame-parameter nil 'alpha-background 80)
|
;; (set-frame-parameter nil 'alpha-background 80)
|
||||||
|
|
||||||
;; Nerd-Icons modes
|
;; Nerd-Icons modes
|
||||||
(when (require 'nerd-icons)
|
(when (require 'nerd-icons nil :noerror)
|
||||||
(nerd-icons-set-font "Symbols Nerd Font Mono")
|
(nerd-icons-set-font "Symbols Nerd Font Mono")
|
||||||
(when (require 'nerd-icons-dired nil :noerror)
|
(when (require 'nerd-icons-dired nil :noerror)
|
||||||
(add-hook 'dired-mode-hook #'nerd-icons-dired-mode))
|
(add-hook 'dired-mode-hook #'nerd-icons-dired-mode))
|
||||||
|
|
|
||||||
|
|
@ -7,9 +7,13 @@
|
||||||
* Common defaults
|
* Common defaults
|
||||||
|
|
||||||
#+BEGIN_SRC emacs-lisp :results output silent
|
#+BEGIN_SRC emacs-lisp :results output silent
|
||||||
|
(setq custom-file (locate-user-emacs-file "custom.el"))
|
||||||
|
(when (and custom-file (file-exists-p custom-file))
|
||||||
|
(load custom-file nil 'nomessage))
|
||||||
|
|
||||||
(setq user-full-name "Evie Litherland-Smith"
|
(setq user-full-name "Evie Litherland-Smith"
|
||||||
user-mail-address "evie@xenia.me.uk"
|
user-mail-address "evie@xenia.me.uk"
|
||||||
custom-file (locate-user-emacs-file "custom.el")
|
use-short-answers t
|
||||||
load-prefer-newer t
|
load-prefer-newer t
|
||||||
indent-tabs-mode nil
|
indent-tabs-mode nil
|
||||||
global-auto-revert-non-file-buffers t
|
global-auto-revert-non-file-buffers t
|
||||||
|
|
@ -63,6 +67,87 @@
|
||||||
("melpa" . 0))))
|
("melpa" . 0))))
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
|
** Authentication
|
||||||
|
#+begin_src emacs-lisp
|
||||||
|
(when (require 'auth-source nil :noerror)
|
||||||
|
(setq auth-sources '("secrets:Login"))
|
||||||
|
(auth-source-pass-enable))
|
||||||
|
#+end_src
|
||||||
|
* UI
|
||||||
|
|
||||||
|
** Font ligatures
|
||||||
|
#+begin_src emacs-lisp
|
||||||
|
(use-package ligature
|
||||||
|
:ensure t
|
||||||
|
:config
|
||||||
|
;; Enable the "www" ligature in every possible major mode
|
||||||
|
(ligature-set-ligatures 't '("www"))
|
||||||
|
;; Enable traditional ligature support in eww-mode, if the
|
||||||
|
;; `variable-pitch' face supports it
|
||||||
|
(ligature-set-ligatures 'eww-mode '("ff" "fi" "ffi"))
|
||||||
|
;; Enable all Cascadia and Fira Code ligatures in programming modes
|
||||||
|
(ligature-set-ligatures 'prog-mode
|
||||||
|
'(;; == === ==== => =| =>>=>=|=>==>> ==< =/=//=// =~
|
||||||
|
;; =:= =!=
|
||||||
|
("=" (rx (+ (or ">" "<" "|" "/" "~" ":" "!" "="))))
|
||||||
|
;; ;; ;;;
|
||||||
|
(";" (rx (+ ";")))
|
||||||
|
;; && &&&
|
||||||
|
("&" (rx (+ "&")))
|
||||||
|
;; !! !!! !. !: !!. != !== !~
|
||||||
|
("!" (rx (+ (or "=" "!" "\." ":" "~"))))
|
||||||
|
;; ?? ??? ?: ?= ?.
|
||||||
|
("?" (rx (or ":" "=" "\." (+ "?"))))
|
||||||
|
;; %% %%%
|
||||||
|
("%" (rx (+ "%")))
|
||||||
|
;; |> ||> |||> ||||> |] |} || ||| |-> ||-||
|
||||||
|
;; |->>-||-<<-| |- |== ||=||
|
||||||
|
;; |==>>==<<==<=>==//==/=!==:===>
|
||||||
|
("|" (rx (+ (or ">" "<" "|" "/" ":" "!" "}" "\]"
|
||||||
|
"-" "=" ))))
|
||||||
|
;; \\ \\\ \/
|
||||||
|
("\\" (rx (or "/" (+ "\\"))))
|
||||||
|
;; ++ +++ ++++ +>
|
||||||
|
("+" (rx (or ">" (+ "+"))))
|
||||||
|
;; :: ::: :::: :> :< := :// ::=
|
||||||
|
(":" (rx (or ">" "<" "=" "//" ":=" (+ ":"))))
|
||||||
|
;; // /// //// /\ /* /> /===:===!=//===>>==>==/
|
||||||
|
("/" (rx (+ (or ">" "<" "|" "/" "\\" "\*" ":" "!"
|
||||||
|
"="))))
|
||||||
|
;; .. ... .... .= .- .? ..= ..<
|
||||||
|
("\." (rx (or "=" "-" "\?" "\.=" "\.<" (+ "\."))))
|
||||||
|
;; -- --- ---- -~ -> ->> -| -|->-->>->--<<-|
|
||||||
|
("-" (rx (+ (or ">" "<" "|" "~" "-"))))
|
||||||
|
;; *> */ *) ** *** ****
|
||||||
|
("*" (rx (or ">" "/" ")" (+ "*"))))
|
||||||
|
;; www wwww
|
||||||
|
("w" (rx (+ "w")))
|
||||||
|
;; <> <!-- <|> <: <~ <~> <~~ <+ <* <$ </ <+> <*>
|
||||||
|
;; <$> </> <| <|| <||| <|||| <- <-| <-<<-|-> <->>
|
||||||
|
;; <<-> <= <=> <<==<<==>=|=>==/==//=!==:=>
|
||||||
|
;; << <<< <<<<
|
||||||
|
("<" (rx (+ (or "\+" "\*" "\$" "<" ">" ":" "~" "!"
|
||||||
|
"-" "/" "|" "="))))
|
||||||
|
;; >: >- >>- >--|-> >>-|-> >= >== >>== >=|=:=>>
|
||||||
|
;; >> >>> >>>>
|
||||||
|
(">" (rx (+ (or ">" "<" "|" "/" ":" "=" "-"))))
|
||||||
|
;; #: #= #! #( #? #[ #{ #_ #_( ## ### #####
|
||||||
|
("#" (rx (or ":" "=" "!" "(" "\?" "\[" "{" "_(" "_"
|
||||||
|
(+ "#"))))
|
||||||
|
;; ~~ ~~~ ~= ~- ~@ ~> ~~>
|
||||||
|
("~" (rx (or ">" "=" "-" "@" "~>" (+ "~"))))
|
||||||
|
;; __ ___ ____ _|_ __|____|_
|
||||||
|
("_" (rx (+ (or "_" "|"))))
|
||||||
|
;; Fira code: 0xFF 0x12
|
||||||
|
("0" (rx (and "x" (+ (in "A-F" "a-f" "0-9")))))
|
||||||
|
;; Fira code:
|
||||||
|
"Fl" "Tl" "fi" "fj" "fl" "ft"
|
||||||
|
;; The few not covered by the regexps.
|
||||||
|
"{|" "[|" "]#" "(*" "}#" "$>" "^="))
|
||||||
|
;; Enables ligature checks globally in all buffers. You can also do it
|
||||||
|
;; per mode with `ligature-mode'.
|
||||||
|
(global-ligature-mode t))
|
||||||
|
#+end_src
|
||||||
* Org-mode
|
* Org-mode
|
||||||
For reference information, see [[https://orgmode.com][Org-mode website]]
|
For reference information, see [[https://orgmode.com][Org-mode website]]
|
||||||
|
|
||||||
|
|
@ -181,7 +266,7 @@ Will reorganise into separate sections later
|
||||||
;; (set-frame-parameter nil 'alpha-background 80)
|
;; (set-frame-parameter nil 'alpha-background 80)
|
||||||
|
|
||||||
;; Nerd-Icons modes
|
;; Nerd-Icons modes
|
||||||
(when (require 'nerd-icons)
|
(when (require 'nerd-icons nil :noerror)
|
||||||
(nerd-icons-set-font "Symbols Nerd Font Mono")
|
(nerd-icons-set-font "Symbols Nerd Font Mono")
|
||||||
(when (require 'nerd-icons-dired nil :noerror)
|
(when (require 'nerd-icons-dired nil :noerror)
|
||||||
(add-hook 'dired-mode-hook #'nerd-icons-dired-mode))
|
(add-hook 'dired-mode-hook #'nerd-icons-dired-mode))
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue