diff --git a/.doom.d/autoload.el b/.doom.d/autoload.el index 3bb337cf..3adf6435 100644 --- a/.doom.d/autoload.el +++ b/.doom.d/autoload.el @@ -357,14 +357,15 @@ _g_ gfm _o_ org _m_ markdown ;;;###autoload (defun +complete-at-point (&optional args) + "use ,, to trigger +complete-at-point, use ,. to complete with copilot" (interactive) (if (eq major-mode 'vterm-mode) (vterm--self-insert) (cond - ((and (eq (preceding-char) ?,) (boundp 'pabbrev-marker) pabbrev-marker) - (progn (delete-char -1 nil) - (call-interactively #'pabbrev-expand-maybe) - (pabbrev-delete-last-suggestion))) + ;; ((and (eq (preceding-char) ?,) (boundp 'pabbrev-marker) pabbrev-marker) + ;; (progn (delete-char -1 nil) + ;; (call-interactively #'pabbrev-expand-maybe) + ;; (pabbrev-delete-last-suggestion))) ((and (eq (preceding-char) ?,) (modulep! :editor evil) (modulep! :completion corfu) corfu-mode) (progn (delete-char -1 nil) diff --git a/.doom.d/lang.el b/.doom.d/lang.el index 0af2c9f1..1a0a6211 100644 --- a/.doom.d/lang.el +++ b/.doom.d/lang.el @@ -62,8 +62,8 @@ (cl-letf (((symbol-function 'nim-log) (lambda (&rest _args)))) (funcall orig-fn method callback))))) +(setq! lsp-copilot-enabled nil) (after! lsp-mode - ;; (setq! lsp-copilot-enabled nil) ;; https://github.com/emacs-lsp/lsp-mode/issues/3577#issuecomment-1709232622 (delete 'lsp-terraform lsp-client-packages) (setq! lsp-completion-provider :none) @@ -76,9 +76,11 @@ (add-hook! 'lsp-completion-mode-hook :append '++lsp-init-company-backends-h t)) ;; (delq! 'lsp-ui-mode lsp-mode-hook) (setq! + lsp-copilot-enabled nil ;; lsp-imenu-sort-methods '(position) ;; lsp-eldoc-enable-hover nil ;; lsp-disabled-clients '(javascript-typescript-langserver) + lsp-disabled-clients '(copilot-ls graphql-lsp) lsp-enable-file-watchers nil lsp-file-watch-threshold 200 lsp-bash-highlight-parsing-errors t diff --git a/.doom.d/map.el b/.doom.d/map.el index 62b9d43d..8248419b 100644 --- a/.doom.d/map.el +++ b/.doom.d/map.el @@ -70,6 +70,8 @@ [remap async-shell-command] #'detached-shell-command [remap compile] #'detached-compile [remap recompile] #'detached-compile-recompile + (:map doom-leader-open-map + :desc "proced" "p" #'proced) (:leader (:prefix-map ("d" . "Detached") :desc "View" "l" #'detached-view-session diff --git a/.doom.d/prog.el b/.doom.d/prog.el index 9289c13f..1f0b8083 100644 --- a/.doom.d/prog.el +++ b/.doom.d/prog.el @@ -177,6 +177,7 @@ It is a fallback for when which-func-functions and `add-log-current-defun' retur clojurec-mode) . copilot-mode) :init (setq! copilot-max-char -1 + copilot-idle-delay 10 ;; copilot-version "1.41.0" copilot-indent-offset-warning-disable t) :config diff --git a/modules/yqrashawn/home-manager/dotfiles/.authinfo.gpg b/modules/yqrashawn/home-manager/dotfiles/.authinfo.gpg index 99f087ee..61b90d37 100644 Binary files a/modules/yqrashawn/home-manager/dotfiles/.authinfo.gpg and b/modules/yqrashawn/home-manager/dotfiles/.authinfo.gpg differ diff --git a/modules/yqrashawn/home-manager/dotfiles/aerospace.toml b/modules/yqrashawn/home-manager/dotfiles/aerospace.toml index ad4eca51..7fe441a9 100644 --- a/modules/yqrashawn/home-manager/dotfiles/aerospace.toml +++ b/modules/yqrashawn/home-manager/dotfiles/aerospace.toml @@ -47,6 +47,11 @@ M = '^DELL' 4 = '^DELL' 5 = '^DELL' +[[on-window-detected]] +if.app-id = 'org.mozilla.firefoxdeveloperedition' +if.window-title-regex-substring = '^https://www\.perplexity\.ai - Perplexity$' +run = 'layout floating' + ### termial workspace [[on-window-detected]] if.app-id = 'net.kovidgoyal.kitty'