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): cleanup and is-termux variable

Browse source
This commit is contained in:
Pavel Korytov 2021-07-31 20:21:43 +03:00
parent 304993a14e
commit 1be22593a4
4 changed files with 139 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

137
.emacs.d/init.el
View file

@ -41,6 +41,8 @@
(setq my/slow-ssh (string= (getenv "IS_TRAMP") "true"))
(setq my/is-termux (string-match-p (rx (* nonl) "com.termux" (* nonl)) (getenv "HOME")))
(when my/lowpower
(setq comp-async-jobs-number 1))
@ -606,6 +608,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(use-package wakatime-mode
:straight t
:if (not my/is-termux)
:config
(advice-add 'wakatime-init :after (lambda () (setq wakatime-cli-path "/home/pavel/bin/wakatime")))
(global-wakatime-mode))
@ -615,12 +618,14 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(use-package activity-watch-mode
:straight t
:if (not my/is-termux)
:config
(global-activity-watch-mode))
(tool-bar-mode -1)
(menu-bar-mode -1)
(scroll-bar-mode -1)
(unless my/is-termux
(tool-bar-mode -1)
(menu-bar-mode -1)
(scroll-bar-mode -1))
;; (set-frame-parameter (selected-frame) 'alpha '(90 . 90))
;; (add-to-list 'default-frame-alist '(alpha . (90 . 90)))
@ -657,6 +662,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(use-package doom-themes
:straight t
:if (not my/is-termux)
:config
(setq doom-themes-enable-bold t
doom-themes-enable-italic t)
@ -665,36 +671,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)
(unless my/is-termux
(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))
(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))
(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)
@ -798,11 +805,12 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(use-package emojify
:straight t
:if (not my/lowpower)
:if (not (or my/lowpower my/is-termux))
:hook (after-init . global-emojify-mode))
(use-package ligature
:straight (:host github :repo "mickeynp/ligature.el")
:if (not my/is-termux)
:config
(ligature-set-ligatures
'(
@ -940,7 +948,9 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(use-package all-the-icons-dired
:straight t
:if (not (or my/lowpower my/slow-ssh))
:hook (dired-mode . all-the-icons-dired-mode)
:hook (dired-mode . (lambda ()
(unless (string-match-p "/gnu/store" default-directory)
(all-the-icons-dired-mode))))
:config
(advice-add 'dired-add-entry :around #'all-the-icons-dired--refresh-advice)
(advice-add 'dired-remove-entry :around #'all-the-icons-dired--refresh-advice)
@ -1163,32 +1173,34 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(org-crypt-use-before-save-magic)
(setq org-tags-exclude-from-inheritance (quote ("crypt")))
(setq org-crypt-key "C1EC867E478472439CC82410DE004F32AFA00205")
(use-package jupyter
:straight t
:init
(my-leader-def "ar" 'jupyter-run-repl))
(use-package ob-hy
:straight t)
(org-babel-do-load-languages
'org-babel-load-languages
'((emacs-lisp . t)
(python . t)
(sql . t)
;; (typescript .t)
(hy . t)
(shell . t)
(octave . t)
(jupyter . t)))
(add-hook 'org-babel-after-execute-hook 'org-redisplay-inline-images)
(org-babel-jupyter-override-src-block "python")
(org-babel-jupyter-override-src-block "hy")
(add-hook 'org-src-mode-hook
(lambda ()
;; (hs-minor-mode -1)
;; (electric-indent-local-mode -1)
;; (rainbow-delimiters-mode -1)
(highlight-indent-guides-mode -1)))
(unless my/is-termux
(use-package jupyter
:straight t
:if (not my/is-termux)
:init
(my-leader-def "ar" 'jupyter-run-repl))
(use-package ob-hy
:straight t)
(org-babel-do-load-languages
'org-babel-load-languages
'((emacs-lisp . t)
(python . t)
(sql . t)
;; (typescript .t)
(hy . t)
(shell . t)
(octave . t)
(jupyter . t)))
(add-hook 'org-babel-after-execute-hook 'org-redisplay-inline-images)
(org-babel-jupyter-override-src-block "python")
(org-babel-jupyter-override-src-block "hy")
(add-hook 'org-src-mode-hook
(lambda ()
;; (hs-minor-mode -1)
;; (electric-indent-local-mode -1)
;; (rainbow-delimiters-mode -1)
(highlight-indent-guides-mode -1))))
(setq my/org-latex-scale 1.75)
(setq org-format-latex-options (plist-put org-format-latex-options :scale my/org-latex-scale))
(setq my/latex-preview-header "\\documentclass{article}
@ -1314,6 +1326,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(use-package jupyter
:straight t
:if (not my/is-termux)
:init
(my-leader-def "ar" 'jupyter-run-repl))
@ -1778,7 +1791,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(use-package lsp-mode
:straight t
:if (not my/slow-ssh)
:if (not (or my/slow-ssh my/is-termux))
:hook (
(typescript-mode . lsp)
(vue-mode . lsp)
@ -2740,7 +2753,8 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(general-define-key "C-c f" 'my/open-yadm-file)
(my-leader-def "cf" 'my/open-yadm-file)
(load-file (expand-file-name "mail.el" user-emacs-directory))
(unless my/is-termux
(load-file (expand-file-name "mail.el" user-emacs-directory)))
(use-package elfeed
:straight (:repo "SqrtMinusOne/elfeed" :host github)
@ -2827,6 +2841,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(use-package emms
:straight t
:commands (emms-smart-browse emms-browser)
:if (not my/is-termux)
:init
(my-leader-def
:infix "as"

6
.profile
View file

@ -6,12 +6,6 @@ export QT_AUTO_SCREEN_SCALE_FACTOR=0
# export GTK2_RC_FILES="$HOME/.gtkrc-2.0"
# Environment:1 ends here
# [[file:Console.org::*Android][Android:1]]
if [ "$HOME" != "${HOME%"com.termux"*}" ]; then
export IS_ANDROID=true
fi
# Android:1 ends here
# [[file:Console.org::*My paths][My paths:1]]
if [ -d "$HOME/bin" ] ; then
export PATH="$HOME/bin:$PATH"

14
Console.org
View file

@ -56,14 +56,6 @@ export QT_QPA_PLATFORMTHEME="qt5ct"
export QT_AUTO_SCREEN_SCALE_FACTOR=0
# export GTK2_RC_FILES="$HOME/.gtkrc-2.0"
#+end_src
** Android
Check if =.profile= is being run from Android. If so, set a variable.
#+begin_src sh
if [ "$HOME" != "${HOME%"com.termux"*}" ]; then
export IS_ANDROID=true
fi
#+end_src
** My paths
My script folders
#+begin_src sh
@ -941,6 +933,12 @@ Don't forget to install the following termux packages:
| starship |
| fish |
| exa |
| bat |
| git |
Also:
- cleanup =$PREFIX/etc/motd= to remove hello message.
- copy the required font at =$HOME/.termux/font.ttf= and run =termux-reload-settings=.
** Installation of [[https://gitlab.com/dwt1/shell-color-scripts][DT's colorscripts]]:
#+begin_src bash :tangle no :eval no

122
Emacs.org
View file

@ -332,10 +332,15 @@ The following variable is true when my machine is not powerful enough for some r
(setq my/lowpower (string= (system-name) "azure"))
#+end_src
And the following is true if Emacs is meant to be used with TRAMP over slow ssh
The following is true if Emacs is meant to be used with TRAMP over slow ssh
#+begin_src emacs-lisp
(setq my/slow-ssh (string= (getenv "IS_TRAMP") "true"))
#+end_src
And the following is true if Emacs is ran from termux on Android.
#+begin_src emacs-lisp
(setq my/is-termux (string-match-p (rx (* nonl) "com.termux" (* nonl)) (getenv "HOME")))
#+end_src
*** Native compilation
Set number of jobs to 1 on low-power machines
#+begin_src emacs-lisp
@ -1066,31 +1071,6 @@ Function to open dired and vterm at given nodes.
"gt" 'my/treemacs-open-vterm
"`" 'my/treemacs-open-vterm))
#+end_src
Also a function to open a file from all treemacs projects.
#+begin_src emacs-lisp
(defun my/get-treemacs-workspace-file-alist ()
(apply
#'append
(mapcar
(lambda (project)
(let* ((path (treemacs-project->path project))
(name (projectile-project-name path)))
(mapcar (lambda (file) (cons
(format "[%s] %s" name file)
(concat path "/" file)))
(projectile-project-files path))))
(treemacs-workspace->projects
(treemacs-current-workspace)))))
(defun my/treemacs-open-file-in-all-workspaces ()
(interactive)
(find-file
(let* ((files (my/get-treemacs-workspace-file-alist)))
(cdr (assoc
(completing-read "Files: " files nil t)
files)))))
#+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.
@ -1241,6 +1221,7 @@ Before I figure out how to package this for Guix:
#+begin_src emacs-lisp
(use-package wakatime-mode
:straight t
:if (not my/is-termux)
:config
(advice-add 'wakatime-init :after (lambda () (setq wakatime-cli-path "/home/pavel/bin/wakatime")))
(global-wakatime-mode))
@ -1252,6 +1233,7 @@ Before I figure out how to package this for Guix:
(use-package activity-watch-mode
:straight t
:if (not my/is-termux)
:config
(global-activity-watch-mode))
#+end_src
@ -1259,9 +1241,10 @@ Before I figure out how to package this for Guix:
** General UI & GUI Settings
Disable GUI elements
#+begin_src emacs-lisp
(tool-bar-mode -1)
(menu-bar-mode -1)
(scroll-bar-mode -1)
(unless my/is-termux
(tool-bar-mode -1)
(menu-bar-mode -1)
(scroll-bar-mode -1))
#+end_src
Transparency
@ -1338,6 +1321,7 @@ My colorscheme of choice.
#+begin_src emacs-lisp
(use-package doom-themes
:straight t
:if (not my/is-termux)
:config
(setq doom-themes-enable-bold t
doom-themes-enable-italic t)
@ -1353,36 +1337,37 @@ A custom theme is necessary because if one calls =custom-set-faces= and =custom-
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)
(unless my/is-termux
(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))
(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))
(advice-add 'load-theme :after #'my/update-my-theme)
(when (fboundp 'doom-color)
(my/update-my-theme)))
#+end_src
*** Font
@ -1556,7 +1541,7 @@ References:
#+begin_src emacs-lisp
(use-package emojify
:straight t
:if (not my/lowpower)
:if (not (or my/lowpower my/is-termux))
:hook (after-init . global-emojify-mode))
#+end_src
*** Ligatures
@ -1564,6 +1549,7 @@ Ligature setup for the JetBrainsMono font.
#+begin_src emacs-lisp
(use-package ligature
:straight (:host github :repo "mickeynp/ligature.el")
:if (not my/is-termux)
:config
(ligature-set-ligatures
'(
@ -1711,15 +1697,17 @@ Reuse the current dired buffer instead of spamming new ones.
Display icons for files.
| Note | Type |
|-----------+-----------------------------------------|
| *ACHTUNG* | This plugin is slow as hell with TRAMP |
| Note | Type |
|-----------+----------------------------------------------------------|
| *ACHTUNG* | This plugin is slow as hell with TRAMP or in =gnu/store= |
#+begin_src emacs-lisp
(use-package all-the-icons-dired
:straight t
:if (not (or my/lowpower my/slow-ssh))
:hook (dired-mode . all-the-icons-dired-mode)
:hook (dired-mode . (lambda ()
(unless (string-match-p "/gnu/store" default-directory)
(all-the-icons-dired-mode))))
:config
(advice-add 'dired-add-entry :around #'all-the-icons-dired--refresh-advice)
(advice-add 'dired-remove-entry :around #'all-the-icons-dired--refresh-advice)
@ -2051,7 +2039,8 @@ Use the built-in org mode.
(lambda ()
(rainbow-delimiters-mode -1)))
<<org-crypt-setup>>
<<org-lang-setup>>
(unless my/is-termux
<<org-lang-setup>>)
<<org-ui-setup>>
<<org-keys-setup>>
<<org-productivity-setup>>)
@ -2106,6 +2095,7 @@ References:
#+begin_src emacs-lisp :noweb-ref org-lang-setup
(use-package jupyter
:straight t
:if (not my/is-termux)
:init
(my-leader-def "ar" 'jupyter-run-repl))
#+end_src
@ -2980,7 +2970,7 @@ References:
#+begin_src emacs-lisp
(use-package lsp-mode
:straight t
:if (not my/slow-ssh)
:if (not (or my/slow-ssh my/is-termux))
:hook (
(typescript-mode . lsp)
(vue-mode . lsp)
@ -4191,7 +4181,8 @@ Open a file managed by yadm.
My notmuch config now resides in [[file:Mail.org][Mail.org]].
#+begin_src emacs-lisp
(load-file (expand-file-name "mail.el" user-emacs-directory))
(unless my/is-termux
(load-file (expand-file-name "mail.el" user-emacs-directory)))
#+end_src
*** Elfeed
[[https://github.com/skeeto/elfeed][elfeed]] is an Emacs RSS client.
@ -4316,6 +4307,7 @@ References:
(use-package emms
:straight t
:commands (emms-smart-browse emms-browser)
:if (not my/is-termux)
:init
(my-leader-def
:infix "as"