|
|
|
|
@ -71,7 +71,8 @@
|
|
|
|
|
|
|
|
|
|
(tool-bar-mode -1)
|
|
|
|
|
|
|
|
|
|
(add-hook 'after-init-hook 'global-company-mode)
|
|
|
|
|
;; (add-hook 'after-init-hook 'global-company-mode)
|
|
|
|
|
(add-hook 'after-init-hook 'global-corfu-mode)
|
|
|
|
|
(xclip-mode 1)
|
|
|
|
|
(setq-default fill-column 80)
|
|
|
|
|
|
|
|
|
|
@ -239,12 +240,12 @@
|
|
|
|
|
(expand-add-abbrevs php-mode-abbrev-table hugot-php-mode-expand-list)
|
|
|
|
|
(abbrev-mode 1)
|
|
|
|
|
|
|
|
|
|
(set (make-local-variable 'company-minimum-prefix-length) 0)
|
|
|
|
|
(set (make-local-variable 'company-tooltip-align-annotations) t)
|
|
|
|
|
;; (set (make-local-variable 'company-minimum-prefix-length) 0)
|
|
|
|
|
;; (set (make-local-variable 'company-tooltip-align-annotations) t)
|
|
|
|
|
|
|
|
|
|
(set (make-local-variable 'company-idle-delay) 0.1)
|
|
|
|
|
;; (set (make-local-variable 'company-idle-delay) 0.1)
|
|
|
|
|
|
|
|
|
|
(set (make-local-variable 'company-backends) '(phpinspect-company-backend))
|
|
|
|
|
;; (set (make-local-variable 'company-backends) '(phpinspect-company-backend))
|
|
|
|
|
|
|
|
|
|
;; Handy namespace stuff
|
|
|
|
|
(define-key php-mode-map (kbd "C-c u") 'phpinspect-fix-uses-interactive)
|
|
|
|
|
@ -255,7 +256,8 @@
|
|
|
|
|
(phpinspect-mode))
|
|
|
|
|
|
|
|
|
|
(when (require 'phpinspect nil t)
|
|
|
|
|
(add-hook 'php-mode-hook #'hugot-php-personal-hook))
|
|
|
|
|
(add-hook 'php-mode-hook #'hugot-php-personal-hook)
|
|
|
|
|
(add-hook 'web-mode-hook #'hugot-php-personal-hook))
|
|
|
|
|
|
|
|
|
|
;; END PHP
|
|
|
|
|
|
|
|
|
|
@ -263,41 +265,51 @@
|
|
|
|
|
;;;;; CSS ;;;;;
|
|
|
|
|
;;;;;;;;;;;;;;;
|
|
|
|
|
|
|
|
|
|
(defun hugot-css-mode-hook ()
|
|
|
|
|
"Custom actions to execute when initializing css-mode"
|
|
|
|
|
(setq-local company-minimum-prefix-length 1)
|
|
|
|
|
(setq-local company-idle-delay 0))
|
|
|
|
|
(add-hook 'css-mode-hook 'hugot-css-mode-hook)
|
|
|
|
|
;; (defun hugot-css-mode-hook ()
|
|
|
|
|
;; "Custom actions to execute when initializing css-mode"
|
|
|
|
|
;; (setq-local company-minimum-prefix-length 1)
|
|
|
|
|
;; (setq-local company-idle-delay 0))
|
|
|
|
|
;; (add-hook 'css-mode-hook 'hugot-css-mode-hook)
|
|
|
|
|
|
|
|
|
|
;; END CSS
|
|
|
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
;;;;; COMPANY MODE ;;;;;
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
(with-eval-after-load 'company
|
|
|
|
|
(dolist (map (list company-active-map company-search-map))
|
|
|
|
|
(define-key map (kbd "C-n") nil)
|
|
|
|
|
(define-key map (kbd "C-p") nil)
|
|
|
|
|
(define-key map (kbd "M-n") #'company-select-next)
|
|
|
|
|
(define-key map (kbd "M-p") #'company-select-previous))
|
|
|
|
|
|
|
|
|
|
(setq company-auto-complete t)
|
|
|
|
|
(setq company-idle-delay 1)
|
|
|
|
|
(setq company-auto-complete 'company-explicit-action-p)
|
|
|
|
|
|
|
|
|
|
(global-set-key (kbd "M-p") 'company-select-previous)
|
|
|
|
|
(global-set-key (kbd "M-n") 'company-select-next)
|
|
|
|
|
(add-to-list 'company-backends 'company-shell t)
|
|
|
|
|
(add-to-list 'company-backends 'company-dabbrev-code t)
|
|
|
|
|
(add-to-list 'company-backends 'company-capf))
|
|
|
|
|
|
|
|
|
|
(defun hugot-make-capf-dominant-company-backend ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(setq company-backends
|
|
|
|
|
`(company-capf
|
|
|
|
|
,@(seq-filter (lambda (elt)
|
|
|
|
|
(not (eq 'company-capf elt)))
|
|
|
|
|
company-backends))))
|
|
|
|
|
;; (with-eval-after-load 'company
|
|
|
|
|
;; (dolist (map (list company-active-map company-search-map))
|
|
|
|
|
;; (define-key map (kbd "C-n") nil)
|
|
|
|
|
;; (define-key map (kbd "C-p") nil)
|
|
|
|
|
;; (define-key map (kbd "M-n") #'company-select-next)
|
|
|
|
|
;; (define-key map (kbd "M-p") #'company-select-previous)))
|
|
|
|
|
|
|
|
|
|
(with-eval-after-load 'corfu
|
|
|
|
|
(require 'kind-icon)
|
|
|
|
|
(setq kind-icon-use-icons t)
|
|
|
|
|
(setq kind-icon-default-face 'corfu-default)
|
|
|
|
|
(add-to-list 'corfu-margin-formatters #'kind-icon-margin-formatter))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; (define-key map (kbd "M-p") #'))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; (setq company-auto-complete t)
|
|
|
|
|
;; (setq company-idle-delay 1)
|
|
|
|
|
;; (setq company-auto-complete 'company-explicit-action-p)
|
|
|
|
|
|
|
|
|
|
;; (global-set-key (kbd "M-p") 'company-select-previous)
|
|
|
|
|
;; (global-set-key (kbd "M-n") 'company-select-next)
|
|
|
|
|
;; (add-to-list 'company-backends 'company-shell t)
|
|
|
|
|
;; (add-to-list 'company-backends 'company-dabbrev-code t)
|
|
|
|
|
;; (add-to-list 'company-backends 'company-capf))
|
|
|
|
|
|
|
|
|
|
;; (defun hugot-make-capf-dominant-company-backend ()
|
|
|
|
|
;; (interactive)
|
|
|
|
|
;; (setq company-backends
|
|
|
|
|
;; `(company-capf
|
|
|
|
|
;; ,@(seq-filter (lambda (elt)
|
|
|
|
|
;; (not (eq 'company-capf elt)))
|
|
|
|
|
;; company-backends))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -307,7 +319,7 @@
|
|
|
|
|
;;;;; GO ;;;;;
|
|
|
|
|
;;;;;;;;;;;;;;
|
|
|
|
|
(require 'go-mode)
|
|
|
|
|
(require 'company-go)
|
|
|
|
|
;;(require 'company-go)
|
|
|
|
|
(require 'go-eldoc)
|
|
|
|
|
(require 'flycheck)
|
|
|
|
|
|
|
|
|
|
@ -349,8 +361,8 @@
|
|
|
|
|
|
|
|
|
|
(local-set-key (kbd "C-c g") 'hugot-go-run)
|
|
|
|
|
|
|
|
|
|
(setq gofmt-command "goimports")
|
|
|
|
|
(hugot-make-capf-dominant-company-backend))
|
|
|
|
|
(setq gofmt-command "goimports"))
|
|
|
|
|
;(hugot-make-capf-dominant-company-backend))
|
|
|
|
|
|
|
|
|
|
(add-hook 'go-mode-hook 'hugot-go-mode-hook)
|
|
|
|
|
|
|
|
|
|
@ -559,6 +571,8 @@ Enables ido for M-x and describe-function/describe-variable."
|
|
|
|
|
cr-args `(,prompt ,(funcall coll "" pred t) ,pred ,@args)))))))
|
|
|
|
|
(apply cr-function cr-args)))
|
|
|
|
|
|
|
|
|
|
;;(setq completing-read-function #'completing-read-default)
|
|
|
|
|
|
|
|
|
|
(setq completing-read-function #'hugot-completing-read)
|
|
|
|
|
|
|
|
|
|
;; Use IDO for M-x
|
|
|
|
|
@ -669,3 +683,4 @@ See `yank' for documentation of ARG."
|
|
|
|
|
(message "~/.ssh/id_rsa.pub contents added to kill-ring")))
|
|
|
|
|
|
|
|
|
|
;; END COMMANDS
|
|
|
|
|
(put 'list-threads 'disabled nil)
|
|
|
|
|
|
