From c556cdee387819b66fad0e8e7f68652c65a16d02 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Fri, 25 Mar 2022 13:06:25 +0200 Subject: [PATCH] Add RBS mode --- init.el | 3 +- lang/ruby.el | 1 + pkg/fonts.el | 14 ++++----- pkg/hydra.el | 5 +-- pkg/prog-mode.el | 1 + straight/versions/default.el | 59 ++++++++++++++++++------------------ 6 files changed, 44 insertions(+), 39 deletions(-) diff --git a/init.el b/init.el index 5deb88f..58735fe 100644 --- a/init.el +++ b/init.el @@ -80,7 +80,8 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(safe-local-variable-values - '((lsp-lens-mode) + '((lsp-elixir-project-dir . "/Users/maciej/Development/mindvalley/connect/app") + (lsp-lens-mode) (lsp-lens-enable) (cider-shadow-default-options . ":app") (cider-preferred-build-tool . lein) diff --git a/lang/ruby.el b/lang/ruby.el index d0b3046..dc37ec3 100644 --- a/lang/ruby.el +++ b/lang/ruby.el @@ -8,6 +8,7 @@ (use-package rspec-mode :straight t :defer t) (use-package ruby-end :straight t :defer t) +(use-package rbs-mode :straight t :defer t) (use-package enh-ruby-mode :requires (rspec-mode ruby-end) diff --git a/pkg/fonts.el b/pkg/fonts.el index 66603a5..abb6320 100644 --- a/pkg/fonts.el +++ b/pkg/fonts.el @@ -58,19 +58,19 @@ (cond ((eq (x-display-list) nil)) ;; built-in screen - ((>= 1050 (x-display-pixel-height)) (set-font +custom-font 14)) + ((>= 1050 (x-display-pixel-height)) (set-font +custom-font +custom-font-size)) ;; 4K screen on a Mac - ((>= 1080 (x-display-pixel-height)) (set-font +custom-font 14)) + ((>= 1080 (x-display-pixel-height)) (set-font +custom-font +custom-font-size)) ;; Other screens - ((>= 1120 (x-display-pixel-height)) (set-font +custom-font 14)) - ((>= 1440 (x-display-pixel-height)) (set-font +custom-font 17)) - ((>= 1920 (x-display-pixel-height)) (set-font +custom-font 14)) + ((>= 1120 (x-display-pixel-height)) (set-font +custom-font +custom-font-size)) + ((>= 1440 (x-display-pixel-height)) (set-font +custom-font (+ +custom-font-size 3))) + ((>= 1920 (x-display-pixel-height)) (set-font +custom-font +custom-font-size)) ;; 4K screen on Windows - ((>= 2160 (x-display-pixel-height)) (set-font +custom-font 20)) - (t (set-font +custom-font 16)))) + ((>= 2160 (x-display-pixel-height)) (set-font +custom-font (+ +custom-font-size 6))) + (t (set-font +custom-font (+ +custom-font-size 2))))) ;; Do it automatically on startup (set-font-to-screen) diff --git a/pkg/hydra.el b/pkg/hydra.el index 2a068af..bff2e6a 100644 --- a/pkg/hydra.el +++ b/pkg/hydra.el @@ -104,7 +104,7 @@ ^ Buffer Other ^──────────────────────────────────────────────────────────────────────────────── ^ _r_: Reload _m_: iMenu -^ _f_: Format +^ _f_: Format _e_: Show Errors ^ _i_: Indent ^ " @@ -114,7 +114,8 @@ ("i" mark-and-indent-whole-buffer) ("f" lsp-format-buffer) - ("m" lsp-ui-imenu)) + ("m" lsp-ui-imenu) + ("e" flycheck-list-errors)) (defhydra +hydra-history-menu (:color teal :hint nil) " diff --git a/pkg/prog-mode.el b/pkg/prog-mode.el index b74b8c7..b0caf81 100644 --- a/pkg/prog-mode.el +++ b/pkg/prog-mode.el @@ -37,6 +37,7 @@ :hook (((prog-mode text-mode) . rainbow-delimiters-mode)) :init ;;; Match parenthasis (left-right) + (electric-pair-mode t) (show-paren-mode t)) diff --git a/straight/versions/default.el b/straight/versions/default.el index e7a0451..7671061 100644 --- a/straight/versions/default.el +++ b/straight/versions/default.el @@ -1,74 +1,74 @@ (("ace-window" . "0577c426a9833ab107bab46c60d1885c611b2fb9") - ("apropospriate-theme" . "1761bf480cd62859e452ca492b69f09024bb308a") + ("apropospriate-theme" . "7bcabbbbef2cb1dd12917f248402565b557d8f60") ("avy" . "ba5f035be33693d1a136a5cbeedb24327f551a92") ("base16-emacs" . "ad2fd1137d6ec144f87b26dce15ce5c5d42bde39") ("buffer-move" . "cb517ecf8409b5fdcda472d7190c6021f0c49751") ("bui.el" . "f3a137628e112a91910fd33c0cff0948fa58d470") ("caml-mode" . "204bfde9ad21cb94c273db8b0c12d31a4eb425e5") ("cfrs" . "f3a21f237b2a54e6b9f8a420a9da42b4f0a63121") - ("cider" . "7a072d8374eb92c8164b436ee271abb5e9e351e3") - ("clj-refactor.el" . "1017297cb04b3c72dc5fceb48bf2791917eeccd2") - ("clojure-mode" . "4a0b598c340143c5d9d39e36d32cee9693ec0e32") + ("cider" . "36277802a47b0dbc9c1fd60f60908963c59c58d6") + ("clj-refactor.el" . "f368c56c83843396b160440f472a661a3b639862") + ("clojure-mode" . "c339353f9e649b3af084f1bb6ce759e614a2f243") ("column-enforce-mode" . "14a7622f2268890e33536ccd29510024d51ee96f") ("company-box" . "f9cbbc7df8efbb56a8d31a5b422d158660d9109e") - ("company-mode" . "adc387ab1c040c32a011630a31f852c87f54dba5") - ("counsel-projectile" . "e30150792a96968f55f34638cbfe63eaa30839cc") - ("dap-mode" . "6933fca0b53ea5d2d65a0545e5a4ae6424d32e9b") + ("company-mode" . "299e606435f589aa3024daadb7c249940ed8c36a") + ("counsel-projectile" . "40d1e1d4bb70acb00fddd6f4df9778bf2c52734b") + ("dap-mode" . "de713ea5ebb0644aac03e5e6f8117d2de7a68aa9") ("dash-at-point" . "fba1a6f42ea51d05110e12c62bdced664059eb55") ("dash.el" . "da167c51e9fd167a48d06c7c0ee8e3ac7abd9718") ("deft" . "28be94d89bff2e1c7edef7244d7c5ba0636b1296") ("diminish.el" . "6b7e837b0cf0129e9d7d6abae48093cf599bb9e8") - ("dockerfile-mode" . "11c43de04b128b7638cd98a1e80be2b661c18fbb") - ("dune" . "f6a8920f49b51d7e0022bf7ae17dc6aa29357095") + ("dockerfile-mode" . "b63a3d12b7dea0cb9efc7f78d7ad5672ceab2a3f") + ("dune" . "33d625d08bcf596a6c309d791a2cab70f2b8abce") ("edit-indirect" . "e3d86416bcf8ddca951d7d112e57ad30c5f9a081") ("el-get" . "9353309744e4f8a7c9b1adf22ec99536fb2146b0") ("elisp-refs" . "8f84280997d8b233d66fb9958a34b46078c58b03") ("emacs-ansible" . "d89ac0ee57742cca0f0e0a3453d9dcc521575690") - ("emacs-dashboard" . "7ae46300df5d22d3941ff9f10bc52d232985b628") - ("emacs-elixir" . "6f61e04c8537c2e9a807dc29908f619b5202b0f8") + ("emacs-dashboard" . "1d17ab01e712ee562c868e94b26bc5557210adc6") + ("emacs-elixir" . "e0d0466d83ec80ddb412bb1473908a21baad1ec3") ("emacs-fsharp-mode" . "b3aa4c53fc9e98648b25ad036e657632ae2fe192") ("emacs-gradle-mode" . "e4d665d5784ecda7ddfba015f07c69be3cfc45f2") ("emacs-hcl-mode" . "e4d9eef631e8a386341ae8f94f7c2579586e65b5") ("emacs-racer" . "1e63e98626737ea9b662d4a9b1ffd6842b1c648c") ("emacs-which-key" . "1217db8c6356659e67b35dedd9f5f260c06f6e99") - ("emacsmirror-mirror" . "2f4191479123b4770881512bee3dcd62de084519") + ("emacsmirror-mirror" . "75b9477acee5ab4bf6f404d6d6700d0524cdb4e3") ("enhanced-ruby-mode" . "e960bf941d9fa9d92eabf7c03a8bbb51ba1ac453") ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6") ("exec-path-from-shell" . "3a8d97c096c2c5714b667130fd8a80d5622ee067") ("f.el" . "50af874cd19042f17c8686813d52569b1025c76a") - ("flycheck" . "784f184cdd9f9cb4e3dbb997c09d93e954142842") + ("flycheck" . "278d0810f05eb03600d835c2bdd67d6b55a58034") ("flycheck-rust" . "a139cd53c5062697e9ed94ad80b803c37d999600") ("flyspell-correct" . "e8027a412262bc04056a5b5440efdb7f370c3320") ("frame-local" . "7ee1106c3bcd4022f48421f8cb1ef4f995da816e") ("git-modes" . "62fbf2e5b84ca789e7bc2f87939386023b5ba3df") ("gleam-mode" . "a0b76a64f6c062a8fe0c0541e788de8470828fd2") - ("gnu-elpa-mirror" . "2e0df8fefaa2e16a1847b37f7b031e4b0f1c3bb4") + ("gnu-elpa-mirror" . "bc03f8141c285538418daeff450f67d90ead2403") ("go-mode.el" . "3273fcece5d9ab7edd4f15b2d6bce61f4e5a0666") ("groovy-emacs-modes" . "bf732d367b16887f81d404481c11ed1a58671d4e") - ("haskell-mode" . "f13b6db78bc880e680c320e015ae232f525e0a27") + ("haskell-mode" . "b1505b727b1fb8ae352e59dc90ec6dd05369ce32") ("helpful" . "67cdd1030b3022d3dc4da2297f55349da57cde01") ("ht.el" . "c4c1be487d6ecb353d07881526db05d7fc90ea87") ("hydra" . "9e9e00cb240ea1903ffd36a54956b3902c379d29") ("jenkinsfile-mode" . "65bf3925852c35c6bd499978f08f83c1193f4347") - ("js2-mode" . "997cac4c80a03062145b541b006c51cc91ee0c24") + ("js2-mode" . "b9ed9e406d59661bb099cb2307dfbfcc1d47beae") ("jump.el" . "55caa66a7cc6e0b1a76143fd40eff38416928941") ("keyfreq" . "7bb36e910ae04ff1dce387e3ce73b669d299680b") ("kotlin-mode" . "3e0c34087ba4965a8bf08d3f27325f0a1e631bfb") ("let-alist" . "592553db5929b54db40af0df90c5add0aaca045b") - ("lsp-haskell" . "69ddd5d32d6d7d658ec3f89c8ec6280e912e6be8") - ("lsp-mode" . "0147f98a9c5747f4ea318a3b74e78d43ed1e5e8e") + ("lsp-haskell" . "7cf64944ab3a25ea5d6f8d5e0cd33124182df991") + ("lsp-mode" . "4acf72202d47dd7f0166c69220e1f734d133db89") ("lsp-treemacs" . "72d367757a89453a712f6ba1df9b6e789ece2bbd") - ("lsp-ui" . "21ce926eedd41ef305c2d89412506ce59b1a7eac") + ("lsp-ui" . "96b1ecbfbf87a775f05b5f0b55253376a3bd61e7") ("macrostep" . "424e3734a1ee526a1bd7b5c3cd1d3ef19d184267") - ("magit" . "613682a70631178caee15d1b5a16fae90da4af7b") + ("magit" . "b32521d5432b5fbc33a2e47b72f2258bf98cb8b4") ("map" . "3d80a6d7cdc7d9e5760290fa95db4da992612837") ("markdown-mode" . "521658eb32e456681592443e04ae507c3a59ed07") - ("melpa" . "2e87a00dc3f61007db361015f4d3131cb265530c") - ("merlin" . "8091fad9953c6b9840a53aa53336fdebe51658b6") + ("melpa" . "1a054aba2409fb8ae12a634952f3d1336a14eb70") + ("merlin" . "fb5cfc2a5091ffa77894629538efb0ec953fb6e7") ("mmm-mode" . "0d00cdf4d02cc166304f6967a20fa22e2eaf208b") ("multiple-cursors.el" . "8a60fc7ef0ae6e5ca089a7c95264cd0ae83e7274") ("nginx-mode" . "6e9d96f58eddd69f62f7fd443d9b9753e16e0e96") - ("otp" . "2186bf41233c3ec986df2645035e303826e0eacb") + ("otp" . "123e6783bfe0d043ffe983fdc1e0a9f9248eb771") ("paredit" . "8330a41e8188fe18d3fa805bb9aa529f015318e8") ("parseclj" . "a8c4cf30fb68b66ae51541462a8b21753229a6e5") ("parseedn" . "e70ca8d03a314f97e4f49b7d6098fa565742e217") @@ -77,16 +77,17 @@ ("pkg-info" . "76ba7415480687d05a4353b27fea2ae02b8d9d61") ("pos-tip" . "179cc126b363f72ca12fab1e0dc462ce0ee79742") ("posframe" . "c91d4d53fa479ceb604071008ce0a901770eff57") - ("projectile" . "2c948f3a8ed378ae5fd800d2c66aece06ba058b8") + ("projectile" . "20df208385ce7b80207602c9931e31094eca85fb") ("purescript-mode" . "0acd1af446424ba855153161fe07a20f67dc0a89") ("queue" . "130c2d656cd5d7376552272fab9e50a7c37d0c4a") ("rainbow-delimiters" . "a32b39bdfe6c61c322c37226d66e1b6d4f107ed0") ("rainbow-mode" . "949166cc0146bc9fabf74ce70c1c4a097f4cffd4") + ("rbs-mode" . "fd766a943d5f1f0624e10ffce096b9aaba14a5f4") ("reason-mode" . "5690544a7091630e0ea0023bbbd57a733cea8bde") ("rich-minority" . "a03e693f6f9232cf75363aaaf1cb041f21675c19") ("rspec-mode" . "4215ff1f2d1cee24a144ff08297276dc7b971c25") ("ruby-end.el" . "a136f75abb6d5577ce40d61dfeb778c2e9bb09c0") - ("rust-mode" . "c8ae5dedb3deddaf35f6345da894ae26d156bf27") + ("rust-mode" . "26ecc903c50b2ffd289bbe981f9ad03626fc0057") ("s.el" . "08661efb075d1c6b4fa812184c1e5e90c08795a9") ("sesman" . "e0f555f963c9f02f8e4a50e06fc353eb4c15ee77") ("slime" . "6ef28864d4a6b4d9390dbd0cac64f2a56582682d") @@ -98,16 +99,16 @@ ("straight.el" . "af5437f2afd00936c883124d6d3098721c2d306c") ("swiper" . "c97ea72285f2428ed61b519269274d27f2b695f9") ("terraform-mode" . "e560caaa9d9a11b0868adf6d9dcae5ebb5055730") - ("transient" . "7c771c94c8fc31d859c1e083bf32fbce403f4766") + ("transient" . "132090a4b6d65603a09e33113f6dbd9a1131e38e") ("treemacs" . "b18a05b1f62074a40e6011d83cd4c92cbee040dd") ("tuareg" . "04f5ab6be9ae1c594bab359819dbaf708ae57fda") - ("undo-tree" . "e326c6135e62f5fe8536528d3acd5e798f847407") + ("undo-tree" . "16f4121032d09ef44b3d7d02c4d02c3c2f18041f") ("use-package" . "a7422fb8ab1baee19adb2717b5b47b9c3812a84c") ("visual-regexp.el" . "48457d42a5e0fe10fa3a9c15854f1f127ade09b5") ("vue-html-mode" . "1514939804bad558584feeb6298b38d22eadf64e") ("vue-mode" . "031edd1f97db6e7d8d6c295c0e6d58dd128b9e71") - ("web-mode" . "f70277774a725e177774cc81ecbd228792cd6656") - ("with-editor" . "f514f23258af67a10fc8e1c431bfe94702b6e65b") + ("web-mode" . "efa853e5cfff8e0bcacbda9d1c6696b33da91b03") + ("with-editor" . "e8569e027ff5c9bef8d9ff0734e3293e1c0574a2") ("yaml-mode" . "535273d5a1eb76999d20afbcf4d9f056d8ffd2da") ("yasnippet" . "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6") ("yasnippet-snippets" . "b7c09f1ad7e1a62da6f6042bfaa2b26d111c7e81"))