Update doom
This commit is contained in:
parent
83dd7af3c0
commit
890f76ae91
3 changed files with 76 additions and 6 deletions
|
|
@ -25,7 +25,8 @@
|
|||
;; 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)
|
||||
;(setq doom-theme 'doom-one)
|
||||
(setq doom-theme 'doom-nord)
|
||||
|
||||
;; 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!
|
||||
|
|
@ -53,6 +54,9 @@
|
|||
;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
|
||||
;; they are implemented.
|
||||
|
||||
(use-package! puppet-mode
|
||||
:mode "\\.pp\\'")
|
||||
|
||||
(setq doom-leader-key ",")
|
||||
(setq doom-leader-alt-key "M-,")
|
||||
(setq doom-localleader-key ", m")
|
||||
|
|
@ -69,3 +73,17 @@
|
|||
:n "C-l" #'evil-window-right
|
||||
:n "-" #'flycheck-next-error
|
||||
:n "_" #'flycheck-previous-error)
|
||||
|
||||
|
||||
;; Eshell stuff
|
||||
(setenv "SSH_AUTH_SOCK" (concat (getenv "HOME") "/.gnupg/S.gpg-agent.ssh"))
|
||||
|
||||
;(eshell/addpath "/opt/puppetlabs/pdk/bin")
|
||||
|
||||
;; Where to find rubocop
|
||||
(setq flycheck-ruby-rubocop-executable "~/.rbenv/shims/rubocop")
|
||||
|
||||
(eval-after-load "flymake-json"
|
||||
'(defun flymake-json-command (filename)
|
||||
"Construct a command that flymake can use to check json source in FILENAME."
|
||||
(list "jsonlint" "-V" "/Users/hunner/.doom.d/draft-07.json" "-c" "-q" filename)))
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
(popup +defaults) ; tame sudden yet inevitable temporary windows
|
||||
;;pretty-code ; ligatures or substitute text with pretty symbols
|
||||
;;tabs ; a tab bar for Emacs
|
||||
;;treemacs ; a project drawer, like neotree but cooler
|
||||
treemacs ; a project drawer, like neotree but cooler ; XXX Changed
|
||||
;;unicode ; extended unicode support for various languages
|
||||
vc-gutter ; vcs diff in the fringe
|
||||
vi-tilde-fringe ; fringe tildes to mark beyond EOB
|
||||
|
|
@ -92,7 +92,7 @@
|
|||
(eval +overlay) ; run code, run (also, repls)
|
||||
;;gist ; interacting with github gists
|
||||
lookup ; navigate your code and its documentation
|
||||
;;lsp
|
||||
lsp ; XXX Changed
|
||||
macos ; MacOS-specific commands XXX Changed
|
||||
magit ; a git porcelain for Emacs
|
||||
make ; run make tasks from Emacs ; XXX Changed
|
||||
|
|
@ -130,7 +130,7 @@
|
|||
;;idris ;
|
||||
;;json ; At least it ain't XML
|
||||
;;(java +meghanada) ; the poster child for carpal tunnel syndrome
|
||||
javascript ; all(hope(abandon(ye(who(enter(here)))))) ; XXX Changed
|
||||
(javascript +lsp) ; all(hope(abandon(ye(who(enter(here)))))) ; XXX Changed
|
||||
;;julia ; a better, faster MATLAB
|
||||
;;kotlin ; a better, slicker Java(Script)
|
||||
;;latex ; writing papers in Emacs has never been so fun
|
||||
|
|
@ -146,7 +146,7 @@
|
|||
;;php ; perl's insecure younger brother
|
||||
;;plantuml ; diagrams for confusing people more
|
||||
;;purescript ; javascript, but functional
|
||||
;;python ; beautiful is better than ugly
|
||||
(python +lsp) ; beautiful is better than ugly ;; XXX Changed
|
||||
;;qt ; the 'cutest' gui framework ever
|
||||
;;racket ; a DSL for DSLs
|
||||
;;raku ; the artist formerly known as perl6
|
||||
|
|
@ -162,7 +162,7 @@
|
|||
;;swift ; who asked for emoji variables?
|
||||
;;terra ; Earth and Moon in alignment for performance.
|
||||
;;web ; the tubes
|
||||
;;yaml ; JSON, but readable
|
||||
yaml ; JSON, but readable ;; XXX Changed
|
||||
|
||||
:email
|
||||
;;(mu4e +gmail)
|
||||
|
|
|
|||
52
.doom.d/packages.el
Normal file
52
.doom.d/packages.el
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; $DOOMDIR/packages.el
|
||||
|
||||
;; To install a package with Doom you must declare them here and run 'doom sync'
|
||||
;; on the command line, then restart Emacs for the changes to take effect -- or
|
||||
;; use 'M-x doom/reload'.
|
||||
|
||||
|
||||
;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
|
||||
;(package! some-package)
|
||||
|
||||
;; 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"))
|
||||
|
||||
;; 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")))
|
||||
|
||||
;; 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)
|
||||
|
||||
;; 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"))
|
||||
|
||||
;; 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"))
|
||||
|
||||
;; Use `:pin' to specify a particular commit to install.
|
||||
;(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)
|
||||
;; ...or multiple packages
|
||||
;(unpin! pinned-package another-pinned-package)
|
||||
;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
|
||||
;(unpin! t)
|
||||
|
||||
(package! puppet-mode)
|
||||
Loading…
Add table
Add a link
Reference in a new issue