diff --git a/emacs/doom-emacs/config.el b/emacs/doom-emacs/config.el index 67ae043..983568c 100644 --- a/emacs/doom-emacs/config.el +++ b/emacs/doom-emacs/config.el @@ -3,7 +3,6 @@ ;; 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. (setq user-full-name (getenv "DEFAULT_FULL_NAME") @@ -22,7 +21,7 @@ ;; (setq doom-font (font-spec :family "monospace" :size 12 :weight 'semi-light) ;; doom-variable-pitch-font (font-spec :family "sans" :size 13)) -(setq doom-font (font-spec :family "Anonymice Nerd Font Mono" :size 19)) +(setq doom-font (font-spec :family "AnonymicePro Nerd Font Mono" :size 16)) ;; 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 @@ -31,12 +30,11 @@ ;; 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/") +(setq org-directory "~/.org/") ;; 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 t) - +(setq display-line-numbers-type nil) ;; Here are some additional functions/macros that could help you configure Doom: ;; @@ -58,9 +56,20 @@ (global-visual-line-mode t) (setq-default fill-column 120) - (setq projectile-enable-caching nil) (setq eww-search-prefix "https://www.yandex.com/search/?text=") (setq-default TeX-engine 'xetex TeX-PDF-mode t) + +(setq lsp-intelephense-licence-key (getenv "INTELEPHENSE_LICENSE_KEY")) +(setq lsp-file-watch-threshold 5000) + +(setq lsp-disabled-clients '(typeprof-ls semgrep-ls)) + +;; (add-hook 'after-save-hook +;; (lambda () +;; (when (and buffer-file-name (derived-mode-p 'markdown-mode) (file-exists-p "./node_modules/.bin/markdownlint")) +;; (shell-command (format "./node_modules/.bin/markdownlint --fix --quiet %s" buffer-file-name))))) + +(set-formatter! 'rubocopfmt '("rubocop" "--stdin" filepath "-a" "--stderr" "--format" "quiet" "--fail-level" "fatal") :modes '(ruby-mode ruby-ts-mode)) diff --git a/emacs/doom-emacs/custom.el b/emacs/doom-emacs/custom.el new file mode 100644 index 0000000..a325dff --- /dev/null +++ b/emacs/doom-emacs/custom.el @@ -0,0 +1,12 @@ +(custom-set-variables + ;; custom-set-variables was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(auth-sources '("~/.authinfo"))) +(custom-set-faces + ;; custom-set-faces was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(ts-fold-replacement-face ((t (:foreground unspecified :box nil :inherit font-lock-comment-face :weight light))))) diff --git a/emacs/doom-emacs/init.el b/emacs/doom-emacs/init.el index 1795dd0..205642f 100644 --- a/emacs/doom-emacs/init.el +++ b/emacs/doom-emacs/init.el @@ -20,11 +20,11 @@ ;;layout ; auie,ctsrnm is the superior home row :completion - company ; the ultimate code completion backend ;;helm ; the *other* search engine for love and life + (company +childframe) ; the ultimate code completion backend ;;ido ; the other *other* search engine... - ;;(ivy +fuzzy +prescient +childframe) ; a search engine for love and life - (vertico +icons) ; the search engine of the future + (ivy +fuzzy +prescient +childframe +icons) ; a search engine for love and life + ;;(vertico +icons +childframe) ; the search engine of the future :ui ;;deft ; notational velocity for Emacs @@ -37,13 +37,13 @@ ;;indent-guides ; highlighted indent columns ;;ligatures ; ligatures and symbols to make your code pretty again ;;minimap ; show a map of the code on the side - ;;(modeline +light) ; snazzy, Atom-inspired modeline, plus API + modeline;; +light) ; snazzy, Atom-inspired modeline, plus API ;;nav-flash ; blink cursor line after big motions ;;neotree ; a project drawer, like NERDTree for vim ophints ; highlight the region an operation acts on (popup +defaults) ; tame sudden yet inevitable temporary windows ;;tabs ; a tab bar for Emacs - ;;treemacs ; a project drawer, like neotree but cooler + treemacs ; a project drawer, like neotree but cooler unicode ; extended unicode support for various languages ;;vc-gutter ; vcs diff in the fringe ;;vi-tilde-fringe ; fringe tildes to mark beyond EOB @@ -55,7 +55,7 @@ (evil +everywhere); come to the dark side, we have cookies file-templates ; auto-snippets for empty files fold ; (nigh) universal code folding - format ; automated prettiness + (format +onsave) ; automated prettiness ;;god ; run Emacs commands without modifier keys ;;lispy ; vim for lisp, for people who don't like vim ;;multiple-cursors ; editing in many places at once @@ -63,23 +63,23 @@ ;;parinfer ; turn lisp into python, sort of ;;rotate-text ; cycle region at point between text candidates snippets ; my elves. They type so I don't have to - ;;word-wrap ; soft wrapping with language-aware indent + word-wrap ; soft wrapping with language-aware indent :emacs dired ; making dired pretty [functional] electric ; smarter, keyword-based electric-indent (ibuffer +icons) ; interactive buffer management - undo ; persistent, smarter undo for your inevitable mistakes + (undo +tree) ; persistent, smarter undo for your inevitable mistakes vc ; version-control and Emacs, sitting in a tree :term - (eshell +company) ; the elisp shell that works everywhere + ;;eshell ; the elisp shell that works everywhere ;;shell ; simple shell REPL for Emacs ;;term ; basic terminal emulator for Emacs ;;vterm ; the best terminal emulation in Emacs :checkers - syntax ; tasing you for every semicolon you forget + (syntax +childframe) ; tasing you for every semicolon you forget ;;(spell +flyspell) ; tasing you for misspelling mispelling ;;grammar ; tasing grammar mistake every you make @@ -93,7 +93,7 @@ (eval +overlay) ; run code, run (also, repls) ;;gist ; interacting with github gists lookup ; navigate your code and its documentation - lsp ; M-x vscode + (lsp +peek) ; M-x vscode ;;magit ; a git porcelain for Emacs ;;make ; run make tasks from Emacs ;;pass ; password manager for nerds @@ -101,7 +101,8 @@ ;;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 + tree-sitter ;;tmux ; an API for interacting with tmux ;;upload ; map local to remote projects via ssh/ftp @@ -112,7 +113,7 @@ :lang ;;agda ; types of types of types of types... ;;beancount ; mind the GAAP - (cc +lsp) ; C > C++ == 1 + cc ; C > C++ == 1 ;;clojure ; java with a lisp common-lisp ; if you've seen one lisp, you've seen them all ;;coq ; proofs-as-programs @@ -121,7 +122,7 @@ ;;data ; config/data formats ;;(dart +flutter) ; paint ui and not much else ;;dhall - (elixir +lsp) ; erlang done right + (elixir +lsp) ; erlang done right ;;elm ; care for a cup of TEA? emacs-lisp ; drown in parentheses ;;erlang ; an elegant language for a more civilized age @@ -131,16 +132,17 @@ ;;fsharp ; ML stands for Microsoft's Language ;;fstar ; (dependent) types and (monadic) effects and Z3 ;;gdscript ; the language you waited for - (go +lsp) ; the hipster dialect - (haskell +lsp) ; a language that's lazier than I am + (go +lsp) ; the hipster dialect + (graphql +lsp) + ;;(haskell +lsp) ; a language that's lazier than I am ;;hy ; readability of scheme w/ speed of python ;;idris ; a language you can depend on - (json +lsp) ; At least it ain't XML + (json +lsp) ; At least it ain't XML ;;(java +meghanada) ; the poster child for carpal tunnel syndrome - (javascript +lsp) ; all(hope(abandon(ye(who(enter(here)))))) + (javascript +lsp +tree-sitter) ; all(hope(abandon(ye(who(enter(here)))))) ;;julia ; a better, faster MATLAB ;;kotlin ; a better, slicker Java(Script) - (latex +latexml +lsp) ; writing papers in Emacs has never been so fun + (latex +latexmk) ; writing papers in Emacs has never been so fun ;;lean ; for folks with too much to prove ;;ledger ; be audit you can be ;;lua ; one-based indices? one-based indices @@ -149,26 +151,26 @@ ;;nix ; I hereby declare "nix geht mehr!" ;;ocaml ; an objective camel ;;org ; organize your plain life in plain text - (php +lsp) ; perl's insecure younger brother + (php +tree-sitter +lsp) ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more ;;purescript ; javascript, but functional - (python +lsp) ; beautiful is better than ugly + python ; beautiful is better than ugly ;;qt ; the 'cutest' gui framework ever ;;racket ; a DSL for DSLs ;;raku ; the artist formerly known as perl6 ;;rest ; Emacs as a REST client ;;rst ; ReST in peace - (ruby +lsp +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - (rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + (ruby +rails +tree-sitter +lsp) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} + rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() ;;scala ; java, but good ;;(scheme +guile) ; a fully conniving family of lisps - sh ; she sells {ba,z,fi}sh shells on the C xor + (sh +lsp +tree-sitter) ; she sells {ba,z,fi}sh shells on the C xor ;;sml ;;solidity ; do you need a blockchain? No. ;;swift ; who asked for emoji variables? ;;terra ; Earth and Moon in alignment for performance. - (web +lsp) ; the tubes - (yaml +lsp) ; JSON, but readable + (web +lsp) ; the tubes + (yaml +lsp) ; JSON, but readable ;;zig ; C, but simpler :email diff --git a/emacs/doom-emacs/packages.el b/emacs/doom-emacs/packages.el index 263f213..a1dc1fb 100644 --- a/emacs/doom-emacs/packages.el +++ b/emacs/doom-emacs/packages.el @@ -7,48 +7,52 @@ ;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: -;(package! some-package) + ;(package! some-package) (package! slim-mode) (package! coffee-mode) (package! sqlformat) (package! nvm) +(package! epc) +;; (package! transient :pin "c2bdf7e12c530eb85476d3aef317eb2941ab9440") +;; (package! with-editor :pin "391e76a256aeec6b9e4cbd733088f30c677d965b") ;; To install a package directly from a remote git repo, you must specify a ;; `:recipe'. You'll find documentation on what `:recipe' accepts here: ;; https://github.com/raxod502/straight.el#the-recipe-format -;(package! another-package -; :recipe (:host github :repo "username/repo")) + ;(package! another-package + ; :recipe (:host github :repo "username/repo")) ;; 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 ;; `:files' in the `:recipe': -;(package! this-package -; :recipe (:host github :repo "username/repo" -; :files ("some-file.el" "src/lisp/*.el"))) + ;(package! this-package + ; :recipe (:host github :repo "username/repo" + ; :files ("some-file.el" "src/lisp/*.el"))) ;; If you'd like to disable a package included with Doom, you can do so here ;; with the `:disable' property: -;(package! builtin-package :disable t) + ;(package! builtin-package :disable t) + ;(package! docker-tramp :disable t) ;; 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 ;; from Doom or MELPA/ELPA/Emacsmirror: -;(package! builtin-package :recipe (:nonrecursive t)) -;(package! builtin-package-2 :recipe (:repo "myfork/package")) + ;(package! builtin-package :recipe (:nonrecursive t)) + ;(package! builtin-package-2 :recipe (:repo "myfork/package")) ;; 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 ;; our package manager can't deal with; see raxod502/straight.el#279) -;(package! builtin-package :recipe (:branch "develop")) + ;(package! builtin-package :recipe (:branch "develop")) ;; 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 ;; release. The `unpin!' macro allows you to unpin single packages... -;(unpin! pinned-package) + ;(unpin! pinned-package) ;; ...or multiple packages -;(unpin! pinned-package another-pinned-package) + ;(unpin! pinned-package another-pinned-package) ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) -;(unpin! t) + ;(unpin! t)