Merge pull request #3 from binwan-dev/feat_29

Feat 29

Author: binwan-dev

Diff for: config/init-blamer.el

@@ -1,9 +1,9 @@
 (use-package blamer
-  :bind (("s-i" . blamer-show-commit-info))
+  :bind (("C-i" . blamer-show-commit-info))
   :defer 20
   :custom
   (blamer-idle-time 0.3)
-  (blamer-min-offset 70)
+  (blamer-min-offset 20)
   :custom-face
   (blamer-face ((t :foreground "#7a88cf"
                     :background nil

Diff for: config/init-bongo.el

@@ -0,0 +1,5 @@
+(use-package bongo
+  :config
+  (bongo-insert-directory "/Users/binwan/Documents/binwan-dev/mp3"))
+
+(provide 'init-bongo)

Diff for: config/init-font.el

@@ -14,7 +14,7 @@
               ((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))
+                      (format "%s:pixelsize=%d" (car fonts) 24))
   (dolist (charset '(kana han symbol cjk-misc bopomofo))
     (set-fontset-font (frame-parameter nil 'font) charset
                       (font-spec :family (car (cdr fonts)))))
@@ -23,13 +23,13 @@
   (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 "Cascadia Code 13")
-    (set-face-attribute 'mode-line-inactive nil :font "Cascadia Code 13")))
+    (set-face-attribute 'mode-line nil :font "Cascadia Code 9")
+    (set-face-attribute 'mode-line-inactive nil :font "Cascadia Code 9")))
 
 (when (display-graphic-p)
     (set-graphic-font))
 
-(setq-default line-spacing 0.2)
+(setq-default line-spacing 0.4)
 
 (use-package ligature
   :load-path "path-to-ligature-repo"

Diff for: config/init-go.el

@@ -6,6 +6,9 @@
   (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)
+  (setq tab-width 4)
+  (setq indent-tabs-mode 1)
+  (add-hook 'go-mode-hook (lambda () (setq tab-width 4) (setq indent-tabs-mode 1)))
   (add-hook 'before-save-hook 'gofmt-before-save)
   :hook (go-mode . lsp))
 

Diff for: config/init-helm.el

@@ -29,6 +29,9 @@
 
   )
 
+(use-package helm-ag
+  :ensure t)
+
 (use-package helm-tramp
   :ensure t)
 

Diff for: config/init-lspmode.el

@@ -1,7 +1,9 @@
 (setq js-indent-level 2)
 
+(use-package vue-mode :ensure t
+  :config
+  (setq web-mode-code-indent-offset 2))
 (use-package csharp-mode :ensure t)
-(use-package vue-mode :ensure t)
 (use-package py-autopep8
   :hook
   (python-mode . py-autopep8-mode))
@@ -15,23 +17,24 @@
   :hook (python-mode . (lambda ()
                           (require 'lsp-pyright)
                           (lsp))))
+(use-package rust-mode
+  :config
+  (setq rust-format-on-save t)
+  (setq lsp-rust-server 'rust-analyzer)
+  :bind (("C-c C-c" . rust-run)))
+
 (use-package lsp-mode
   :init
-  :hook ((csharp-mode . lsp)
-	 (vue-mode . lsp)
-	 (lsp-mode . lsp-enable-which-key-integration))
-  :config
-  (lsp-ui-mode -1)
+  :hook ((vue-mode . lsp)
+	 (csharp-mode . lsp)
+	 (lsp-mode . lsp-enable-which-key-integration)
+	 (json-mode . lsp)
+	 (rust-mode . lsp))
   ;; 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)
@@ -45,23 +48,29 @@
 (use-package helm-lsp :commands helm-lsp-workspace-symbol)
 ;; (use-package dap-mode)
 
+(use-package web-mode
+  :config
+  (setq web-mode-code-indent-offset 4)
+  (add-to-list 'auto-mode-alist '("\\.cshtml?\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.razor?\\'" . web-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-ui
+  :ensure t
+  :commands lsp-ui-mode
+  :init
+  (add-hook 'lsp-mode-hook 'lsp-ui-mode)
+  :config
+  (setq lsp-ui-mode nil)
+  (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

Diff for: config/init-org.el

@@ -7,7 +7,10 @@
 
 ;; org capture
 (setq org-capture-templates
-      '(("i" "Inbox Agenda" entry (file+headline "~/icloud/Documents/belog/inbox.org" "Inbox")
+      '(("i" "Private Agenda" entry (file+headline "~/icloud/Documents/belog/private.org" "Private")
+	 "* TODO %?\n %i\n"
+	 :empty-lines 1)
+	("w" "Work Agenda" entry (file+headline "~/icloud/Documents/belog/Shushan.org" "Work")
 	 "* TODO %?\n %i\n"
 	 :empty-lines 1)))
 

Diff for: config/init-rust.el

@@ -3,7 +3,6 @@
 (menu-bar-mode -1)                      ;禁用菜单栏
 (scroll-bar-mode -1)                    ;禁用滚动条
 (delete-selection-mode 1)               ;启用删除选择模式
-(global-linum-mode 1)                   ;打开行号
 (desktop-save-mode -1)                  ;记录文件供下次打开
 (setq-default cursor-type 'bar)         ;设置光标为 |
 (fset 'yes-or-no-p 'y-or-n-p)           ;以 y/n代表 yes/no
@@ -18,15 +17,30 @@
 ; 设置透明函数
 (defun binwan-toggle-frame-transparency ()
   (interactive)
-  (if (equal (frame-parameter nil 'alpha) 100)
-      (set-frame-parameter nil 'alpha 50)
-    (set-frame-parameter nil 'alpha 100)))
+  (if (equal (frame-parameter nil 'alpha-background) 100)
+      (set-frame-parameter nil 'alpha-background 85)
+    (set-frame-parameter nil 'alpha-background 100)))
 
 ; 开启窗口序号管理
 (use-package window-numbering
   :init
   (window-numbering-mode))
 
+;; 居中显示
+(use-package writeroom-mode
+  :config
+  (setq writeroom-width 128
+        writeroom-bottom-divider-width 0
+        writeroom-fringes-outside-margins t
+        writeroom-fullscreen-effect nil
+        writeroom-major-modes '(text-mode prog-mode conf-mode special-mode Info-mode dired-mode)
+        writeroom-maximize-window nil
+        writeroom-mode-line t
+        writeroom-mode-line-toggle-position 'mode-line-format)
+  :hook
+  (emacs-startup . global-writeroom-mode))
+
+
 ; 缩进线
 (use-package highlight-indent-guides
   :ensure t

Diff for: config/init-ui.el

@@ -36,20 +36,21 @@
     ;;    (require 'init-yasnippet)
     (require 'init-lspmode)
     (require 'init-yaml)
-    (require 'init-rust)
+    ;; (require 'init-rust)
     ;; (require 'init-omnisharp)
     (require 'init-go)
     (require 'init-multi-cursors)
     ;; (require 'init-mssql)
     ;;  (require 'init-undo-tree)
     (require 'init-magit)
-    (require 'init-blamer)
+    ;; (require 'init-blamer)
  ;;   (require 'init-tab)
     (require 'init-org)
     (require 'init-project)
  ;;   (require 'init-vue)
     (require 'init-shell)
     (require 'init-protobuf)
+    (require 'init-bongo)
     (require 'init-dashboard)))
 ;;(require 'init-exwm)
 

Diff for: config/init.el

@@ -23,7 +23,7 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
-   '(lsp-pyright py-autopep8 web-mode tide tree-sitter origami lsp-completion lsp coverlay ns-auto-titlebar fill-column-indicator json-mode typescript-mode tsx-mode blamer posframe lsp-treemacs treemacs-magit treemacs-icons-dired treemacs-tab-bar treemacs treemacs-projectile yaml-mode vue-mode company-lsp helm-lsp helm-tramp c++-mode ob-csharp ox-gfm nyan-mode eaf-browser edbi cnfonts yasnippet window-numbering which-key use-package tree-sitter-langs tree-sitter-indent rust-mode rainbow-mode rainbow-delimiters quelpa protobuf-mode olivetti mmm-mode meow mc-extras magit lsp-ui hungry-delete helm-projectile helm-gtags go-projectile flycheck exec-path-from-shell doom-themes doom-modeline dashboard csharp-mode conda company)))
+   '(writeroom-mode fuo racer racer-mode bongo helm-rg helm-ag lsp-pyright py-autopep8 web-mode tide tree-sitter origami lsp-completion lsp coverlay ns-auto-titlebar fill-column-indicator json-mode typescript-mode tsx-mode blamer posframe lsp-treemacs treemacs-magit treemacs-icons-dired treemacs-tab-bar treemacs treemacs-projectile yaml-mode vue-mode company-lsp helm-lsp helm-tramp c++-mode ob-csharp ox-gfm nyan-mode eaf-browser edbi cnfonts yasnippet window-numbering which-key use-package tree-sitter-langs tree-sitter-indent rust-mode rainbow-mode rainbow-delimiters quelpa protobuf-mode olivetti mmm-mode meow mc-extras magit lsp-ui hungry-delete helm-projectile helm-gtags go-projectile flycheck exec-path-from-shell doom-themes doom-modeline dashboard csharp-mode conda company)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.