sqrtminusone/dotfiles
1
0
Fork 0
mirror of https://github.com/SqrtMinusOne/dotfiles.git synced 2025-12-10 19:23:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(emacs): dired & vterm from treemacs, custom theme

Browse source
This commit is contained in:
Pavel Korytov 2021-07-22 12:16:10 +03:00
parent b880e8a2e1
commit 740753d696
3 changed files with 120 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.emacs.d/custom.el
View file

@ -4,9 +4,7 @@
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(aweshell-auto-suggestion-p nil)
'(aweshell-invalid-command-color "#f07178")
'(aweshell-search-history-key "C-r")
'(aweshell-valid-command-color "#c3e88d")
'(css-indent-offset 2)
'(custom-safe-themes
'("47db50ff66e35d3a440485357fb6acb767c100e135ccdf459060407f8baea7b2" "246a9596178bb806c5f41e5b571546bb6e0f4bd41a9da0df5dfbca7ec6e2250c" "fce3524887a0994f8b9b047aef9cc4cc017c5a93a5fb1f84d300391fba313743" "5034d4b3ebd327bbdc1bbf925b6bf7e4dfbe4f3f84ee4d21e154143f128c6e04" "aaa4c36ce00e572784d424554dcc9641c82d1155370770e231e10c649b59a074" "c83c095dd01cde64b631fb0fe5980587deec3834dc55144a6e78ff91ebc80b19" "bf387180109d222aee6bb089db48ed38403a1e330c9ec69fe1f52460a8936b66" "e074be1c799b509f52870ee596a5977b519f6d269455b84ed998666cf6fc802a" default))

75
.emacs.d/init.el
View file

