From 9508dfa70d6443bc55dfc4dc7b70de4cb9ec98b3 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Tue, 21 Mar 2023 13:42:40 +0200 Subject: [PATCH] Rename hydra to transient, add copilot --- custom-init.el | 2 +- lang/clojure.el | 4 ++-- lang/elixir.el | 2 +- lang/golang.el | 2 +- lang/haskell.el | 2 +- lang/ocaml.el | 2 +- lang/php.el | 2 +- pkg/company-yasnippet.el | 8 ++++++++ pkg/deft.el | 2 +- pkg/{hydra.el => transient.el} | 8 ++++---- 10 files changed, 21 insertions(+), 13 deletions(-) rename pkg/{hydra.el => transient.el} (96%) diff --git a/custom-init.el b/custom-init.el index 47de4fe..56b7128 100644 --- a/custom-init.el +++ b/custom-init.el @@ -36,7 +36,7 @@ (require '+custom-pkg-base "$HOME/.emacs.d/pkg/base.el") (require '+custom-pkg-sys-specific "$HOME/.emacs.d/pkg/sys-specific.el") (require '+custom-pkg-ivy "$HOME/.emacs.d/pkg/ivy.el") -(require '+custom-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") +(require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el") (require '+custom-pkg-magit "$HOME/.emacs.d/pkg/magit.el") (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") (require '+custom-pkg-company-yasnippet "$HOME/.emacs.d/pkg/company-yasnippet.el") diff --git a/lang/clojure.el b/lang/clojure.el index a5ed411..66013ad 100644 --- a/lang/clojure.el +++ b/lang/clojure.el @@ -3,7 +3,7 @@ ;;; Code: (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") -(require '+custom-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") +(require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el") (use-package clojure-mode :defer t :straight t) @@ -19,7 +19,7 @@ :defer t :straight t) -;; Hydra +;; Transient (transient-define-prefix +my-transient-cider-context-menu () "Clojure Buffer Commands" ["" diff --git a/lang/elixir.el b/lang/elixir.el index edf653c..dd7730b 100644 --- a/lang/elixir.el +++ b/lang/elixir.el @@ -4,7 +4,7 @@ (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") (require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el") -(require '+custom-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") +(require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el") (use-package elixir-mode :requires (lsp-mode lsp-ui) :straight t) diff --git a/lang/golang.el b/lang/golang.el index 4672f28..23d203a 100644 --- a/lang/golang.el +++ b/lang/golang.el @@ -11,7 +11,7 @@ ;;; Code: (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") -(require '+custom-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") +(require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el") (use-package go-mode :requires (lsp-mode lsp-ui) diff --git a/lang/haskell.el b/lang/haskell.el index 6cf60b1..911d019 100644 --- a/lang/haskell.el +++ b/lang/haskell.el @@ -12,7 +12,7 @@ (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") (require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el") -(require '+custom-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") +(require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el") (use-package haskell-mode :straight t diff --git a/lang/ocaml.el b/lang/ocaml.el index dc4f603..2ff4721 100644 --- a/lang/ocaml.el +++ b/lang/ocaml.el @@ -2,7 +2,7 @@ ;;; Commentary: ;;; Code: -(require '+custom-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") +(require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el") (use-package tuareg :defer t diff --git a/lang/php.el b/lang/php.el index 6d8ed98..d577d40 100644 --- a/lang/php.el +++ b/lang/php.el @@ -12,7 +12,7 @@ (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") (require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el") -(require '+custom-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") +(require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el") (use-package php-mode :requires (lsp-mode lsp-ui) diff --git a/pkg/company-yasnippet.el b/pkg/company-yasnippet.el index 03ac21c..7d31206 100644 --- a/pkg/company-yasnippet.el +++ b/pkg/company-yasnippet.el @@ -28,9 +28,17 @@ :after company :hook (((company-mode) . company-box-mode))) +(use-package copilot + :straight (:host github :repo "zerolfx/copilot.el" :files ("dist" "*.el")) + :ensure t) + (global-company-mode t) (yas-global-mode 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 diff --git a/pkg/deft.el b/pkg/deft.el index 873fa4a..6456e8d 100644 --- a/pkg/deft.el +++ b/pkg/deft.el @@ -4,7 +4,7 @@ ;;; Code: (require '+custom-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el") -(require '+custom-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") +(require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el") (use-package deft :straight t diff --git a/pkg/hydra.el b/pkg/transient.el similarity index 96% rename from pkg/hydra.el rename to pkg/transient.el index 3a0fdf4..393ab9e 100644 --- a/pkg/hydra.el +++ b/pkg/transient.el @@ -1,6 +1,6 @@ -;;; pkg/hydra -- summary -*- lexical-binding: t; -*- +;;; pkg/transient -- summary -*- lexical-binding: t; -*- ;;; Commentary: -;;; Global hydra definitions. +;;; Global Transient definitions. ;;; Code: (require '+custom-pkg-avy "$HOME/.emacs.d/pkg/avy.el") @@ -119,5 +119,5 @@ (define-key global-map (kbd "C-c m") '+my-transient-move-menu) (define-key global-map (kbd "C-c l") '+my-transient-language-context-menu) -(provide '+custom-pkg-hydra) -;;; hydra.el ends here +(provide '+custom-pkg-transient) +;;; transient.el ends here