Merge pull request #1 from binwan-dev/feat_29

Feat 29

Author: binwan-dev

.lsp-eslint-choices

@@ -0,0 +1 @@
+#s(hash-table size 65 test equal rehash-size 1.5 rehash-threshold 0.8125 data ("/home/binwan/Documents/binwan-dev/dbviewer/dbviewer/node_modules/eslint/lib/api.js" 4))

config/init-blamer.el

@@ -0,0 +1,15 @@
+(use-package blamer
+  :bind (("s-i" . blamer-show-commit-info))
+  :defer 20
+  :custom
+  (blamer-idle-time 0.3)
+  (blamer-min-offset 70)
+  :custom-face
+  (blamer-face ((t :foreground "#7a88cf"
+                    :background nil
+                    :height 140
+                    :italic t)))
+  :config
+  (global-blamer-mode 1))
+
+(provide 'init-blamer)

config/init-elpa.el

@@ -1,7 +1,10 @@
 (require 'package)
 
-(setq package-archives '(("gnu" . "http://mirrors.tuna.tsinghua.edu.cn/elpa/gnu/")
-			   ("qinghua" . "http://mirrors.tuna.tsinghua.edu.cn/elpa/melpa/")))
+;; (setq package-archives '(("melpa" . "http://melpa.org/packages/")
+;; 			 ("gnu" . "http://mirrors.tuna.tsinghua.edu.cn/elpa/gnu/")
+;; 			   ("qinghua" . "http://mirrors.tuna.tsinghua.edu.cn/elpa/melpa/")))
+(setq package-archives '(("gnu"   . "http://mirror.wanbin.tech/elpa/gnu/")
+                         ("melpa" . "http://mirror.wanbin.tech/elpa/melpa/")))
 
 ;;; Install into separate package dirs for each Emacs version, to prevent bytecode incompatibility
 (let ((versioned-package-dir

config/init-font.el

@@ -1,16 +1,60 @@
-(let ((emacs-font-size 13)
-      emacs-font-name)
-  (setq emacs-font-name "Fira Code")
-  (when (display-grayscale-p)
-    (set-frame-font (format "%s-%s" (eval emacs-font-name) (eval emacs-font-size)))
-    (set-fontset-font (frame-parameter nil 'font) 'unicode (eval emacs-font-name))
-
-    (setq nox-doc-tooltip-font (format "%s-%s" emacs-font-name emacs-font-size))
-    )
+;; (let ((emacs-font-size 13)
+;;       emacs-font-name)
+;;   (setq emacs-font-name "Fira Code")
+;;   (when (display-grayscale-p)
+;;     (set-frame-font (format "%s-%s" (eval emacs-font-name) (eval emacs-font-size)))
+;;     (set-fontset-font (frame-parameter nil 'font) 'unicode (eval emacs-font-name))
+
+;;     (setq nox-doc-tooltip-font (format "%s-%s" emacs-font-name emacs-font-size))
+;;     )
+
+(defun set-graphic-font()
+  (setq fonts
+	(cond ((eq system-type 'darwin)     '("MonoLisa Nasy"    "STHeiti"))
+              ((eq system-type 'gnu/linux)  '("Cascadia Code"     "WenQuanYi Zen Hei"))
+              ((eq system-type 'windows-nt) '("Cascadia Code"  "Microsoft Yahei"))))
+  (set-face-attribute 'default nil :font
+                      (format "%s:pixelsize=%d" (car fonts) 14))
+  (dolist (charset '(kana han symbol cjk-misc bopomofo))
+    (set-fontset-font (frame-parameter nil 'font) charset
+                      (font-spec :family (car (cdr fonts)))))
+
+  ;Fix chinese font width and rescale
+  (setq face-font-rescale-alist '(("Microsoft Yahei" . 1.2) ("WenQuanYi Micro Hei Mono" . 1.2) ("STHeiti". 1.2)))
+
   (with-eval-after-load 'doom-modeline
-    (set-face-attribute 'mode-line nil :font "SourceCodePro-12")
-    (set-face-attribute 'mode-line-inactive nil :font "SourceCodePro-12")))
+    (set-face-attribute 'mode-line nil :font "Cascadia Code 13")
+    (set-face-attribute 'mode-line-inactive nil :font "Cascadia Code 13")))
+
+(when (display-graphic-p)
+    (set-graphic-font))
+
+(setq-default line-spacing 0.2)
 
-(setq line-spacing 0.2)
+(use-package ligature
+  :load-path "path-to-ligature-repo"
+  :config
+  ;; Enable the "www" ligature in every possible major mode
+  (ligature-set-ligatures 't '("www"))
+  ;; Enable traditional ligature support in eww-mode, if the
+  ;; `variable-pitch' face supports it
+  (ligature-set-ligatures 'eww-mode '("ff" "fi" "ffi"))
+  ;; Enable all Cascadia Code ligatures in programming modes
+  (ligature-set-ligatures 'prog-mode '("|||>" "<|||" "<==>" "<!--" "####" "~~>" "***" "||=" "||>"
+                                       ":::" "::=" "=:=" "===" "==>" "=!=" "=>>" "=<<" "=/=" "!=="
+                                       "!!." ">=>" ">>=" ">>>" ">>-" ">->" "->>" "-->" "---" "-<<"
+                                       "<~~" "<~>" "<*>" "<||" "<|>" "<$>" "<==" "<=>" "<=<" "<->"
+                                       "<--" "<-<" "<<=" "<<-" "<<<" "<+>" "</>" "###" "#_(" "..<"
+                                       "..." "+++" "/==" "///" "_|_" "www" "&&" "^=" "~~" "~@" "~="
+                                       "~>" "~-" "**" "*>" "*/" "||" "|}" "|]" "|=" "|>" "|-" "{|"
+                                       "[|" "]#" "::" ":=" ":>" ":<" "$>" "==" "=>" "!=" "!!" ">:"
+                                       ">=" ">>" ">-" "-~" "-|" "->" "--" "-<" "<~" "<*" "<|" "<:"
+                                       "<$" "<=" "<>" "<-" "<<" "<+" "</" "#{" "#[" "#:" "#=" "#!"
+                                       "##" "#(" "#?" "#_" "%%" ".=" ".-" ".." ".?" "+>" "++" "?:"
+                                       "?=" "?." "??" ";;" "/*" "/=" "/>" "//" "__" "~~" "(*" "*)"
+                                       "\\\\" "://"))
+  ;; Enables ligature checks globally in all buffers. You can also do it
+  ;; per mode with `ligature-mode'.
+  (global-ligature-mode t))
 
 (provide 'init-font)

config/init-generic.el

@@ -8,10 +8,10 @@
 (use-package which-key
   :init (which-key-mode 1))
 
-(use-package olivetti
-  :config
-  (setq olivetti-minimum-body-width 120)
-  :hook (prog-mode . olivetti-mode))
+;; (use-package olivetti
+;;   :config
+;;   (setq olivetti-minimum-body-width 130)
+;;   :hook (prog-mode . olivetti-mode))
 
 (setq use-dialog-box nil)               ;never pop dialog
 (setq inhibit-startup-screen t)         ;inhibit start screen
@@ -34,6 +34,7 @@
 (setq auto-save-timeout 120)
 (setq backup-directory-alist `((".*" . "~/.autosave/")))
 (setq auto-save-file-name-transforms `((".*","~/.autosave/" t)))
+(setq create-lockfiles nil)
 
 ;; enable recent file mode
 (use-package recentf

config/init-helm.el

@@ -10,7 +10,9 @@
 	 ("M-s g" . 'helm-imenu-in-all-buffers)
 	 ("M-x" . #'helm-M-x)
 	 ("C-x r b" . #'helm-filtered-bookmarks)
-	 ("C-x C-f" . 'helm-find-files))
+	 ("C-x C-f" . 'helm-find-files)
+	 ("C-x b" . 'helm-buffers-list)
+	 ("C-x C-b" . 'helm-buffers-list))
   :bind (:map helm-map
 	 ("<tab>" . 'helm-execute-persistent-action) ; rebind tab to run persistent action
 	 ("C-i" . 'helm-execute-persistent-action) ; make TAB work in terminal
@@ -27,5 +29,7 @@
 
   )
 
+(use-package helm-tramp
+  :ensure t)
 
 (provide 'init-helm)

config/init-ligature.el

@@ -1,53 +1,137 @@
-(use-package lsp-ui
-  :ensure t
-  :commands lsp-ui-mode
-  :init
-  (add-hook 'lsp-mode-hook 'lsp-ui-mode)
-  :config
-  (setq lsp-ui-peek-enable t)
-  (setq lsp-ui-doc-enable nil)
-  (setq lsp-ui-imenu-enable t)
-  (setq lsp-ui-flycheck-enable t)
-  (setq lsp-ui-sideline-enable nil)
-  (setq lsp-ui-sideline-ignore-duplicate t))
-
-(use-package lsp-mode
-  ;; :init
-  ;; (setq lsp-file-watch-threshold 102400)
-  :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)))
+(setq js-indent-level 2)
 
+(use-package csharp-mode :ensure t)
+(use-package vue-mode :ensure t)
 (use-package py-autopep8
-  :hook (python-mode . py-autopep8-enable-on-save))
-
-
+  :hook
+  (python-mode . py-autopep8-mode))
 (use-package lsp-pyright
   :config
-  (setq lsp-pyright-venv-path "/Users/bin/opt/anaconda3/envs")
+  (setq lsp-pyright-venv-path "/Users/binwan/opt/anaconda3/envs")
   (setq lsp-pyright-auto-import-completions t)
   (setq lsp-pyright-auto-search-paths t)
   :bind
   (("C-c j" . lsp-find-definition))
   :hook (python-mode . (lambda ()
                           (require 'lsp-pyright)
                           (lsp))))
-
-(use-package ccls
+(use-package lsp-mode
+  :init
+  :hook ((csharp-mode . lsp)
+	 (vue-mode . lsp)
+	 (lsp-mode . lsp-enable-which-key-integration))
   :config
-  (setq ccls-executable "/usr/bin/ccls")
-  :hook (ccls . lsp))
+  (lsp-ui-mode -1)
+  ;; for typescript/javascript
+  ;; (setq lsp-typescript-auto-closing-tags t)
+  ;; (setq lsp-typescript-format-enable t)
+  ;; (setq lsp-javascript-auto-closing-tags t)
+  
+  (lsp-register-client
+    (make-lsp-client :new-connection (lsp-tramp-connection "cls")
+                     :major-modes '(csharp-mode)
+                     :remote? t
+                     :server-id 'csharp-ls-remote))
+  :commands lsp
+  :bind (
+	 ("C-c s s" . lsp-restart-workspace)
+	 ("C-." . lsp-execute-code-action)
+	 ("C-c C-j" . lsp-find-definition)
+	 ("C-c C-r" . lsp-find-references)
+	 ("C-c C-i" . lsp-find-implementation)
+	 ("C-C t b" . pop-tag-mark)))
+
+;; (use-package lsp-ui :commands lsp-ui-mode)
+(use-package helm-lsp :commands helm-lsp-workspace-symbol)
+;; (use-package dap-mode)
+
+
+
+
+;; ; lsp
+;; (use-package lsp-ui
+;;   :ensure t
+;;   :commands lsp-ui-mode
+;;   :init
+;;   (add-hook 'lsp-mode-hook 'lsp-ui-mode)
+;;   :config
+;;   ;; (setq lsp-ui-peek-enable t)
+;;   ;; (setq lsp-ui-doc-enable nil)
+;;   ;; (setq lsp-ui-imenu-enable t)
+;;   ;; (setq lsp-ui-flycheck-enable t)
+;;   ;; (setq lsp-ui-sideline-enable nil)
+;;   ;; (setq lsp-ui-sideline-ignore-duplicate t)
+;;   )
+
+;; (use-package lsp-mode
+;;   ;; :init
+;;   ;; (setq lsp-file-watch-threshold 102400)
+;;   :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)
+
+;;   (lsp-register-client
+;;     (make-lsp-client :new-connection (lsp-tramp-connection "rust-analyzer")
+;;                      :major-modes '(rust-mode)
+;;                      :remote? t
+;;                      :server-id 'rust-remote))
+  
+;;   :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))
+;;   :hook (prog-mode . lsp-deferred))
+
+;; ; csharp
+;; (use-package tree-sitter)
+;; (use-package tree-sitter-langs)
+;; (use-package tree-sitter-indent)
+
+;; (use-package csharp-mode
+;;   :ensure t
+;;   :config
+;;   ;(setq tree-sitter-indent-offset 4)
+;;   ;(tree-sitter-mode)
+;;   ;; (add-to-list 'auto-mode-alist '("\\.cs\\'" . tree-sitter-mode))
+;;   )
+
+
+;; (use-package py-autopep8
+;;   :hook (python-mode . py-autopep8-enable-on-save))
+
+
+;; (use-package ccls
+;;   :config
+;;   (setq ccls-executable "/usr/bin/ccls")
+;;   :hook (ccls . lsp))
+
+;; ;; set for csharp
+;; ;; (use-package tree-sitter :ensure t)
+;; ;; (use-package tree-sitter-langs :ensure t)
+;; ;; (use-package tree-sitter-indent :ensure t)
+
+;; (use-package csharp-mode
+;;   :ensure t
+;;   :hook (csharp-mode . lsp))
+
+;; (use-package vue-mode
+;;   :config
+;;   (setq-default
+;;    web-mode-markup-indent-offset 2
+;;    web-mode-code-indent-offset 2
+;;    web-mode-css-indent-offset 2)
+;;   (setq js2-basic-offset 2)
+;;   (setq css-indent-offset 2)
+;;   (setq js-indent-level 2)
+;;   (setq lsp-javascript-format-enable t)
+;;   :hook (vue-mode . (lambda ()
+;; 		      (olivetti-mode)
+;; 		      (lsp))))
 
-(use-package csharp-mode
-  :hook (csharp-mode . lsp))
 
 (provide 'init-lspmode)