update

Author: binwan

config/init-eaf.el

@@ -3,7 +3,7 @@
 ;;               :files ("*")))
 
 (use-package eaf
-  ;; :load-path "~/.emacs.d/site-lisp/emacs-application-framework" ; Set to "/usr/share/emacs/site-lisp/eaf" if installed from AUR
+  :load-path "~/.emacs.d/third/emacs-application-framework" ; Set to "/usr/share/emacs/site-lisp/eaf" if installed from AUR
   :init
   (use-package epc :defer t :ensure t)
   (use-package ctable :defer t :ensure t)

config/init-elpa.el

@@ -1,9 +1,8 @@
 (require 'package)
 
-(setq package-archives '(("qinghua" . "http://mirrors.tuna.tsinghua.edu.cn/elpa/melpa/")))
-			 ;; ("gnu"   . "http://elpa.emacs-china.org/gnu/")
-			   ;; ("melpa" . "http://elpa.emacs-china.org/melpa/")
-			   
+(setq package-archives '(("gnu"   . "http://elpa.emacs-china.org/gnu/")
+			   ("melpa" . "http://elpa.emacs-china.org/melpa/")
+			   ("qinghua" . "http://mirrors.tuna.tsinghua.edu.cn/elpa/melpa/")))
 
 ;;; Install into separate package dirs for each Emacs version, to prevent bytecode incompatibility
 (let ((versioned-package-dir
@@ -14,27 +13,60 @@
 
 ;;; Standard package repositories
 
-;;(let* ((no-ssl (and (memq system-type '(windows-nt ms-dos))
-;;                    (not (gnutls-available-p))))
-;;       (proto (if no-ssl "http" "https")))
+(let* ((no-ssl (and (memq system-type '(windows-nt ms-dos))
+                    (not (gnutls-available-p))))
+       (proto (if no-ssl "http" "https")))
   ;;(add-to-list 'package-archives (cons "melpa" (concat proto "://melpa.org/packages/")) t)
   ;; Official MELPA Mirror, in case necessary.
-;;  (add-to-list 'package-archives (cons "melpa-mirror" (concat proto "://elpa.emacs-china.org/melpa/")) t)
-;;  (if (< emacs-major-version 24)
+  (add-to-list 'package-archives (cons "melpa-mirror" (concat proto "://elpa.emacs-china.org/melpa/")) t)
+  (if (< emacs-major-version 24)
       ;; For important compatibility libraries like cl-lib
-;;      (add-to-list 'package-archives '("gnu" . (concat proto "://elpa.emacs-china.org/gnu/")))
-;;    (unless no-ssl
+      (add-to-list 'package-archives '("gnu" . (concat proto "://elpa.emacs-china.org/gnu/")))
+    (unless no-ssl
       ;; Force SSL for GNU ELPA
-;;      (setcdr (assoc "gnu" package-archives) "http://elpa.emacs-china.org/gnu/"))))
+      (setcdr (assoc "gnu" package-archives) "http://elpa.emacs-china.org/gnu/"))))
 
 ;; We include the org repository for completeness, but don't normally
 ;; use it.
 (add-to-list 'package-archives '("org" . "http://orgmode.org/elpa/"))
 
+
+;;; On-demand installation of packages
+
+(defun require-package (package &optional min-version no-refresh)
+  "Install given PACKAGE, optionally requiring MIN-VERSION.
+If NO-REFRESH is non-nil, the available package lists will not be
+re-downloaded in order to locate PACKAGE."
+  (if (package-installed-p package min-version)
+      t
+    (if (or (assoc package package-archive-contents) no-refresh)
+        (if (boundp 'package-selected-packages)
+            ;; Record this as a package the user installed explicitly
+            (package-install package nil)
+          (package-install package))
+      (progn
+        (package-refresh-contents)
+        (require-package package min-version t)))))
+
+
+(defun maybe-require-package (package &optional min-version no-refresh)
+  "Try to install PACKAGE, and return non-nil if successful.
+In the event of failure, return nil and print a warning message.
+Optionally require MIN-VERSION.  If NO-REFRESH is non-nil, the
+available package lists will not be re-downloaded in order to
+locate PACKAGE."
+  (condition-case err
+      (require-package package min-version no-refresh)
+    (error
+     (message "Couldn't install optional package `%s': %S" package err)
+     nil)))
+
 ;;; Fire up package.el
 
 (setq package-enable-at-startup nil)
 (package-initialize)
 
+(setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3")
+
 
 (provide 'init-elpa)

config/init-font.el

@@ -1,4 +1,4 @@
-(let ((emacs-font-size 16)
+(let ((emacs-font-size 14)
       emacs-font-name)
   (setq emacs-font-name "Fira Code")
   (when (display-grayscale-p)

config/init-go.el

@@ -1,34 +1,14 @@
 (require-package 'go-projectile)
-(require-package 'lsp-mode)
-(require-package 'lsp-ui)
+(require-package 'go-mode)
 
-;; Prefer goimports to gofmt if installed
-(let ((goimports (executable-find "goimports")))
-  (when goimports
-    (setq gofmt-command goimports)))
-
-(add-hook 'before-save-hook 'gofmt-before-save nil t)
-;; (whitespace-toggle-options '(tabs))
-;;   (set (make-local-variable 'company-backends) '(company-go))
-
-(use-package lsp-mode
-  :ensure t
-  :commands (lsp lsp-deferred)
-  :hook (go-mode . lsp-deferred))
-
-;; Optional - provides fancier overlays.
-(use-package lsp-ui
-  :ensure t
-  :commands lsp-ui-mode)
-
-
-;; Company mode is a standard completion package that works well with lsp-mode.
-(use-package company
+(use-package go-mode
   :ensure t
   :config
-  ;; Optionally enable completion-as-you-type behavior.
-  (setq company-idle-delay 0)
-  (setq company-minimum-prefix-length 1))
+  (setq gofmt-command "goimports")
+  (local-set-key (kbd "C-c t") 'go-test-current-file)
+  (local-set-key (kbd "C-c s r") 'my-kill-go-server-fun)
+  (add-hook 'before-save-hook 'gofmt-before-save)
+  :hook (go-mode . lsp))
 
 ;; Optional - provides snippet support.
 (use-package yasnippet
@@ -37,20 +17,6 @@
   :hook (go-mode . yas-minor-mode))
 
 
-(defun go-mode-defaults ()
-  (interactive)  
-  (local-set-key (kbd "C-c C-b") 'pop-tag-mark)
-  (local-set-key (kbd "C-c t") 'go-test-current-file)
-  (local-set-key (kbd "C-c C-j") 'lsp-find-definition)
-  (local-set-key (kbd "C-c s s") 'lsp-restart-workspace)
-  (local-set-key (kbd "C-c s r") 'my-kill-go-server-fun)
-  (local-set-key (kbd "C-c C-c") 'lsp-find-references)
-  (add-hook 'before-save-hook #'lsp-format-buffer t t)
-  (add-hook 'before-save-hook #'lsp-organize-imports t t)
-  (setq tab-width 4))
-
-(add-hook 'go-mode-hook 'go-mode-defaults)
-
 ;; ;; (require-package 'protobuf-mode)
 ;; ;; (defconst protobuf-style
 ;; ;;   '((c-basic-offset . 2)
@@ -59,11 +25,11 @@
 ;; ;; (add-hook 'protobuf-mode-hook
 ;; ;;           (lambda () (c-add-style "my-style" protobuf-style t)))
 
-(defun my-kill-go-server-fun ()
-  (interactive)
-  (deferred:process-shell '"kill -9 `ps aux|grep gopls|grep -v grep |awk '{print $2}'`")
-  (sleep-for 0.2)
-  (lsp-restart-workspace))
+;; (defun my-kill-go-server-fun ()
+;;   (interactive)
+;;   (deferred:process-shell '"kill -9 `ps aux|grep gopls|grep -v grep |awk '{print $2}'`")
+;;   (sleep-for 0.2)
+;;   (lsp-restart-workspace))
 
 
 (provide 'init-go)

config/init-lspmode.el

@@ -1,21 +1,24 @@
-(require-package 'lsp-ui)
 (require-package 'py-autopep8)
+(require-package 'lsp-ui)
 
 (use-package lsp-ui
   :hook (lsp-mode . lsp-ui-mode))
 
 (use-package lsp-mode
   ;; :init
   ;; (setq lsp-file-watch-threshold 102400)
-  :bind (("C-c j" . lsp-find-definition)))
-
-;; (use-package lsp-python-ms
-;;   :ensure t
-;;   :init (setq lsp-python-ms-auto-install-server t)
-;;   :hook
-;;   (python-mode . (lambda ()
-;;                           (require 'lsp-python-ms)
-;;                           (lsp))))  ; or lsp-deferred
+  :config
+  (setq tab-width 4)
+  (setq indent-tabs-mode 4)
+  (setq company-idle-delay 0)
+  (setq company-minimum-prefix-length 1)
+  ;; (add-hook 'before-save-hook #'lsp-format-buffer t t)
+  (add-hook 'before-save-hook #'lsp-organize-imports t t)
+  :bind (("C-c C-j" . lsp-find-definition)
+	 ("C-c C-b" . pop-tag-mark)
+	 ("C-c s s" . lsp-restart-workspace)
+	 ("C-c C-c" . lsp-find-references)
+	 ("C-." . lsp-execute-code-action)))
 
 (use-package py-autopep8
   :hook (python-mode . py-autopep8-enable-on-save))

config/init-rainbow.el

@@ -1,8 +1,8 @@
-(require-package 'rainbow-mode)
-(require-package 'rainbow-delimiters)
+;; (require-package 'rainbow-mode)
+;; (require-package 'rainbow-delimiters)
 
-(use-package rainbow-mode
-  :ensure t
-  :hook (prog-mode . rainbow-delimiters-mode))
+;; (use-package rainbow-mode
+;;   :ensure t
+;;   :hook (prog-mode . rainbow-delimiters-mode))
 
 (provide 'init-rainbow)