Remove useless code

diff --git a/eh-basic.el b/eh-basic.el
index 8adc02b..1dbfb92 100644 (file)
--- a/eh-basic.el
+++ b/eh-basic.el
@@ -385,14 +385,6 @@
 (require 'pyim-basedict)
 (pyim-basedict-enable)
 
-;; ;; liberime
-;; (setq liberime-auto-build t)
-;; (require 'liberime nil t)
-;; (require 'pyim-liberime nil t)
-;; (with-eval-after-load "liberime"
-;;   (liberime-try-select-schema "luna_pinyin_simp")
-;;   (pyim-default-scheme 'rime-quanpin))
-
 ;; ** calendar
 (require 'calendar)
 (require 'cal-china-x)
@@ -403,57 +395,6 @@
 ;; 一周第一天，0表示星期天, 1表示星期一
 (setq calendar-week-start-day 0)
 
-(setq calendar-holidays
-      '(;;公历节日
-        (holiday-fixed 1 1 "元旦")
-        (holiday-fixed 2 14 "情人节")
-        (holiday-fixed 3 8 "妇女节")
-        (holiday-fixed 3 14 "白色情人节")
-        (holiday-fixed 4 1 "愚人节")
-        (holiday-fixed 5 1 "劳动节")
-        (holiday-fixed 5 4 "青年节")
-        (holiday-float 5 0 2 "母亲节")
-        (holiday-fixed 6 1 "儿童节")
-        (holiday-float 6 0 3 "父亲节")
-        (holiday-fixed 9 10 "教师节")
-        (holiday-fixed 10 1 "国庆节")
-        (holiday-fixed 10 24 "程序员节")
-        (holiday-fixed 12 25 "圣诞节")
-        ;; 农历节日
-        (holiday-lunar 1 1 "春节" 0)
-        (holiday-lunar 1 2 "春节" 0)
-        (holiday-lunar 1 3 "春节" 0)
-        (holiday-lunar 1 15 "元宵节" 0)
-        (holiday-solar-term "清明" "清明节")
-        (holiday-solar-term "小寒" "小寒")
-        (holiday-solar-term "大寒" "大寒")
-        (holiday-solar-term "立春" "立春")
-        (holiday-solar-term "雨水" "雨水")
-        (holiday-solar-term "惊蛰" "惊蛰")
-        (holiday-solar-term "春分" "春分")
-        (holiday-solar-term "谷雨" "谷雨")
-        (holiday-solar-term "立夏" "立夏")
-        (holiday-solar-term "小满" "小满")
-        (holiday-solar-term "芒种" "芒种")
-        (holiday-solar-term "夏至" "夏至")
-        (holiday-solar-term "小暑" "小暑")
-        (holiday-solar-term "大暑" "大暑")
-        (holiday-solar-term "立秋" "立秋")
-        (holiday-solar-term "处暑" "处暑")
-        (holiday-solar-term "白露" "白露")
-        (holiday-solar-term "秋分" "秋分")
-        (holiday-solar-term "寒露" "寒露")
-        (holiday-solar-term "霜降" "霜降")
-        (holiday-solar-term "立冬" "立冬")
-        (holiday-solar-term "小雪" "小雪")
-        (holiday-solar-term "大雪" "大雪")
-        (holiday-solar-term "冬至" "冬至")
-        (holiday-lunar 5 5 "端午节" 0)
-        (holiday-lunar 8 15 "中秋节" 0)
-        (holiday-lunar 7 7 "七夕情人节" 0)
-        (holiday-lunar 12 8 "腊八节" 0)
-        (holiday-lunar 9 9 "重阳节" 0)))
-
 (setq calendar-month-name-array
       ["一月" "二月" "三月" "四月" "五月" "六月"
        "七月" "八月" "九月" "十月" "十一月" "十二月"])
@@ -461,16 +402,6 @@
 (setq calendar-day-name-array
       ["周日" "周一" "周二" "周三" "周四" "周五" "周六"])
 
-(defun eh-org-chinese-anniversary (year lunar-month lunar-day &optional mark)
-  (if year
-      (let* ((d-date (diary-make-date lunar-month lunar-day year))
-             (a-date (calendar-absolute-from-gregorian d-date))
-             (c-date (calendar-chinese-from-absolute a-date))
-             (cycle (car c-date))
-             (yy (cadr c-date))
-             (y (+ (* 100 cycle) yy)))
-        (diary-chinese-anniversary lunar-month lunar-day y mark))
-    (diary-chinese-anniversary lunar-month lunar-day year mark)))
 
 ;; * Footer
 (provide 'eh-basic)

diff --git a/eh-emms.el b/eh-emms.el
deleted file mode 100644 (file)
index d6d9d24..0000000
--- a/eh-emms.el
+++ /dev/null
@@ -1,261 +0,0 @@
-;;; eh-emms.el --- Tumashu's emacs configuation   -*- lexical-binding: t; -*-
-
-;; * Header
-;; Copyright (c) 2011-2019, Feng Shu
-
-;; Author: Feng Shu <[email protected]>
-;; URL: https://github.com/tumashu/emacs-helper
-;; Version: 0.0.1
-
-;; This file is not part of GNU Emacs.
-
-;;; License:
-
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License
-;; as published by the Free Software Foundation; either version 3
-;; of the License, or (at your option) any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; * 简介                                                  :README:
-;;  这个文件是tumashu个人专用的emacs配置文件，emacs中文用户可以参考。
-
-;;; Code:
-
-;; * 代码                                                      :code:
-(require 'emms)
-(require 'emms-setup)
-(require 'emms-info-exiftool)
-(require 'emms-info-native)
-(require 'emms-browser)
-
-(emms-all)
-(emms-default-players)
-(emms-cache 1)
-
-(global-set-key (kbd "<f12>") 'emms-smart-browse)
-(global-set-key (kbd "<f11>") 'emms-next)
-(global-set-key (kbd "<f10>") 'emms-pause)
-
-;; "+" 按起来麻烦，用 = 省事。
-(define-key emms-playlist-mode-map (kbd "=") 'emms-volume-raise)
-(define-key emms-browser-mode-map (kbd "=") 'emms-volume-raise)
-
-(setq emms-directory (concat user-emacs-directory "emms"))
-
-(setq emms-source-file-default-directory
-      (or emms-source-file-default-directory
-          (concat (file-name-as-directory emms-directory) "music")))
-
-(when (file-writable-p "~")
-  (unless (file-directory-p emms-directory)
-    (make-directory
-     (file-name-as-directory emms-directory) t))
-
-  (unless (file-directory-p emms-source-file-default-directory)
-    (make-directory
-     (file-name-as-directory
-      emms-source-file-default-directory)
-     t)))
-
-;; 设定EMMS主模式为 Playlist 模式
-(setq emms-playlist-default-major-mode 'emms-playlist-mode)
-
-;; 修复播放完后的 BUG
-(setq emms-player-next-function 'emms-next-noerror)
-
-;; 设定音轨初始化信息
-(add-to-list 'emms-track-initialize-functions
-             'emms-info-initialize-track)
-
-;; 关闭 EMMS 信息异步模式
-(setq emms-info-asynchronously nil)
-
-;; 设定 EMMS 启动列表循环播放
-(setq emms-repeat-playlist t)
-
-;; 排序方法: 艺术家 -> 专辑 -> 序号
-(setq emms-playlist-sort-function
-      'emms-playlist-sort-by-natural-order)
-
-;; 在 minibuffer 中显示播放信息 (emms-show)
-(setq emms-show-format "正在播放:%s")
-(add-hook 'emms-player-started-hook #'emms-show)
-
-;; 不在 mode-line 中显示播放信息
-(require 'emms-mode-line)
-(emms-mode-line-mode -1)
-
-;; 如何显示 track
-(setq emms-track-description-function
-      #'eh-emms-track-simple-description)
-
-(defun eh-emms-track-simple-description (track)
-  (let* ((type (emms-track-type track))
-         (string (cond ((eq 'file type)
-                        (emms-track-name track))
-                       ((eq 'url type)
-                        (emms-format-url-track-name (emms-track-name track)))
-                       (t (concat (symbol-name type)
-                                  ": " (emms-track-name track))))))
-    (with-temp-buffer
-      (insert (concat "  ♪ " string))
-      (eh-emms-wash-buffer)
-      (buffer-string))))
-
-;; Playlist 清洗功能
-(defvar eh-emms-wash-config nil)
-
-(defun eh-emms-wash-buffer ()
-  (dolist (x eh-emms-wash-config)
-    (goto-char (point-min))
-    (while (re-search-forward
-            (if (nth 2 x)
-                (nth 0 x)
-              (regexp-quote (nth 0 x)))
-            nil t)
-      (replace-match (propertize (nth 1 x) 'face (text-properties-at (point))) nil t))))
-
-(defun eh-emms-wash-config ()
-  (interactive)
-  (let ((str1 (read-string "请输入需清洗的字符串："))
-        (str2 (read-string "请输入清洗成的字符串："))
-        (regexp-p (y-or-n-p "是否将待清洗的字符串作为 regexp 处理? ")))
-    (when (> (length str1) 0)
-      (push (list str1 str2 regexp-p) eh-emms-wash-config))
-    (customize-save-variable
-     'eh-emms-wash-config
-     (delete-dups eh-emms-wash-config))
-    (with-current-emms-playlist
-      (eh-emms-wash-buffer))))
-
-;; 显示歌词
-(require 'emms-lyrics)
-(emms-lyrics 1)
-
-;; Track information
-;; 1. emms-info-exiftool 使用 perl 程序 exiftool, 速度比较慢但兼容性很好。
-;; 2. emms-info-native 是用 elisp 实现的，安装比较省事，速度还可以。
-
-;; (setq emms-info-functions '(emms-info-exiftool))
-(setq emms-info-functions '(eh-emms-info-native))
-
-(defun eh-emms-info-native (track)
-  (let ((file (emms-track-name track)))
-    (condition-case nil
-        (emms-info-native track)
-      (error (message "EMMS: 无法从 %S 中读取音乐信息." file)))))
-
-;; 设置 Playlist 的显示方式
-(setq emms-last-played-format-alist
-      '(((emms-last-played-seconds-today) . "%H:%M")
-        (604800                           . "%H:%M")
-        ((emms-last-played-seconds-month) . "%d")
-        ((emms-last-played-seconds-year)  . "%m-%d")
-        (t                                . "%Y")))
-
-;; 设置 EMMS 浏览器, 默认显示方式为: 显示所有
-(emms-browser-set-filter (assoc "EVERYTHING" emms-browser-filters))
-
-;; filter: 显示所有
-(emms-browser-make-filter "EVERYTHING" 'ignore)
-
-;; filter: 只显示文件
-(emms-browser-make-filter
- "ALL-FILES"
- (emms-browser-filter-only-type 'file))
-
-;; filter: 最近一个星期播放的
-(emms-browser-make-filter
- "LAST-WEEK"
- (emms-browser-filter-only-recent 7))
-
-;; filter: 最近一个月都没有播放的
-(emms-browser-make-filter
- "LAST-MONTH-NOT-PLAYED"
- (lambda (track)
-   (not (funcall (emms-browser-filter-only-recent 30) track))))
-
-;; 设置 emms browser 和 playlist 中音乐的显示格式
-
-(defun eh-emms-browser-format-line (orig_func bdata &optional target)
-  (let* ((type (emms-browser-bdata-type bdata))
-         (level (emms-browser-bdata-level bdata))
-         (indent (emms-browser-make-indent level))
-         (str (funcall orig_func bdata target)))
-    ;; 删除原来函数添加的 " ", 不然 playlist 对齐不好处理。
-    (when (and (eq type 'info-title)
-               (not (string= indent "")))
-      (setq str (string-remove-prefix " " str)))
-    str))
-
-(advice-add 'emms-browser-format-line :around #'eh-emms-browser-format-line)
-
-(defvar emms-browser-info-year-format      "%i+ %n")
-(defvar emms-browser-info-genre-format     "%i+ %n")
-(defvar emms-browser-info-performer-format "%i+ %n")
-(defvar emms-browser-info-composer-format  "%i+ %n")
-(defvar emms-browser-info-artist-format    "%i* %n")
-(defvar emms-browser-info-album-format     "%i- %n")
-(defvar emms-browser-info-title-format     "%i♪ %n")
-(defvar emms-browser-playlist-info-year-format      "%i%n")
-(defvar emms-browser-playlist-info-genre-format     "%i%n")
-(defvar emms-browser-playlist-info-performer-format "%i%n")
-(defvar emms-browser-playlist-info-composer-format  "%i%n")
-(defvar emms-browser-playlist-info-artist-format    "%i%n")
-(defvar emms-browser-playlist-info-album-format     "%i%n")
-(defvar emms-browser-playlist-info-title-format     "  ♪ %n")
-
-(defun eh-emms-browser-wash-playlist (&optional _)
-  "简化 playlist, emms-browser 默认生成的 playlist 有缩进，看起来太花。"
-  (with-current-emms-playlist
-    (eh-emms-wash-buffer)
-    (goto-char (point-max))))
-
-(add-hook 'emms-browser-tracks-added-hook #'eh-emms-browser-wash-playlist)
-
-;; 使用类似 org-mode 的快捷键
-(define-key emms-browser-mode-map (kbd "<tab>") 'emms-browser-toggle-subitems-recursively)
-(define-key emms-browser-mode-map (kbd "<backtab>") 'emms-browser-toggle-subitems-recursively)
-(define-key emms-browser-mode-map (kbd "C-c C-c") 'emms-browser-add-tracks-and-play)
-
-;; 加载 playlist 历史
-(require 'emms-history)
-(require 'emms-tag-editor)
-
-(add-hook 'after-init-hook #'emms-history-load)
-
-(setq emms-tag-editor-pipe-config
-      '(("处理MP3中文标签乱码 (mid3iconv -e gbk <file>)"
-         :command "mid3iconv"
-         :arguments ("-e" "gbk" name))
-        ("Test1 (echo -a <name> -c <name>)"
-         :command "echo"
-         :arguments (("-a" name) ("-b" name1) ("-c" name)))
-        ("Test2 (echo <artist>-<title>)"
-         :command "echo"
-         :arguments
-         (lambda (track)
-           (list (format "%s-%s"
-                         (emms-track-get track 'info-artist)
-                         (emms-track-get track 'info-title)))))))
-
-;; * Footer
-(provide 'eh-emms)
-
-;; Local Variables:
-;; coding: utf-8-unix
-;; End:
-
-;;; eh-emms.el ends here

diff --git a/eh-guix.el b/eh-guix.el
index cfac5c3..0699f09 100644 (file)
--- a/eh-guix.el
+++ b/eh-guix.el
@@ -61,53 +61,6 @@
 ;; ** Enable guix-devel-mode
 (add-hook 'scheme-mode-hook #'guix-devel-mode)
 
-;; ** Let geiser-guile use guix repl.
-(defun eh-guix-get-guile-load-path ()
-  "Get guile load-path from GUIX_PACKAGE_PATH environment."
-  (when-let* ((path-str (getenv "GUIX_PACKAGE_PATH"))
-              (length (> (length path-str) 0))
-              (paths (split-string path-str ":")))
-    (mapcan (lambda (path)
-              (list "-L" (substitute-in-file-name path)))
-            paths)))
-
-(setq geiser-guile-binary
-      `("guix" "repl"
-        ,@(eh-guix-get-guile-load-path)))
-
-;; ** Do not auto load paths to guile %load-path.
-(defun eh-geiser-guile--startup (remote)
-  "Advice function of `geiser-guile--startup'.
-Do not deal with `geiser-guile-load-path'."
-  (geiser-guile--set-up-error-links)
-  (let ((geiser-log-verbose t))
-    (when (or geiser-guile--conn-address remote)
-      (geiser-guile--set-geiser-load-path))
-    (geiser-guile--set-up-declarative-modules)
-    (geiser-guile--set-up-backtrace)
-    (geiser-eval--send/wait ",use (geiser emacs)\n'done")
-    (geiser-eval--send/wait ",use (guix)\n'done")
-    (geiser-eval--send/wait ",use (guix gexp)\n'done")
-    (geiser-eval--send/wait ",use (guix store)\n'done")
-    (geiser-eval--send/wait ",use (guix packages)\n'done")
-    (geiser-eval--send/wait ",use (guix derivations)\n'done")
-    (geiser-guile-update-warning-level)))
-
-(defun eh-geiser-guile--parameters (orig-func &rest args)
-  "Advice function of `geiser-guile--parameters'.
-Do not handle `geiser-guile-load-path'."
-  (let ((geiser-guile-load-path nil))
-    (apply orig-func args)))
-
-;; NOTE: geiser and geiser-guile will auto add project path,
-;; `geiser-guile-load-path' in dir-local.el and path of current-buffer
-;; to guile %load-path, this could lead to potential confusion for
-;; guix new developer. DISABLE THIS FEATURE, we just use
-;; GUIX_PACKAGE_PATH environment and 'guix repl' to handle %load-path.
-(setq geiser-repl-add-project-paths nil)
-(advice-add 'geiser-guile--startup :override #'eh-geiser-guile--startup)
-(advice-add 'geiser-guile--parameters :around #'eh-geiser-guile--parameters)
-
 ;; ** Get guix checkout directory.
 (defun eh-guix-dir ()
   "Get guix checkout directory created by guix pull."

diff --git a/eh-installer.el b/eh-installer.el
index f61a830..cce6050 100644 (file)
--- a/eh-installer.el
+++ b/eh-installer.el
@@ -17,8 +17,8 @@
            adaptive-wrap aggressive-indent
            cal-china-x cnfonts
            company company-posframe
-           consult eat ebdb
-           ebdb-i18n-chn el2org emms
+           consult ebdb
+           ebdb-i18n-chn
            flycheck geiser-guile guix
            magit marginalia markdown-mode
            modus-themes orderless

diff --git a/eh-misc.el b/eh-misc.el
index 82b765b..642ee24 100644 (file)
--- a/eh-misc.el
+++ b/eh-misc.el
@@ -35,10 +35,6 @@
 
 ;; * 代码                                                      :code:
 
-;; ** emacs-eat
-(require 'eat)
-(eat-eshell-mode 1)
-
 ;; ** projectile
 (require 'projectile)
 (global-set-key (kbd "C-x F") 'projectile-find-file)
@@ -81,9 +77,6 @@
 (define-key cnfonts-mode-map (kbd "C--") 'cnfonts-decrease-fontsize)
 (define-key cnfonts-mode-map (kbd "C-=") 'cnfonts-increase-fontsize)
 
-;; ** el2org
-(require 'el2org)
-
 ;; ** EPG
 (require 'epg)
 ;; 1. Put the below to your ~/.gnupg/gpg-agent.conf:
@@ -94,9 +87,6 @@
 ;; 4. (pinentry-start)
 (setq epg-pinentry-mode 'loopback)
 
-;; ** emms
-(require 'eh-emms)
-
 ;; ** aggressive-indent
 (require 'aggressive-indent)