Apply config changes from doom upstream
This commit is contained in:
parent
29eb82cb9d
commit
6bb5381d8c
4 changed files with 26 additions and 23 deletions
5
README.md
Normal file
5
README.md
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
# Install or update doom configuration
|
||||||
|
|
||||||
|
```bash
|
||||||
|
curl https://gitea.mrdev023.fr/florian.richer/emacs_conf/raw/branch/main/install.sh | bash
|
||||||
|
```
|
|
@ -21,8 +21,8 @@
|
||||||
;; See 'C-h v doom-font' for documentation and more examples of what they
|
;; See 'C-h v doom-font' for documentation and more examples of what they
|
||||||
;; accept. For example:
|
;; accept. For example:
|
||||||
;;
|
;;
|
||||||
;; (setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'semi-light)
|
;;(setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'semi-light)
|
||||||
;; doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13))
|
;; 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
|
||||||
|
|
12
init.el
12
init.el
|
@ -22,6 +22,7 @@
|
||||||
|
|
||||||
:completion
|
:completion
|
||||||
company ; the ultimate code completion backend
|
company ; the ultimate code completion backend
|
||||||
|
(corfu +orderless) ; complete with cap(f), cape and a flying feather!
|
||||||
;;helm ; the *other* search engine for love and life
|
;;helm ; the *other* search engine for love and life
|
||||||
;;ido ; the other *other* search engine...
|
;;ido ; the other *other* search engine...
|
||||||
;;ivy ; a search engine for love and life
|
;;ivy ; a search engine for love and life
|
||||||
|
@ -34,7 +35,6 @@
|
||||||
;;doom-quit ; DOOM quit-message prompts when you quit Emacs
|
;;doom-quit ; DOOM quit-message prompts when you quit Emacs
|
||||||
(emoji +unicode) ; 🙂
|
(emoji +unicode) ; 🙂
|
||||||
hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
|
hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
|
||||||
;;hydra
|
|
||||||
;;indent-guides ; highlighted indent columns
|
;;indent-guides ; highlighted indent columns
|
||||||
ligatures ; ligatures and symbols to make your code pretty again
|
ligatures ; ligatures and symbols to make your code pretty again
|
||||||
;;minimap ; show a map of the code on the side
|
;;minimap ; show a map of the code on the side
|
||||||
|
@ -69,6 +69,7 @@
|
||||||
:emacs
|
:emacs
|
||||||
dired ; making dired pretty [functional]
|
dired ; making dired pretty [functional]
|
||||||
electric ; smarter, keyword-based electric-indent
|
electric ; smarter, keyword-based electric-indent
|
||||||
|
;;eww ; the internet is gross
|
||||||
(ibuffer +icons) ; interactive buffer management
|
(ibuffer +icons) ; interactive buffer management
|
||||||
undo ; persistent, smarter undo for your inevitable mistakes
|
undo ; persistent, smarter undo for your inevitable mistakes
|
||||||
vc ; version-control and Emacs, sitting in a tree
|
vc ; version-control and Emacs, sitting in a tree
|
||||||
|
@ -94,7 +95,6 @@
|
||||||
;;editorconfig ; let someone else argue about tabs vs spaces
|
;;editorconfig ; let someone else argue about tabs vs spaces
|
||||||
;;ein ; tame Jupyter notebooks with emacs
|
;;ein ; tame Jupyter notebooks with emacs
|
||||||
(eval +overlay) ; run code, run (also, repls)
|
(eval +overlay) ; run code, run (also, repls)
|
||||||
;;gist ; interacting with github gists
|
|
||||||
lookup ; navigate your code and its documentation
|
lookup ; navigate your code and its documentation
|
||||||
lsp ; M-x vscode
|
lsp ; M-x vscode
|
||||||
magit ; a git porcelain for Emacs
|
magit ; a git porcelain for Emacs
|
||||||
|
@ -102,22 +102,20 @@
|
||||||
;;pass ; password manager for nerds
|
;;pass ; password manager for nerds
|
||||||
;;pdf ; pdf enhancements
|
;;pdf ; pdf enhancements
|
||||||
;;prodigy ; FIXME managing external services & code builders
|
;;prodigy ; FIXME managing external services & code builders
|
||||||
rgb ; creating color strings
|
|
||||||
;;taskrunner ; taskrunner for all your projects
|
|
||||||
;;terraform ; infrastructure as code
|
;;terraform ; infrastructure as code
|
||||||
;;tmux ; an API for interacting with tmux
|
;;tmux ; an API for interacting with tmux
|
||||||
tree-sitter ; syntax and parsing, sitting in a tree...
|
tree-sitter ; syntax and parsing, sitting in a tree...
|
||||||
;;upload ; map local to remote projects via ssh/ftp
|
;;upload ; map local to remote projects via ssh/ftp
|
||||||
|
|
||||||
:os
|
:os
|
||||||
(:if IS-MAC macos) ; improve compatibility with macOS
|
(:if (featurep :system 'macos) macos) ; improve compatibility with macOS
|
||||||
;;tty ; improve the terminal Emacs experience
|
;;tty ; improve the terminal Emacs experience
|
||||||
|
|
||||||
:lang
|
:lang
|
||||||
;;agda ; types of types of types of types...
|
;;agda ; types of types of types of types...
|
||||||
;;beancount ; mind the GAAP
|
;;beancount ; mind the GAAP
|
||||||
(cc +lsp) ; C > C++ == 1
|
(cc +lsp) ; C > C++ == 1
|
||||||
;;cloju
|
;;clojure ; java with a lisp
|
||||||
;;common-lisp ; if you've seen one lisp, you've seen them all
|
;;common-lisp ; if you've seen one lisp, you've seen them all
|
||||||
;;coq ; proofs-as-programs
|
;;coq ; proofs-as-programs
|
||||||
;;crystal ; ruby at the speed of c
|
;;crystal ; ruby at the speed of c
|
||||||
|
@ -157,6 +155,7 @@
|
||||||
org ; organize your plain life in plain text
|
org ; organize your plain life in plain text
|
||||||
;;php ; perl's insecure younger brother
|
;;php ; perl's insecure younger brother
|
||||||
;;plantuml ; diagrams for confusing people more
|
;;plantuml ; diagrams for confusing people more
|
||||||
|
;;graphviz ; diagrams for confusing yourself even more
|
||||||
;;purescript ; javascript, but functional
|
;;purescript ; javascript, but functional
|
||||||
;;python ; beautiful is better than ugly
|
;;python ; beautiful is better than ugly
|
||||||
(qt +lsp +xp) ; the 'cutest' gui framework ever
|
(qt +lsp +xp) ; the 'cutest' gui framework ever
|
||||||
|
@ -188,7 +187,6 @@
|
||||||
;;everywhere ; *leave* Emacs!? You must be joking
|
;;everywhere ; *leave* Emacs!? You must be joking
|
||||||
;;irc ; how neckbeards socialize
|
;;irc ; how neckbeards socialize
|
||||||
;;(rss +org) ; emacs as an RSS reader
|
;;(rss +org) ; emacs as an RSS reader
|
||||||
;;twitter ; twitter client https://twitter.com/vnought
|
|
||||||
|
|
||||||
:config
|
:config
|
||||||
;;literate
|
;;literate
|
||||||
|
|
28
packages.el
28
packages.el
|
@ -7,46 +7,46 @@
|
||||||
|
|
||||||
|
|
||||||
;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
|
;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
|
||||||
;(package! some-package)
|
;; (package! some-package)
|
||||||
|
|
||||||
;; To install a package directly from a remote git repo, you must specify a
|
;; To install a package directly from a remote git repo, you must specify a
|
||||||
;; `:recipe'. You'll find documentation on what `:recipe' accepts here:
|
;; `:recipe'. You'll find documentation on what `:recipe' accepts here:
|
||||||
;; https://github.com/radian-software/straight.el#the-recipe-format
|
;; https://github.com/radian-software/straight.el#the-recipe-format
|
||||||
;(package! another-package
|
;; (package! another-package
|
||||||
; :recipe (:host github :repo "username/repo"))
|
;; :recipe (:host github :repo "username/repo"))
|
||||||
|
|
||||||
;; If the package you are trying to install does not contain a PACKAGENAME.el
|
;; If the package you are trying to install does not contain a PACKAGENAME.el
|
||||||
;; file, or is located in a subdirectory of the repo, you'll need to specify
|
;; file, or is located in a subdirectory of the repo, you'll need to specify
|
||||||
;; `:files' in the `:recipe':
|
;; `:files' in the `:recipe':
|
||||||
;(package! this-package
|
;; (package! this-package
|
||||||
; :recipe (:host github :repo "username/repo"
|
;; :recipe (:host github :repo "username/repo"
|
||||||
; :files ("some-file.el" "src/lisp/*.el")))
|
;; :files ("some-file.el" "src/lisp/*.el")))
|
||||||
|
|
||||||
;; If you'd like to disable a package included with Doom, you can do so here
|
;; If you'd like to disable a package included with Doom, you can do so here
|
||||||
;; with the `:disable' property:
|
;; with the `:disable' property:
|
||||||
;(package! builtin-package :disable t)
|
;; (package! builtin-package :disable t)
|
||||||
|
|
||||||
;; You can override the recipe of a built in package without having to specify
|
;; You can override the recipe of a built in package without having to specify
|
||||||
;; all the properties for `:recipe'. These will inherit the rest of its recipe
|
;; all the properties for `:recipe'. These will inherit the rest of its recipe
|
||||||
;; from Doom or MELPA/ELPA/Emacsmirror:
|
;; from Doom or MELPA/ELPA/Emacsmirror:
|
||||||
;(package! builtin-package :recipe (:nonrecursive t))
|
;; (package! builtin-package :recipe (:nonrecursive t))
|
||||||
;(package! builtin-package-2 :recipe (:repo "myfork/package"))
|
;; (package! builtin-package-2 :recipe (:repo "myfork/package"))
|
||||||
|
|
||||||
;; Specify a `:branch' to install a package from a particular branch or tag.
|
;; Specify a `:branch' to install a package from a particular branch or tag.
|
||||||
;; This is required for some packages whose default branch isn't 'master' (which
|
;; This is required for some packages whose default branch isn't 'master' (which
|
||||||
;; our package manager can't deal with; see radian-software/straight.el#279)
|
;; our package manager can't deal with; see radian-software/straight.el#279)
|
||||||
;(package! builtin-package :recipe (:branch "develop"))
|
;; (package! builtin-package :recipe (:branch "develop"))
|
||||||
|
|
||||||
;; Use `:pin' to specify a particular commit to install.
|
;; Use `:pin' to specify a particular commit to install.
|
||||||
;(package! builtin-package :pin "1a2b3c4d5e")
|
;; (package! builtin-package :pin "1a2b3c4d5e")
|
||||||
|
|
||||||
|
|
||||||
;; Doom's packages are pinned to a specific commit and updated from release to
|
;; Doom's packages are pinned to a specific commit and updated from release to
|
||||||
;; release. The `unpin!' macro allows you to unpin single packages...
|
;; release. The `unpin!' macro allows you to unpin single packages...
|
||||||
;(unpin! pinned-package)
|
;; (unpin! pinned-package)
|
||||||
;; ...or multiple packages
|
;; ...or multiple packages
|
||||||
;(unpin! pinned-package another-pinned-package)
|
;; (unpin! pinned-package another-pinned-package)
|
||||||
;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
|
;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
|
||||||
;(unpin! t)
|
;; (unpin! t)
|
||||||
|
|
||||||
(package! ripgrep)
|
(package! ripgrep)
|
||||||
|
|
Loading…
Reference in a new issue