From 9546f1e17c97f94f783b00272e346bdf750edc28 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Sun, 3 Apr 2022 12:28:32 +0300 Subject: [PATCH] Update packages, add zig --- init.el | 1 + lang/ziglang.el | 32 ++++++++++++++++++++++++ pkg/fonts.el | 5 ++++ pkg/themes.el | 2 +- pkg/undo-tree.el | 2 ++ straight/versions/default.el | 47 ++++++++++++++++++------------------ 6 files changed, 65 insertions(+), 24 deletions(-) create mode 100644 lang/ziglang.el diff --git a/init.el b/init.el index 58735fe..2f57bc2 100644 --- a/init.el +++ b/init.el @@ -68,6 +68,7 @@ (require '+custom-lang-purescript "$HOME/.emacs.d/lang/purescript.el") (require '+custom-lang-php "$HOME/.emacs.d/lang/php.el") (require '+custom-lang-golang "$HOME/.emacs.d/lang/golang.el") +(require '+custom-lang-ziglang "$HOME/.emacs.d/lang/ziglang.el") (require '+custom-lang-markdown "$HOME/.emacs.d/lang/markdown.el") (require '+custom-lang-other "$HOME/.emacs.d/lang/other.el") diff --git a/lang/ziglang.el b/lang/ziglang.el new file mode 100644 index 0000000..5acac9c --- /dev/null +++ b/lang/ziglang.el @@ -0,0 +1,32 @@ +;;; ziglang.el --- summary + +;; Author: Maciej Szlosarczyk +;; Maintainer: Maciej Szlosarczyk +;; Version: 0.1-snapshot + +;;; Commentary: + +;; ziglang does a thing. + +;;; Code: + +(require '+custom-pkg-projectile "$HOME/.emacs.d/pkg/projectile.el") +(require '+custom-pkg-ctags "$HOME/.emacs.d/pkg/ctags.el") +(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") + +(use-package zig-mode :straight t :defer t) + +(defun activate-zig-mode () + "Goodies for editing zig files." + + ;; Set column width to 100 + (column-enforce-n 100) + + ;; Set indentation to 4 chars + (set-indent 4) + (lsp)) + +(add-hook 'zig-mode-hook 'activate-zig-mode) + +(provide '+custom-lang-ziglang) +;;; ziglang.el ends here diff --git a/pkg/fonts.el b/pkg/fonts.el index abb6320..74cf3cc 100644 --- a/pkg/fonts.el +++ b/pkg/fonts.el @@ -80,6 +80,11 @@ (interactive "nEnter size for font: ") (set-font +custom-font size)) +(defun set-font-size-for-this-frame (new-size) + "Set font NEW-SIZE for this frame only." + (interactive "nEnter new size for font in this frame: ") + (set-frame-font (format "%s %d" +custom-font new-size))) + ;; Remove ugly black line (set-face-attribute 'vertical-border nil :foreground (face-attribute 'fringe :background)) diff --git a/pkg/themes.el b/pkg/themes.el index d641389..de5bcda 100644 --- a/pkg/themes.el +++ b/pkg/themes.el @@ -41,7 +41,7 @@ "$HOME/.emacs.d/themes/base16-harmonic-light-modified.el") (sml/apply-theme 'respectful) -(enable-theme 'base16-harmonic-light-modified) +(enable-theme 'base16-zenburn-modified) (provide '+custom-pkg-themes) ;;; themes.el ends here diff --git a/pkg/undo-tree.el b/pkg/undo-tree.el index cb5d800..7934389 100644 --- a/pkg/undo-tree.el +++ b/pkg/undo-tree.el @@ -15,6 +15,8 @@ :defer t :straight t :config (setq-default + ;; Save history to a specific folder + undo-tree-history-directory-alist '(("." . "~/.emacs_backups/undo-tree")) ;; Show diff undo-tree-visualizer-diff t ;; Show timestamps diff --git a/straight/versions/default.el b/straight/versions/default.el index 7671061..726e3b2 100644 --- a/straight/versions/default.el +++ b/straight/versions/default.el @@ -6,69 +6,69 @@ ("bui.el" . "f3a137628e112a91910fd33c0cff0948fa58d470") ("caml-mode" . "204bfde9ad21cb94c273db8b0c12d31a4eb425e5") ("cfrs" . "f3a21f237b2a54e6b9f8a420a9da42b4f0a63121") - ("cider" . "36277802a47b0dbc9c1fd60f60908963c59c58d6") + ("cider" . "86dd3fee9d9836dcd56f6abb91ba59b7aeedecb9") ("clj-refactor.el" . "f368c56c83843396b160440f472a661a3b639862") ("clojure-mode" . "c339353f9e649b3af084f1bb6ce759e614a2f243") ("column-enforce-mode" . "14a7622f2268890e33536ccd29510024d51ee96f") ("company-box" . "f9cbbc7df8efbb56a8d31a5b422d158660d9109e") - ("company-mode" . "299e606435f589aa3024daadb7c249940ed8c36a") + ("company-mode" . "073aef72ddf93f897a856c246c58dcdfe003674e") ("counsel-projectile" . "40d1e1d4bb70acb00fddd6f4df9778bf2c52734b") - ("dap-mode" . "de713ea5ebb0644aac03e5e6f8117d2de7a68aa9") + ("dap-mode" . "f918c0580bd17105cbe50aa701a2375abca5a6ab") ("dash-at-point" . "fba1a6f42ea51d05110e12c62bdced664059eb55") ("dash.el" . "da167c51e9fd167a48d06c7c0ee8e3ac7abd9718") ("deft" . "28be94d89bff2e1c7edef7244d7c5ba0636b1296") ("diminish.el" . "6b7e837b0cf0129e9d7d6abae48093cf599bb9e8") ("dockerfile-mode" . "b63a3d12b7dea0cb9efc7f78d7ad5672ceab2a3f") - ("dune" . "33d625d08bcf596a6c309d791a2cab70f2b8abce") + ("dune" . "4bc7629a5e767623f35f0a52c2d4d147e18cf7ac") ("edit-indirect" . "e3d86416bcf8ddca951d7d112e57ad30c5f9a081") ("el-get" . "9353309744e4f8a7c9b1adf22ec99536fb2146b0") ("elisp-refs" . "8f84280997d8b233d66fb9958a34b46078c58b03") ("emacs-ansible" . "d89ac0ee57742cca0f0e0a3453d9dcc521575690") - ("emacs-dashboard" . "1d17ab01e712ee562c868e94b26bc5557210adc6") + ("emacs-dashboard" . "99f6504850f47fc8b0cfbef5f0721a6442719f2a") ("emacs-elixir" . "e0d0466d83ec80ddb412bb1473908a21baad1ec3") ("emacs-fsharp-mode" . "b3aa4c53fc9e98648b25ad036e657632ae2fe192") ("emacs-gradle-mode" . "e4d665d5784ecda7ddfba015f07c69be3cfc45f2") ("emacs-hcl-mode" . "e4d9eef631e8a386341ae8f94f7c2579586e65b5") ("emacs-racer" . "1e63e98626737ea9b662d4a9b1ffd6842b1c648c") ("emacs-which-key" . "1217db8c6356659e67b35dedd9f5f260c06f6e99") - ("emacsmirror-mirror" . "75b9477acee5ab4bf6f404d6d6700d0524cdb4e3") + ("emacsmirror-mirror" . "d733ec0b70803781280e12f7a683ce8850c23e78") ("enhanced-ruby-mode" . "e960bf941d9fa9d92eabf7c03a8bbb51ba1ac453") ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6") ("exec-path-from-shell" . "3a8d97c096c2c5714b667130fd8a80d5622ee067") ("f.el" . "50af874cd19042f17c8686813d52569b1025c76a") - ("flycheck" . "278d0810f05eb03600d835c2bdd67d6b55a58034") + ("flycheck" . "55f25fd98abc145c0c464756504132c271f0f039") ("flycheck-rust" . "a139cd53c5062697e9ed94ad80b803c37d999600") ("flyspell-correct" . "e8027a412262bc04056a5b5440efdb7f370c3320") ("frame-local" . "7ee1106c3bcd4022f48421f8cb1ef4f995da816e") - ("git-modes" . "62fbf2e5b84ca789e7bc2f87939386023b5ba3df") + ("git-modes" . "bb71cb2226a1cf105c329f3186bfcb5bb37e2f2d") ("gleam-mode" . "a0b76a64f6c062a8fe0c0541e788de8470828fd2") ("gnu-elpa-mirror" . "bc03f8141c285538418daeff450f67d90ead2403") ("go-mode.el" . "3273fcece5d9ab7edd4f15b2d6bce61f4e5a0666") ("groovy-emacs-modes" . "bf732d367b16887f81d404481c11ed1a58671d4e") - ("haskell-mode" . "b1505b727b1fb8ae352e59dc90ec6dd05369ce32") + ("haskell-mode" . "cb573c8db5b856eb37473009f2c62e0717a1cd02") ("helpful" . "67cdd1030b3022d3dc4da2297f55349da57cde01") ("ht.el" . "c4c1be487d6ecb353d07881526db05d7fc90ea87") ("hydra" . "9e9e00cb240ea1903ffd36a54956b3902c379d29") ("jenkinsfile-mode" . "65bf3925852c35c6bd499978f08f83c1193f4347") - ("js2-mode" . "b9ed9e406d59661bb099cb2307dfbfcc1d47beae") + ("js2-mode" . "fed41615b26404e0bfd7e4f64643981ca798a34b") ("jump.el" . "55caa66a7cc6e0b1a76143fd40eff38416928941") ("keyfreq" . "7bb36e910ae04ff1dce387e3ce73b669d299680b") ("kotlin-mode" . "3e0c34087ba4965a8bf08d3f27325f0a1e631bfb") ("let-alist" . "592553db5929b54db40af0df90c5add0aaca045b") ("lsp-haskell" . "7cf64944ab3a25ea5d6f8d5e0cd33124182df991") - ("lsp-mode" . "4acf72202d47dd7f0166c69220e1f734d133db89") - ("lsp-treemacs" . "72d367757a89453a712f6ba1df9b6e789ece2bbd") + ("lsp-mode" . "017529b420d6382990885d8e2bc88720795090a7") + ("lsp-treemacs" . "355e468b7fa9887c616a8bfe873d8e456303b67b") ("lsp-ui" . "96b1ecbfbf87a775f05b5f0b55253376a3bd61e7") ("macrostep" . "424e3734a1ee526a1bd7b5c3cd1d3ef19d184267") - ("magit" . "b32521d5432b5fbc33a2e47b72f2258bf98cb8b4") + ("magit" . "6a5c79fd1b19c5f64b2fdfc04112359954d06c1d") ("map" . "3d80a6d7cdc7d9e5760290fa95db4da992612837") ("markdown-mode" . "521658eb32e456681592443e04ae507c3a59ed07") - ("melpa" . "1a054aba2409fb8ae12a634952f3d1336a14eb70") - ("merlin" . "fb5cfc2a5091ffa77894629538efb0ec953fb6e7") + ("melpa" . "780e7b4449c54f6ff5716b4953c85accfb7f0ebd") + ("merlin" . "5d59c7065938ea9c9b52f368b97a50bc8bf6d65b") ("mmm-mode" . "0d00cdf4d02cc166304f6967a20fa22e2eaf208b") - ("multiple-cursors.el" . "8a60fc7ef0ae6e5ca089a7c95264cd0ae83e7274") + ("multiple-cursors.el" . "aae47aebc0ae829211fa1e923232715d8e327b36") ("nginx-mode" . "6e9d96f58eddd69f62f7fd443d9b9753e16e0e96") - ("otp" . "123e6783bfe0d043ffe983fdc1e0a9f9248eb771") + ("otp" . "f9c7f02e774639b95f47a99f8d539f83d13a94c7") ("paredit" . "8330a41e8188fe18d3fa805bb9aa529f015318e8") ("parseclj" . "a8c4cf30fb68b66ae51541462a8b21753229a6e5") ("parseedn" . "e70ca8d03a314f97e4f49b7d6098fa565742e217") @@ -77,7 +77,7 @@ ("pkg-info" . "76ba7415480687d05a4353b27fea2ae02b8d9d61") ("pos-tip" . "179cc126b363f72ca12fab1e0dc462ce0ee79742") ("posframe" . "c91d4d53fa479ceb604071008ce0a901770eff57") - ("projectile" . "20df208385ce7b80207602c9931e31094eca85fb") + ("projectile" . "defce6e6bb504bdfab1e091550e2f709310327b9") ("purescript-mode" . "0acd1af446424ba855153161fe07a20f67dc0a89") ("queue" . "130c2d656cd5d7376552272fab9e50a7c37d0c4a") ("rainbow-delimiters" . "a32b39bdfe6c61c322c37226d66e1b6d4f107ed0") @@ -85,7 +85,7 @@ ("rbs-mode" . "fd766a943d5f1f0624e10ffce096b9aaba14a5f4") ("reason-mode" . "5690544a7091630e0ea0023bbbd57a733cea8bde") ("rich-minority" . "a03e693f6f9232cf75363aaaf1cb041f21675c19") - ("rspec-mode" . "4215ff1f2d1cee24a144ff08297276dc7b971c25") + ("rspec-mode" . "a54ac64097b6ccc6acc52a8b077ceb63766fc4d1") ("ruby-end.el" . "a136f75abb6d5577ce40d61dfeb778c2e9bb09c0") ("rust-mode" . "26ecc903c50b2ffd289bbe981f9ad03626fc0057") ("s.el" . "08661efb075d1c6b4fa812184c1e5e90c08795a9") @@ -97,9 +97,9 @@ ("spinner" . "34905eae12a236753fa88abc831eff1e41e8576e") ("ssass-mode" . "96f557887ad97a0066a60c54f92b7234b8407016") ("straight.el" . "af5437f2afd00936c883124d6d3098721c2d306c") - ("swiper" . "c97ea72285f2428ed61b519269274d27f2b695f9") + ("swiper" . "40e017dc1bc4655f7c3cf4bbbe3a827ce2fff213") ("terraform-mode" . "e560caaa9d9a11b0868adf6d9dcae5ebb5055730") - ("transient" . "132090a4b6d65603a09e33113f6dbd9a1131e38e") + ("transient" . "d02458186344ee6eddc718740d0b225f8fb1ca6b") ("treemacs" . "b18a05b1f62074a40e6011d83cd4c92cbee040dd") ("tuareg" . "04f5ab6be9ae1c594bab359819dbaf708ae57fda") ("undo-tree" . "16f4121032d09ef44b3d7d02c4d02c3c2f18041f") @@ -108,8 +108,9 @@ ("vue-html-mode" . "1514939804bad558584feeb6298b38d22eadf64e") ("vue-mode" . "031edd1f97db6e7d8d6c295c0e6d58dd128b9e71") ("web-mode" . "efa853e5cfff8e0bcacbda9d1c6696b33da91b03") - ("with-editor" . "e8569e027ff5c9bef8d9ff0734e3293e1c0574a2") + ("with-editor" . "7381fa1ebf9295f2cd6af1f3f25e4adaccbff0bd") ("yaml-mode" . "535273d5a1eb76999d20afbcf4d9f056d8ffd2da") ("yasnippet" . "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6") - ("yasnippet-snippets" . "b7c09f1ad7e1a62da6f6042bfaa2b26d111c7e81")) + ("yasnippet-snippets" . "c5bf4c4085aa61b9c07563de89f7aacc2a357db5") + ("zig-mode" . "aa20d630b8c413dab8d6bd120ec3ed5db5c9da70")) :beta