diff --git a/.gitignore b/.gitignore index 37ce0ff..4f4a77c 100644 --- a/.gitignore +++ b/.gitignore @@ -42,6 +42,7 @@ history # generated by elisp packages at root /.local/ /.cask/ +/tabspaces/ /auto/ /auto-save-list/ /cask/ diff --git a/history b/history deleted file mode 100644 index 76218e5..0000000 --- a/history +++ /dev/null @@ -1,16 +0,0 @@ -;; -*- mode: emacs-lisp; lexical-binding: t; coding: utf-8-emacs-unix -*- -;; Minibuffer history file, automatically generated by ‘savehist’. - -(setq savehist-minibuffer-history-variables '(minibuffer-history consult--line-history rg-files-history rg-pattern-history file-name-history extended-command-history buffer-name-history)) -(setq minibuffer-history '("cmake-mode MELPA")) -(setq consult--line-history '("ss")) -(setq rg-files-history '("elisp")) -(setq rg-pattern-history '("ss")) -(setq file-name-history '("~/.emacs.d/init.el" "~/.emacs.d/lisp/" "~/.emacs.d/lisp/init-coding.el" "~/.emacs.d/lisp/init-better-default.el" "~/.emacs.d/lisp/init-coding.el" "~/.emacs.d/lisp/init-shell.el" "~/.emacs.d/init.el" "~/.emacs.d/lisp/init-snippet.el" "~/.emacs.d/lisp/init-ui.el" "~/.emacs.d/lisp/init-vcs.el" "~/.emacs.d/lisp/init-workspace.el" "~/.emacs.d/early-init.el" "~/.emacs.d/lisp/init-edit.el" "~/.emacs.d/lisp/init-utils.el" "~/uni/Seminars/Algebraic Geometry/exer.tex" "~/.emacs.d/lisp/init-completion.el" "~/.emacs.d/lisp/init-eglot.el" "~/org/roam/20260222193638-ring.org" "~/org/yunnan.org" "~/org/workout.org" "~/org/todo.org" "~/org/notes.org" "~/org/learn-haskell.org" "~/org/diary.org" "~/org/roam/20260105223044-ideal_of_ring.org" "~/Library/texmf/tex/latex/local/elegantbook.cls" "~/.emacs.d/auctex/elegantbook.el" "~/Library/Rime/wubi091.dict.yaml" "~/Library/Rime/wubi091.schema.yaml" "~/.emacs.d/snippets/LaTeX-mode/in" "~/.emacs.d/snippets/LaTeX-mode/not in" "~/Library/Rime/pinyin_simp.txt" "~/.emacs.d/rime/user.yaml" "~/.emacs.d/snippets/LaTeX-mode/sqrt" "~/.emacs.d/bookmarks.eld" "~/org/roam/20260322143810-noetherian_topological_space_is_compact.org" "~/.config/aerospace/aerospace.toml" "~/.config/sketchybar/plugins/current_space.sh" "~/.config/sketchybar/sketchybarrc" "~/.config/sketchybar/plugins/aerospace.sh" "~/.emacs.d/lisp/init-org.el" "~/.emacs.d/elpaca/builds/org/org-loaddefs.el" "~/.emacs.d/lisp/init-tex.el" "~/uni/undergrad/26s1/Geometry/ass1/main.tex" "~/.emacs.d/snippets/LaTeX-mode/.yas-ignore-filenames-as-triggers" "~/uni/undergrad/26s1/Geometry/" "~/uni/undergrad/26s1/PFi/main.tex" "~/.emacs.d/snippets/LaTeX-mode/chastar.yasnippet" "~/.emacs.d/snippets/LaTeX-mode/star" "~/.emacs.d/snippets/LaTeX-mode/substar.yasnippet" "~/.emacs.d/snippets/LaTeX-mode/Display Math" "~/.emacs.d/snippets/LaTeX-mode/implied by" "~/.emacs.d/snippets/LaTeX-mode/less or equal" "~/.emacs.d/snippets/LaTeX-mode/lesser lesser" "~/.emacs.d/snippets/LaTeX-mode/greater or equal" "~/.emacs.d/snippets/LaTeX-mode/lrangle" "~/.emacs.d/eshell/alias" "~/.emacs.d/.gitignore" "~/.latexmkrc" "~/.emacs.d/lisp/init-window.el" "~/uni/undergrad/26s1/.projectile" "~/.emacs.d/snippets/LaTeX-mode/bigop.yasnippet" "~/org/roam/20260222194140-category_theory.org" "~/uni/Seminars/Representation theory/.projectile" "~/uni/Seminars/Representation theory/main.tex" "~/.emacs.d/snippets/LaTeX-mode/odot" "~/.emacs.d/snippets/LaTeX-mode/supset" "~/Library/texmf/tex/latex/local/auto/elegantbook.el" "~/uni/Seminars/Algebraic Geometry/auto/exer.el" "~/.config/nvim/LuaSnip/tex/math-commands.lua" "~/.emacs.d/snippets/LaTeX-mode/supseteq" "~/uni/Seminars/Representation theory/auto/main.el" "~/.emacs.d/auctex/auto/elegantbook.el" "~/org/roam/20260307170815-the_first_isomorphism_theorem.org" "~/org/roam/20251208162138-eu4_chinese_on_linux.org" "~/org/roam/20251207033411-quant.org" "~/org/roam/20251117171745-emacs.org" "~/.emacs.d/README.org" "~/.cache/org-persist/d8/df010c-12af-4345-96ea-38c574c74b6f-782ac370c3e966153f81b05909bf82d8.png" "~/org/todo.org_archive" "~/build-emacs-for-macos/flake.nix" "~/build-emacs-for-macos/go.mod" "~/build-emacs-for-macos/Brewfile" "~/.emacs.d/lisp/init-hydra.el" "~/docker_compose/yama.toml" "~/.emacs.d/snippets/LaTeX-mode/cap" "~/.emacs.d/snippets/LaTeX-mode/cup" "~/.emacs.d/snippets/LaTeX-mode/template" "~/build-emacs-for-macos/builds/Emacs.app/Contents/Resources/lisp/loaddefs.el.gz" "~/uni/undergrad/25s1/VCA/Notes/Vector-Calculus-Note.tex" "~/.emacs.d/lisp/init-dashboard.el")) -(setq extended-command-history '("easysession-reset" "elpaca-browse" "savehist-mode" "xref-find-definitions" "elisp-enable-lexical-binding" "elpaca-browse" "transient-posframe-mode" "elpaca-browse" "elisp-enable-lexical-binding" "transient-posframe-mode" "elpaca-browse" "proced" "elpaca-browse" "eldoc-mode" "benchmark-init/show-durations-tabulated")) -(setq buffer-name-history '("*Proced*")) -(setq projectile-project-command-history '#s(hash-table test equal)) -(setq mark-ring 'nil) -(setq global-mark-ring 'nil) -(setq search-ring '(#("cod" 0 3 (isearch-case-fold-search t isearch-regexp-function nil)) #("recentf" 0 7 (isearch-case-fold-search t isearch-regexp-function nil)) #("doom-mode" 0 9 (isearch-case-fold-search t isearch-regexp-function nil)) #("easy" 0 4 (isearch-case-fold-search t isearch-regexp-function nil)) #("use-package rg" 0 14 (isearch-case-fold-search t isearch-regexp-function nil)))) -(setq regexp-search-ring 'nil) diff --git a/lisp/init-completion.el b/lisp/init-completion.el index 28a5283..0ff3fc8 100644 --- a/lisp/init-completion.el +++ b/lisp/init-completion.el @@ -52,9 +52,9 @@ (use-package vertico :custom (vertico-count 15) :bind (:map vertico-map - ("RET" . vertico-directory-enter) - ("DEL" . vertico-directory-delete-char) - ("M-DEL" . vertico-directory-delete-word)) + ("RET" . vertico-directory-enter) + ("DEL" . vertico-directory-delete-char) + ("M-DEL" . vertico-directory-delete-word)) :hook (elpaca-after-init . vertico-mode) :hook (rfn-eshadow-update-overlay . vertico-directory-tidy)) @@ -112,9 +112,9 @@ ;; Consulting completing-read (use-package consult :bind (("C-." . consult-imenu) - ("C-c T" . consult-theme) + ("C-c T" . consult-theme) - ([remap Info-search] . consult-info) + ([remap Info-search] . consult-info) ;; ([remap isearch-forward] . consult-line) ([remap recentf-open-files] . consult-recent-file) @@ -138,9 +138,9 @@ ("M-g k" . consult-global-mark) ("M-g i" . consult-imenu) ("M-g I" . consult-imenu-multi) - + ;; M-g bindings in `search-map' - ("s-f" . consult-line) + ("s-f" . consult-line) ("M-g d" . consult-find) ;; Alternative: consult-fd ("M-g c" . consult-locate) ("M-g G" . consult-git-grep) @@ -149,8 +149,8 @@ ("M-g L" . consult-line-multi) ("M-g k" . consult-keep-lines) ("M-g u" . consult-focus-lines) - ("C-x C-r" . consult-recent-file) - ("C-x B" . consult-buffer) + ("C-x C-r" . consult-recent-file) + ("C-x b" . consult-buffer) ("M-g e" . consult-isearch-history) :map isearch-mode-map @@ -223,7 +223,7 @@ (use-package embark-consult :bind (:map minibuffer-mode-map - ("C-c C-o" . embark-export)) + ("C-c C-o" . embark-export)) :hook (embark-collect-mode . consult-preview-at-point-mode)) ;; Auto completion diff --git a/lisp/init-snippet.el b/lisp/init-snippet.el index dc09eb7..e3887f6 100644 --- a/lisp/init-snippet.el +++ b/lisp/init-snippet.el @@ -28,7 +28,7 @@ (yas-expand))))) ;; Collection of yasnippet snippets -(use-package yasnippet-snippets) +;; (use-package yasnippet-snippets) diff --git a/lisp/init-workspace.el b/lisp/init-workspace.el index ddb5f9d..fb0b5db 100644 --- a/lisp/init-workspace.el +++ b/lisp/init-workspace.el @@ -13,10 +13,10 @@ (use-package ibuffer-projectile :config (add-hook 'ibuffer-hook - (lambda () - (ibuffer-projectile-set-filter-groups) - (unless (eq ibuffer-sorting-mode 'alphabetic) - (ibuffer-do-sort-by-alphabetic))))) + (lambda () + (ibuffer-projectile-set-filter-groups) + (unless (eq ibuffer-sorting-mode 'alphabetic) + (ibuffer-do-sort-by-alphabetic))))) (use-package consult-projectile :bind (([remap projectile-find-file] . consult-projectile-find-file) @@ -25,34 +25,12 @@ ([remap projectile-switch-to-buffer] . consult-projectile-switch-to-buffer) ([remap projectile-find-dir] . consult-projectile-find-dir))) -;; (use-package org-project-capture) - -;; (use-package org-projectile -;; :config -;; (setq org-project-capture-default-backend -;; (make-instance 'org-project-capture-projectile-backend))) - (global-set-key (kbd "C-x C-b") #'ibuffer) -;; (use-package beframe -;; :hook elpaca-after-init -;; :bind (("C-x b" . beframe-switch-buffer) -;; ("C-x C-b" . beframe-buffer-menu) -;; ("C-x f" . other-frame-prefix)) -;; :config -;; (define-key global-map (kbd "C-c b") #'beframe-prefix-map)) - - (use-package eyebrowse :hook elpaca-after-init :custom - (eyebrowse-new-workspace t)) - -(use-package easysession - :diminish - :demand t - ;; :hook (elpaca-after-init easysession-scratch-mode) - ;; :hook (elpaca-after-init easysession-magit-mode) + (eyebrowse-new-workspace t) :bind (("s-1" . eyebrowse-switch-to-window-config-1) ("s-2" . eyebrowse-switch-to-window-config-2) ("s-3" . eyebrowse-switch-to-window-config-3) @@ -60,15 +38,18 @@ ("s-5" . eyebrowse-switch-to-window-config-5) ("s-6" . eyebrowse-switch-to-window-config-6) ("s-7" . eyebrowse-switch-to-window-config-7) - ("s-8" . eyebrowse-switch-to-window-config-8)) - ;; ("C-c C-s l" . easysession-switch-to) - ;; ("C-c C-s L" . easysession-switch-to-and-restore-geometry) - ;; ("C-c C-s s" . easysession-save) - ;; ("C-c C-s r" . easysession-rename) - ;; ("C-c C-s R" . easysession-reset) - ;; ("C-c C-s u" . easysession-unload) - ;; ("C-c C-s d" . easysession-delete)) + ("s-8" . eyebrowse-switch-to-window-config-8))) +(use-package easysession + :diminish + :demand t + :bind (("C-c C-s l" . easysession-switch-to) + ("C-c C-s L" . easysession-switch-to-and-restore-geometry) + ("C-c C-s s" . easysession-save) + ("C-c C-s r" . easysession-rename) + ("C-c C-s R" . easysession-reset) + ("C-c C-s u" . easysession-unload) + ("C-c C-s d" . easysession-delete)) :custom (easysession-switch-to-save-session t) (easysession-switch-to-exclude-current nil)