diff --git a/init.el b/init.el index 3eaafeb..e9f8ebe 100644 --- a/init.el +++ b/init.el @@ -93,7 +93,8 @@ (cider-repl-display-help-banner) (column-enforce-column . 10000) (haskell-process-use-ghci . t) - (haskell-indent-spaces . 4)))) + (haskell-indent-spaces . 4))) + '(warning-suppress-types '((comp) (lsp-mode)))) ;; Improve font settings in Markdown code (custom-set-faces diff --git a/lang/sh.el b/lang/sh.el index 7e11a05..a9ae734 100644 --- a/lang/sh.el +++ b/lang/sh.el @@ -5,6 +5,7 @@ (add-to-list 'auto-mode-alist '("\\.zsh\\'" . sh-mode)) (add-to-list 'auto-mode-alist '("\\zshrc\\'" . sh-mode)) (add-to-list 'auto-mode-alist '("\\.zshrc\\'" . sh-mode)) +(add-to-list 'auto-mode-alist '("\\.envrc\\'" . sh-mode)) (provide '+custom-lang-sh) ;;; sh.el ends here diff --git a/pkg/base.el b/pkg/base.el index 6e1d547..6456cd9 100644 --- a/pkg/base.el +++ b/pkg/base.el @@ -95,6 +95,8 @@ :config (add-to-list 'exec-path "/usr/local/bin") (exec-path-from-shell-initialize)) +(use-package direnv :straight t :config (direnv-mode)) + ;; Draw underline lower (setq x-underline-at-descent-line t) diff --git a/pkg/themes.el b/pkg/themes.el index de5bcda..d09a5b9 100644 --- a/pkg/themes.el +++ b/pkg/themes.el @@ -12,6 +12,7 @@ (use-package base16-theme :straight t :defer t) (use-package apropospriate-theme :straight t :defer t) +(use-package modus-themes :straight t :defer t) ;; Disable cursor blinking (blink-cursor-mode 0) @@ -21,7 +22,7 @@ ;; Light themes (load-theme 'base16-atelier-forest-light t t) -(load-theme 'base16-harmonic-light t t) +(load-theme 'base16-harmonic16-light t t) (load-theme 'apropospriate-light t t) (load-theme 'base16-humanoid-light t t) @@ -32,6 +33,7 @@ (load-theme 'base16-solarflare t t) (load-theme 'base16-snazzy t t) (load-theme 'base16-gruvbox-dark-hard t t) +(load-theme 'modus-vivendi t t) ;; My own theme modifications: (require 'base16-zenburn-modified-theme diff --git a/straight/versions/default.el b/straight/versions/default.el index e165798..b6062e9 100644 --- a/straight/versions/default.el +++ b/straight/versions/default.el @@ -1,118 +1,125 @@ -(("ace-window" . "0577c426a9833ab107bab46c60d1885c611b2fb9") - ("apropospriate-theme" . "52ed4bf4aaa01c527271d71e6ce00f3607839777") - ("avy" . "ba5f035be33693d1a136a5cbeedb24327f551a92") - ("base16-emacs" . "58851095cf04cd2229041f1179190f4d84eae59a") +(("ace-window" . "77115afc1b0b9f633084cf7479c767988106c196") + ("all-the-icons.el" . "4a4d6269b8b85b0b15954f063e6ce378630d80c0") + ("apropospriate-theme" . "07265cc0122d3bde62615e8f5671e271598d95da") + ("avy" . "955c8dedd68c74f3cf692c1249513f048518c4c9") + ("base16-emacs" . "a53091ca225b70136e8e3a1f693d0e856022dd31") ("buffer-move" . "e7800b3ab1bd76ee475ef35507ec51ecd5a3f065") ("bui.el" . "f3a137628e112a91910fd33c0cff0948fa58d470") ("caml-mode" . "f2f170f46b758341d96385986e8a93b9b4d248f1") ("cfrs" . "f3a21f237b2a54e6b9f8a420a9da42b4f0a63121") - ("cider" . "0f8fd4d84decfa3514fbdd556c5235f490b7a507") - ("clj-refactor.el" . "f368c56c83843396b160440f472a661a3b639862") - ("clojure-mode" . "b6f41d74904daa9312648f3a7bea7a72fd8e140b") + ("cider" . "101671c06df301833b3dcf6a5ed83a028efc334f") + ("clj-refactor.el" . "cd97626fd952f824564808a2f21b40bfcb59ff0f") + ("clojure-mode" . "d47298212ffc486ade3f2428f103feba3a467af0") ("column-enforce-mode" . "14a7622f2268890e33536ccd29510024d51ee96f") - ("company-box" . "f9cbbc7df8efbb56a8d31a5b422d158660d9109e") - ("company-mode" . "d5145006b948f93e673f439a766da01f636d39fc") - ("compat" . "1753ad6043a826ad7639dc99f3dd47ba59b6be79") + ("company-box" . "79abd77f3357279c2726b74f8b20df27b71aa867") + ("company-mode" . "35408c0ac3a730908fbce0810f8d159eb353c1d5") + ("compat" . "056e3ccffc716990dcb7b33273453d5fce0402de") ("counsel-projectile" . "40d1e1d4bb70acb00fddd6f4df9778bf2c52734b") - ("dap-mode" . "67fd9e5d4e157e72b09ab34daca67619cb98c673") + ("dap-mode" . "442aef50dbc3cfb853bee6d919e98d2941973136") ("dash-at-point" . "fba1a6f42ea51d05110e12c62bdced664059eb55") - ("dash.el" . "76606f90774c5349f7adac20c33e6d37a1939a1f") + ("dash.el" . "0ac1ecf6b56eb67bb81a3cf70f8d4354b5782341") ("deft" . "28be94d89bff2e1c7edef7244d7c5ba0636b1296") - ("diminish.el" . "6b7e837b0cf0129e9d7d6abae48093cf599bb9e8") - ("dockerfile-mode" . "b63a3d12b7dea0cb9efc7f78d7ad5672ceab2a3f") - ("dune" . "74fb788b2a4936b82d584ae42fbd2f728b560c99") + ("diminish.el" . "fbd5d846611bad828e336b25d2e131d1bc06b83d") + ("dockerfile-mode" . "52c6c00da1d31c0b6c29c74335b3af63ed6bf06c") + ("dune" . "2b02c1fb31d4c2a07108c8862a4e86830247f535") ("edit-indirect" . "f80f63822ffae78de38dbe72cacaeb1aaa96c732") - ("el-get" . "a620c91fe7d6d482c0e7538df75e10af0af1bb16") - ("elisp-refs" . "8f84280997d8b233d66fb9958a34b46078c58b03") + ("el-get" . "94a0dc58b8a90cf3adf2b8a34ffc512826dd11f1") + ("elisp-refs" . "af73739084637c8ebadad337a8fe58ff4f1d2ec1") + ("elisp-tree-sitter" . "3cfab8a0e945db9b3df84437f27945746a43cc71") ("emacs-ansible" . "d89ac0ee57742cca0f0e0a3453d9dcc521575690") - ("emacs-dashboard" . "1e691b346b9220b73337fd4962bbe6ef775ad9e7") - ("emacs-elixir" . "e0d0466d83ec80ddb412bb1473908a21baad1ec3") - ("emacs-fsharp-mode" . "5208b54098c7534f4768b87c5f4c8a01b638737b") + ("emacs-dashboard" . "554dc6fac1362dd6b66318c8250eea8bd63aa92f") + ("emacs-direnv" . "268536f564b7eba99264a89a9149268eb4bc67ac") + ("emacs-elixir" . "d495ed87a9c507f5939a51c740f119950c83e2ff") + ("emacs-fsharp-mode" . "42e8db5ff67c37228f92ca8750d203aa5bd9e1e5") ("emacs-gradle-mode" . "e4d665d5784ecda7ddfba015f07c69be3cfc45f2") ("emacs-hcl-mode" . "e4d9eef631e8a386341ae8f94f7c2579586e65b5") ("emacs-racer" . "1e63e98626737ea9b662d4a9b1ffd6842b1c648c") - ("emacs-which-key" . "1ab1d0cc88843c9a614ed3226c5a1070e32e4823") - ("emacsmirror-mirror" . "75fc16a034c76fd17b8efe724b60cc679b938d84") - ("enhanced-ruby-mode" . "f240ac00ccbbd0916b5e3d272c0064a26f527ef8") + ("emacs-which-key" . "8093644032854b1cdf3245ce4e3c7b6673f741bf") + ("emacsmirror-mirror" . "405485ea1d735db831db4784d18c03b6c9b72726") + ("enhanced-ruby-mode" . "8dcb8888cd8007420594212945fee88f82b663f6") ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6") - ("exec-path-from-shell" . "6336db9be13d46e2d4bc3b50bc37a3fbf30fdc9e") - ("f.el" . "e0dc429f9c20322c7af735a828fe2404bb416715") - ("flycheck" . "66a973afca1d03b8284baaa7590eb2b8615a1e6a") + ("exec-path-from-shell" . "ddd24dc823de9a94435b4d8ea7569161657f31e2") + ("f.el" . "d50dca48929575642912bb5bbb2585709ba38f82") + ("flycheck" . "b8f5bad487dafb942b577b571786e4495bd5a400") ("flycheck-rust" . "a139cd53c5062697e9ed94ad80b803c37d999600") ("flyspell-correct" . "7d7b6b01188bd28e20a13736ac9f36c3367bd16e") ("frame-local" . "7ee1106c3bcd4022f48421f8cb1ef4f995da816e") ("git-modes" . "eca3bb42ea8abed9ef8549b2ac91bbea445c5bb5") - ("gleam-mode" . "a0b76a64f6c062a8fe0c0541e788de8470828fd2") - ("gnu-elpa-mirror" . "808923d95777d378ca340b8020dd571e6a62460a") - ("go-mode.el" . "fa2693278637f56759480d2bf203bb8aad107230") - ("graphql-mode" . "9740e4027bd9313697d5cac5caaa5b15626ab1da") - ("groovy-emacs-modes" . "29210e5a969c02169b68e04f2e28e3bf2fc13363") - ("haskell-mode" . "fe3a8046aa1e1767ddc11a74e3d45bd9c614e655") - ("helpful" . "2f91e7992dae078a9cbc0d7f8e603e02d0abfcb0") - ("ht.el" . "c4c1be487d6ecb353d07881526db05d7fc90ea87") - ("hydra" . "9e9e00cb240ea1903ffd36a54956b3902c379d29") + ("gleam-mode" . "1fada93bac21811221081116c247b3d4d3b91d6c") + ("gnu-elpa-mirror" . "8894843ed04708877163c3a3b8cbd19624894ed7") + ("go-mode.el" . "08aa90d52f0e7d2ad02f961b554e13329672d7cb") + ("graphql-mode" . "92136cf9b5a4dcd8c202c8dba9064b497776d2f7") + ("groovy-emacs-modes" . "c612ac1e9f742856914ad6e8eb9e9dc169f489ab") + ("haskell-mode" . "90503413f4cdb0ed26871e39c4e6e2552b57f7db") + ("helpful" . "3aa08da7a151f1928bf0e3d12fc2443b6485b6ef") + ("ht.el" . "cdc76669a5032c42a2b9f7cddcbc33c5deeb6beb") + ("hydra" . "317e1de33086637579a7aeb60f77ed0405bf359b") ("jenkinsfile-mode" . "fa5545be1329df3067dcfd81749bbd99df070d6b") - ("js2-mode" . "fed41615b26404e0bfd7e4f64643981ca798a34b") + ("js2-mode" . "841cfec9570ae06a67a131997e2aff32340e81d7") ("jump.el" . "55caa66a7cc6e0b1a76143fd40eff38416928941") - ("keyfreq" . "7bb36e910ae04ff1dce387e3ce73b669d299680b") + ("keyfreq" . "dd88193cd7a91a92113121191573758ea2a3ceb1") ("kotlin-mode" . "99499e1500034b5fd5fdce9bfef367d90c61b5ce") ("let-alist" . "592553db5929b54db40af0df90c5add0aaca045b") - ("lsp-haskell" . "daa51072e1718ca075987901fccbbc2357bca1fc") - ("lsp-mode" . "2f0ea2e396ec9a570f2a2aeb097c304ddc61ebee") - ("lsp-treemacs" . "9859326df6b8e8c954a3c227e53b6878e54aaae8") - ("lsp-ui" . "370022b6785e5c1906cf23fe92d658f10623f3ba") + ("lsp-docker" . "a0d7cbf80652429c0be4dc7d39e1887ba4691ec7") + ("lsp-haskell" . "485c1148ce4d27030bb95b21c7289809294e7d31") + ("lsp-mode" . "c1945f1e2731dc60f4593ae20c508b3028368709") + ("lsp-treemacs" . "f7ae97560cfbc88e781a2d5b9253dace7175b918") + ("lsp-ui" . "3cd7cc61273341023b863dcf45906ac9142fd1aa") ("macrostep" . "424e3734a1ee526a1bd7b5c3cd1d3ef19d184267") - ("magit" . "4b8eab3af130c47421482c1d28c1cbcb033106fc") + ("magit" . "ada7b21fcc90004d7ac1c5a42c0750e12c2a5ef8") ("map" . "9f46b9c966505874d68d9036827a4f63b55ab846") - ("markdown-mode" . "4477f381de0068a04b55e198c32614793f67b38a") - ("melpa" . "cf2e923e6036542b89ee9cb36fca699092a24b64") - ("merlin" . "5b5f8f5fa6940cc4c99f49adad9aca181d10c564") + ("markdown-mode" . "92d037504742cb3e579f1f488bc3fc23c648ff29") + ("melpa" . "a24b706cdc277fec9d3998574430882f318e26f8") + ("merlin" . "ca0ab2be087d661f2017c00be64a736459042f3f") ("mmm-mode" . "0d00cdf4d02cc166304f6967a20fa22e2eaf208b") - ("multiple-cursors.el" . "2f003612b7e5a37d6cf2b26a9be455f727814966") + ("modus-themes" . "87b3a2f78ecd5c2d4d434b26b1626201459fb952") + ("multiple-cursors.el" . "1e4842d1297241a5277bfd5c7bfab9e8711da60a") ("nginx-mode" . "6e9d96f58eddd69f62f7fd443d9b9753e16e0e96") - ("otp" . "4b4a6d20a67ccf395f136429981bc3be5755abfa") - ("paredit" . "8330a41e8188fe18d3fa805bb9aa529f015318e8") - ("parseclj" . "a8c4cf30fb68b66ae51541462a8b21753229a6e5") - ("parseedn" . "a67204eeaa32ca8f11f6aeecc2a88349f196add6") - ("pfuture" . "f9e67bd7edbd5b4e033efd82c0acc4a85ff860a8") - ("php-mode" . "4503672471b8fdaaea6c454344817a119c87fcc6") + ("nongnu-elpa" . "50a8788a8f32f3447ac23746051c23ca4cb52216") + ("otp" . "8177d9b3da4fa69b12440807ec072b2352810926") + ("paredit" . "e4a67f4f23ba936b4bdc8d7e66bd8c6729064558") + ("parseclj" . "4d0e780e00f1828b00c43099e6eebc6582998f72") + ("parseedn" . "a09686fbb9113b8b1b4f20c9e1dc0d6fea01a64f") + ("pfuture" . "19b53aebbc0f2da31de6326c495038901bffb73c") + ("php-mode" . "6513efaf6fd062aaa5ed542a710394553fe1c4e1") ("pkg-info" . "76ba7415480687d05a4353b27fea2ae02b8d9d61") - ("pos-tip" . "179cc126b363f72ca12fab1e0dc462ce0ee79742") + ("pos-tip" . "bfe74204d1201a33ace81898e7c485382817510a") ("posframe" . "0d23bc5f7cfac00277d83ae7ba52c48685bcbc68") - ("projectile" . "39314925e0813d9042911197b08cfe304baff350") - ("purescript-mode" . "9c37067e611b5253a095f03245c247aa97bd7614") + ("projectile" . "20aa2adccc1ecb19f54f2fbc428b4904071fcab8") + ("purescript-mode" . "cf113871f98da672bd2e9ae58da9c852236f3934") ("queue" . "130c2d656cd5d7376552272fab9e50a7c37d0c4a") ("rainbow-delimiters" . "a32b39bdfe6c61c322c37226d66e1b6d4f107ed0") ("rainbow-mode" . "55a8c15782197cd9db8950d2f5ed1b9caca08dae") ("rbs-mode" . "fd766a943d5f1f0624e10ffce096b9aaba14a5f4") ("reason-mode" . "5690544a7091630e0ea0023bbbd57a733cea8bde") ("rich-minority" . "a03e693f6f9232cf75363aaaf1cb041f21675c19") - ("rspec-mode" . "41224216cb7762a18eb0e309095796f3eb319e01") + ("rspec-mode" . "484f0bab468674852aaf3e0ad0c3b3d4335d4316") ("ruby-end.el" . "a136f75abb6d5577ce40d61dfeb778c2e9bb09c0") - ("rust-mode" . "0df2f22479b98f76d97de90e1c390ff1b0902a46") - ("s.el" . "08661efb075d1c6b4fa812184c1e5e90c08795a9") + ("rust-mode" . "b4537b6f5fa65626c1bab944681b35769cab9b5c") + ("s.el" . "e957dcb0677da18b2bb60ad867db5df5c35b5616") ("sesman" . "e0f555f963c9f02f8e4a50e06fc353eb4c15ee77") - ("slime" . "1f9a95f3a07b2aa5b01d8be427b90837be5cea6a") + ("slime" . "805c29672c8a1f6c68286ab379359f9ab9ad9dc2") ("slime-company" . "f20ecc4104d4c35052696e7e760109fb02060e72") ("smart-mode-line" . "abcb0ab6f7110a03d6c7428bae67cf8731496433") - ("speed-type" . "5ef695f7159aa1f20c7c9e55f0c39bcdacce8d21") - ("spinner" . "34905eae12a236753fa88abc831eff1e41e8576e") + ("speed-type" . "304cb8cd6c30d07577d7d864fd32858a29a73dba") + ("spinner" . "634529bb3173e09b37499f636de70abf29d9fa8a") ("ssass-mode" . "96f557887ad97a0066a60c54f92b7234b8407016") - ("straight.el" . "af5437f2afd00936c883124d6d3098721c2d306c") - ("swiper" . "8bf8027e4bd8c093bddb76a813952d2a0dcbf21d") + ("straight.el" . "f21103d97d180fba0b6e2e86ebb0b6269219ef2c") + ("swiper" . "29b61fe1f4d5268d750b666a7ffc1269e22c6477") ("terraform-mode" . "e560caaa9d9a11b0868adf6d9dcae5ebb5055730") - ("transient" . "2e4426fe8161893382f09b3f4635e152ee02488e") - ("treemacs" . "68fd2ddab926e2a9e3948e64803abfd02d8c40cd") - ("tuareg" . "04f5ab6be9ae1c594bab359819dbaf708ae57fda") + ("transient" . "097f5be6e0c228790a6e78ffee5f0c599cb58b20") + ("treemacs" . "20765acd38e00faa46a72b9a2cf63a7b451c6850") + ("tuareg" . "760cdcd0e6ff2a6718728f249db81cd9df76a23a") ("undo-tree" . "16f4121032d09ef44b3d7d02c4d02c3c2f18041f") - ("use-package" . "a7422fb8ab1baee19adb2717b5b47b9c3812a84c") + ("use-package" . "9a45a8004a9e520e0e822b960ca9d70c2528181e") ("visual-regexp.el" . "48457d42a5e0fe10fa3a9c15854f1f127ade09b5") ("vue-html-mode" . "1514939804bad558584feeb6298b38d22eadf64e") ("vue-mode" . "031edd1f97db6e7d8d6c295c0e6d58dd128b9e71") - ("web-mode" . "7d139a209a8f92cf1749fefccc917eda1985d1fe") - ("with-editor" . "4ab8c6148bb2698ff793d4a8acdbd8d0d642e133") - ("yaml-mode" . "535273d5a1eb76999d20afbcf4d9f056d8ffd2da") + ("web-mode" . "de9dfa3ac3cd54e6acb4f9d9d1343f8d4eabd363") + ("with-editor" . "1d5860cfd05d6805018bd071b8f9b56493ba11c6") + ("yaml-mode" . "9969207f60b69e42c573a63764faeb9caaccb2bf") + ("yaml.el" . "73fde9d8fbbaf2596449285df9eb412ae9dd74d9") ("yasnippet" . "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6") - ("yasnippet-snippets" . "c5bf4c4085aa61b9c07563de89f7aacc2a357db5") + ("yasnippet-snippets" . "cd665c9cba4bab646f6d50ac098bee63573a4ca5") ("zig-mode" . "dbc648f5bca8f3b9ca2cc7827f326f5530115144")) -:beta +:gamma