From abaeeb64864e4db0eeea6011a15e30dcf979c470 Mon Sep 17 00:00:00 2001 From: Zelong Kuang Date: Thu, 2 Apr 2026 15:31:43 +1100 Subject: [PATCH] Update --- lisp/init-better-default.el | 7 ++++- lisp/init-completion.el | 1 + lisp/init-org.el | 8 +++--- lisp/init-ui.el | 4 --- lisp/init-workspace.el | 19 ++++++------- snippets/latex-mode/abstract.yasnippet | 9 ------ snippets/latex-mode/align.yasnippet | 9 ------ snippets/latex-mode/alignstar.yasnippet | 9 ------ snippets/latex-mode/array.yasnippet | 9 ------ snippets/latex-mode/article.yasnippet | 28 ------------------- snippets/latex-mode/beamer.yasnippet | 37 ------------------------- snippets/latex-mode/begin | 7 ----- snippets/latex-mode/bib.yasnippet | 8 ------ snippets/latex-mode/bigop.yasnippet | 3 +- snippets/latex-mode/chastar.yasnippet | 8 ------ snippets/latex-mode/enum.yasnippet | 9 ------ snippets/latex-mode/eq.yasnippet | 10 ------- snippets/latex-mode/eqs.yasnippet | 10 ------- snippets/latex-mode/fig.yasnippet | 12 -------- snippets/latex-mode/frame.yasnippet | 9 ------ snippets/latex-mode/limit | 2 +- snippets/latex-mode/minipage.yasnippet | 9 ------ 22 files changed, 23 insertions(+), 204 deletions(-) delete mode 100644 snippets/latex-mode/abstract.yasnippet delete mode 100644 snippets/latex-mode/align.yasnippet delete mode 100644 snippets/latex-mode/alignstar.yasnippet delete mode 100644 snippets/latex-mode/array.yasnippet delete mode 100644 snippets/latex-mode/article.yasnippet delete mode 100644 snippets/latex-mode/beamer.yasnippet delete mode 100644 snippets/latex-mode/begin delete mode 100644 snippets/latex-mode/bib.yasnippet delete mode 100644 snippets/latex-mode/chastar.yasnippet delete mode 100644 snippets/latex-mode/enum.yasnippet delete mode 100644 snippets/latex-mode/eq.yasnippet delete mode 100644 snippets/latex-mode/eqs.yasnippet delete mode 100644 snippets/latex-mode/fig.yasnippet delete mode 100644 snippets/latex-mode/frame.yasnippet delete mode 100644 snippets/latex-mode/minipage.yasnippet diff --git a/lisp/init-better-default.el b/lisp/init-better-default.el index 223c741..fb2036a 100644 --- a/lisp/init-better-default.el +++ b/lisp/init-better-default.el @@ -181,7 +181,12 @@ If this is a daemon session, load them all immediately instead." (setq kill-whole-line t) (setq make-backup-files nil) (setq use-short-answers t) -;; (setq frame-title-format "\n") +(setq frame-title-format + '((:eval (if (and (boundp 'projectile-mode) + projectile-mode + (projectile-project-p)) + (format "[%s] %s" (projectile-project-name) (buffer-name)) ;; Add project name in front when avaliable + "%b")))) ;; Otherwise buffer name only (setq custom-safe-themes t) (add-to-list 'default-frame-alist '(drag-internal-border . 1)) diff --git a/lisp/init-completion.el b/lisp/init-completion.el index 896340a..3329f93 100644 --- a/lisp/init-completion.el +++ b/lisp/init-completion.el @@ -117,6 +117,7 @@ ([remap Info-search] . consult-info) ;; ([remap isearch-forward] . consult-line) ([remap recentf-open-files] . consult-recent-file) + ([remap bookmark-jump] . consult-bookmark) ("C-x M-:" . consult-complex-command) ;; orig. repeat-complex-command ;; Custom M-# bindings for fast register access ("M-#" . consult-register-load) diff --git a/lisp/init-org.el b/lisp/init-org.el index 102d872..6366092 100644 --- a/lisp/init-org.el +++ b/lisp/init-org.el @@ -86,6 +86,10 @@ org-faces org-entities org-list org-pcomplete org-src org-footnote org-macro ob org org-clock org-agenda org-capture)) + + (add-hook 'org-mode-hook + (lambda () + (yas-activate-extra-mode 'LaTeX-mode))) ;; For hydra (defun hot-expand (str &optional mod) "Expand org template. @@ -209,10 +213,6 @@ the element after the #+HEADER: tag." ("BUG" error bold) ("XXX" font-lock-constant-face bold)))) -(add-hook 'org-mode-hook - (lambda () - (yas-activate-extra-mode 'LaTeX-mode))) - (use-package org-latex-preview :straight nil :hook (org-mode . org-latex-preview-mode) diff --git a/lisp/init-ui.el b/lisp/init-ui.el index e9c09eb..35c5e67 100644 --- a/lisp/init-ui.el +++ b/lisp/init-ui.el @@ -164,10 +164,6 @@ ;; but you can use any other Nerd Font if you want (nerd-icons-font-family "Symbols Nerd Font Mono")) -(use-package nerd-icons-ibuffer - :straight t - :hook (ibuffer-mode-hook . nerd-icons-ibuffer-mode)) - ;; Display transient in child frame ;; (use-package transient-posframe ;; :diminish diff --git a/lisp/init-workspace.el b/lisp/init-workspace.el index 8d328e7..d770e88 100644 --- a/lisp/init-workspace.el +++ b/lisp/init-workspace.el @@ -10,23 +10,21 @@ ;; Recommended keymap prefix on Windows/Linux (define-key projectile-mode-map (kbd "C-x p") 'projectile-command-map)) +(use-package ibuffer + :ensure nil + :bind ("C-x C-b" . ibuffer) + :init (setq ibuffer-filter-group-name-face '(:inherit (font-lock-string-face bold)))) +(use-package nerd-icons-ibuffer + :straight t + :hook (ibuffer-mode-hook . nerd-icons-ibuffer-mode)) (use-package ibuffer-projectile - :config + :init (add-hook 'ibuffer-hook (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) -;; ([remap projectile-recentf] . consult-projectile-recentf) -;; ([remap projectile-switch-project] . consult-projectile-switch-project) -;; ([remap projectile-switch-to-buffer] . consult-projectile-switch-to-buffer) -;; ([remap projectile-find-dir] . consult-projectile-find-dir))) - -(global-set-key (kbd "C-x C-b") #'ibuffer) - (use-package beframe :hook after-init :bind ("C-x f" . other-frame-prefix) @@ -49,6 +47,7 @@ (beframe--assume (list (get-buffer buf)))))) + ;; Beframe integration with other packages (with-eval-after-load 'consult (defun consult-beframe-buffer-list (&optional frame) "Return the list of buffers from `beframe-buffer-names' sorted by visibility. diff --git a/snippets/latex-mode/abstract.yasnippet b/snippets/latex-mode/abstract.yasnippet deleted file mode 100644 index 04badc7..0000000 --- a/snippets/latex-mode/abstract.yasnippet +++ /dev/null @@ -1,9 +0,0 @@ -# -*- mode: snippet -*- -# contributor : Mads D. Kristensen -# key : abstract -# group: sections -# name : \abstract -# -- -\begin{abstract} -$0 -\end{abstract} \ No newline at end of file diff --git a/snippets/latex-mode/align.yasnippet b/snippets/latex-mode/align.yasnippet deleted file mode 100644 index 4fd7beb..0000000 --- a/snippets/latex-mode/align.yasnippet +++ /dev/null @@ -1,9 +0,0 @@ -# -*- mode: snippet -*- -# contributor : Rasmus Borgsmidt -# key : align -# group: environments -# name : \begin{align} ... \end{align} -# -- -\begin{align} - $0 -\end{align} \ No newline at end of file diff --git a/snippets/latex-mode/alignstar.yasnippet b/snippets/latex-mode/alignstar.yasnippet deleted file mode 100644 index 538a2dd..0000000 --- a/snippets/latex-mode/alignstar.yasnippet +++ /dev/null @@ -1,9 +0,0 @@ -# -*- mode: snippet -*- -# contributor : Rasmus Borgsmidt -# key : align* -# group: environments -# name : \begin{align*} ... \end{align*} -# -- -\begin{align*} - $0 -\end{align*} \ No newline at end of file diff --git a/snippets/latex-mode/array.yasnippet b/snippets/latex-mode/array.yasnippet deleted file mode 100644 index aa67ae9..0000000 --- a/snippets/latex-mode/array.yasnippet +++ /dev/null @@ -1,9 +0,0 @@ -# -*- mode: snippet -*- -# contributor : Peter Urbak -# key : arr -# group: environments -# name : \begin{array} ... \end{array} -# -- -\begin{array}{$1} - $0 -\end{array} diff --git a/snippets/latex-mode/article.yasnippet b/snippets/latex-mode/article.yasnippet deleted file mode 100644 index a9e5203..0000000 --- a/snippets/latex-mode/article.yasnippet +++ /dev/null @@ -1,28 +0,0 @@ -# -*- mode: snippet -*- -# contributor: Mads D. Kristensen -# contributor : Song Qiang -# key: article -# group: skeleton -# name: \documentclass{article} ... -# -- -\documentclass[11pt]{article} - -\usepackage{graphicx,amsmath,amssymb,subfigure,url,xspace} -\newcommand{\eg}{e.g.,\xspace} -\newcommand{\bigeg}{E.g.,\xspace} -\newcommand{\etal}{\textit{et~al.\xspace}} -\newcommand{\etc}{etc.\@\xspace} -\newcommand{\ie}{i.e.,\xspace} -\newcommand{\bigie}{I.e.,\xspace} - -\title{${1:title}} -\author{${2:Author Name}} - -\begin{document} -\maketitle - - -\bibliographystyle{${3:plain}} -\bibliography{${4:literature.bib}} - -\end{document} diff --git a/snippets/latex-mode/beamer.yasnippet b/snippets/latex-mode/beamer.yasnippet deleted file mode 100644 index 4c4c7c3..0000000 --- a/snippets/latex-mode/beamer.yasnippet +++ /dev/null @@ -1,37 +0,0 @@ -# -*- mode: snippet -*- -# contributor: Claudio Marforio -# key: beamer -# group: skeleton -# name: \documentclass{beamer} ... -# -- -\documentclass[xcolor=dvipsnames]{beamer} - -\usepackage{graphicx,subfigure,url} - -% example themes -\usetheme{Frankfurt} -\usecolortheme{seahorse} -\usecolortheme{rose} - -% put page numbers -% \setbeamertemplate{footline}[frame number]{} -% remove navigation symbols -% \setbeamertemplate{navigation symbols}{} - -\title{${1:Presentation Title}} -\author{${2:Author Name}} - -\begin{document} - -\frame[plain]{\titlepage} - -\begin{frame}[plain]{Outline} - \tableofcontents -\end{frame} - -\section{${3:Example Section}} -\begin{frame}{${4:Frame Title}} - -\end{frame} - -\end{document} diff --git a/snippets/latex-mode/begin b/snippets/latex-mode/begin deleted file mode 100644 index 038ced0..0000000 --- a/snippets/latex-mode/begin +++ /dev/null @@ -1,7 +0,0 @@ -# -*- mode: snippet -*- -# key : beg -# name : \begin{} ... \end{} -# -- -\begin{${1:$$(yas-choose-value (mapcar 'car LaTeX-environment-list))}} - $0 -\end{$1} \ No newline at end of file diff --git a/snippets/latex-mode/bib.yasnippet b/snippets/latex-mode/bib.yasnippet deleted file mode 100644 index 9dc6ad7..0000000 --- a/snippets/latex-mode/bib.yasnippet +++ /dev/null @@ -1,8 +0,0 @@ -# -*- mode: snippet -*- -# contributor: Mads D. Kristensen -# key: bib -# group: misc -# name: \bibliography -# -- -\bibliographystyle{plain} -\bibliography{$1}$0 \ No newline at end of file diff --git a/snippets/latex-mode/bigop.yasnippet b/snippets/latex-mode/bigop.yasnippet index ee03fb1..2f83c76 100644 --- a/snippets/latex-mode/bigop.yasnippet +++ b/snippets/latex-mode/bigop.yasnippet @@ -1,7 +1,8 @@ # -*- mode: snippet -*- # contributor: François Garillot -# key: bigop +# key: bop # group: math # name: \bigop_{n}^{} +# condition: (and (texmathp) 'auto) # -- \\big${1:$$(yas/choose-value '("oplus" "otimes" "odot" "cup" "cap" "uplus" "sqcup" "vee" "wedge"))}_{$2}^{$3}$0 \ No newline at end of file diff --git a/snippets/latex-mode/chastar.yasnippet b/snippets/latex-mode/chastar.yasnippet deleted file mode 100644 index d9a8bb9..0000000 --- a/snippets/latex-mode/chastar.yasnippet +++ /dev/null @@ -1,8 +0,0 @@ -# -*- mode: snippet -*- -# contributor : Mads D. Kristensen -# key : cha* -# group: sections -# name : \chapter* -# -- -\chapter*{${1:name}} -$0 \ No newline at end of file diff --git a/snippets/latex-mode/enum.yasnippet b/snippets/latex-mode/enum.yasnippet deleted file mode 100644 index 9d7e398..0000000 --- a/snippets/latex-mode/enum.yasnippet +++ /dev/null @@ -1,9 +0,0 @@ -# -*- mode: snippet -*- -# contributor : Mads D. Kristensen -# key: enum -# group: environments -# name : \begin{enumerate} ... \end{enumerate} -# -- -\begin{enumerate} -\item $0 -\end{enumerate} diff --git a/snippets/latex-mode/eq.yasnippet b/snippets/latex-mode/eq.yasnippet deleted file mode 100644 index 64be33f..0000000 --- a/snippets/latex-mode/eq.yasnippet +++ /dev/null @@ -1,10 +0,0 @@ -# -*- mode: snippet -*- -# contributor: Mads D. Kristensen -# key: eq -# group: math -# name: \begin{equation} ... \end{equation} -# -- -\begin{equation} -\label{${1:"waiting for reftex-label call..."$(unless yas/modified-p (reftex-label nil 'dont-insert))}} -$0 -\end{equation} diff --git a/snippets/latex-mode/eqs.yasnippet b/snippets/latex-mode/eqs.yasnippet deleted file mode 100644 index 1eee28c..0000000 --- a/snippets/latex-mode/eqs.yasnippet +++ /dev/null @@ -1,10 +0,0 @@ -# -*- mode: snippet -*- -# contributor: Mads D. Kristensen -# key: eqs -# group: math -# name: \begin{align} ... \end{align} -# -- -\begin{${1:$$(yas/choose-value '("align" "align*" "multline" "gather" "subequations"))}} -\label{${2:"waiting for reftex-label call..."$(unless yas/modified-p (reftex-label nil 'dont-insert))}} -$0 -\end{$1} diff --git a/snippets/latex-mode/fig.yasnippet b/snippets/latex-mode/fig.yasnippet deleted file mode 100644 index 2152c36..0000000 --- a/snippets/latex-mode/fig.yasnippet +++ /dev/null @@ -1,12 +0,0 @@ -# -*- mode: snippet -*- -# contributor : Mads D. Kristensen -# key : fig -# group: environments -# name : \begin{figure} ... \end{figure} -# -- -\begin{figure}[htbp] - \centering - $0 - \caption{${1:caption}} - \label{${2:"waiting for reftex-label call..."$(unless yas/modified-p (reftex-label nil 'dont-insert))}} -\end{figure} diff --git a/snippets/latex-mode/frame.yasnippet b/snippets/latex-mode/frame.yasnippet deleted file mode 100644 index 966e1f2..0000000 --- a/snippets/latex-mode/frame.yasnippet +++ /dev/null @@ -1,9 +0,0 @@ -# -*- mode: snippet -*- -# contributor: Claudio Marforio -# key: frame -# group: environments -# name : \begin{frame} ... \end{frame} -# -- -\begin{frame}{${1:Frame Title$(capitalize yas-text)}} -$0 -\end{frame} diff --git a/snippets/latex-mode/limit b/snippets/latex-mode/limit index 9d10f73..8afa5f3 100644 --- a/snippets/latex-mode/limit +++ b/snippets/latex-mode/limit @@ -1,7 +1,7 @@ # -*- mode: snippet -*- # name: limit # key: lim -# conditon: (texmathp) +# condition: (and (texmathp) 'auto) # group: math # -- \\lim_{${1:n} \\to ${2:\\infty}} $0 \ No newline at end of file diff --git a/snippets/latex-mode/minipage.yasnippet b/snippets/latex-mode/minipage.yasnippet deleted file mode 100644 index 447b31e..0000000 --- a/snippets/latex-mode/minipage.yasnippet +++ /dev/null @@ -1,9 +0,0 @@ -# -*- mode: snippet -*- -# contributor: Mads D. Kristensen -# key: minipage -# group: environments -# name: \begin{minipage}[position][width] ... \end{minipage} -# -- -\begin{minipage}[${1:htbp}]{${2:1.0}${3:\linewidth}} - $0 -\end{minipage} \ No newline at end of file