Update 2021-04-21

2021-04-19 08:52:43 +03:00 · 2021-04-19 08:52:43 +03:00 · eb6b5fb740
commit eb6b5fb740
parent 6dc31b3338
5 changed files with 84 additions and 43 deletions
--- a/init.el
+++ b/init.el
@ -66,6 +66,7 @@
 (require '+custom-lang-clang "$HOME/.emacs.d/lang/clang.el")
 (require '+custom-lang-clojure "$HOME/.emacs.d/lang/clojure.el")
 (require '+custom-lang-ocaml "$HOME/.emacs.d/lang/ocaml.el")
+(require '+custom-lang-kotlin "$HOME/.emacs.d/lang/kotlin.el")
 (require '+custom-lang-purescript "$HOME/.emacs.d/lang/purescript.el")
 (require '+custom-lang-php "$HOME/.emacs.d/lang/php.el")
 (require '+custom-lang-markdown "$HOME/.emacs.d/lang/markdown.el")
--- a/lang/kotlin.el
+++ b/lang/kotlin.el
@ -0,0 +1,34 @@
+;;; kotlin.el --- summary
+
+;; Author: Maciej Szlosarczyk
+;; Maintainer: Maciej Szlosarczyk
+;; Version: 0.1-snapshot
+
+;;; Commentary:
+
+;; kotlin does a thing.
+
+;;; Code:
+
+(use-package kotlin-mode
+	:defer t
+	:straight t)
+
+(use-package gradle-mode
+	:defer t
+	:straight t)
+
+(defun activate-kotlin-mode ()
+  "All things Kotlin."
+  (set-indent 4)
+  (column-enforce-n 100)
+  (lsp)
+
+  ;; Company list override
+  (add-to-list (make-local-variable 'company-backends)
+               '(company-capf company-yasnippet)))
+
+(add-hook 'kotlin-mode-hook 'activate-kotlin-mode)
+
+(provide '+custom-lang-kotlin)
+;;; kotlin.el ends here
--- a/snippets/prog-mode/todo
+++ b/snippets/prog-mode/todo
@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: todo
-# key: TD
+# key: todo
 # --
 `comment-start`TODO: $0`comment-end`
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@ -1,38 +1,39 @@
 (("a.el" . "3d341eb7813ee02b00ab28e11c915295bfd4b5a7")
 ("ace-window" . "c7cb315c14e36fded5ac4096e158497ae974bec9")
- ("apropospriate-theme" . "22b394e3c9fc8db3a33c0f7fa36263ce44b0dec5")
+ ("apropospriate-theme" . "a21c143b7cc92a0d8402955d079fc78c4140c2ff")
 ("avy" . "e92cb37457b43336b765630dbfbea8ba4be601fa")
- ("base16-emacs" . "0c3aa33520ae4cb467c76ce53d438827df77eb1a")
+ ("base16-emacs" . "b35d21ae0d46856416b64851ccbb5e44ee9498d0")
 ("buffer-move" . "cb517ecf8409b5fdcda472d7190c6021f0c49751")
 ("bui.el" . "f3a137628e112a91910fd33c0cff0948fa58d470")
 ("caml-mode" . "38ebde12d3d529e6ef8078967997d32226e69e82")
 ("cfrs" . "7c42f2c82c7ae689f3ef291b066688c58ab96298")
- ("cider" . "569e8e2ddb77b3c1170b1592e3c63f3aad9b0b8e")
- ("clj-refactor.el" . "9f3e7357117e96135de051b78deabc0a327c7b06")
- ("clojure-mode" . "a14671e03c867c9d759ee9e59cdc5cecbf271245")
+ ("cider" . "65e14c5f164862e26e028239931aee2f919c3b2f")
+ ("clj-refactor.el" . "f50fb242ba0ff8526746ae0ffeb19b9a535c00b2")
+ ("clojure-mode" . "83df48ecd01483e91d5578b015a2f1f7a7526d60")
 ("column-enforce-mode" . "14a7622f2268890e33536ccd29510024d51ee96f")
- ("company-mode" . "de80d17cd2e7e51826c72ef85d94d38a0fca0a76")
+ ("company-mode" . "4286972775832e29434becc6c72e767319139a1c")
 ("counsel-projectile" . "06b03c1080d3ccc3fa9b9c41b1ccbcf13f058e4b")
- ("dap-mode" . "41b78d230ee2750f0ac1e9c54d2441c433a6013d")
+ ("dap-mode" . "2cb49bb2ec22a7d6d4fd403bd4e2cc468f512501")
 ("dash-at-point" . "4d795a23a8428c421d5107f1b005c9d8e0d1816c")
- ("dash.el" . "a17b6b5409825891423b3867cd7bea84852d6ddd")
+ ("dash.el" . "b9286a84975874b10493f1cb4ea051c501f51273")
 ("deft" . "c4af44827f4257e7619e63abfd22094a29a9ab52")
 ("diminish.el" . "6ec6ebc391371418efc6c98d70b013f34af5a2ee")
- ("dockerfile-mode" . "3b1374563f62d71aec11ebd33d37109459e54571")
- ("dune" . "55acb0c661c50196cac11ea92dc6b73057668247")
+ ("dockerfile-mode" . "ad06a41259ff2961d603bf23a3a8fbd22dde2161")
+ ("dune" . "4933706c28ca6f0caa7b731b5cec3cbea5b92085")
 ("edit-indirect" . "bdc8f542fe8430ba55f9a24a7910639d4c434422")
 ("el-get" . "84dd1837f9ac80a329ab0c2de6859777f445f8ff")
 ("elisp-refs" . "b3634a4567c655a1cda51b217629849cba0ac6a7")
 ("emacs-ansible" . "40af0d2bbb6c5bbcf7aa9269ac9a07e22622d263")
 ("emacs-dashboard" . "00f1dc84d3fbaf439d23645aa531eee59e28f688")
 ("emacs-elixir" . "0212b06f079f4965b6032bbbe7f86876575770de")
- ("emacs-fsharp-mode" . "78898a1535878394d83643c383f4320e7b5fcefd")
+ ("emacs-fsharp-mode" . "93b1fbc31d73286a18640a36fc2be87d1736e0f2")
+ ("emacs-gradle-mode" . "e4d665d5784ecda7ddfba015f07c69be3cfc45f2")
 ("emacs-hcl-mode" . "e12b1df2ca28d2b06c471cd709c038a2dc0bcdbd")
- ("emacs-libvterm" . "1bc4516f53955dcbf397cf999f38e67eec835d8c")
+ ("emacs-libvterm" . "2b1392cb2b14ec5bd0b7355197d5f353aa5d3983")
 ("emacs-planet-theme" . "b0a310ff36565fe22224c407cf59569986698a32")
 ("emacs-racer" . "1e63e98626737ea9b662d4a9b1ffd6842b1c648c")
- ("emacs-which-key" . "c632dbf27a77c1c73ce559041b3a78ec5f78b187")
- ("emacsmirror-mirror" . "9f00df1a00d97bbcdb9a820e0941f9196a71ec3d")
+ ("emacs-which-key" . "5fb30301cb3b4fca5a0e1ce8ec1ef59290b79199")
+ ("emacsmirror-mirror" . "1c24bceb43e0e475656be908133a8eb6df3bf973")
 ("enhanced-ruby-mode" . "e960bf941d9fa9d92eabf7c03a8bbb51ba1ac453")
 ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
 ("exec-path-from-shell" . "bf4bdc8b8911e7a2c04e624b9a343164c3878282")
@ -42,41 +43,42 @@
 ("flycheck-rust" . "a139cd53c5062697e9ed94ad80b803c37d999600")
 ("git-modes" . "14adca24eb6b0b4e311ad144c5d41972c6b044b2")
 ("gleam-mode" . "60c0102e9a905027eb88600fef7d60bd3fbdaab1")
- ("gnu-elpa-mirror" . "c9bc5582228c82db01617802b8729ca86a76bf79")
+ ("gnu-elpa-mirror" . "3e7e5862acc80a6371fae2e1bf087442402f7c54")
 ("groovy-emacs-modes" . "26da902d1158c0312628d57578109be54eca2415")
- ("haskell-mode" . "1baa12abfa2c81128e5b13d1351f2978a4a54b4f")
+ ("haskell-mode" . "d771202bcb04c04cdfc6c102f99b917f31216390")
 ("helpful" . "7e4b1f0d5572a4e2b8ee7a9b084ef863d0315a73")
 ("ht.el" . "c4c1be487d6ecb353d07881526db05d7fc90ea87")
 ("hydra" . "2d553787aca1aceb3e6927e426200e9bb9f056f1")
 ("jenkinsfile-mode" . "65bf3925852c35c6bd499978f08f83c1193f4347")
- ("js2-mode" . "29979e5f3301796ba606759e39ee0b1b6a2a24f3")
+ ("js2-mode" . "b891edecedf30be6321e2f109fdfeb25b0edad27")
 ("jump.el" . "55caa66a7cc6e0b1a76143fd40eff38416928941")
 ("keyfreq" . "e5fe9d585ce882f1ba9afa5d894eaa82c79be4f4")
+ ("kotlin-mode" . "0e4bafb31d1fc2a0a420a521c2723d5526646c0b")
 ("let-alist" . "6708ec0b2e6dff80ff5b64698aa009d9070a2ed2")
 ("lsp-haskell" . "7efbef3d206989faa8b691a4230a3ed872542187")
- ("lsp-mode" . "4a234270d6a9706a9aee9d6acd6d56c3e8537b84")
- ("lsp-treemacs" . "3bae4a91e05d55d5ca92da272ffcd497f370e9df")
- ("lsp-ui" . "1613a2de55eca6213761a9b2c3e400063c87b5d0")
+ ("lsp-mode" . "54cb9a81d97c9f19ebea34510844ac7b69e755bc")
+ ("lsp-treemacs" . "4cfb46d7fe69cc537a8a86389c5d8d9fd3fbfabe")
+ ("lsp-ui" . "efae00eb6a733d5271cb33e9d92c3d8c2fa98dde")
 ("macrostep" . "424e3734a1ee526a1bd7b5c3cd1d3ef19d184267")
- ("magit" . "abb61935c65bc02815a6397c0e5d867aebcf5e54")
- ("markdown-mode" . "051734091aba17a54af96b81beebdbfc84c26459")
- ("melpa" . "380125490f47bd150218280c2e16c01be9054a60")
- ("merlin" . "cc17ed60630fb1831ad950fe62970b1c7a7f4c8b")
+ ("magit" . "c7364e169648f454dc73fe50596d827fbf1f0fb7")
+ ("markdown-mode" . "ac9ea26b941eef512a3c206375a6404625c229ed")
+ ("melpa" . "21d32adebc711ffcff2633c5ec4ba4fe58dcb0b5")
+ ("merlin" . "a70703abc68f66b0270e2a0deb2c3b7014113a6c")
 ("mmm-mode" . "0d00cdf4d02cc166304f6967a20fa22e2eaf208b")
 ("multiple-cursors.el" . "7b13b03c995e13ad86e499d40ec49c4dc281f889")
 ("nginx-mode" . "a2bab83c2eb233d57d76b236e7c141c2ccc97005")
- ("otp" . "acd6700700aba75107f5b2a6194ff49cd31d7c4f")
+ ("otp" . "2c2aad8e2cf094a08cb12c97346e98c30b81fc09")
 ("page-break-lines" . "3b8549cd414d4d7ee0168ab9917124133566d3db")
 ("paredit" . "8330a41e8188fe18d3fa805bb9aa529f015318e8")
 ("parseclj" . "eff941126859bc9e949eae5cd6c2592e731629f2")
 ("parseedn" . "90cfe3df51b96f85e346f336c0a0ee6bf7fee508")
- ("perspective-el" . "cbdc3e5dc77ccb681f8719db0a85af8850b757d2")
+ ("perspective-el" . "dd2a380ac71edf1321a6462f14668baf99879e80")
 ("pfuture" . "d7926de3ba0105a36cfd00811fd6278aea903eef")
- ("php-mode" . "a2bca9be4c34a9dc38393602cb2708df24587838")
+ ("php-mode" . "c86190eebf66a45791f30b9691da3d737cb8aae7")
 ("pkg-info" . "76ba7415480687d05a4353b27fea2ae02b8d9d61")
 ("pos-tip" . "179cc126b363f72ca12fab1e0dc462ce0ee79742")
- ("posframe" . "fff21ccb706b576f4074883f9fa87d2bcc534096")
- ("projectile" . "1528ed4f082e7aaca19f22394eb4bed879645b7c")
+ ("posframe" . "5cc13723139181ba77694080fc772c645b200135")
+ ("projectile" . "513228f473910128efcad13f46dfc22a74976675")
 ("purescript-mode" . "0acd1af446424ba855153161fe07a20f67dc0a89")
 ("queue" . "130c2d656cd5d7376552272fab9e50a7c37d0c4a")
 ("rainbow-delimiters" . "f43d48a24602be3ec899345a3326ed0247b960c6")
@ -86,19 +88,19 @@
 ("rspec-mode" . "92ef785010f6a68cbf73861e75ac6cf4e1832291")
 ("ruby-end.el" . "a136f75abb6d5577ce40d61dfeb778c2e9bb09c0")
 ("rust-mode" . "e9e9e32c4f82a9b895543c120b327ab5536ec42b")
- ("s.el" . "43ba8b563bee3426cead0e6d4ddc09398e1a349d")
+ ("s.el" . "3a5166c81ac9e50eaccf5490c5c632f93452287e")
 ("sesman" . "edee869c209c016e5f0c5cbb8abb9f3ccd2d1e05")
- ("slime" . "68c58c0194ff03cd147fcec99f0ee90ba9178875")
+ ("slime" . "0d66b02b7dd5ebd8f3e85decd00eb6aeec05d785")
 ("slime-company" . "f20ecc4104d4c35052696e7e760109fb02060e72")
 ("smart-mode-line" . "999be065b195f2eddb4e1b629f99038d832d44b7")
 ("speed-type" . "5ef695f7159aa1f20c7c9e55f0c39bcdacce8d21")
 ("spinner" . "e19f3cfc0646c0e23c10c22df219fcf427054621")
 ("ssass-mode" . "96f557887ad97a0066a60c54f92b7234b8407016")
 ("straight.el" . "e1390a933b6f5a15079d6dec91eac97a17aad10c")
- ("swiper" . "bb7965aa645982c9a80bd9e772538a210b645942")
+ ("swiper" . "471d644d6bdd7d5dc6ca4efb405e6a6389dff245")
 ("terraform-mode" . "a9fa5bdaf58e9cae32ee44b7d0883f5600441b05")
 ("transient" . "cc16a5eaa73617a281b0bbf71b24432c38994e30")
- ("treemacs" . "62ef710023c7d974380a8e0127591b66e8ebe65c")
+ ("treemacs" . "b92d43aa6974c8581ea7a4f4b3586041a7f44f32")
 ("tuareg" . "37a673020152ae0dbcaa250118b155d84e448f68")
 ("undo-tree" . "e326c6135e62f5fe8536528d3acd5e798f847407")
 ("use-package" . "a7422fb8ab1baee19adb2717b5b47b9c3812a84c")
@ -109,5 +111,5 @@
 ("with-editor" . "ebcbd3b137154e6c5a2b976bacbb89d48ddfa242")
 ("yaml-mode" . "fc5e1c58f94472944c4aa838f00f6adcac6fa992")
 ("yasnippet" . "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6")
- ("yasnippet-snippets" . "899c027f442587e0f8ef90761f58b27907ca64b4"))
+ ("yasnippet-snippets" . "be823d7e1a1a46454d60a9f3dabb16b68b5dd853"))
 :beta
--- a/themes/themes.el
+++ b/themes/themes.el
@ -46,7 +46,11 @@
  (interactive "sNew font: \nnEnter size for font %s: ")
  (set-face-attribute 'default nil :font (format "%s %d" name size))
  ;; Set modeline font to be 1 pixel point smaller than the general font
-  (set-face-attribute 'mode-line nil :font (format "%s %d" name (- size 1))))
+  (set-face-attribute 'mode-line nil :font (format "%s %d" name (- size 1)))
+  (set-face-attribute 'mode-line-inactive nil :font
+                      (format "%s %d" name (- size 1))))
+
+(defconst +custom-font "JetBrains Mono")

 (defun set-font-to-screen ()
  "Automatically set font size to suit the monitor."
@ -54,12 +58,12 @@
  ;; If display is set to emulate FullHD resultion or less, make the font
  ;; smaller.
  (cond ((eq (x-display-list) nil)) ()
-        ((>= 1050 (x-display-pixel-height)) (set-font "IBM Plex Mono" 14))
-        ((>= 1080 (x-display-pixel-height)) (set-font "IBM Plex Mono" 13))
-        ((>= 1120 (x-display-pixel-height)) (set-font "IBM Plex Mono" 14))
-        ((>= 1440 (x-display-pixel-height)) (set-font "IBM Plex Mono" 16))
-        ((>= 2160 (x-display-pixel-height)) (set-font "IBM Plex Mono" 20))
-        (t (set-font "IBM Plex Mono" 16))))
+        ((>= 1050 (x-display-pixel-height)) (set-font +custom-font 14))
+        ((>= 1080 (x-display-pixel-height)) (set-font +custom-font 13))
+        ((>= 1120 (x-display-pixel-height)) (set-font +custom-font 14))
+        ((>= 1440 (x-display-pixel-height)) (set-font +custom-font 16))
+        ((>= 2160 (x-display-pixel-height)) (set-font +custom-font 20))
+        (t (set-font +custom-font 16))))

 ;; Do it automatically on startup
 (set-font-to-screen)