@ -490,6 +490,26 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
"tw" 'treemacs-switch-workspace
"te" 'treemacs-edit-workspaces)
(defun my/treemacs-open-dired ()
"Open dired at given treemacs node"
(interactive)
(let (path (treemacs--prop-at-point :path))
(dired path)))
(defun my/treemacs-open-vterm ()
"Open vterm at given treemacs node"
(interactive)
(let ((default-directory (file-name-directory (treemacs--prop-at-point :path))))
(vterm)))
(with-eval-after-load 'treemacs
(general-define-key
:keymaps 'treemacs-mode-map
:states '(treemacs)
"gd" 'my/treemacs-open-dired
"gt" 'my/treemacs-open-vterm
"`" 'my/treemacs-open-vterm))
(use-package projectile
:straight t
:config
@ -635,6 +655,37 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(setq doom-themes-treemacs-theme "doom-colors")
(doom-themes-treemacs-config))
(deftheme my-theme)
(defun my/update-my-theme (&rest _)
(custom-theme-set-faces
'my-theme
`(tab-bar-tab ((t (
:background ,(doom-color 'bg)
:foreground ,(doom-color 'yellow)
:underline ,(doom-color 'yellow)))))
`(org-block ((t (:background ,(color-darken-name (doom-color 'bg) 3)))))
`(org-block-begin-line ((t (
:background ,(color-darken-name (doom-color 'bg) 3)
:foreground ,(doom-color 'grey)))))
`(auto-dim-other-buffers-face ((t (:background ,(color-darken-name (doom-color 'bg) 3)))))
`(aweshell-alert-buffer-face ((t (:foreground ,(doom-color 'red) :weight bold))))
`(aweshell-alert-command-face ((t (:foreground ,(doom-color 'yellow) :weight bold))))
`(epe-pipeline-delimiter-face ((t (:foreground ,(doom-color 'green)))))
`(epe-pipeline-host-face ((t (:foreground ,(doom-color 'blue)))))
`(epe-pipeline-time-face ((t (:foreground ,(doom-color 'yellow)))))
`(epe-pipeline-user-face ((t (:foreground ,(doom-color 'red)))))
`(elfeed-search-tag-face ((t (:foreground ,(doom-color 'yellow))))))
(custom-theme-set-variables
'my-theme
`(aweshell-invalid-command-color ,(doom-color 'red))
`(aweshell-valid-command-color ,(doom-color 'green)))
(enable-theme 'my-theme))
(advice-add 'load-theme :after #'my/update-my-theme)
(when (fboundp 'doom-color)
(my/update-my-theme))
(set-frame-font "JetBrainsMono Nerd Font 10" nil t)
(setq-default frame-title-format
@ -661,14 +712,6 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(general-nmap "gn" 'tab-new)
(general-nmap "gN" 'tab-close)
;; Colors
(custom-set-faces
;; `(tab-bar ((t (:background ,(doom-color 'bg) :foreground ,(doom-color 'bg)))))
`(tab-bar-tab ((t (
:background ,(doom-color 'bg)
:foreground ,(doom-color 'yellow)
:underline ,(doom-color 'yellow))))))
(setq my/project-title-separators "[-_ ]")
(defun my/shorten-project-name-elem (elem crop)
@ -997,13 +1040,6 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
:straight (:repo "manateelazycat/aweshell" :host github)
:after eshell
:config
(custom-set-faces
`(aweshell-alert-buffer-face ((t (:foreground ,(doom-color 'red) :weight bold))))
`(aweshell-alert-command-face ((t (:foreground ,(doom-color 'yellow) :weight bold))))
`(epe-pipeline-delimiter-face ((t (:foreground ,(doom-color 'green)))))
`(epe-pipeline-host-face ((t (:foreground ,(doom-color 'blue)))))
`(epe-pipeline-time-face ((t (:foreground ,(doom-color 'yellow)))))
`(epe-pipeline-user-face ((t (:foreground ,(doom-color 'red))))))
(setq eshell-highlight-prompt nil)
(setq eshell-prompt-function 'epe-theme-pipeline))
@ -1346,7 +1382,10 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(tags-todo "+waitlist+SCHEDULED<=\"<+14>\""
((org-agenda-overriding-header "Waitlist")
(org-agenda-hide-tags-regexp "waitlist")
(org-agenda-prefix-format " %i %-12:c %-12(my/org-scheduled-get-time)")))))))
(org-agenda-prefix-format " %i %-12:c %-12(my/org-scheduled-get-time)")))))
("tp" "Personal tasks"
((tags-todo "personal"
((org-agenda-prefix-format " %i %-12:c [%e] ")))))))
(use-package org-journal
:straight t
@ -1425,7 +1464,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
'("online" . " |${=key=}| ${title} ${url}")))
(use-package org-roam-bibtex
:straight (:host github :repo "org-roam/org-roam-bibtex" :branch "org-roam-v2")
:straight (:host github :repo "org-roam/org-roam-bibtex")
:after (org-roam org-ref)
:disabled
:config
@ -2625,8 +2664,6 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(lambda (fun &rest r)
(let ((shr-use-fonts nil))
(apply fun r))))
(custom-set-faces
`(elfeed-search-tag-face ((t (:foreground ,(doom-color 'yellow))))))
(evil-collection-define-key 'normal 'elfeed-search-mode-map
"o" #'my/elfeed-search-filter-source
"c" #'elfeed-search-clear-filter

82
Emacs.org
View file

@ -66,6 +66,7 @@ As with other files in the repo, parts prefixed with (OFF) are not used but kept
- [[#keybindings][Keybindings]]
- [[#off-helm][(OFF) Helm]]
- [[#treemacs][Treemacs]]
- [[#helper-functions][Helper functions]]
- [[#projectile][Projectile]]
- [[#company][Company]]
- [[#git--magit][Git & Magit]]
@ -78,6 +79,7 @@ As with other files in the repo, parts prefixed with (OFF) are not used but kept
- [[#ui][UI]]
- [[#general-ui--gui-settings][General UI & GUI Settings]]
- [[#theme--global-stuff][Theme & global stuff]]
- [[#custom-theme][Custom theme]]
- [[#font][Font]]
- [[#custom-frame-title][Custom frame title]]
- [[#tab-bar][Tab bar]]
@ -115,7 +117,7 @@ As with other files in the repo, parts prefixed with (OFF) are not used but kept
- [[#do-not-wrap-output-in-emacs-jupyter][Do not wrap output in emacs-jupyter]]
- [[#wrap-source-code-output][Wrap source code output]]
- [[#productivity--knowledge-management][Productivity & Knowledge management]]
- [[#capture-templates][Capture templates]]
- [[#capture-templates--various-settings][Capture templates & various settings]]
- [[#custom-agendas][Custom agendas]]
- [[#org-journal][Org Journal]]
- [[#org-roam][Org Roam]]
@ -231,6 +233,7 @@ As with other files in the repo, parts prefixed with (OFF) are not used but kept
- [[#pomidor][Pomidor]]
- [[#eww][EWW]]
- [[#proced][proced]]
- [[#screenshotel][screenshot.el]]
- [[#snow][Snow]]
- [[#zone][Zone]]
- [[#discord-integration][Discord integration]]
@ -1016,7 +1019,28 @@ Integrates with evil, magit and projectile.
"tw" 'treemacs-switch-workspace
"te" 'treemacs-edit-workspaces)
#+end_src
*** Helper functions
#+begin_src emacs-lisp
(defun my/treemacs-open-dired ()
"Open dired at given treemacs node"
(interactive)
(let (path (treemacs--prop-at-point :path))
(dired path)))
(defun my/treemacs-open-vterm ()
"Open vterm at given treemacs node"
(interactive)
(let ((default-directory (file-name-directory (treemacs--prop-at-point :path))))
(vterm)))
(with-eval-after-load 'treemacs
(general-define-key
:keymaps 'treemacs-mode-map
:states '(treemacs)
"gd" 'my/treemacs-open-dired
"gt" 'my/treemacs-open-vterm
"`" 'my/treemacs-open-vterm))
#+end_src
** Projectile
[[https://github.com/bbatsov/projectile][Projectile]] gives a bunch of useful functions for managing projects, like finding files within a project, fuzzy-find, replace, etc.
@ -1274,6 +1298,45 @@ My colorscheme of choice.
(setq doom-themes-treemacs-theme "doom-colors")
(doom-themes-treemacs-config))
#+end_src
*** Custom theme
A custom theme, dependent on Doom. I set all my custom variables there.
A custom theme is necessary because if one calls =custom-set-faces= and =custom-set-variables= in code, whenever a variable is changed and saved in a customize buffer, data from all calls of these functions is saved as as well.
Also, a hook allows me to change doom-theme more or less at will, although I do that only to switch to a light theme once in a blue moon.
#+begin_src emacs-lisp
(deftheme my-theme)
(defun my/update-my-theme (&rest _)
(custom-theme-set-faces
'my-theme
`(tab-bar-tab ((t (
:background ,(doom-color 'bg)
:foreground ,(doom-color 'yellow)
:underline ,(doom-color 'yellow)))))
`(org-block ((t (:background ,(color-darken-name (doom-color 'bg) 3)))))
`(org-block-begin-line ((t (
:background ,(color-darken-name (doom-color 'bg) 3)
:foreground ,(doom-color 'grey)))))
`(auto-dim-other-buffers-face ((t (:background ,(color-darken-name (doom-color 'bg) 3)))))
`(aweshell-alert-buffer-face ((t (:foreground ,(doom-color 'red) :weight bold))))
`(aweshell-alert-command-face ((t (:foreground ,(doom-color 'yellow) :weight bold))))
`(epe-pipeline-delimiter-face ((t (:foreground ,(doom-color 'green)))))
`(epe-pipeline-host-face ((t (:foreground ,(doom-color 'blue)))))
`(epe-pipeline-time-face ((t (:foreground ,(doom-color 'yellow)))))
`(epe-pipeline-user-face ((t (:foreground ,(doom-color 'red)))))
`(elfeed-search-tag-face ((t (:foreground ,(doom-color 'yellow))))))
(custom-theme-set-variables
'my-theme
`(aweshell-invalid-command-color ,(doom-color 'red))
`(aweshell-valid-command-color ,(doom-color 'green)))
(enable-theme 'my-theme))
(advice-add 'load-theme :after #'my/update-my-theme)
(when (fboundp 'doom-color)
(my/update-my-theme))
#+end_src
*** Font
To install a font, download the font and unpack it into the =.local/share/fonts= directory. Create one if it doesn't exist.
@ -1316,14 +1379,6 @@ I rely rather heavily on tab-bar in my workflow. I have a suspicion I'm not usin
;; Tabs
(general-nmap "gn" 'tab-new)
(general-nmap "gN" 'tab-close)
;; Colors
(custom-set-faces
;; `(tab-bar ((t (:background ,(doom-color 'bg) :foreground ,(doom-color 'bg)))))
`(tab-bar-tab ((t (
:background ,(doom-color 'bg)
:foreground ,(doom-color 'yellow)
:underline ,(doom-color 'yellow))))))
#+end_src
*** My title
Prepend tab name with the shortened projectile project title
@ -1780,13 +1835,6 @@ A shell written in Emacs lisp. I don't use it as of now, but keep the config jus
:straight (:repo "manateelazycat/aweshell" :host github)
:after eshell
:config
(custom-set-faces
`(aweshell-alert-buffer-face ((t (:foreground ,(doom-color 'red) :weight bold))))
`(aweshell-alert-command-face ((t (:foreground ,(doom-color 'yellow) :weight bold))))
`(epe-pipeline-delimiter-face ((t (:foreground ,(doom-color 'green)))))
`(epe-pipeline-host-face ((t (:foreground ,(doom-color 'blue)))))
`(epe-pipeline-time-face ((t (:foreground ,(doom-color 'yellow)))))
`(epe-pipeline-user-face ((t (:foreground ,(doom-color 'red))))))
(setq eshell-highlight-prompt nil)
(setq eshell-prompt-function 'epe-theme-pipeline))
@ -4033,8 +4081,6 @@ Using my own fork until the modifications are merged into master.
(lambda (fun &rest r)
(let ((shr-use-fonts nil))
(apply fun r))))
(custom-set-faces
`(elfeed-search-tag-face ((t (:foreground ,(doom-color 'yellow))))))
(evil-collection-define-key 'normal 'elfeed-search-mode-map
"o" #'my/elfeed-search-filter-source
"c" #'elfeed-search-clear-filter