Split up emacs config to multiple files
This commit is contained in:
parent
18250f7a44
commit
957dc764b4
4 changed files with 47 additions and 182 deletions
140
doom/config.el
140
doom/config.el
|
@ -1,14 +1,11 @@
|
||||||
;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
|
;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
|
||||||
|
|
||||||
;; Place your private configuration here! Remember, you do not need to run 'doom
|
|
||||||
;; sync' after modifying this file!
|
|
||||||
|
|
||||||
|
|
||||||
;; Some functionality uses this to identify you, e.g. GPG configuration, email
|
|
||||||
;; clients, file templates and snippets. It is optional.
|
|
||||||
(setq user-full-name "Roman Godmaire"
|
(setq user-full-name "Roman Godmaire"
|
||||||
user-mail-address "godmaire@twilit.com")
|
user-mail-address "godmaire@twilit.com")
|
||||||
|
|
||||||
|
(setq doom-theme 'doom-gruvbox)
|
||||||
|
(setq display-line-numbers-type 'relative)
|
||||||
|
|
||||||
;; Doom exposes five (optional) variables for controlling fonts in Doom:
|
;; Doom exposes five (optional) variables for controlling fonts in Doom:
|
||||||
;;
|
;;
|
||||||
;; - `doom-font' -- the primary font to use
|
;; - `doom-font' -- the primary font to use
|
||||||
|
@ -18,44 +15,12 @@
|
||||||
;; - `doom-unicode-font' -- for unicode glyphs
|
;; - `doom-unicode-font' -- for unicode glyphs
|
||||||
;; - `doom-serif-font' -- for the `fixed-pitch-serif' face
|
;; - `doom-serif-font' -- for the `fixed-pitch-serif' face
|
||||||
;;
|
;;
|
||||||
;; See 'C-h v doom-font' for documentation and more examples of what they
|
|
||||||
;; accept. For example:
|
|
||||||
;;
|
|
||||||
;;(setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'semi-light)
|
|
||||||
;; doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13))
|
|
||||||
;;
|
|
||||||
;; If you or Emacs can't find your font, use 'M-x describe-font' to look them
|
;; If you or Emacs can't find your font, use 'M-x describe-font' to look them
|
||||||
;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to
|
;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to
|
||||||
;; refresh your font settings. If Emacs still can't find your font, it likely
|
;; refresh your font settings. If Emacs still can't find your font, it likely
|
||||||
;; wasn't installed correctly. Font issues are rarely Doom issues!
|
;; wasn't installed correctly. Font issues are rarely Doom issues!
|
||||||
(setq doom-font (font-spec :family "Hack Nerd Font Mono" :size 14 :weight 'regular))
|
(setq doom-font (font-spec :family "Hack Nerd Font Mono" :size 14 :weight 'regular))
|
||||||
|
|
||||||
;; 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-gruvbox)
|
|
||||||
|
|
||||||
;; This determines the style of line numbers in effect. If set to `nil', line
|
|
||||||
;; numbers are disabled. For relative line numbers, set this to `relative'.
|
|
||||||
(setq display-line-numbers-type 'relative)
|
|
||||||
|
|
||||||
;; 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 org-directory "~/org/")
|
|
||||||
|
|
||||||
;; Whenever you reconfigure a package, make sure to wrap your config in an
|
|
||||||
;; `after!' block, otherwise Doom's defaults may override your settings. E.g.
|
|
||||||
;;
|
|
||||||
;; (after! PACKAGE
|
|
||||||
;; (setq x y))
|
|
||||||
;;
|
|
||||||
;; The exceptions to this rule:
|
|
||||||
;;
|
|
||||||
;; - Setting file/directory variables (like `org-directory')
|
|
||||||
;; - Setting variables which explicitly tell you to set them before their
|
|
||||||
;; package is loaded (see 'C-h v VARIABLE' to look up their documentation).
|
|
||||||
;; - Setting doom variables (which start with 'doom-' or '+').
|
|
||||||
;;
|
|
||||||
;; Here are some additional functions/macros that will help you configure Doom.
|
;; Here are some additional functions/macros that will help you configure Doom.
|
||||||
;;
|
;;
|
||||||
;; - `load!' for loading external *.el files relative to this one
|
;; - `load!' for loading external *.el files relative to this one
|
||||||
|
@ -65,45 +30,18 @@
|
||||||
;; this file. Emacs searches the `load-path' when you load packages with
|
;; this file. Emacs searches the `load-path' when you load packages with
|
||||||
;; `require' or `use-package'.
|
;; `require' or `use-package'.
|
||||||
;; - `map!' for binding new keys
|
;; - `map!' for binding new keys
|
||||||
;;
|
|
||||||
;; To get information about any of these functions/macros, move the cursor over
|
(load! "config/lsp.el")
|
||||||
;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k').
|
(load! "config/org.el")
|
||||||
;; This will open documentation for it, including demos of how they are used.
|
|
||||||
;; Alternatively, use `C-h o' to look up a symbol (functions, variables, facs,
|
|
||||||
;; etc).
|
|
||||||
;;
|
|
||||||
;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
|
|
||||||
;; they are implemented.
|
|
||||||
|
|
||||||
;; Elfeed
|
;; Elfeed
|
||||||
(add-hook! 'elfeed-search-mode-hook #'elfeed-update)
|
(add-hook! 'elfeed-search-mode-hook #'elfeed-update)
|
||||||
|
|
||||||
;; org-recur
|
;; Tectonic for LaTeX
|
||||||
(use-package! org-recur
|
|
||||||
:hook ((org-mode . org-recur-mode)
|
|
||||||
(org-agenda-mode . org-recur-agenda-mode))
|
|
||||||
:demand t
|
|
||||||
:config
|
|
||||||
(define-key org-recur-mode-map (kbd "C-c d") 'org-recur-finish)
|
|
||||||
|
|
||||||
;; Rebind the 'd' key in org-agenda (default: `org-agenda-day-view').
|
|
||||||
(define-key org-recur-agenda-mode-map (kbd "d") 'org-recur-finish)
|
|
||||||
(define-key org-recur-agenda-mode-map (kbd "C-c d") 'org-recur-finish)
|
|
||||||
|
|
||||||
(setq org-recur-finish-done t
|
|
||||||
org-recur-finish-archive t))
|
|
||||||
;; Latex config
|
|
||||||
(add-hook 'LaTeX-mode-hook
|
|
||||||
(lambda ()
|
|
||||||
(setq TeX-command-default "Tectonic")))
|
|
||||||
|
|
||||||
(after! (latex tex)
|
(after! (latex tex)
|
||||||
(add-to-list 'TeX-command-list
|
(add-to-list 'TeX-command-list
|
||||||
'("Tectonic" "tectonic %s.tex" TeX-run-command nil t)))
|
'("Tectonic" "tectonic %s.tex" TeX-run-command nil t)))
|
||||||
|
|
||||||
;; Web-Mode LSP Config
|
|
||||||
(setq-hook! 'web-mode-hook +format-with-lsp nil)
|
|
||||||
|
|
||||||
;; Dired config
|
;; Dired config
|
||||||
(add-hook 'dired-after-readin-hook 'dired-git-info-auto-enable)
|
(add-hook 'dired-after-readin-hook 'dired-git-info-auto-enable)
|
||||||
|
|
||||||
|
@ -113,70 +51,6 @@
|
||||||
(add-hook 'writeroom-mode-disable-hook
|
(add-hook 'writeroom-mode-disable-hook
|
||||||
(lambda () (display-line-numbers-mode)))
|
(lambda () (display-line-numbers-mode)))
|
||||||
|
|
||||||
;; Svlete
|
|
||||||
(define-derived-mode svelte-mode web-mode "Svelte")
|
|
||||||
(add-to-list 'auto-mode-alist '("\\.svelte\\'" . svelte-mode))
|
|
||||||
|
|
||||||
(use-package! eglot
|
|
||||||
:config
|
|
||||||
(add-to-list 'eglot-server-programs
|
|
||||||
'(svelte-mode . ("svelteserver" "--stdio"))))
|
|
||||||
|
|
||||||
;; dap-mode config
|
|
||||||
(after! dap-mode
|
|
||||||
;; Golang
|
|
||||||
(require 'dap-dlv-go)
|
|
||||||
|
|
||||||
;; Python
|
|
||||||
(require 'dap-python)
|
|
||||||
(setq dap-python-debugger 'debugpy)
|
|
||||||
|
|
||||||
;; Rust
|
|
||||||
(require 'dap-cpptools)
|
|
||||||
(require 'dap-gdb-lldb)
|
|
||||||
(dap-register-debug-template
|
|
||||||
"Rust::GDB Run Configuration"
|
|
||||||
(list :type "gdb"
|
|
||||||
:request "launch"
|
|
||||||
:name "GDB::Run"
|
|
||||||
:gdbpath "rust-gdb"
|
|
||||||
:cwd nil))
|
|
||||||
|
|
||||||
;; Elixir
|
|
||||||
(load! "dap-elixir"))
|
|
||||||
|
|
||||||
(map! :map dap-mode-map
|
|
||||||
:leader
|
|
||||||
:prefix ("d" . "dap")
|
|
||||||
;; basics
|
|
||||||
:desc "dap debug" "s" #'dap-debug
|
|
||||||
:desc "dap debug restart" "r" #'dap-debug-restart
|
|
||||||
:desc "dap disconnect" "Q" #'dap-disconnect
|
|
||||||
:desc "dap next" "n" #'dap-next
|
|
||||||
:desc "dap step in" "i" #'dap-step-in
|
|
||||||
:desc "dap step out" "o" #'dap-step-out
|
|
||||||
:desc "dap continue" "c" #'dap-continue
|
|
||||||
:desc "dap hydra" "h" #'dap-hydra
|
|
||||||
|
|
||||||
;; debug
|
|
||||||
:prefix ("dd" . "Debug")
|
|
||||||
:desc "dap debug recent" "r" #'dap-debug-recent
|
|
||||||
:desc "dap debug last" "l" #'dap-debug-last
|
|
||||||
|
|
||||||
;; eval
|
|
||||||
:prefix ("de" . "Eval")
|
|
||||||
:desc "eval" "e" #'dap-eval
|
|
||||||
:desc "eval region" "r" #'dap-eval-region
|
|
||||||
:desc "eval thing at point" "s" #'dap-eval-thing-at-point
|
|
||||||
:desc "add expression" "a" #'dap-ui-expressions-add
|
|
||||||
:desc "remove expression" "d" #'dap-ui-expressions-remove
|
|
||||||
|
|
||||||
:prefix ("db" . "Breakpoint")
|
|
||||||
:desc "dap breakpoint toggle" "b" #'dap-breakpoint-toggle
|
|
||||||
:desc "dap breakpoint condition" "c" #'dap-breakpoint-condition
|
|
||||||
:desc "dap breakpoint hit count" "h" #'dap-breakpoint-hit-condition
|
|
||||||
:desc "dap breakpoint log message" "l" #'dap-breakpoint-log-message)
|
|
||||||
|
|
||||||
;; Wakatime
|
;; Wakatime
|
||||||
(global-wakatime-mode)
|
(global-wakatime-mode)
|
||||||
|
|
||||||
|
|
14
doom/config/lsp.el
Normal file
14
doom/config/lsp.el
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
;;; $DOOMDIR/config/lsp.el -*- lexical-binding: tl -*-
|
||||||
|
|
||||||
|
;; web-mode
|
||||||
|
(setq-hook! 'web-mode-hook +format-with-lsp nil)
|
||||||
|
|
||||||
|
;; svlete-mode
|
||||||
|
(define-derived-mode svelte-mode web-mode "Svelte")
|
||||||
|
(add-to-list 'auto-mode-alist '("\\.svelte\\'" . svelte-mode))
|
||||||
|
(add-hook 'svelte-mode-hook 'eglot-ensure)
|
||||||
|
|
||||||
|
(use-package! eglot
|
||||||
|
:config
|
||||||
|
(add-to-list 'eglot-server-programs
|
||||||
|
'(svelte-mode . ("svelteserver" "--stdio"))))
|
26
doom/config/org.el
Normal file
26
doom/config/org.el
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
;;; $DOOMDIR/config/org.el -*- lexical-binding: t; -*-
|
||||||
|
|
||||||
|
(setq org-directory "~/org/")
|
||||||
|
|
||||||
|
;; org-recur
|
||||||
|
(use-package! org-recur
|
||||||
|
:hook ((org-mode . org-recur-mode)
|
||||||
|
(org-agenda-mode . org-recur-agenda-mode))
|
||||||
|
:demand t
|
||||||
|
:config
|
||||||
|
(define-key org-recur-mode-map (kbd "C-c d") 'org-recur-finish)
|
||||||
|
|
||||||
|
;; Rebind the 'd' key in org-agenda (default: `org-agenda-day-view').
|
||||||
|
(define-key org-recur-agenda-mode-map (kbd "d") 'org-recur-finish)
|
||||||
|
(define-key org-recur-agenda-mode-map (kbd "C-c d") 'org-recur-finish)
|
||||||
|
|
||||||
|
(setq org-recur-finish-done t
|
||||||
|
org-recur-finish-archive t))
|
||||||
|
|
||||||
|
;; ox-gfm
|
||||||
|
(after! (org)
|
||||||
|
(require 'ox-gfm nil t))
|
||||||
|
;; Latex config
|
||||||
|
(add-hook 'LaTeX-mode-hook
|
||||||
|
(lambda ()
|
||||||
|
(setq TeX-command-default "Tectonic")))
|
|
@ -1,49 +0,0 @@
|
||||||
;;; dap-elixir.el -*- lexical-binding: t; -*-
|
|
||||||
;;;
|
|
||||||
;;; Custom dap-elixir.el module since the default one is built mostly for only debugging tests.
|
|
||||||
(require 'dap-mode)
|
|
||||||
(require 'lsp-elixir)
|
|
||||||
|
|
||||||
(defun dap-elixir--populate-start-file-args (conf)
|
|
||||||
"Populate CONF with the required arguments."
|
|
||||||
(-> conf
|
|
||||||
(dap--put-if-absent :dap-server-path (list (concat (file-name-as-directory lsp-elixir-ls-server-dir) "debugger.sh")))
|
|
||||||
(dap--put-if-absent :type "mix_task")
|
|
||||||
(dap--put-if-absent :name "mix default")
|
|
||||||
(dap--put-if-absent :request "launch")
|
|
||||||
(dap--put-if-absent :projectDir (lsp-find-session-folder (lsp-session) (buffer-file-name)))
|
|
||||||
(dap--put-if-absent :cwd (lsp-find-session-folder (lsp-session) (buffer-file-name)))))
|
|
||||||
|
|
||||||
(dap-register-debug-provider "Elixir" 'dap-elixir--populate-start-file-args)
|
|
||||||
|
|
||||||
(dap-register-debug-template
|
|
||||||
"Elixir :: Run"
|
|
||||||
(list :type "Elixir"
|
|
||||||
:task "run"
|
|
||||||
:name "Elixir::Run"))
|
|
||||||
|
|
||||||
(dap-register-debug-template
|
|
||||||
"Elixir :: Run No Halt"
|
|
||||||
(list :type "Elixir"
|
|
||||||
:task "run"
|
|
||||||
:taskArgs (list "--no-halt")
|
|
||||||
:name "Elixir::Run No Halt"))
|
|
||||||
|
|
||||||
(dap-register-debug-template
|
|
||||||
"Elixir :: Phoenix Server"
|
|
||||||
(list :type "Elixir"
|
|
||||||
:name "Elixir::Phoenix Server"
|
|
||||||
:task "phx.server"))
|
|
||||||
|
|
||||||
(dap-register-debug-template
|
|
||||||
"Elixir :: Test"
|
|
||||||
(list :type "Elixir"
|
|
||||||
:name "Elixir::Test"
|
|
||||||
:task "test"
|
|
||||||
:taskArgs (list "--trace")
|
|
||||||
:startApps t
|
|
||||||
:requireFiles (list
|
|
||||||
"test/**/test_helper.exs"
|
|
||||||
"test/**/*_test.exs")))
|
|
||||||
|
|
||||||
(provide 'dap-elixir)
|
|
Loading…
Reference in a new issue