From 95d1169b3a82caea32607343a9c8c63682b7d0bf Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Sat, 22 Jun 2024 10:14:01 +0300 Subject: [PATCH] Add GPT support though it doesn't really work or do anything useful --- pkg/company-yasnippet.el | 27 ++++++++++---- pkg/themes.el | 3 +- straight/versions/default.el | 71 ++++++++++++++++++------------------ 3 files changed, 57 insertions(+), 44 deletions(-) diff --git a/pkg/company-yasnippet.el b/pkg/company-yasnippet.el index ab186d5..2f06e7e 100644 --- a/pkg/company-yasnippet.el +++ b/pkg/company-yasnippet.el @@ -31,14 +31,6 @@ (global-company-mode t) (yas-global-mode t) -(use-package copilot - :straight (:host github :repo "zerolfx/copilot.el" :files ("dist" "*.el")) - :ensure t) - -;; (add-hook 'prog-mode-hook 'copilot-mode) -(define-key copilot-completion-map (kbd "") 'copilot-accept-completion) -(define-key copilot-completion-map (kbd "TAB") 'copilot-accept-completion) - (setq-default company-minimum-prefix-length 3 ;; minimum prefix character number for auto complete. company-idle-delay 0.1 @@ -94,5 +86,24 @@ (define-key text-mode-map (kbd "") 'insert-space-and-complete) (define-key text-mode-map (kbd "TAB") 'company-indent-or-complete-common) + +;;; Copilot and other GPT stuff +(use-package copilot + :straight (:host github :repo "copilot-emacs/copilot.el" :files ("*.el")) + :ensure t) + +;; Do not enable copilot by default because it sorta sucks? +;; (add-hook 'prog-mode-hook 'copilot-mode) +(define-key copilot-completion-map (kbd "") 'copilot-accept-completion) +(define-key copilot-completion-map (kbd "TAB") 'copilot-accept-completion) + +;; Enable Anthropic Claude LLM support for chat (it also sucks) +(use-package gptel :straight t :ensure t) + +(setq + gptel-model "claude-3-sonnet-20240229" + gptel-backend (gptel-make-anthropic "Claude" + :stream t :key "Your key goes here")) + (provide '+custom-pkg-company-yasnippet) ;;; company-yasnippet.el ends here diff --git a/pkg/themes.el b/pkg/themes.el index aef7549..4943a4a 100644 --- a/pkg/themes.el +++ b/pkg/themes.el @@ -25,6 +25,7 @@ (load-theme 'base16-harmonic16-light t t) (load-theme 'base16-horizon-light t t) (load-theme 'base16-humanoid-light t t) +(load-theme 'sanityinc-tomorrow-day t t) ;; Dark themes (load-theme 'cyberpunk t t) @@ -50,7 +51,7 @@ (spaceline-emacs-theme) -(enable-theme 'base16-onedark) +(enable-theme 'base16-zenburn-modified) (provide '+custom-pkg-themes) ;;; themes.el ends here diff --git a/straight/versions/default.el b/straight/versions/default.el index 741154c..11e7e93 100644 --- a/straight/versions/default.el +++ b/straight/versions/default.el @@ -9,18 +9,18 @@ ("bui.el" . "f3a137628e112a91910fd33c0cff0948fa58d470") ("caml-mode" . "47defafa2b08fb680e89bfee9cb9ce82bd9e3bcf") ("cfrs" . "f3a21f237b2a54e6b9f8a420a9da42b4f0a63121") - ("cider" . "2b37d0f6494a4916c0b88013e02037485229c438") + ("cider" . "105da319b09a436552f1b3c6194cbbc833017dd2") ("clj-refactor.el" . "dc1bbc8cdaa723bdbb6669ea7d280625c370755d") - ("clojure-mode" . "9c2f9677819510ec70e03d68a68a99e6d04175ca") - ("color-theme-sanityinc-tomorrow" . "5f3b2039eda57e9e4501f8decab5808d9edf98eb") + ("clojure-mode" . "59888c84b61081e9b0085e388f55132925a66e7a") + ("color-theme-sanityinc-tomorrow" . "ddf2920a8866040e57359d2e1c5517fffcad2e38") ("column-enforce-mode" . "14a7622f2268890e33536ccd29510024d51ee96f") ("company-box" . "c4f2e243fba03c11e46b1600b124e036f2be7691") - ("company-mode" . "6c7731d4ec1e43199ea328e1691999b4fe8967a8") - ("compat" . "0533ca41385aa4509dcd3f8310c0d5b3702f259e") + ("company-mode" . "1a0fc12a9c3d25e28c22f319e7b097f435b1c27d") + ("compat" . "25da9d232399203a38722aa6638b7fe8ecab3f60") ("copilot.el" . "733bff26450255e092c10873580e9abfed8a81b8") ("counsel-projectile" . "40d1e1d4bb70acb00fddd6f4df9778bf2c52734b") ("cyberpunk-theme.el" . "1fd5350ddfc53c30e6eef82af77c62d7c825df3c") - ("dap-mode" . "11431a26bc4c8ca92b097dbdbcbdc9e3d7fb5583") + ("dap-mode" . "b407773ebca56e3bd8e6a4643854e91cbde0c35e") ("dart-mode" . "44beb628e5b4774062f7486008e06ae663e1ced0") ("dash-at-point" . "fba1a6f42ea51d05110e12c62bdced664059eb55") ("dash.el" . "1de9dcb83eacfb162b6d9a118a4770b1281bcd84") @@ -29,17 +29,17 @@ ("diminish.el" . "fbd5d846611bad828e336b25d2e131d1bc06b83d") ("docker.el" . "d5255a65b7240d0038cc417f301b43df05a27922") ("dockerfile-mode" . "39a012a27fcf6fb629c447d13b6974baf906714c") - ("dune" . "86b8a6d45d1ce56d26009b782111bcee89bb8f99") + ("dune" . "871759ac680f7c5f5ea1dc671e945c6ebfe87554") ("easy-kill" . "de7d66c3c864a4722a973ee9bc228a14be49ba0c") - ("editorconfig-emacs" . "b120ccdcd853205e46ccc2f296055d5b09c7f9a0") + ("editorconfig-emacs" . "1651294334f3987d749eeb287f11d256cf2ba5b1") ("el-get" . "f220df34333fdb363b84b28f4ed4a5575341bf45") ("eldoc" . "c9f5787b0d2295ecca61067eedbc45039e46da5d") ("elisp-refs" . "541a064c3ce27867872cf708354a65d83baf2a6d") ("elisp-tree-sitter" . "3cfab8a0e945db9b3df84437f27945746a43cc71") ("elixir-ts-mode" . "b08d399e29714fe3d968db925aec0e1dfac54d89") ("emacs-aio" . "da93523e235529fa97d6f251319d9e1d6fc24a41") - ("emacs-ansible" . "1d7de8d3ddac980715eebd87ee66859f8665b101") - ("emacs-dashboard" . "541f6334d94bc78fe0588755e641a146bc563c64") + ("emacs-ansible" . "b4dca00f89334392d770a7a67fffc935ec7354aa") + ("emacs-dashboard" . "3852301f9c6f3104d9cc98389612b5ef3452a7de") ("emacs-direnv" . "c0bf3b81c7a97e2a0d06d05495e86848254fcc1f") ("emacs-elixir" . "00d6580a040a750e019218f9392cf9a4c2dac23a") ("emacs-fish" . "2526b1803b58cf145bc70ff6ce2adb3f6c246f89") @@ -48,8 +48,8 @@ ("emacs-leuven-theme" . "a504c1d20625fe373ad5ea4ff3d94ea3706cbb87") ("emacs-reformatter" . "0d29a04d69d47599e2cb7f1a8f8e897a2b592921") ("emacs-theme-darktooth" . "2358dd334b5dcb6dc9828422bd7bd1e4da556819") - ("emacs-which-key" . "1e89fa000e9ba9549f15ef57abccd118d5f2fe1a") - ("emacsmirror-mirror" . "0acbee372083436ccc3fd22704a53c74c7429175") + ("emacs-which-key" . "ed389312170df955aaf10c2e120cc533ed5c509e") + ("emacsmirror-mirror" . "d9919dfe6eede6ff668614b23f64cfef0f954c48") ("enhanced-ruby-mode" . "03dee65fc7153e5f98d2dcc294881a5bc38d5d5b") ("exec-path-from-shell" . "72ede29a0e0467b3b433e8edbee3c79bab005884") ("f.el" . "1e7020dc0d4c52d3da9bd610d431cab13aa02d8c") @@ -57,23 +57,24 @@ ("flycheck-rust" . "988c0a938c400947d447727f294574973863061e") ("flyspell-correct" . "1e7a5a56362dd875dddf848b9a9e25d1395b9d37") ("frame-local" . "7ee1106c3bcd4022f48421f8cb1ef4f995da816e") - ("git-modes" . "52ea2a1281ea9df9b8732fe2add0e6a0c9c2cd11") - ("gleam-mode" . "17050f7ae63f1a656dd7abac1f4723079c78258f") - ("gnu-elpa-mirror" . "5338f22d8cee40109a2616007b40b558e53eb0ae") - ("go-mode.el" . "6f4ff9ef874d151ed8d297a80f1bf27db5d9dbf0") + ("git-modes" . "7901415b39bef1b789d161ca2c10dfb910d13780") + ("gleam-mode" . "57b14bd9d760ed1c876aa9d463587e6d8ede59cb") + ("gnu-elpa-mirror" . "e59499eeb86979ef2b41f004b11c0e712f6354b3") + ("go-mode.el" . "636d36e37a0d2b6adb2e12d802ff4794ccbba336") + ("gptel" . "44780a408a3cf73a03f1ece3a6b570c160914834") ("graphql-mode" . "ef4aecaeada77f46d1f0465ab62b9e9f537ec260") ("groovy-emacs-modes" . "7b8520b2e2d3ab1d62b35c426e17ac25ed0120bb") ("haskell-mode" . "727f72a2a4b8e4fd0a7b62129668baea55a2c3e0") ("hcl-mode" . "37f2cb1bf6fb51fbf99d4fac256298fcd6d1dd24") ("heex-ts-mode" . "90142df2929956536dc1eaae3bb5ca04dc4232ab") - ("helpful" . "a32a5b3d959a7fccf09a71d97b3d7c888ac31c69") + ("helpful" . "4ba24cac9fb14d5fdc32582cd947572040e82b2c") ("ht.el" . "1c49aad1c820c86f7ee35bf9fff8429502f60fef") ("hydra" . "317e1de33086637579a7aeb60f77ed0405bf359b") ("jenkinsfile-mode" . "568865ee419e0592de0dd0717d6769a66d9df111") ("js2-mode" . "9b90d31ed968e5c51bd3e279d4003248ea896807") ("json-mode" . "77125b01c0ddce537085201098bea9b4b8ba6be3") ("json-snatcher" . "b28d1c0670636da6db508d03872d96ffddbc10f2") - ("jsonrpc" . "812faa14545ba5c210f477d7a186ac03dbc17b5e") + ("jsonrpc" . "70defbea6cf411de7eb8ca4ce4d23895fac78023") ("jump.el" . "55caa66a7cc6e0b1a76143fd40eff38416928941") ("keyfreq" . "c6955162307f37c2ac631d9daf118781009f8dda") ("kotlin-mode" . "fddd747e5b4736e8b27a147960f369b86179ddff") @@ -81,27 +82,27 @@ ("let-alist" . "6e9f470e78cf50afa0e53a61da191d68d87a0104") ("lsp-dart" . "1f52e81c9371055ff9188117ace81f009d1c79f2") ("lsp-docker" . "42dd54d02d2414fa4450aeaf2b4da44c9b3692d6") - ("lsp-haskell" . "2808b065d1d5384bd9fec48739cd7d38cd0dd2dc") - ("lsp-mode" . "fceda197b563e109a1ed5ff17916fc74bc6d5109") + ("lsp-haskell" . "18a7c7881fb249d9b4cb5f376dfa84682022dc83") + ("lsp-mode" . "cec9e56390e90d7ced3b18a922ab954e782b8628") ("lsp-treemacs" . "1d43e9e0307f84496a4a7ddf9dba481000391dbd") ("lsp-ui" . "00f1fecdfb41c30428734cf27e492f26f46627fb") ("lua-mode" . "d074e4134b1beae9ed4c9b512af741ca0d852ba3") ("macrostep" . "4939d88779761e8b5461b4cf73f86600172987db") - ("magit" . "f9268a959828d0c6ab26171dd2fb1ffc55e5ae70") + ("magit" . "7e144529b7fca345fcaa92d7e986688ea24ae94c") ("map" . "9e592e741c3bee76c170d7462485fd9fc8cdd9ba") ("markdown-mode" . "0cdebc833ed9b98baf9f260ed12b1e36b0ca0e89") - ("melpa" . "edbb47c3e7df4f72c21e0129e7b24bcda598a1a2") - ("merlin" . "a7e8e6ec378a5496c6b913ec7304dc223aa182f8") - ("modus-themes" . "d2762db19ed48bd0cbba61c41940be479760a35e") + ("melpa" . "fd3bb4b191bf416dd419c5c76d510c7f5890e673") + ("merlin" . "b6ff2d4d569c23dd8fa91639d26fb984e9411862") + ("modus-themes" . "4f7fa199d2d355d9cb50a327d66ebda341c405ec") ("multiple-cursors.el" . "c870c18462461df19382ecd2f9374c8b902cd804") ("nginx-mode" . "c4ac5de975d65c84893a130a470af32a48b0b66c") - ("nongnu-elpa" . "80d311f71fbe9607f5f372c6e0c9d84fb5941b62") - ("otp" . "85d8c9c035ee62c14913739045a2f4d33582bac4") - ("paredit" . "9a2c4b37fc8c1c7bdbb1f86fdec874c0d0652e64") + ("nongnu-elpa" . "c7b774608a8b17b5e95a096317d12fae7dc31b68") + ("otp" . "3f5a62c2f69fb50dddc1af9290af1abe3c77b567") + ("paredit" . "037b9b8acbca75151f133b6c0f7f3ff97d9042e5") ("parseclj" . "6af22372e0fe14df882dd300b22b12ba2d7e00b0") ("parseedn" . "3407e4530a367b6c2b857dae261cdbb67a440aaa") ("pfuture" . "19b53aebbc0f2da31de6326c495038901bffb73c") - ("php-mode" . "c8e4c16ca0d234f4a659713a94467f0c32ef4bc8") + ("php-mode" . "4792988a120d6ac515ba16605278d04cb8be0d69") ("posframe" . "f4e9e509ba96ceb3c2b2b054957291607fb52651") ("powerline" . "c35c35bdf5ce2d992882c1f06f0f078058870d4a") ("projectile" . "0163b335a18af0f077a474d4dc6b36e22b5e3274") @@ -117,7 +118,7 @@ ("s.el" . "dda84d38fffdaf0c9b12837b504b402af910d01d") ("seq" . "d6b97ea450817ecef174d9c65d59b69bc5721a35") ("sesman" . "7bca68dbbab0af26a6a23be1ff5fa97f9a18e022") - ("slime" . "e261cc83b2a4675824c196965d060b135f6777ad") + ("slime" . "81b6508cdf344b72fe4af1eadbc0194d64163643") ("slime-company" . "f20ecc4104d4c35052696e7e760109fb02060e72") ("spaceline" . "086420d16e526c79b67fc1edec4c2ae1e699f372") ("speed-type" . "b982ee6081a11837760eeaed73c4f413eefb07b1") @@ -126,20 +127,20 @@ ("swiper" . "2a25a6fb5b081cb141c5eccac8ee58ab1feeb747") ("tablist" . "fcd37147121fabdf003a70279cf86fbe08cfac6f") ("terraform-mode" . "a645c32a8f0f0d04034262ae5fea330d5c7a33c6") - ("transient" . "0dd64387d3847d63298fbe10bf73f20aeef0cf2a") + ("transient" . "f78aebdd03292241b45023c4379bcad5c746fc4c") ("tree-sitter-indent.el" . "4ef246db3e4ff99f672fe5e4b416c890f885c09e") - ("tree-sitter-langs" . "acc7a3bdf1cb8762de4002251294aad83d0fef6f") - ("treemacs" . "923fbbdea57b27ed3293079b13846206add85d9d") + ("tree-sitter-langs" . "a06804e13fc1d24d0099b44ce23d6ac5e6bac5b8") + ("treemacs" . "54ef590b7621032a76f8f3e307032fc13c802371") ("tuareg" . "1d53723e39f22ab4ab76d31f2b188a2879305092") - ("typescript.el" . "1cf78d7ef8e0a1684a2cf265539c54ccff4068c0") + ("typescript.el" . "fc3a4f3b275e8cf6cf41aa0c9ef42e25ef908feb") ("undo-tree" . "5e9f4c92348b3cfd6f140c1730294017dca4bc05") ("use-package" . "a6e856418d2ebd053b34e0ab2fda328abeba731c") ("visual-regexp.el" . "48457d42a5e0fe10fa3a9c15854f1f127ade09b5") ("web-mode" . "005aa62d6f41fbf9bc045cac3b3b772716ee8ba7") - ("with-editor" . "1b4526453ef6bdee30635f469aa26085c02b1ac1") + ("with-editor" . "0eff758e59b0efeab0a4f40b19c51e5712c19d4e") ("yaml-mode" . "7b5ce294fb15c2c8926fa476d7218aa415550a2a") ("yaml.el" . "70c4fcead97e9bd6594e418c922ae769818f4245") ("yasnippet" . "eb5ba2664c3a68ae4a53bb38b85418dd131b208f") - ("yasnippet-snippets" . "6fafad13bb4689600285d9e38c61958dd63c356d") + ("yasnippet-snippets" . "1bf034887c4048c38266842686b7f9c8384f72e7") ("zig-mode" . "f55e42536a3f34b81198b856595dc3a61867aa3e")) :gamma