diff options
| -rw-r--r-- | .doom.d/config.el | 94 | ||||
| -rw-r--r-- | .doom.d/custom.el | 0 | ||||
| -rw-r--r-- | .doom.d/init.el | 60 | ||||
| -rw-r--r-- | .doom.d/packages.el | 10 |
4 files changed, 45 insertions, 119 deletions
diff --git a/.doom.d/config.el b/.doom.d/config.el index 92265f3e..16ac4275 100644 --- a/.doom.d/config.el +++ b/.doom.d/config.el @@ -21,22 +21,20 @@ ;; 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)) -(setq doom-font (font-spec :family "Mononoki Nerd Font" :size 16) + +(setq doom-font (font-spec :family "Mononoki Nerd Font" :size 14) doom-variable-pitch-font (font-spec :family "sans") doom-big-font (font-spec :family "Mononoki Nerd Font" :size 24)) +;; 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: (after! doom-themes (setq doom-themes-enable-bold t doom-themes-enable-italic t)) (custom-set-faces! '(font-lock-comment-face :slant italic) '(font-lock-keyword-face :slant italic)) - -;; 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-material) (setq doom-theme 'doom-oceanic-next) ;; If you use `org' and don't want your org files in the default location below, @@ -64,9 +62,6 @@ ;; ;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how ;; they are implemented. -;; WhiteSpace Cleanup -(global-whitespace-cleanup-mode) - ;; HTTP Statuses for Helm (defvar helm-httpstatus-source '((name . "HTTP STATUS") @@ -114,31 +109,6 @@ ;; Removes mouse from code ;; (mouse-avoidance-mode "animate") -;; Basic: Turn off bugging yes-or-no-p -(fset 'yes-or-no-p 'y-or-n-p) - -;; JavaScript -;; (eval-after-load 'js2-mode -(after! js2-mode - '(progn - (add-hook 'js2-mode-hook #'add-node-modules-path) - (add-hook 'js2-mode-hook #'prettier-js-mode))) - -;; TypeScript -(after! typescript-mode - (add-hook 'typescript-mode-hook #'prettier-js-mode)) - -;; WebMode -(after! web-mode - (add-hook 'web-mode-hook 'rainbow-mode) - (setq web-mode-markup-indent-offset 2) - (setq web-mode-css-indent-offset 2) - (setq web-mode-code-indent-offset 2) - (setq js-indent-level 2) - (setq-default tab-width 2) - (setq js-highlight-level 3) - (setq auto-indent-indent-style 'aggressive)) - ;; Org Mode (after! org ;; Include diary @@ -223,19 +193,6 @@ (require 'org-bullets) (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))) -;; lsp-mode -(after! lsp-mode - :init - (setq lsp-headerline-breadcrumb-enable t) - :custom - (setq lsp-ui-doc-enable t) - ;; LSP eslint config - (setq lsp-eslint-server-command - '("node" - "/home/roger/.vscode-oss/extensions/vscode-eslint-release-2.1.5/server/out/eslintServer.js" - "--stdio"))) -(after! lsp-ui - (setq lsp-ui-doc-enable t)) ;; My own menu (map! :leader @@ -246,45 +203,16 @@ :desc "Run ispell" "i" #'ispell )) -;; Autofill mode -(add-hook 'text-mode-hook 'auto-fill-mode) -(setq-default fill-column 80) ;; Python (require 'auto-virtualenv) (after! python :init - (setq lsp-pyls-plugins-pylint-enabled t) - (setq lsp-pyls-plugins-autopep8-enabled nil) - (setq lsp-pyls-plugins-pyflakes-enabled nil) - (setq lsp-pyls-plugins-pycodestyle-enabled nil) - (setq lsp-pyls-configuration-sources "pep8") - (add-hook 'before-save-hook 'lsp-format-buffer) + ;; (setq lsp-pyls-plugins-pylint-enabled t) + ;; (setq lsp-pyls-plugins-autopep8-enabled nil) + ;; (setq lsp-pyls-plugins-pyflakes-enabled nil) + ;; (setq lsp-pyls-plugins-pycodestyle-enabled nil) + ;; (setq lsp-pyls-configuration-sources "pep8") + ;; (add-hook 'before-save-hook 'lsp-format-buffer) (add-hook 'python-mode-hook 'auto-virtualenv-set-virtualenv)) - - -;; Ruby - -(defvar ruby--byebug-breakpoint-string "require 'byebug'; byebug ## DEBUG ##" - "Ruby breakpoint string used by `ruby-insert-breakpoint'") - -(defun ruby-insert-breakpoint () - "Inserts a ruby breakpoint using `byebug'" - (interactive) - (back-to-indentation) - ;; this preserves the correct indentation in case the line above - ;; point is a nested block - (split-line) - (insert ruby--byebug-breakpoint-string)) - - -(after! ruby-mode - :init - (add-hook 'ruby-mode-hook 'add-debug-highlight) - (define-key ruby-mode-map (kbd "<f6>") 'ruby-insert-breakpoint)) - -;; Compile -(global-set-key [f4] 'compile) -(global-set-key [f5] 'recompile) -(add-to-list 'default-frame-alist '(inhibit-double-buffering . t)) diff --git a/.doom.d/custom.el b/.doom.d/custom.el deleted file mode 100644 index e69de29b..00000000 --- a/.doom.d/custom.el +++ /dev/null diff --git a/.doom.d/init.el b/.doom.d/init.el index bcb1f21e..69af5eb5 100644 --- a/.doom.d/init.el +++ b/.doom.d/init.el @@ -21,7 +21,7 @@ :completion company ; the ultimate code completion backend - helm ; the *other* search engine for love and life + ;;helm ; the *other* search engine for love and life ;;ido ; the other *other* search engine... ivy ; a search engine for love and life @@ -30,16 +30,16 @@ doom ; what makes DOOM look the way it does doom-dashboard ; a nifty splash screen for Emacs doom-quit ; DOOM quit-message prompts when you quit Emacs - (emoji +unicode) ; 🙂 + ;;(emoji +unicode) ; 🙂 ;;fill-column ; a `fill-column' indicator hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW ;;hydra 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 + ;;minimap ; show a map of the code on the side modeline ; snazzy, Atom-inspired modeline, plus API - nav-flash ; blink cursor line after big motions - neotree ; a project drawer, like NERDTree for vim + ;;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 @@ -47,7 +47,7 @@ ;;unicode ; extended unicode support for various languages vc-gutter ; vcs diff in the fringe vi-tilde-fringe ; fringe tildes to mark beyond EOB - window-select ; visually switch windows + ;;window-select ; visually switch windows workspaces ; tab emulation, persistence & separate workspaces ;;zen ; distraction-free coding or writing @@ -55,37 +55,37 @@ (evil +everywhere); come to the dark side, we have cookies file-templates ; auto-snippets for empty files fold ; (nigh) universal code folding - ;; (format +onsave) ; 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 ;;objed ; text object editing for the innocent ;;parinfer ; turn lisp into python, sort of - rotate-text ; cycle region at point between text candidates + ;;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 ; interactive buffer management + ;;ibuffer ; interactive buffer management undo ; persistent, smarter undo for your inevitable mistakes vc ; version-control and Emacs, sitting in a tree :term - ;; eshell ; 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 - ;;spell ; tasing you for misspelling mispelling + ;;(spell +flyspell) ; tasing you for misspelling mispelling ;;grammar ; tasing grammar mistake every you make :tools ;;ansible - (debugger +lsp) ; FIXME stepping through code, to help you add bugs + ;;debugger ; FIXME stepping through code, to help you add bugs ;;direnv docker ;;editorconfig ; let someone else argue about tabs vs spaces @@ -93,7 +93,7 @@ (eval +overlay) ; run code, run (also, repls) ;;gist ; interacting with github gists lookup ; navigate your code and its documentation - lsp + ;;lsp (magit +forge) ; a git porcelain for Emacs ;;make ; run make tasks from Emacs ;;pass ; password manager for nerds @@ -106,24 +106,26 @@ ;;upload ; map local to remote projects via ssh/ftp :os - ;; (:if IS-MAC macos) ; improve compatibility with macOS + (:if IS-MAC macos) ; improve compatibility with macOS ;;tty ; improve the terminal Emacs experience :lang ;;agda ; types of types of types of types... - ;;cc ; C/C++/Obj-C madness + ;;beancount ; mind the GAAP + ;;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 ;;crystal ; ruby at the speed of c - csharp ; unity, .NET, and mono shenanigans - data ; config/data formats + ;;csharp ; unity, .NET, and mono shenanigans + ;;data ; config/data formats ;;(dart +flutter) ; paint ui and not much else ;;elixir ; erlang done right ;;elm ; care for a cup of TEA? emacs-lisp ; drown in parentheses ;;erlang ; an elegant language for a more civilized age ;;ess ; emacs speaks statistics + ;;factor ;;faust ; dsp, but you get to keep your soul ;;fsharp ; ML stands for Microsoft's Language ;;fstar ; (dependent) types and (monadic) effects and Z3 @@ -132,15 +134,14 @@ ;;(haskell +dante) ; a language that's lazier than I am ;;hy ; readability of scheme w/ speed of python ;;idris ; a language you can depend on - json ; At least it ain't XML + ;;json ; 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 ; all(hope(abandon(ye(who(enter(here)))))) ;;julia ; a better, faster MATLAB ;;kotlin ; a better, slicker Java(Script) ;;latex ; writing papers in Emacs has never been so fun - ;;lean - ;;factor - ;;ledger ; an accounting system in Emacs + ;;lean ; for folks with too much to prove + ;;ledger ; be audit you can be ;;lua ; one-based indices? one-based indices markdown ; writing docs for people to ignore ;;nim ; python + lisp at the speed of c @@ -150,23 +151,24 @@ ;;php ; 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 +rails +lsp) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} + ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} ;;rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() ;;scala ; java, but good - ;;scheme ; a fully conniving family of lisps + ;;(scheme +guile) ; a fully conniving family of lisps sh ; 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 ; the tubes - yaml ; JSON, but readable + web ; the tubes + yaml ; JSON, but readable + ;;zig ; C, but simpler :email ;;(mu4e +gmail) @@ -175,6 +177,8 @@ :app ;;calendar + ;;emms + ;;everywhere ; *leave* Emacs!? You must be joking ;;irc ; how neckbeards socialize ;;(rss +org) ; emacs as an RSS reader ;;twitter ; twitter client https://twitter.com/vnought diff --git a/.doom.d/packages.el b/.doom.d/packages.el index 6abc3325..967c9a56 100644 --- a/.doom.d/packages.el +++ b/.doom.d/packages.el @@ -48,13 +48,7 @@ ;(unpin! pinned-package another-pinned-package) ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) ;(unpin! t) -; -(package! whitespace-cleanup-mode) -(package! prettier-js) -(package! aggressive-indent) -(package! emojify) -(package! ghub+) -(package! lsp-python-ms :disable t) -(package! jenkinsfile-mode) + (package! auto-virtualenv) (package! org-bullets) +;; (package! lsp-python-ms :disable t) |