refactor(doom): reorganize doom/config.el
This commit is contained in:
parent
0c89e6d473
commit
fa08240510
1 changed files with 170 additions and 156 deletions
|
|
@ -4,69 +4,44 @@
|
||||||
;; sync' after modifying this file!
|
;; sync' after modifying this file!
|
||||||
|
|
||||||
|
|
||||||
;; Some functionality uses this to identify you, e.g. GPG configuration, email
|
;; --- Identity ---
|
||||||
;; clients, file templates and snippets.
|
|
||||||
(setq
|
(setq
|
||||||
user-full-name "Infinidoge"
|
user-full-name "Infinidoge"
|
||||||
user-mail-address "infinidoge@doge-inc.net"
|
user-mail-address "infinidoge@doge-inc.net"
|
||||||
)
|
)
|
||||||
|
|
||||||
;; Doom exposes five (optional) variables for controlling fonts in Doom. Here
|
;; --- Appearance ---
|
||||||
;; are the three important ones:
|
|
||||||
;;
|
|
||||||
;; + `doom-font'
|
|
||||||
;; + `doom-variable-pitch-font'
|
|
||||||
;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for
|
|
||||||
;; presentations or streaming.
|
|
||||||
;;
|
|
||||||
;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd
|
|
||||||
;; font string. You generally only need these two:
|
|
||||||
;; (setq doom-font (font-spec :family "monospace" :size 12 :weight 'semi-light)
|
|
||||||
;; doom-variable-pitch-font (font-spec :family "sans" :size 13))
|
|
||||||
|
|
||||||
;; There are two ways to load a theme. Both assume the theme is installed and
|
|
||||||
;; available. You can either set `doom-theme' or manually load a theme with the
|
|
||||||
;; `load-theme' function. This is the default:
|
|
||||||
(setq doom-theme 'doom-one)
|
|
||||||
|
|
||||||
;; If you use `org' and don't want your org files in the default location below,
|
|
||||||
;; change `org-directory'. It must be set before org loads!
|
|
||||||
(setq
|
(setq
|
||||||
org-directory "~/org/"
|
doom-theme 'doom-one
|
||||||
org-agenda-files '("~/org/" "~/org/agenda" "~/Projects/" "~/Documents/School")
|
display-line-numbers-type t
|
||||||
|
doom-modeline-enable-word-count t
|
||||||
|
)
|
||||||
|
|
||||||
|
;; --- Org Mode
|
||||||
|
(setq
|
||||||
|
;; Directories
|
||||||
|
org-directory "~/Documents/Org"
|
||||||
|
org-agenda-files '("~/Documents/" "~/Documents/Notes" "~/Documents/Org/" "~/Documents/Org/agenda" "~/Projects/" "~/Documents/School")
|
||||||
|
|
||||||
|
;; General settings
|
||||||
org-use-speed-commands t
|
org-use-speed-commands t
|
||||||
org-list-demote-modify-bullet '(("-" . "+") ("+" . "-") ("1." . "a."))
|
org-list-demote-modify-bullet '(("-" . "+") ("+" . "-") ("1." . "a."))
|
||||||
|
;; org-list-demote-modify-bullet '(("-" . "-") ("1." . "a."))
|
||||||
org-startup-shrink-all-tables t
|
org-startup-shrink-all-tables t
|
||||||
org-startup-align-all-tables t
|
org-startup-align-all-tables t
|
||||||
)
|
|
||||||
;; (setq org-list-demote-modify-bullet '(("-" . "-") ("1." . "a.")))
|
|
||||||
|
|
||||||
;; Setup Projectile's properties
|
;; Export
|
||||||
(setq
|
org-latex-listings 'minted
|
||||||
projectile-indexing-method 'hybrid
|
org-latex-packages-alist '(("" "minted" "listingsutf8"))
|
||||||
projectile-project-search-path '("~/Projects/" "~/Documents/School")
|
org-latex-pdf-process
|
||||||
|
'("pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f"
|
||||||
|
"biber %b"
|
||||||
|
"pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f"
|
||||||
|
"pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f")
|
||||||
|
org-src-fontify-natively t
|
||||||
)
|
)
|
||||||
|
|
||||||
;; This determines the style of line numbers in effect. If set to `nil', line
|
;; Run formatters in org src blocks on save
|
||||||
;; numbers are disabled. For relative line numbers, set this to `relative'.
|
|
||||||
(setq display-line-numbers-type t)
|
|
||||||
|
|
||||||
(setq deft-recursive t)
|
|
||||||
|
|
||||||
(setq
|
|
||||||
tramp-default-method "ssh"
|
|
||||||
tramp-terminal-type "tramp"
|
|
||||||
)
|
|
||||||
|
|
||||||
(after! flyspell
|
|
||||||
(setq flyspell-lazy-idle-seconds 1))
|
|
||||||
|
|
||||||
(setq doom-modeline-enable-word-count t)
|
|
||||||
|
|
||||||
(setq emms-volume-change-function 'emms-volume-pulse-change)
|
|
||||||
|
|
||||||
(setq epg-pinentry-mode 'loopback)
|
|
||||||
|
|
||||||
(defun infinidoge/format-org-src-blocks ()
|
(defun infinidoge/format-org-src-blocks ()
|
||||||
(org-babel-map-src-blocks nil
|
(org-babel-map-src-blocks nil
|
||||||
(if (equal (alist-get :format (org-babel-parse-header-arguments header-args) "yes")
|
(if (equal (alist-get :format (org-babel-parse-header-arguments header-args) "yes")
|
||||||
|
|
@ -77,72 +52,80 @@
|
||||||
)
|
)
|
||||||
|
|
||||||
(add-hook 'before-save-hook 'infinidoge/format-org-src-blocks)
|
(add-hook 'before-save-hook 'infinidoge/format-org-src-blocks)
|
||||||
;; Temporary until the Black configuration is fixed
|
|
||||||
;; (setq-hook! 'python-mode-hook +format-with :none)
|
|
||||||
|
|
||||||
;; Here are some additional functions/macros that could help you configure Doom:
|
;; Automatically tangle src blocks on save
|
||||||
;;
|
(defun infinidoge/tangle-on-save ()
|
||||||
;; - `load!' for loading external *.el files relative to this one
|
(when (eq major-mode 'org-mode)
|
||||||
;; - `use-package!' for configuring packages
|
(org-babel-tangle)))
|
||||||
;; - `after!' for running code after a package has loaded
|
|
||||||
;; - `add-load-path!' for adding directories to the `load-path', relative to
|
|
||||||
;; this file. Emacs searches the `load-path' when you load packages with
|
|
||||||
;; `require' or `use-package'.
|
|
||||||
;; - `map!' for binding new keys
|
|
||||||
;;
|
|
||||||
;; To get information about any of these functions/macros, move the cursor over
|
|
||||||
;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k').
|
|
||||||
;; This will open documentation for it, including demos of how they are used.
|
|
||||||
;;
|
|
||||||
;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
|
|
||||||
;; they are implemented.
|
|
||||||
|
|
||||||
;; Keybindings
|
(add-hook 'after-save-hook 'infinidoge/tangle-on-save)
|
||||||
|
|
||||||
(defvar infinidoge-doom-private-dir "/etc/nixos/users/infinidoge/config/doom")
|
;; Setup ox-extras to allow ignoring headlines while keeping content
|
||||||
|
(use-package! ox-extra
|
||||||
|
:config
|
||||||
|
(ox-extras-activate '(ignore-headlines)))
|
||||||
|
|
||||||
(defun infinidoge/doom/open-private-config ()
|
;; Load babel languages
|
||||||
"Browse your `infinidoge-doom-private-dir'."
|
(org-babel-do-load-languages
|
||||||
(interactive)
|
'org-babel-load-languages
|
||||||
(infinidoge-doom-project-browse doom-private-dir))
|
'((R . t)
|
||||||
|
(latex . t)))
|
||||||
|
|
||||||
(defun infinidoge/doom/find-file-in-private-config ()
|
;; --- Projectile ----
|
||||||
"Search for a file in `infinidoge-doom-private-dir'."
|
(setq
|
||||||
(interactive)
|
projectile-indexing-method 'hybrid
|
||||||
(infinidoge-doom-project-find-file doom-private-dir))
|
projectile-project-search-path '("~/Projects/" "~/Documents/School")
|
||||||
|
|
||||||
(defun infinidoge/doom/goto-private-init-file ()
|
|
||||||
"Open your private init.el file.
|
|
||||||
And jumps to your `doom!' block."
|
|
||||||
(interactive)
|
|
||||||
(find-file (expand-file-name "init.el" infinidoge-doom-private-dir))
|
|
||||||
(goto-char
|
|
||||||
(or (save-excursion
|
|
||||||
(goto-char (point-min))
|
|
||||||
(search-forward "(doom!" nil t))
|
|
||||||
(point))))
|
|
||||||
|
|
||||||
(defun infinidoge/doom/goto-private-config-file ()
|
|
||||||
"Open your private config.el file."
|
|
||||||
(interactive)
|
|
||||||
(find-file (expand-file-name "config.el" infinidoge-doom-private-dir)))
|
|
||||||
|
|
||||||
(defun infinidoge/doom/goto-private-packages-file ()
|
|
||||||
"Open your private packages.el file."
|
|
||||||
(interactive)
|
|
||||||
(find-file (expand-file-name "packages.el" infinidoge-doom-private-dir)))
|
|
||||||
|
|
||||||
(map! :map help-map
|
|
||||||
"dc" #'infinidoge/doom/goto-private-config-file
|
|
||||||
"dC" #'infinidoge/doom/goto-private-init-file
|
|
||||||
"dpd" #'infinidoge/doom/goto-private-packages-file
|
|
||||||
)
|
)
|
||||||
|
|
||||||
(map! :map doom-leader-file-map
|
;; --- Deft ---
|
||||||
"p" #'infinidoge/doom/find-file-in-private-config
|
(setq
|
||||||
"P" #'infinidoge/doom/open-private-config
|
deft-recursive t
|
||||||
|
deft-directory "~/Documents/Notes"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
;; --- Tramp ---
|
||||||
|
(setq
|
||||||
|
tramp-default-method "ssh"
|
||||||
|
tramp-terminal-type "tramp"
|
||||||
|
)
|
||||||
|
|
||||||
|
;; --- Flyspell ---
|
||||||
|
(after! flyspell
|
||||||
|
(setq flyspell-lazy-idle-seconds 1))
|
||||||
|
|
||||||
|
;; --- Emms ---
|
||||||
|
(setq emms-volume-change-function 'emms-volume-pulse-change)
|
||||||
|
|
||||||
|
;; --- GnuPG ---
|
||||||
|
(setq epg-pinentry-mode 'loopback)
|
||||||
|
|
||||||
|
;; --- Evil Goggles ---
|
||||||
|
(use-package! evil-goggles
|
||||||
|
:config
|
||||||
|
;; (evil-goggles-use-diff-faces)
|
||||||
|
;; (evil-goggles-use-diff-refine-faces)
|
||||||
|
(evil-goggles-use-magit-faces)
|
||||||
|
)
|
||||||
|
;; (custom-set-faces
|
||||||
|
;; '(evil-goggles-default-face ((t (:inherit 'highlight)))))
|
||||||
|
|
||||||
|
;; --- Nix ---
|
||||||
|
(set-formatter! 'nixpkgs-fmt "nixpkgs-fmt" :modes '(nix-mode))
|
||||||
|
|
||||||
|
(defun infinidoge/nixpkgs-fmt-fix ()
|
||||||
|
(when (eq major-mode 'nix-mode)
|
||||||
|
(format-all-buffer)))
|
||||||
|
|
||||||
|
(add-hook 'before-save-hook #'infinidoge/nixpkgs-fmt-fix)
|
||||||
|
|
||||||
|
;; --- LSP ---
|
||||||
|
(use-package! lsp-python-ms
|
||||||
|
:init
|
||||||
|
(setq lsp-python-ms-executable (executable-find "python-language-server")))
|
||||||
|
|
||||||
|
(setq lsp-csharp-server-path (executable-find "omnisharp"))
|
||||||
|
|
||||||
|
;; --- Keybindings ---
|
||||||
(map!
|
(map!
|
||||||
;; Remove scroll-left and scroll-right keybindings
|
;; Remove scroll-left and scroll-right keybindings
|
||||||
"C-<next>" nil
|
"C-<next>" nil
|
||||||
|
|
@ -201,57 +184,88 @@ And jumps to your `doom!' block."
|
||||||
"<left>" #'which-key-show-previous-page-cycle
|
"<left>" #'which-key-show-previous-page-cycle
|
||||||
)
|
)
|
||||||
|
|
||||||
(use-package! evil-goggles
|
|
||||||
:config
|
|
||||||
;; (evil-goggles-use-diff-faces)
|
|
||||||
;; (evil-goggles-use-diff-refine-faces)
|
|
||||||
(evil-goggles-use-magit-faces)
|
|
||||||
)
|
|
||||||
|
|
||||||
;; (custom-set-faces
|
|
||||||
;; '(evil-goggles-default-face ((t (:inherit 'highlight)))))
|
|
||||||
|
|
||||||
(defun infinidoge/tangle-on-save ()
|
|
||||||
(when (eq major-mode 'org-mode)
|
|
||||||
(org-babel-tangle)))
|
|
||||||
|
|
||||||
(add-hook 'after-save-hook 'infinidoge/tangle-on-save)
|
|
||||||
|
|
||||||
;; (setq auth-sources '(password-store))
|
|
||||||
|
|
||||||
(set-formatter! 'nixpkgs-fmt "nixpkgs-fmt" :modes '(nix-mode))
|
|
||||||
|
|
||||||
(defun infinidoge/nixpkgs-fmt-fix ()
|
|
||||||
(when (eq major-mode 'nix-mode)
|
|
||||||
(format-all-buffer)))
|
|
||||||
|
|
||||||
(add-hook 'before-save-hook #'infinidoge/nixpkgs-fmt-fix)
|
|
||||||
|
|
||||||
(setq
|
|
||||||
org-latex-listings 'minted
|
|
||||||
org-latex-packages-alist '(("" "minted" "listingsutf8"))
|
|
||||||
org-latex-pdf-process
|
|
||||||
'("pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f"
|
|
||||||
"biber %b"
|
|
||||||
"pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f"
|
|
||||||
"pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f")
|
|
||||||
org-src-fontify-natively t
|
|
||||||
)
|
|
||||||
|
|
||||||
(org-babel-do-load-languages
|
|
||||||
'org-babel-load-languages
|
|
||||||
'((R . t)
|
|
||||||
(latex . t)))
|
|
||||||
|
|
||||||
(use-package! lsp-python-ms
|
|
||||||
:init
|
|
||||||
(setq lsp-python-ms-executable (executable-find "python-language-server")))
|
|
||||||
|
|
||||||
(setq lsp-csharp-server-path (executable-find "omnisharp"))
|
|
||||||
|
|
||||||
(use-package! ox-extra
|
|
||||||
:config
|
|
||||||
(ox-extras-activate '(ignore-headlines)))
|
|
||||||
|
|
||||||
|
;; Setup custom functions to open private directory in my flake
|
||||||
|
(defvar infinidoge-doom-private-dir "/etc/nixos/users/infinidoge/config/doom")
|
||||||
;; Disable excessive warnings in configuration directory
|
;; Disable excessive warnings in configuration directory
|
||||||
(add-to-list '+emacs-lisp-disable-flycheck-in-dirs infinidoge-doom-private-dir)
|
(add-to-list '+emacs-lisp-disable-flycheck-in-dirs infinidoge-doom-private-dir)
|
||||||
|
|
||||||
|
;; TODO: Fix the function to properly open the directory
|
||||||
|
(defun infinidoge/doom/open-private-config ()
|
||||||
|
"Browse your `infinidoge-doom-private-dir'."
|
||||||
|
(interactive)
|
||||||
|
(infinidoge-doom-project-browse doom-private-dir))
|
||||||
|
|
||||||
|
;; TODO: Fix the function to properly find files in the directory
|
||||||
|
(defun infinidoge/doom/find-file-in-private-config ()
|
||||||
|
"Search for a file in `infinidoge-doom-private-dir'."
|
||||||
|
(interactive)
|
||||||
|
(infinidoge-doom-project-find-file doom-private-dir))
|
||||||
|
|
||||||
|
(defun infinidoge/doom/goto-private-init-file ()
|
||||||
|
"Open your private init.el file.
|
||||||
|
And jumps to your `doom!' block."
|
||||||
|
(interactive)
|
||||||
|
(find-file (expand-file-name "init.el" infinidoge-doom-private-dir))
|
||||||
|
(goto-char
|
||||||
|
(or (save-excursion
|
||||||
|
(goto-char (point-min))
|
||||||
|
(search-forward "(doom!" nil t))
|
||||||
|
(point))))
|
||||||
|
|
||||||
|
(defun infinidoge/doom/goto-private-config-file ()
|
||||||
|
"Open your private config.el file."
|
||||||
|
(interactive)
|
||||||
|
(find-file (expand-file-name "config.el" infinidoge-doom-private-dir)))
|
||||||
|
|
||||||
|
(defun infinidoge/doom/goto-private-packages-file ()
|
||||||
|
"Open your private packages.el file."
|
||||||
|
(interactive)
|
||||||
|
(find-file (expand-file-name "packages.el" infinidoge-doom-private-dir)))
|
||||||
|
|
||||||
|
;; Bind functions to keybindings
|
||||||
|
(map! :map help-map
|
||||||
|
"dc" #'infinidoge/doom/goto-private-config-file
|
||||||
|
"dC" #'infinidoge/doom/goto-private-init-file
|
||||||
|
"dpd" #'infinidoge/doom/goto-private-packages-file
|
||||||
|
)
|
||||||
|
|
||||||
|
(map! :map doom-leader-file-map
|
||||||
|
"p" #'infinidoge/doom/find-file-in-private-config
|
||||||
|
"P" #'infinidoge/doom/open-private-config
|
||||||
|
)
|
||||||
|
|
||||||
|
;; --- --- Original Configuration Comments --- ---
|
||||||
|
;; Doom exposes five (optional) variables for controlling fonts in Doom. Here
|
||||||
|
;; are the three important ones:
|
||||||
|
;;
|
||||||
|
;; + `doom-font'
|
||||||
|
;; + `doom-variable-pitch-font'
|
||||||
|
;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for
|
||||||
|
;; presentations or streaming.
|
||||||
|
;;
|
||||||
|
;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd
|
||||||
|
;; font string. You generally only need these two:
|
||||||
|
;; (setq doom-font (font-spec :family "monospace" :size 12 :weight 'semi-light)
|
||||||
|
;; doom-variable-pitch-font (font-spec :family "sans" :size 13))
|
||||||
|
|
||||||
|
;; There are two ways to load a theme. Both assume the theme is installed and
|
||||||
|
;; available. You can either set `doom-theme' or manually load a theme with the
|
||||||
|
;; `load-theme' function.
|
||||||
|
;;
|
||||||
|
;; Here are some additional functions/macros that could help you configure Doom:
|
||||||
|
;;
|
||||||
|
;; - `load!' for loading external *.el files relative to this one
|
||||||
|
;; - `use-package!' for configuring packages
|
||||||
|
;; - `after!' for running code after a package has loaded
|
||||||
|
;; - `add-load-path!' for adding directories to the `load-path', relative to
|
||||||
|
;; this file. Emacs searches the `load-path' when you load packages with
|
||||||
|
;; `require' or `use-package'.
|
||||||
|
;; - `map!' for binding new keys
|
||||||
|
;;
|
||||||
|
;; To get information about any of these functions/macros, move the cursor over
|
||||||
|
;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k').
|
||||||
|
;; This will open documentation for it, including demos of how they are used.
|
||||||
|
;;
|
||||||
|
;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
|
||||||
|
;; they are implemented.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue