minor fix

This commit is contained in:
js0ny 2025-03-16 22:21:02 +00:00
parent fbec6c35a4
commit 2cff95950c
8 changed files with 99 additions and 30 deletions

View file

@ -145,3 +145,9 @@
(load! "local.el"))
;; (load! "telega.el")
(use-package! eee
:config
(if (eq system-type 'gnu/linux)
(setq ee-terminal-command "kitty"))
)

View file

@ -58,6 +58,11 @@
(package! telega :recipe (:files (:defaults "contrib/*.el" "etc" "server" "Makefile")))
(package! org-super-agenda)
(package! catppuccin-theme)
(package! eee
:recipe (:host github :repo "eval-exec/eee.el"
:files (:defaults "*.el" "*.sh")))

View file

@ -19,6 +19,7 @@
;; https://book.emacs-china.org/#orgcfd105e Open with Emacs
;; (server-mode 1)
(setq use-short-answers t)
(require 'recentf)
(recentf-mode 1)
@ -46,8 +47,7 @@
;; 配置备份文件目录
(setq backup-directory-alist `(("." . ,user-backup-directory)))
(when (boundp 'project-list-file)
(setq project-list-file (expand-file-name "projects-list" user-emacs-data)))
(setq project-list-file (expand-file-name "projects-list" user-emacs-data))
;; 配置自动保存文件目录
(setq auto-save-file-name-transforms

View file

@ -8,13 +8,13 @@
:config
(evil-mode 1)
; Colemak Vim Arrow
(evil-define-key '(normal visual operator) 'global
(evil-define-key '(normal visual operator motion) 'global
;; To see the keybindings, use <C-h> k then type the key
"n" 'evil-next-line
"e" 'evil-previous-line
"i" 'evil-forward-char
"l" 'evil-insert
"L" 'evil-insert-0-line
;"l" 'evil-insert
;"L" 'evil-insert-0-line
"k" 'evil-search-next
"K" 'evil-search-previous
"j" 'evil-forward-word-end
@ -23,7 +23,13 @@
"E" '(lambda () (interactive) (evil-previous-line 5)) ; 5e
"H" 'switch-to-prev-buffer
"I" 'switch-to-next-buffer
))
(kbd "C-w n") 'evil-window-down
(kbd "C-w e") 'evil-window-up
(kbd "C-w i") 'evil-window-right
)
(evil-define-key '(normal visual) 'global
"l" 'evil-insert
"L" 'evil-insert-0-line))
;; Text Objects Keymap - Use `l` for inner (swap i and l)
;; https://github.com/emacs-evil/evil/blob/master/evil-maps.el#L398-L421

View file

@ -22,7 +22,7 @@
;; Treemacs - Sidebar File Tree
(use-package treemacs
:ensure t
:straight t
:defer t
:init
(with-eval-after-load 'winum
@ -44,28 +44,29 @@
:ensure t
:config
;; Evil treemacs state bindings
(evil-define-key evil-treemacs-state-map
"n" #'treemacs-next-line
"e" #'treemacs-previous-line
"N" #'treemacs-next-neighbour
"E" #'treemacs-previous-neighbour
"H" #'treemacs-toggle-show-dotfiles
"I" #'treemacs-hide-gitignored-files-mode
"i" #'treemacs-RET-action
"a" #'treemacs-create-file
"A" #'treemacs-create-dir
"c" #'treemacs-copy-file
"x" #'treemacs-move-file
"d" #'treemacs-delete-file
"r" #'treemacs-rename-file
"q" #'treemacs-quit
"y" #'treemacs-copy-relative-path-at-point
"Y" #'treemacs-copy-absolute-path-at-point
"m" #'treemacs-mark-or-unmark-path-at-point)
(evil-define-key 'treemacs evil-treemacs-state-map
(kbd "n") #'treemacs-next-line
(kbd "e") #'treemacs-previous-line
(kbd "N") #'treemacs-next-neighbour
(kbd "E") #'treemacs-previous-neighbour
(kbd "H") #'treemacs-toggle-show-dotfiles
(kbd "I") #'treemacs-hide-gitignored-files-mode
(kbd "i") #'treemacs-RET-action
(kbd "a") #'treemacs-create-file
(kbd "A") #'treemacs-create-dir
(kbd "c") #'treemacs-copy-file
(kbd "x") #'treemacs-move-file
(kbd "d") #'treemacs-delete-file
(kbd "r") #'treemacs-rename-file
(kbd "q") #'treemacs-quit
(kbd "y") #'treemacs-copy-relative-path-at-point
(kbd "Y") #'treemacs-copy-absolute-path-at-point
(kbd "m") #'treemacs-mark-or-unmark-path-at-point)
;; Treemacs mode specific binding
(evil-define-key 'treemacs treemacs-mode-map (kbd "i") #'treemacs-RET-action))
;; magit - Git Client
(use-package magit
:ensure t

View file

@ -51,6 +51,15 @@
(setq org-preview-latex-default-process 'dvisvgm)
(setq org-format-latex-options (plist-put org-format-latex-options :scale 0.8))
(use-package org-latex-impatient
:defer t
:hook (org-mode . org-latex-impatient-mode)
:init
(setq org-latex-impatient-tex2svg-bin
;; location of tex2svg executable
"~/.local/share/pnpm/tex2svg"))
(use-package org-fragtog
:after org
:hook (org-mode . org-fragtog-mode))
@ -233,4 +242,25 @@
(org-get-heading t t t t)
effort))))))
(use-package org-roam
:ensure t
:custom
(org-roam-directory (file-truename (concat org-directory "roam")))
:bind (("C-c n l" . org-roam-buffer-toggle)
("C-c n f" . org-roam-node-find)
("C-c n g" . org-roam-graph)
("C-c n i" . org-roam-node-insert)
("C-c n c" . org-roam-capture)
;; Dailies
("C-c n j" . org-roam-dailies-capture-today))
:config
;; If you're using a vertical completion framework, you might want a more informative completion interface
(setq org-roam-node-display-template (concat "${title:*} " (propertize "${tags:10}" 'face 'org-tag)))
(setq org-roam-db-location (expand-file-name "org-roam.db" user-emacs-data))
(org-roam-db-autosync-mode)
;; If using org-roam-protocol
(require 'org-roam-protocol))
(provide 'init-org)

View file

@ -1,6 +1,29 @@
-- Debugger setups
return {
{ "mfussenegger/nvim-dap" },
{
"mfussenegger/nvim-dap",
config = function()
local dap = require("dap")
dap.adapters.codelldb = {
type = "executable",
command = "codelldb",
}
dap.configurations.cpp = {
{
name = "Launch file",
type = "codelldb",
request = "launch",
program = function()
return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
end,
cwd = "${workspaceFolder}",
stopOnEntry = false,
},
}
dap.configurations.c = dap.configurations.cpp
dap.configurations.rust = dap.configurations.cpp
end,
},
{
"rcarriga/nvim-dap-ui",
opts = {},