From b84a637dcf39f7dc0f8f8ceffea2b42edb15257b Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Mon, 19 Jul 2021 20:32:52 +0300 Subject: [PATCH] Update packages and add setup for das keyboard It, for some reason, has different mappings for the alt keys. God knows why. --- pkg/fonts.el | 3 +- pkg/sys-specific.el | 11 +++++ straight/versions/default.el | 78 ++++++++++++++++++------------------ 3 files changed, 52 insertions(+), 40 deletions(-) diff --git a/pkg/fonts.el b/pkg/fonts.el index 9ac9591..a597156 100644 --- a/pkg/fonts.el +++ b/pkg/fonts.el @@ -29,6 +29,7 @@ "Automatically set font size to suit the monitor." ;; If display is set to emulate FullHD resultion or less, make the font ;; smaller. + (interactive) (cond ((eq (x-display-list) nil)) ;; built-in screen @@ -39,7 +40,7 @@ ;; Other screens ((>= 1120 (x-display-pixel-height)) (set-font +custom-font 14)) - ((>= 1440 (x-display-pixel-height)) (set-font +custom-font 16)) + ((>= 1440 (x-display-pixel-height)) (set-font +custom-font 17)) ;; 4K screen on Windows ((>= 2160 (x-display-pixel-height)) (set-font +custom-font 20)) diff --git a/pkg/sys-specific.el b/pkg/sys-specific.el index 358006b..899d6ec 100644 --- a/pkg/sys-specific.el +++ b/pkg/sys-specific.el @@ -49,6 +49,17 @@ ;; Disable meta on right alt (useful for Polish characters) (setq mac-right-option-modifier nil))) +(defun +custom-switch-right-left-alt () + "Set keyboard to das keyboard." + (interactive) + (if (eq mac-right-option-modifier nil) + (progn + (setq mac-right-option-modifier 'meta) + (setq mac-option-modifier nil)) + (progn + (setq mac-right-option-modifier 'meta) + (setq mac-option-modifier nil)))) + ;;;;;;;;; Mac-specific config ;;;;;;;;;;;;;;;;;;;;; (if IS-GNU (progn diff --git a/straight/versions/default.el b/straight/versions/default.el index 01a750c..16ac6db 100644 --- a/straight/versions/default.el +++ b/straight/versions/default.el @@ -2,83 +2,83 @@ ("ace-window" . "c7cb315c14e36fded5ac4096e158497ae974bec9") ("apropospriate-theme" . "b17a8ce0686848ffd7c6d20aa66bf2e97b7ce3e5") ("avy" . "e92cb37457b43336b765630dbfbea8ba4be601fa") - ("base16-emacs" . "59692942f34b9be0447a7766ad03115d04e79874") + ("base16-emacs" . "7f1db3df9bb6f4a3c9f4d3c10b9a6cf231752547") ("buffer-move" . "cb517ecf8409b5fdcda472d7190c6021f0c49751") ("bui.el" . "f3a137628e112a91910fd33c0cff0948fa58d470") ("caml-mode" . "38ebde12d3d529e6ef8078967997d32226e69e82") ("cfrs" . "2cb7f1cbf9292b0efe167ef372cfb5a7600564eb") - ("cider" . "8f51546c0efb36226c4bae7d65465b0e0aa8c06f") - ("clj-refactor.el" . "ae2f6344eaf66c872ebc4a87a389f34434ad7a3d") - ("clojure-mode" . "33f267ac182afe8fa82cc321e9f515c0397e35f6") + ("cider" . "fe8cf244fd3426261f9f630c981a6296afd433a4") + ("clj-refactor.el" . "466822ff6f9da584f7cf72c868017b8840574dbd") + ("clojure-mode" . "3e426b3a479f479963f2c7d1147cc826ed1a0ee1") ("column-enforce-mode" . "14a7622f2268890e33536ccd29510024d51ee96f") - ("company-mode" . "36839ec2eb06bf970c7ff4a10a13fc0f1b989b5e") + ("company-mode" . "d77184094b9a45b204813d824918e1ec2aac8504") ("counsel-projectile" . "06b03c1080d3ccc3fa9b9c41b1ccbcf13f058e4b") - ("dap-mode" . "cc395e066755c7513d4862f5639f3d162b3bd30f") + ("dap-mode" . "685168efc72e61bca2a248155bace7ec633269a5") ("dash-at-point" . "4d795a23a8428c421d5107f1b005c9d8e0d1816c") - ("dash.el" . "88d799595e8f1b4154637ce8a3f81b97b0520c1a") - ("deft" . "c4af44827f4257e7619e63abfd22094a29a9ab52") + ("dash.el" . "2675596b9ac1c4b9d47b93e227f06f8ec6755ec6") + ("deft" . "28be94d89bff2e1c7edef7244d7c5ba0636b1296") ("diminish.el" . "6ec6ebc391371418efc6c98d70b013f34af5a2ee") ("dockerfile-mode" . "ad06a41259ff2961d603bf23a3a8fbd22dde2161") - ("dune" . "26f5e57d1aef71f476a6dc40990b9d6a517f7849") + ("dune" . "e5e963a2dae220a4b1358ac7a31583fe4a849a8a") ("edit-indirect" . "bdc8f542fe8430ba55f9a24a7910639d4c434422") - ("el-get" . "ec135b5353867ce3564a675e99024944b834395d") + ("el-get" . "463f5e985fc53300f87ab7eb054d1738fc6ac93b") ("elisp-refs" . "fdde21e34b1272783d566d8230b5ed2dc4749048") ("emacs-ansible" . "40af0d2bbb6c5bbcf7aa9269ac9a07e22622d263") - ("emacs-dashboard" . "9983aa0838ce5a2219ef4b674e6b37de41b5b585") + ("emacs-dashboard" . "67573ceb3db5bc7a5192311c6cac044cb29f61a7") ("emacs-elixir" . "6bbc1e5ac46064613c982cedc60566ed077e7a58") ("emacs-fsharp-mode" . "93b1fbc31d73286a18640a36fc2be87d1736e0f2") ("emacs-gradle-mode" . "e4d665d5784ecda7ddfba015f07c69be3cfc45f2") ("emacs-hcl-mode" . "e12b1df2ca28d2b06c471cd709c038a2dc0bcdbd") - ("emacs-libvterm" . "2b1392cb2b14ec5bd0b7355197d5f353aa5d3983") + ("emacs-libvterm" . "d9dfa624679afdd5db6ad25429ef86d3dd91401e") ("emacs-planet-theme" . "b0a310ff36565fe22224c407cf59569986698a32") ("emacs-racer" . "1e63e98626737ea9b662d4a9b1ffd6842b1c648c") - ("emacs-which-key" . "12f743c6955c89352f8d49d292895bd45e82d26f") - ("emacsmirror-mirror" . "6b40ad4759fcfdb113e05fb4aaf8c0ef577f7e1e") + ("emacs-which-key" . "55fcce0c6143044535bc6825a68f42ca83f58f00") + ("emacsmirror-mirror" . "c5261c7625cd849a8657faf04ec7cb7881a93a37") ("enhanced-ruby-mode" . "e960bf941d9fa9d92eabf7c03a8bbb51ba1ac453") ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6") ("exec-path-from-shell" . "bf4bdc8b8911e7a2c04e624b9a343164c3878282") - ("f.el" . "c4dbf8c8e83df834f5d6f72cd5649b9d8a8812ec") + ("f.el" . "50af874cd19042f17c8686813d52569b1025c76a") ("flatui-theme.el" . "9c15db5526c15c8dba55023f5698372b19c2a780") - ("flycheck" . "f8c679fff349850c80541a31de50009c3c15d4c9") + ("flycheck" . "21d52264aa80bfa4ede94c59e37a20fb6d033b0c") ("flycheck-rust" . "a139cd53c5062697e9ed94ad80b803c37d999600") ("git-modes" . "433e1c57a63c88855fc41a942e29d7bc8c9c16c7") ("gleam-mode" . "60c0102e9a905027eb88600fef7d60bd3fbdaab1") - ("gnu-elpa-mirror" . "97425c5a7472e0c669d34c719ea194520afddc8d") + ("gnu-elpa-mirror" . "0ed8c5ac06306b9b5f5900eb01c1a48bed4b6110") ("groovy-emacs-modes" . "99eaf70720e4a6337fbd5acb68ae45cc1779bdc4") - ("haskell-mode" . "b35e8547b67f3d2c4d38ec7e7e516e3c0925352f") + ("haskell-mode" . "98ba3922360199d5260d47f417f096730ad057c5") ("helpful" . "7e4b1f0d5572a4e2b8ee7a9b084ef863d0315a73") ("ht.el" . "c4c1be487d6ecb353d07881526db05d7fc90ea87") ("hydra" . "2d553787aca1aceb3e6927e426200e9bb9f056f1") ("jenkinsfile-mode" . "65bf3925852c35c6bd499978f08f83c1193f4347") - ("js2-mode" . "5e9515dff26ed2fa382c97b0b67cdd370f7859f4") + ("js2-mode" . "6f313c9566d9c8453a91c5ccaa25760978cb9f6d") ("jump.el" . "55caa66a7cc6e0b1a76143fd40eff38416928941") ("keyfreq" . "e5fe9d585ce882f1ba9afa5d894eaa82c79be4f4") ("kotlin-mode" . "0e4bafb31d1fc2a0a420a521c2723d5526646c0b") ("let-alist" . "6708ec0b2e6dff80ff5b64698aa009d9070a2ed2") - ("lsp-haskell" . "7efbef3d206989faa8b691a4230a3ed872542187") - ("lsp-mode" . "52048d47014b03a5de32b19f9a307af92e465192") - ("lsp-treemacs" . "f360d54fa68a00baec228d9582bc67c1a327d757") - ("lsp-ui" . "c4ffa7abf6706d591300c608c51d2b72178848ad") + ("lsp-haskell" . "eb37ac4a6a43277263bbb17aed6a862a0992ae8e") + ("lsp-mode" . "ed1735cf2a6a73b25e587125520edf36e02f30d1") + ("lsp-treemacs" . "905cc74726438cf06d8ad7cabb2efae75aeb2359") + ("lsp-ui" . "4283414de69312298d51b03e938d95d37d238391") ("macrostep" . "424e3734a1ee526a1bd7b5c3cd1d3ef19d184267") - ("magit" . "a3626277ccd7436391302009e69c4fbf5711a89b") - ("markdown-mode" . "1c7d29d52986b2cb153b5f643167ea49417de469") - ("melpa" . "452c6f2768921d73609bb3dd4c70df538c501f54") - ("merlin" . "3eafee3ebb399666db04b3046880e61030126e41") + ("magit" . "bf9cc19a3287f6a3cc5c1836312f0d18b38b6e45") + ("markdown-mode" . "359347b2bb15f8d7ef819692ac79759ccfe2c85d") + ("melpa" . "3ac69fa433b31d7a1a171e76458c9678f851b44d") + ("merlin" . "7c4c0a7018109b2b1bcbc3f6c1486961b223e658") ("mmm-mode" . "0d00cdf4d02cc166304f6967a20fa22e2eaf208b") ("multiple-cursors.el" . "616fbdd3696f99d85660ad57ebbb0c44d6c7f426") ("nginx-mode" . "a2bab83c2eb233d57d76b236e7c141c2ccc97005") - ("otp" . "c2a58792375754eb7d413f657735ae0390edc05d") + ("otp" . "ad6a5320630a885e6a915b14c4366eebccea92ca") ("page-break-lines" . "3b8549cd414d4d7ee0168ab9917124133566d3db") ("paredit" . "8330a41e8188fe18d3fa805bb9aa529f015318e8") ("parseclj" . "eff941126859bc9e949eae5cd6c2592e731629f2") ("parseedn" . "90cfe3df51b96f85e346f336c0a0ee6bf7fee508") - ("perspective-el" . "68b13cef8435cae581850415cdda17e245dd0eae") + ("perspective-el" . "b55aec612db791a1720232df0e2df0d3597d850b") ("pfuture" . "d7926de3ba0105a36cfd00811fd6278aea903eef") - ("php-mode" . "cbf27232649c39e3749eefd23f962750bd249a49") + ("php-mode" . "4b0e9f84d063c476b211ec89b2a17bddac138911") ("pkg-info" . "76ba7415480687d05a4353b27fea2ae02b8d9d61") ("pos-tip" . "179cc126b363f72ca12fab1e0dc462ce0ee79742") - ("posframe" . "74f06b77deeb770cd0a96977b1e6bdedb682487a") - ("projectile" . "155fdb44176347c9599357c7935993033260a930") + ("posframe" . "f97c4aff2c2c376ca62276d5597aa108546633a9") + ("projectile" . "da08a9103b5ba3b38ef031a9627a19436eb318b5") ("purescript-mode" . "0acd1af446424ba855153161fe07a20f67dc0a89") ("queue" . "130c2d656cd5d7376552272fab9e50a7c37d0c4a") ("rainbow-delimiters" . "d576e6694ad3a3e88b2bb1363305b38fa364c149") @@ -90,18 +90,18 @@ ("rust-mode" . "494d59f92cbe12533eb89b202fc4f5342afcd543") ("s.el" . "08661efb075d1c6b4fa812184c1e5e90c08795a9") ("sesman" . "edee869c209c016e5f0c5cbb8abb9f3ccd2d1e05") - ("slime" . "98a656d96b177edce57b552a2fa9d139cdce8c9a") + ("slime" . "68f5623f13c9a0d3d47ce70cf56928e00483d9d6") ("slime-company" . "f20ecc4104d4c35052696e7e760109fb02060e72") ("smart-mode-line" . "744ee1a9479a7901cedd6f0d59e6c6c86b20a78d") ("speed-type" . "5ef695f7159aa1f20c7c9e55f0c39bcdacce8d21") - ("spinner" . "e19f3cfc0646c0e23c10c22df219fcf427054621") + ("spinner" . "34905eae12a236753fa88abc831eff1e41e8576e") ("ssass-mode" . "96f557887ad97a0066a60c54f92b7234b8407016") ("straight.el" . "1e27b0590df77a5d478970ca58fd6606971692f5") - ("swiper" . "040d458bce4a88f37359192061bcea5ebe87007c") - ("terraform-mode" . "a9fa5bdaf58e9cae32ee44b7d0883f5600441b05") - ("transient" . "b711543401dafc159943d8a703cf30fabdc78e1f") - ("treemacs" . "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e") - ("tuareg" . "6559b203bac9416bcdf4b53d217d76893f4454be") + ("swiper" . "56139df678d9886d0612c0a192cce2cf6f156628") + ("terraform-mode" . "e560caaa9d9a11b0868adf6d9dcae5ebb5055730") + ("transient" . "e90481000f071e9a26a1cc0f40d347f7d3e2201e") + ("treemacs" . "e4a85e3266581b8a8f526dbf4142c26d6e76d294") + ("tuareg" . "b59c422759506402f990b089dbaa91c0578e2c2e") ("undo-tree" . "e326c6135e62f5fe8536528d3acd5e798f847407") ("use-package" . "a7422fb8ab1baee19adb2717b5b47b9c3812a84c") ("visual-regexp.el" . "48457d42a5e0fe10fa3a9c15854f1f127ade09b5")