diff options
| -rw-r--r-- | emacs/.emacs.d/main.el | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el index a1a0e0ce..ff3c53f4 100644 --- a/emacs/.emacs.d/main.el +++ b/emacs/.emacs.d/main.el @@ -49,6 +49,7 @@ ;;;;; Use-package +(autoload 'package-installed-p "package.el") (eval-and-compile (require 'seq) (defun is-nix-emacs () @@ -448,7 +449,7 @@ ;; Projectile is awesome for working in projects, especially VCS-backed ;; ones. -(add-to-list 'byte-compile-not-obsolete-funcs #'projectile-global-mode) +(add-to-list 'byte-compile-not-obsolete-funcs 'projectile-global-mode) (use-package projectile :bind (("s-p" . projectile-switch-project) ("C-c C-f" . projectile-find-file) @@ -753,6 +754,7 @@ (use-package tramp :defer 7 + :defines tramp-ssh-controlmaster-options :config (progn (unless (and (getenv "SSH_AUTH_SOCK") (file-exists-p (getenv "SSH_AUTH_SOCK"))) @@ -1347,7 +1349,7 @@ With two prefix arguments, write out the day and month name." "Hook for running code after first-frame is opened.") (defun first-frame-hook-handler (frame) - "Hook run only after first frame is created." + "Hook run only after first frame FRAME is created." (remove-hook 'after-make-frame-functions #'first-frame-hook-handler) (run-at-time nil nil (lambda () (run-hooks 'first-frame-hook)))) @@ -1488,9 +1490,6 @@ With two prefix arguments, write out the day and month name." :mode (("/nginx/servers/" . nginx-mode) ("/nginx/.*\\.d/" . nginx-mode))) -(use-package lua-mode - :defer t) - (use-package ruby-mode :mode (("\\.rb\\'" . ruby-mode) ("\\.cap\\'" . ruby-mode))) @@ -2280,7 +2279,6 @@ With two prefix arguments, write out the day and month name." ("zshenv\\'" . shell-script-mode) ("zshrc\\'" . shell-script-mode)) :config (setq sh-shell-file "/usr/bin/env zsh" - sh-indentation 2 sh-basic-offset 2)) (add-hook 'shell-mode-hook 'ansi-color-for-comint-mode-on) @@ -2294,14 +2292,15 @@ With two prefix arguments, write out the day and month name." :bind ("C-c s" . eshell) :defer 10 :functions (eshell/pwd) - :defines (eshell-prompt-function) + :defines (eshell-prompt-function + eshell-prompt-regexp) :config (progn (setq eshell-directory-name "~/.emacs.d/eshell" eshell-prompt-function (lambda () (concat (eshell/pwd) "\n$ ")) - eshell-prompt-regex (rx bol (char "$") blank)) + eshell-prompt-regexp (rx bol (char "$") blank)) (define-hook-helper eshell-load () (bind-key "C-c C-l" #'counsel-esh-history eshell-mode-map)))) @@ -2481,6 +2480,7 @@ Pass ARG to `comint-delchar-or-maybe-eof'." ";" #'counsel-M-x))) (use-package evil + :defines evil-window-map :config (progn (evil-mode +1) (setq evil-shift-width 2) @@ -2555,6 +2555,7 @@ Pass ARG to `comint-delchar-or-maybe-eof'." (use-package evil-space :if evil-mode + :diminish (evil-space-mode) :config (progn (evil-space-mode +1))) @@ -2579,4 +2580,5 @@ Pass ARG to `comint-delchar-or-maybe-eof'." ;; # Local Variables: ;; # lentic-init: lentic-orgel-org-init +;; # flycheck-disabled-checkers: 'emacs-lisp-checkdoc ;; # End: |