diff options
| -rw-r--r-- | users/profiles/mac.nix | 2 | ||||
| -rw-r--r-- | users/programs/emacs/default.nix (renamed from users/profiles/emacs.nix) | 5 | ||||
| -rw-r--r-- | users/programs/emacs/early-init.el (renamed from configs/users/fcuny/emacs/early-init.el) | 0 | ||||
| -rw-r--r-- | users/programs/emacs/init.el (renamed from configs/users/fcuny/emacs/init.el) | 0 | ||||
| -rw-r--r-- | users/programs/emacs/site-lisp/init-base.el (renamed from configs/users/fcuny/emacs/site-lisp/init-base.el) | 0 | ||||
| -rw-r--r-- | users/programs/emacs/site-lisp/init-completion.el (renamed from configs/users/fcuny/emacs/site-lisp/init-completion.el) | 6 | ||||
| -rw-r--r-- | users/programs/emacs/site-lisp/init-llm.el (renamed from configs/users/fcuny/emacs/site-lisp/init-llm.el) | 0 | ||||
| -rw-r--r-- | users/programs/emacs/site-lisp/init-programming.el (renamed from configs/users/fcuny/emacs/site-lisp/init-programming.el) | 0 | ||||
| -rw-r--r-- | users/programs/emacs/site-lisp/init-text.el (renamed from configs/users/fcuny/emacs/site-lisp/init-text.el) | 0 | ||||
| -rw-r--r-- | users/programs/emacs/site-lisp/init-ui.el (renamed from configs/users/fcuny/emacs/site-lisp/init-ui.el) | 0 |
10 files changed, 6 insertions, 7 deletions
diff --git a/users/profiles/mac.nix b/users/profiles/mac.nix index 85b3e7c..02f2cbd 100644 --- a/users/profiles/mac.nix +++ b/users/profiles/mac.nix @@ -3,7 +3,6 @@ imports = [ ./1password.nix ./dev.nix - ./emacs.nix ./fish.nix ./git.nix ./llm.nix @@ -11,6 +10,7 @@ ./ssh.nix ./starship.nix "${self}/users/programs/alacritty" + "${self}/users/programs/emacs" "${self}/users/programs/bat.nix" ]; diff --git a/users/profiles/emacs.nix b/users/programs/emacs/default.nix index fcf1b8f..d805971 100644 --- a/users/profiles/emacs.nix +++ b/users/programs/emacs/default.nix @@ -1,5 +1,5 @@ { - configPath, + self, pkgs, lib, ... @@ -44,7 +44,6 @@ let tree-sitter tree-sitter-langs treesit-grammars.with-all-grammars - vertico yaml-mode yasnippet yasnippet-capf @@ -61,7 +60,7 @@ let ]; mkEmacsFile = file: { ".config/emacs/${file}" = { - source = "${configPath}/emacs/${file}"; + source = "${self}/users/programs/emacs/${file}"; }; }; in diff --git a/configs/users/fcuny/emacs/early-init.el b/users/programs/emacs/early-init.el index 3953c90..3953c90 100644 --- a/configs/users/fcuny/emacs/early-init.el +++ b/users/programs/emacs/early-init.el diff --git a/configs/users/fcuny/emacs/init.el b/users/programs/emacs/init.el index 973e4ad..973e4ad 100644 --- a/configs/users/fcuny/emacs/init.el +++ b/users/programs/emacs/init.el diff --git a/configs/users/fcuny/emacs/site-lisp/init-base.el b/users/programs/emacs/site-lisp/init-base.el index 7c884ab..7c884ab 100644 --- a/configs/users/fcuny/emacs/site-lisp/init-base.el +++ b/users/programs/emacs/site-lisp/init-base.el diff --git a/configs/users/fcuny/emacs/site-lisp/init-completion.el b/users/programs/emacs/site-lisp/init-completion.el index fc01a39..2601756 100644 --- a/configs/users/fcuny/emacs/site-lisp/init-completion.el +++ b/users/programs/emacs/site-lisp/init-completion.el @@ -7,6 +7,9 @@ ;;; Code: +;; default completion behavior +(fido-mode 1) + (use-package consult :commands (consult-ripgrep consult-buffer consult-imenu) :bind (("C-c m" . consult-mode-command) @@ -36,9 +39,6 @@ (completion-styles '(orderless basic)) (completion-category-defaults nil)) -(use-package vertico - :hook ((after-init . vertico-mode))) - (use-package consult-imenu :after (consult)) diff --git a/configs/users/fcuny/emacs/site-lisp/init-llm.el b/users/programs/emacs/site-lisp/init-llm.el index 48346e6..48346e6 100644 --- a/configs/users/fcuny/emacs/site-lisp/init-llm.el +++ b/users/programs/emacs/site-lisp/init-llm.el diff --git a/configs/users/fcuny/emacs/site-lisp/init-programming.el b/users/programs/emacs/site-lisp/init-programming.el index a2299cf..a2299cf 100644 --- a/configs/users/fcuny/emacs/site-lisp/init-programming.el +++ b/users/programs/emacs/site-lisp/init-programming.el diff --git a/configs/users/fcuny/emacs/site-lisp/init-text.el b/users/programs/emacs/site-lisp/init-text.el index 4a5739b..4a5739b 100644 --- a/configs/users/fcuny/emacs/site-lisp/init-text.el +++ b/users/programs/emacs/site-lisp/init-text.el diff --git a/configs/users/fcuny/emacs/site-lisp/init-ui.el b/users/programs/emacs/site-lisp/init-ui.el index 51ec598..51ec598 100644 --- a/configs/users/fcuny/emacs/site-lisp/init-ui.el +++ b/users/programs/emacs/site-lisp/init-ui.el |
