From f5476ac18052240b3c747156ee7c0b505bb865a9 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Wed, 10 Jan 2024 08:49:08 +0100 Subject: [PATCH 1/3] Add a hook for copilot --- home-manager/modules/programs/emacs/emacs.d/lib/az_copilot.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/modules/programs/emacs/emacs.d/lib/az_copilot.el b/home-manager/modules/programs/emacs/emacs.d/lib/az_copilot.el index 3f27679..f37068c 100644 --- a/home-manager/modules/programs/emacs/emacs.d/lib/az_copilot.el +++ b/home-manager/modules/programs/emacs/emacs.d/lib/az_copilot.el @@ -12,6 +12,10 @@ :config (add-hook 'prog-mode-hook 'copilot-mode) (add-hook 'yaml-mode-hook 'copilot-mode) + + ;; write a hook that runs copilot-clear-overlay after company is finished. + (add-hook 'company-completion-finished-hook 'copilot-clear-overlay) + (add-to-list 'copilot-disable-display-predicates #'company--active-p) (define-key copilot-completion-map (kbd "") 'copilot-accept-completion) (define-key copilot-completion-map (kbd "TAB") 'copilot-accept-completion)) From 41afba87438aa23046640134d71501d0a578b3f2 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Wed, 10 Jan 2024 08:49:22 +0100 Subject: [PATCH 2/3] Change the default formatter for nix files --- .../modules/programs/emacs/emacs.d/lib/az_format_all.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/modules/programs/emacs/emacs.d/lib/az_format_all.el b/home-manager/modules/programs/emacs/emacs.d/lib/az_format_all.el index 52f6412..b24cfa8 100644 --- a/home-manager/modules/programs/emacs/emacs.d/lib/az_format_all.el +++ b/home-manager/modules/programs/emacs/emacs.d/lib/az_format_all.el @@ -56,7 +56,7 @@ ("Literate Haskell" brittany) ("Lua" lua-fmt) ("Markdown" prettier) - ("Nix" nixpkgs-fmt) + ("Nix" nixfmt) ("Objective-C" clang-format) ("OCaml" ocp-indent) ("Perl" perltidy) From e1fec278a1f59e6ccdb07e2863432f6e6fd2e82d Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Mon, 15 Jan 2024 12:56:42 +0100 Subject: [PATCH 3/3] Correct hyperbole config --- .../modules/programs/emacs/emacs.d/lib/az_hyperbole.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/home-manager/modules/programs/emacs/emacs.d/lib/az_hyperbole.el b/home-manager/modules/programs/emacs/emacs.d/lib/az_hyperbole.el index 668b948..5716c4f 100644 --- a/home-manager/modules/programs/emacs/emacs.d/lib/az_hyperbole.el +++ b/home-manager/modules/programs/emacs/emacs.d/lib/az_hyperbole.el @@ -1,5 +1,10 @@ (use-package hyperbole :config - (setq hbmap:dir-user "~/nextcloud/10_documents/99_archive/0000/hyperbole/") + ;; define the local variable az-user-dir to a path and then check if the directory exists + ;; if the directory exists then set the variable hbmap:dir-user to the path + (let ((az-user-dir (expand-file-name "~/nextcloud/10_documents/99_archive/0000/hyperbole/"))) + (when (file-exists-p az-user-dir) + (setq hbmap:dir-user az-user-dir))) + (define-key hyperbole-mode-map (kbd "C-c /") nil) (hyperbole-mode 1))