diff options
Diffstat (limited to '.doom.d/config.el')
-rw-r--r-- | .doom.d/config.el | 94 |
1 files changed, 11 insertions, 83 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)) |