diff --git a/custom.el b/custom.el index c9422a5..ba31752 100644 --- a/custom.el +++ b/custom.el @@ -4,6 +4,7 @@ ;; 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. + '(custom-enabled-themes '(modus-operandi)) '(eglot-code-action-indications '(eldoc-hint)) '(package-selected-packages '(cape dumber-jump evil evil-collection exec-path-from-shell fish-mode diff --git a/init.el b/init.el index 66cf804..0aef0c6 100644 --- a/init.el +++ b/init.el @@ -7,7 +7,11 @@ (set-frame-font "Berkeley Mono 16" nil t) (set-frame-font "BerkeleyMono 14" nil t)) -(load-theme 'modus-vivendi) +;; dark mode +;; (load-theme 'modus-vivendi) + +;; light mode +(load-theme 'modus-operandi) (when (string= system-type "darwin") (setq dired-use-ls-dired nil) @@ -87,21 +91,26 @@ :config (evil-set-leader nil (kbd "SPC")) (evil-mode 1) - (evil-global-set-key 'normal (kbd "ff") #'find-file) - (evil-global-set-key 'normal (kbd "fb") #'switch-to-buffer) - (evil-global-set-key 'normal (kbd "gs") #'magit) - (evil-global-set-key 'normal (kbd "rw") #'dired) - (evil-global-set-key 'normal (kbd "h") #'help-command) + (evil-global-set-key 'motion (kbd "ff") #'find-file) + (evil-global-set-key 'motion (kbd "fb") #'switch-to-buffer) + (evil-global-set-key 'motion (kbd "gs") #'magit) + (evil-global-set-key 'motion (kbd "rw") #'dired) + (evil-global-set-key 'motion (kbd "h") #'help-command) - (evil-global-set-key 'normal (kbd "w") evil-window-map) - (evil-global-set-key 'normal (kbd "p") project-prefix-map) - ) + (evil-global-set-key 'motion (kbd "w") evil-window-map) + (evil-global-set-key 'motion (kbd "p") project-prefix-map)) (use-package evil-collection :after evil :ensure t :config - (evil-collection-init)) + (evil-collection-init) + + (require 'compile) + (keymap-set compilation-minor-mode-map "SPC" nil) + (keymap-set compilation-mode-map "SPC" nil) + (keymap-set help-mode-map "SPC" nil) + (keymap-set dired-mode-map "SPC" nil)) (use-package move-text :bind (("M-" . 'move-text-down) @@ -158,8 +167,9 @@ dumber-jump-find-rules)) (use-package eglot + :hook (jai-mode . eglot-ensure) :config - (push '(jai-mode "jails") eglot-server-programs) + (push '(jai-mode "jails" "-jai_path" (concat (getenv "HOME") "/.local/jai/") eglot-server-programs)) (push '(sql-mode "postgres-language-server" "lsp-proxy") eglot-server-programs)) (use-package yaml-mode)