From 238a0f4341c7d3477f3f26b37c03d58309b2f724 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Wed, 21 Aug 2019 16:15:54 +0300 Subject: [PATCH] Fix for work with a wide monitor --- 01mac.el | 3 +++ 06company-yasnippet.el | 4 ++-- init.el | 3 ++- languages/clojure.el | 26 ++++++++++++++++++++++---- languages/elisp.el | 2 ++ languages/kotlin.el | 7 +++++++ languages/web.el | 3 +++ themes/themes.el | 3 ++- 8 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 languages/kotlin.el diff --git a/01mac.el b/01mac.el index 085572e..98258ec 100644 --- a/01mac.el +++ b/01mac.el @@ -108,6 +108,9 @@ ;; Only warn if a file is bigger than 50 MB when trying to open it (setq large-file-warning-threshold 50000000) +;; Numbers are arbitrary, but work on a large screen. Default is 160 +(setq split-width-threshold 180) + ;;;;;;;;;;;;;;;;;;;;;; Shell stuff ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (add-hook 'shell-mode-hook 'ansi-color-for-comint-mode-on) diff --git a/06company-yasnippet.el b/06company-yasnippet.el index 8632a93..a1e02a2 100644 --- a/06company-yasnippet.el +++ b/06company-yasnippet.el @@ -38,10 +38,10 @@ company-tooltip-flip-when-above t company-tooltip-limit 10 ; tooltip candidates max limit. company-tooltip-minimum 2 ; minimum candidates limit. - company-tooltip-minimum-width 0 ; The minimum width of the tooltip's inner area. + company-tooltip-minimum-width 10 ; The minimum width of the tooltip's inner area. ; This doesn't include the margins and the scroll bar. company-tooltip-margin 2 ; width of margin columns to show around the tooltip - company-tooltip-offset-display 'scrollbar ; 'lines - how to show tooltip unshown candidates number. + company-tooltip-offset-display 'lines ; 'lines - how to show tooltip unshown candidates number. company-show-numbers nil ; t: show quick-access numbers for the first ten candidates. company-selection-wrap-around t ; loop over candidates ;; company-async-wait 0.03 diff --git a/init.el b/init.el index 311eed6..6cd2fab 100644 --- a/init.el +++ b/init.el @@ -76,6 +76,7 @@ (load "$HOME/.emacs.d/languages/rust.el" 'f 't) (load "$HOME/.emacs.d/languages/clang.el" 'f 't) (load "$HOME/.emacs.d/languages/clojure.el" 'f 't) +(load "$HOME/.emacs.d/languages/kotlin.el" 'f 't) (custom-set-variables ;; custom-set-variables was added by Custom. @@ -87,7 +88,7 @@ ("85e6bb2425cbfeed2f2b367246ad11a62fb0f6d525c157038a0d0eaaabc1bfee" "3380a2766cf0590d50d6366c5a91e976bdc3c413df963a0ab9952314b4577299" "cea3ec09c821b7eaf235882e6555c3ffa2fd23de92459751e18f26ad035d2142" "8ffdc8c66ceeaf7921f4510a70d808f01b303e6b4d177c947b442e80d4228678" "b0c5c6cc59d530d3f6fbcfa67801993669ce062dda1435014f74cafac7d86246" "ad16a1bf1fd86bfbedae4b32c269b19f8d20d416bd52a87cd50e355bf13c2f23" "d9dab332207600e49400d798ed05f38372ec32132b3f7d2ba697e59088021555" "bc4c89a7b91cfbd3e28b2a8e9e6750079a985237b960384f158515d32c7f0490" "99c86852decaeb0c6f51ce8bd46e4906a4f28ab4c5b201bdc3fdf85b24f88518" "a85e40c7d2df4a5e993742929dfd903899b66a667547f740872797198778d7b5" default))) '(package-selected-packages (quote - (polymodes planet-theme cider clojure-mode erlang rspec-mode dap-mode lsp-ui company-lsp lsp-mode nginx-mode gitignore-mode js2-mode keyfreq company-web visual-regexp enh-ruby-mode counsel-projectile counsel ivy flycheck-rust flycheck hydra solarized-theme company-ansible alchemist column-enforce-mode yaml-mode ansible dockerfile-mode ruby-end dash-at-point base16-theme exec-path-from-shell)))) + (gradle-mode kotlin-mode clj-refactor planet-theme cider clojure-mode erlang rspec-mode dap-mode lsp-ui company-lsp lsp-mode nginx-mode gitignore-mode js2-mode keyfreq company-web visual-regexp enh-ruby-mode counsel-projectile counsel ivy flycheck-rust flycheck hydra solarized-theme company-ansible alchemist column-enforce-mode yaml-mode ansible dockerfile-mode ruby-end dash-at-point base16-theme exec-path-from-shell)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/languages/clojure.el b/languages/clojure.el index 0d003b4..358fd67 100644 --- a/languages/clojure.el +++ b/languages/clojure.el @@ -8,11 +8,29 @@ :defer t :ensure t) -(defun activate-clojure-mode () +(use-package clj-refactor + :requires (cider clojure-mode) + :defer t + :ensure t) + +(use-package paredit + :defer t + :ensure t) + +(defun activate-my-clojure-mode () "Goodies for clojure files." (set-indent 2) ;; Default indentation of 2 characters (column-enforce-n 80) - ) + (clj-refactor-mode 1) + (cider-mode 1) -(add-hook 'clojure-mode-hook 'activate-clojure-mode) -(add-hook 'clojure-mode-hook 'cider-mode) + ;; Do not show separate error window when in REPL + (setq cider-show-error-buffer 'except-in-repl) + (paredit-mode 1)) + +(add-hook 'clojure-mode-hook 'activate-my-clojure-mode) + +(defun my-clj-repl-config () + (setq-local cider-show-error-buffer 'except-in-repl)) + +(add-hook 'cider-repl-mode-hook 'my-clj-repl-config) diff --git a/languages/elisp.el b/languages/elisp.el index 52148a9..634302d 100644 --- a/languages/elisp.el +++ b/languages/elisp.el @@ -6,6 +6,8 @@ ;; Company list override (add-to-list (make-local-variable 'company-backends) '(company-elisp company-yasnippet)) + + (paredit-mode 1) ) (add-hook 'emacs-lisp-mode-hook 'activate-emacs-lisp-mode) diff --git a/languages/kotlin.el b/languages/kotlin.el new file mode 100644 index 0000000..e7529d0 --- /dev/null +++ b/languages/kotlin.el @@ -0,0 +1,7 @@ +(use-package kotlin-mode + :ensure t + :defer t) + +(use-package gradle-mode + :ensure t + :defer t) diff --git a/languages/web.el b/languages/web.el index 15f52d9..10648f9 100644 --- a/languages/web.el +++ b/languages/web.el @@ -4,6 +4,9 @@ ;; Eex Web mode (add-to-list 'auto-mode-alist '("\\.eex\\'" . web-mode)) +;; ERB mode +(add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode)) + ;; Vue (add-to-list 'auto-mode-alist '("\\.vue\\'" . web-mode)) diff --git a/themes/themes.el b/themes/themes.el index a45e527..f5d12b2 100644 --- a/themes/themes.el +++ b/themes/themes.el @@ -23,7 +23,8 @@ (sml/apply-theme 'respectful) (enable-theme 'base16-mocha)) (progn - (enable-theme 'planet))) + (enable-theme 'base16-mexico-light) + (setq base16-theme-256-color-source "base16-shell"))) ;; Set font face ;;;;;;;;;;;;;;;;;;;;;; Font configuration ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;