Skip to content

Commit 58a1ec1

Browse files
ImymirrorImymirror
committed
delete .DS_Store
1 parent 8c61f27 commit 58a1ec1

27 files changed

+275
-107
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.DS_Store

‎.vanilla-emacs.d/.DS_Store

-6 KB
Binary file not shown.

‎.vanilla-emacs.d/early-init.el

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
;; -*- lexical-binding: t; -*-
22

3+
(setq package-enable-at-startup nil)
4+
5+
(message "early-init...........")
36

47
(provide 'early-init)

‎.vanilla-emacs.d/init.el

+18-23
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,32 @@
77
(require 'init-speedup)
88
(require 'init-some-path)
99
(require 'init-imi-func)
10+
(require 'init-font)
1011
(require 'init-basic)
1112
(require 'init-platform)
12-
(require 'init-package)
13+
(require 'init-straight)
14+
15+
(require 'init-gtd)
1316

1417
;; package
18+
(require 'init-meow)
1519
(require 'init-roam)
16-
(require 'init-org-mode)
17-
(require 'init-telega)
18-
(require 'init-gtd)
19-
(require 'init-doom)
20-
(require 'init-winum)
21-
(require 'init-org-download)
22-
(require 'init-persp)
23-
;; package
24-
25-
;; completion system
26-
(require 'init-selectrum)
27-
(require 'init-consult)
20+
(require 'init-org-mode)
21+
(require 'init-org-download)
22+
23+
;; ;; completion system
24+
(require 'init-vertico)
25+
(require 'init-consult)
2826
(require 'init-rg)
2927

28+
;; ;; language
29+
(require 'init-lsp)
30+
(require 'init-tree-sitter)
31+
32+
(require 'init-mode-enable)
33+
34+
(require 'init-custom)
3035

31-
;; modal
32-
;;(require 'init-ryo-modal)
33-
(require 'init-meow)
34-
35-
;; language
36-
(require 'init-lsp)
37-
(require 'yasnippet)
38-
39-
(require 'init-mode-enable)
4036

41-
(require 'init-custom)
4237

4338

‎.vanilla-emacs.d/lisp/.DS_Store

-6 KB
Binary file not shown.

‎.vanilla-emacs.d/lisp/init-abandon.el

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
;; -*- lexical-binding: t; -*-
2+
3+
;; (require 'init-package)
4+
;;(require 'init-selectrum) ;; selectrum ctrlf
5+
6+
;;(require 'init-doom)
7+
;;(require 'init-winum)
8+
;;(require 'init-persp)
9+
;;(require 'init-session)
10+
;; (require 'init-telega)
11+
12+
;;(ctrlf-mode +1)
13+
14+
15+
(provide 'init-abandon)

‎.vanilla-emacs.d/lisp/init-basic.el

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
;;; -*- lexical-binding: t -*-
22

3-
;;(set-face-attribute 'default nil :height 140 :weight 'regular :width 'normal :family "PingFang SC")
4-
(set-face-attribute 'default nil :height 150)
5-
6-
;; ;; Open links in the same Window by default.
3+
;; Open links in the same Window by default.
74
(setq org-link-frame-setup '((file . find-file)))
85

96
(global-set-key (kbd "<f5>") (lambda() (interactive)(find-file user-init-file)))
@@ -19,6 +16,7 @@
1916

2017

2118
(setq ring-bell-function 'ignore)
19+
(setq inhibit-startup-screen t)
2220
(tool-bar-mode 0)
2321
(scroll-bar-mode 0)
2422
(add-to-list 'display-buffer-alist '("*Help*" display-buffer-same-window))

‎.vanilla-emacs.d/lisp/init-consult.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
;; -*- lexical-binding: t; -*-
22

3-
(consult-theme 'doom-nord)
3+
(consult-theme 'tsdh-light)
44

55
(provide 'init-consult)

‎.vanilla-emacs.d/lisp/init-font.el

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
;; -*- lexical-binding: t; -*-
2+
3+
;;(set-face-attribute 'default nil :height 140 :weight 'regular :width 'normal :family "PingFang SC")
4+
(set-face-attribute 'default nil :height 150)
5+
6+
;; mode-line
7+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
8+
;; (set-face-attribute 'mode-line nil ;;
9+
;; :family "Pingfang SC" ;;
10+
;; :weight 'bold ;;
11+
;; :background "#2E3440" ;;
12+
;; :foreground "white" ;;
13+
;; :box '(:line-width 2 :color "#2E3440") ;;
14+
;; :overline nil ;;
15+
;; :underline nil) ;;
16+
;; ;;
17+
;; (set-face-attribute 'mode-line-inactive nil ;;
18+
;; :background "#4C566A" ;;
19+
;; :foreground "white" ;;
20+
;; :box '(:line-width 2 :color "#4C566A") ;;
21+
;; :overline nil ;;
22+
;; :underline nil) ;;
23+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
24+
25+
(provide 'init-font)

‎.vanilla-emacs.d/lisp/init-imi-func.el

+12-16
Original file line numberDiff line numberDiff line change
@@ -165,21 +165,17 @@ directory to make multiple eshell windows easier."
165165
(defun imi-frame-switch-by-number (n)
166166
(select-frame-set-input-focus (elt (visible-frame-list) n)))
167167

168-
(defun imi-close-perspective()
169-
(message (concat "Saving " imi-persp-path ))
170-
;; telega confict with persp, don't save
171-
(when (telega-server-live-p) (telega-kill 1) )
172-
(persp-save-state-to-file imi-persp-path))
173-
174-
(add-hook 'kill-emacs-hook 'imi-close-perspective)
175-
176-
177-
(defun imi-persp-switch-to-n (n)
178-
(let ((names (persp-names-current-frame-fast-ordered))
179-
(count 0))
180-
(dolist (name names)
181-
(when (= count n)
182-
(persp-switch name))
183-
(cl-incf count))))
168+
(defun imi-org-delete-link ()
169+
"Replace an org link by its description or if empty its address"
170+
(interactive)
171+
(if (org-in-regexp org-link-bracket-re 1)
172+
(save-excursion
173+
(let ((remove (list (match-beginning 0) (match-end 0)))
174+
(description
175+
(if (match-end 2)
176+
(org-match-string-no-properties 2)
177+
(org-match-string-no-properties 1))))
178+
(apply 'delete-region remove)
179+
(insert description)))))
184180

185181
(provide 'init-imi-func)

‎.vanilla-emacs.d/lisp/init-lsp.el

+20-14
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,32 @@
22

33
(require 'lsp-mode)
44

5+
;;(require 'ccls)
6+
;;(setq ccls-executable "/usr/local/bin/ccls")
7+
58
;; 性能相关
6-
(setq read-process-output-max (* 1024 1024)) ;; 1mb
7-
(setq lsp-completion-provider :capf)
8-
(setq lsp-idle-delay 0.500)
9-
(setq lsp-enable-file-watchers nil)
10-
(setq lsp-log-io nil) ; if set to true can cause a performance hit
9+
;;(setq read-process-output-max (* 1024 1024)) ;; 1mb
10+
;;(setq lsp-completion-provider :capf)
11+
;;(setq lsp-idle-delay 0.500)
12+
;;(setq lsp-enable-file-watchers nil)
13+
;;(setq lsp-log-io nil) ; if set to true can cause a performance hit
14+
15+
;; (setq lsp-ui-doc-position 'at-point)
1116

12-
(setq lsp-ui-doc-position 'at-point)
17+
;;(define-key lsp-mode-map (kbd "C-c l") lsp-command-map)
18+
;;(with-eval-after-load 'lsp-mode
19+
;; (add-hook 'lsp-mode-hook (lambda ()
20+
;; (let ((lsp-keymap-prefix "C-c l"))
21+
;; (lsp-enable-which-key-integration)))))
1322

14-
;; 补全
15-
(setq company-minimum-prefix-length 1
16-
company-idle-delay 0.0) ;; default is 0.2
1723

18-
(define-key lsp-mode-map (kbd "C-c l") lsp-command-map)
19-
(with-eval-after-load 'lsp-mode
20-
(add-hook 'lsp-mode-hook (lambda ()
21-
(let ((lsp-keymap-prefix "C-c l"))
22-
(lsp-enable-which-key-integration)))))
24+
(setq lsp-headerline-breadcrumb-enable nil)
2325

26+
;; Company mode
27+
(setq company-idle-delay 0) ;; default 0.2
28+
(setq company-minimum-prefix-length 1)
2429

2530
(add-hook 'c-mode-hook 'lsp)
2631

32+
2733
(provide 'init-lsp)

‎.vanilla-emacs.d/lisp/init-meow.el

+25-9
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,22 @@
22

33
(require 'meow)
44

5-
(global-set-key (kbd "C-M-s-)") 'telega)
5+
;; (global-set-key (kbd "C-M-s-)") 'telega)
66
(global-set-key (kbd "C-M-c") 'ace-pinyin-jump-char)
77
(global-set-key (kbd "C-M-l") 'avy-goto-line)
88

9+
;; buffer
10+
;;(global-set-key (kbd "s-0") #'(lambda () (interactive) (imi-frame-switch-by-number 0)))
11+
(global-set-key (kbd "s-1") (lambda () (interactive) (imi-frame-switch-by-number 1)))
12+
(global-set-key (kbd "s-2") (lambda () (interactive) (imi-frame-switch-by-number 2)))
13+
(global-set-key (kbd "s-3") (lambda () (interactive) (imi-frame-switch-by-number 3)))
14+
(global-set-key (kbd "s-4") (lambda () (interactive) (imi-frame-switch-by-number 4)))
15+
(global-set-key (kbd "s-5") (lambda () (interactive) (imi-frame-switch-by-number 5)))
16+
(global-set-key (kbd "s-6") (lambda () (interactive) (imi-frame-switch-by-number 6)))
17+
(global-set-key (kbd "s-7") (lambda () (interactive) (imi-frame-switch-by-number 7)))
18+
(global-set-key (kbd "s-8") (lambda () (interactive) (imi-frame-switch-by-number 8)))
19+
(global-set-key (kbd "s-9") (lambda () (interactive) (imi-frame-switch-by-number 9)))
20+
921
(defun meow-setup ()
1022
(setq meow-cheatsheet-layout meow-cheatsheet-layout-qwerty)
1123

@@ -33,13 +45,13 @@
3345
;; frame
3446
'( "f n" . make-frame)
3547
'( "f d" . delete-frame)
36-
'( "f 0" . (lambda () (interactive) (imi-frame-switch-by-number 0)))
37-
'( "f 1" . (lambda () (interactive) (imi-frame-switch-by-number 1)))
38-
'( "f 2" . (lambda () (interactive) (imi-frame-switch-by-number 2)))
39-
'( "f 3" . (lambda () (interactive) (imi-frame-switch-by-number 3)))
40-
'( "f 4" . (lambda () (interactive) (imi-frame-switch-by-number 4)))
41-
'( "f 5" . (lambda () (interactive) (imi-frame-switch-by-number 5)))
42-
'( "f 6" . (lambda () (interactive) (imi-frame-switch-by-number 6)))
48+
;; '( "f 0" . (lambda () (interactive) (imi-frame-switch-by-number 0)))
49+
;; '( "f 1" . (lambda () (interactive) (imi-frame-switch-by-number 1)))
50+
;; '( "f 2" . (lambda () (interactive) (imi-frame-switch-by-number 2)))
51+
;; '( "f 3" . (lambda () (interactive) (imi-frame-switch-by-number 3)))
52+
;; '( "f 4" . (lambda () (interactive) (imi-frame-switch-by-number 4)))
53+
;; '( "f 5" . (lambda () (interactive) (imi-frame-switch-by-number 5)))
54+
;; '( "f 6" . (lambda () (interactive) (imi-frame-switch-by-number 6)))
4355

4456
;; window
4557
'( "w m" . delete-other-windows)
@@ -72,12 +84,15 @@
7284
'( "b s" . imi-save-all-buffers)
7385

7486
;; org toggle
75-
'( "o i" . imi-open-iTerm)
87+
'( "o I" . imi-open-iTerm)
7688
'( "o p" . imi-org-download-paste-clipboard)
7789
'( "o s" . shell)
7890
'( "o l" . link-hint-open-link)
7991
'( "o g" . grab-mac-link-dwim)
8092
'( "o o" . imi-reveal-in-finder)
93+
'( "o h" . org-hide-block-all)
94+
'( "o i" . org-toggle-inline-images)
95+
'( "o L" . org-toggle-link-display)
8196

8297
;; persp/project
8398
'( "p 0" . imi-persp-switch-to-0)
@@ -116,6 +131,7 @@
116131
'("3" . meow-expand-3)
117132
'("2" . meow-expand-2)
118133
'("1" . meow-expand-1)
134+
119135
'("-" . negative-argument)
120136
'(";" . meow-reverse)
121137
'("," . meow-inner-of-thing)

‎.vanilla-emacs.d/lisp/init-mode-enable.el

+14-14
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@
22

33
(defun imi-load-after-idle-time ()
44
(yas-global-mode 1)
5-
(winum-mode)
5+
;;(winum-mode)
66
(winner-mode)
77
(delete-selection-mode)
8-
(doom-modeline-mode)
9-
(add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
8+
;;(doom-modeline-mode)
109
(global-company-mode)
1110
(recentf-mode) ;; consult consult-recent-file
1211
(which-key-mode)
13-
(ace-pinyin-global-mode)
14-
)
12+
(ace-pinyin-global-mode))
1513

1614
;; daemon 不允许 idle time，会死机
17-
(imi-load-after-idle-time)
15+
(imi-load-after-idle-time)
16+
17+
18+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
19+
;; (setq setup-idle-time-once ;;
20+
;; (run-with-idle-timer 3 t ;;
21+
;; (lambda () ;;
22+
;; (message "imi-load-after-idle-time") ;;
23+
;; (imi-load-after-idle-time) ;;
24+
;; (cancel-timer setup-idle-time-once)))) ;;
25+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1826

19-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
20-
;; (setq setup-idle-time-once ;;
21-
;; (run-with-idle-timer 3 t ;;
22-
;; (lambda () ;;
23-
;; (message "imi-load-after-idle-time") ;;
24-
;; (imi-load-after-idle-time) ;;
25-
;; (cancel-timer setup-idle-time-once)))) ;;
26-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2727

2828

2929
(provide 'init-mode-enable)

‎.vanilla-emacs.d/lisp/init-package.el

+6-3
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,18 @@
99

1010
;; ("gnu" . "http://elpa.gnu.org/packages/")
1111
("melpa" . "https://melpa.org/packages/")
12-
("melpa-stable" . "https://stable.melpa.org/packages/")
12+
;; ("melpa-stable" . "https://stable.melpa.org/packages/")
1313
;; ("elpy" . "http://jorgenschaefer.github.io/packages/")
1414
))
1515

1616
(package-initialize)
1717

1818
(setq package-list '(
19-
which-key org-roam selectrum telega selectrum-prescient ctrlf rg company smartparens winum ryo-modal crux expand-region avy consult lsp-mode yasnippet link-hint grab-mac-link org-download persp-mode magit meow ace-pinyin
20-
19+
which-key org-roam telega ctrlf rg company smartparens crux avy consult yasnippet link-hint grab-mac-link org-download magit meow ace-pinyin ox-hugo
20+
lsp-mode
21+
tree-sitter tree-sitter-langs
22+
selectrum selectrum-prescient
23+
;;persp-mode ryo-modal winum expand-region
2124

2225
))
2326

‎.vanilla-emacs.d/lisp/init-persp.el

+18
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,25 @@
22

33
(require 'persp-mode)
44

5+
(defun imi-close-perspective()
6+
(message (concat "Saving " imi-persp-path ))
7+
;; telega confict with persp, don't save
8+
(when (telega-server-live-p) (telega-kill 1) )
9+
(persp-save-state-to-file imi-persp-path))
10+
11+
12+
(defun imi-persp-switch-to-n (n)
13+
(let ((names (persp-names-current-frame-fast-ordered))
14+
(count 0))
15+
(dolist (name names)
16+
(when (= count n)
17+
(persp-switch name))
18+
(cl-incf count))))
19+
20+
521
(persp-mode 1)
22+
(add-hook 'kill-emacs-hook 'imi-close-perspective)
23+
624

725
(setq persp-auto-save-opt 0)
826

‎.vanilla-emacs.d/lisp/init-project.el

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
;; -*- lexical-binding: t; -*-
2+
3+
(defun imi-project-vc-override (dir)
4+
(let ((override (locate-dominating-file dir ".project.el")))
5+
(if override
6+
(cons 'vc override)
7+
nil)))
8+
9+
(add-hook 'project-find-functions #'zkj-project-override)
10+
11+
(provide 'init-project)

0 commit comments

Comments
 (0)