From 5a96c38883409f1e2844e78ba8f9f3942244eceb Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Thu, 20 Dec 2018 09:18:28 -0500 Subject: [PATCH] [emacs] remove slack and most of its deps except alert and ht which may come in handy later --- .gitmodules | 21 ------------- init.org | 84 +++++++++++++++++++++++++-------------------------- lib/circe | 1 - lib/deferred | 1 - lib/emojify | 1 - lib/oauth2 | 1 - lib/request | 1 - lib/slack | 1 - lib/websocket | 1 - 9 files changed, 42 insertions(+), 70 deletions(-) delete mode 160000 lib/circe delete mode 160000 lib/deferred delete mode 160000 lib/emojify delete mode 160000 lib/oauth2 delete mode 160000 lib/request delete mode 160000 lib/slack delete mode 160000 lib/websocket diff --git a/.gitmodules b/.gitmodules index 1402da1..ac00f35 100644 --- a/.gitmodules +++ b/.gitmodules @@ -32,9 +32,6 @@ [submodule "boxquote"] path = lib/boxquote url = git@github.com:davep/boxquote.el.git -[submodule "circe"] - path = lib/circe - url = git@github.com:jorgenschaefer/circe.git [submodule "closql"] path = lib/closql url = git@github.com:emacscollective/closql.git @@ -55,9 +52,6 @@ # that the submodule is dirty. so, let's ignore the untracked # files of dash's submodule ignore = untracked -[submodule "deferred"] - path = lib/deferred - url = git@github.com:kiwanami/emacs-deferred.git [submodule "diff-hl"] path = lib/diff-hl url = git@github.com:dgutov/diff-hl.git @@ -83,9 +77,6 @@ [submodule "emmet-mode"] path = lib/emmet-mode url = git@github.com:smihica/emmet-mode.git -[submodule "emojify"] - path = lib/emojify - url = git@github.com:iqbalansari/emacs-emojify.git [submodule "epkg"] path = lib/epkg url = git@github.com:emacscollective/epkg.git @@ -207,9 +198,6 @@ [submodule "no-littering"] path = lib/no-littering url = git@github.com:emacscollective/no-littering.git -[submodule "oauth2"] - path = lib/oauth2 - url = git@github.com:emacsmirror/oauth2.git [submodule "org"] path = lib/org url = git@code.orgmode.org:bzg/org-mode.git @@ -254,9 +242,6 @@ [submodule "proof-site"] # Proof General path = lib/proof-site url = git@github.com:ProofGeneral/PG.git -[submodule "request"] - path = lib/request - url = git@github.com:tkf/emacs-request.git [submodule "rich-minority"] path = lib/rich-minority url = git@github.com:Malabarba/rich-minority.git @@ -272,9 +257,6 @@ [submodule "shut-up"] path = lib/shut-up url = git@github.com:cask/shut-up.git -[submodule "slack"] - path = lib/slack - url = git@github.com:yuya373/emacs-slack.git [submodule "smex"] # used by counsel-M-x path = lib/smex url = git@github.com:nonsequitur/smex.git @@ -299,9 +281,6 @@ [submodule "web-mode"] path = lib/web-mode url = git@github.com:fxbois/web-mode.git -[submodule "websocket"] - path = lib/websocket - url = git@github.com:ahyatt/emacs-websocket.git [submodule "which-key"] path = lib/which-key url = git@github.com:justbur/emacs-which-key.git diff --git a/init.org b/init.org index 5a163e3..36bcc59 100644 --- a/init.org +++ b/init.org @@ -2012,7 +2012,47 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. :hook (text-mode . typo-mode)) #+end_src -** slack +** hl-todo + +#+begin_src emacs-lisp +(use-package hl-todo + :defer 4 + :config + (global-hl-todo-mode)) +#+end_src + +** shrink-path + +#+begin_src emacs-lisp +(use-package shrink-path + :after eshell + :config + (setq eshell-prompt-regexp "\\(.*\n\\)*λ " + eshell-prompt-function #'+eshell/prompt) + + (defun +eshell/prompt () + (let ((base/dir (shrink-path-prompt default-directory))) + (concat (propertize (car base/dir) + 'face 'font-lock-comment-face) + (propertize (cdr base/dir) + 'face 'font-lock-constant-face) + (propertize (+eshell--current-git-branch) + 'face 'font-lock-function-name-face) + "\n" + (propertize "λ" 'face 'eshell-prompt-face) + ;; needed for the input text to not have prompt face + (propertize " " 'face 'default)))) + + (defun +eshell--current-git-branch () + (let ((branch (car (loop for match in (split-string (shell-command-to-string "git branch") "\n") + when (string-match "^\*" match) + collect match)))) + (if (not (eq branch nil)) + (concat " " (substring branch 2)) + "")))) +#+end_src + +** COMMENT slack :ARCHIVE: Hopefully temporary. @@ -2077,47 +2117,7 @@ Hopefully temporary. (setq alert-default-style 'notifier)) #+end_src -** hl-todo - -#+begin_src emacs-lisp -(use-package hl-todo - :defer 4 - :config - (global-hl-todo-mode)) -#+end_src - -** shrink-path - -#+begin_src emacs-lisp -(use-package shrink-path - :after eshell - :config - (setq eshell-prompt-regexp "\\(.*\n\\)*λ " - eshell-prompt-function #'+eshell/prompt) - - (defun +eshell/prompt () - (let ((base/dir (shrink-path-prompt default-directory))) - (concat (propertize (car base/dir) - 'face 'font-lock-comment-face) - (propertize (cdr base/dir) - 'face 'font-lock-constant-face) - (propertize (+eshell--current-git-branch) - 'face 'font-lock-function-name-face) - "\n" - (propertize "λ" 'face 'eshell-prompt-face) - ;; needed for the input text to not have prompt face - (propertize " " 'face 'default)))) - - (defun +eshell--current-git-branch () - (let ((branch (car (loop for match in (split-string (shell-command-to-string "git branch") "\n") - when (string-match "^\*" match) - collect match)))) - (if (not (eq branch nil)) - (concat " " (substring branch 2)) - "")))) -#+end_src - -** COMMENT magithub +** COMMENT magithub :ARCHIVE: For when I /have to/ use GH. diff --git a/lib/circe b/lib/circe deleted file mode 160000 index fedfa7e..0000000 --- a/lib/circe +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fedfa7eb8516a53fa70b6a1f4fce4b5ab66ea91f diff --git a/lib/deferred b/lib/deferred deleted file mode 160000 index 2239671..0000000 --- a/lib/deferred +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2239671d94b38d92e9b28d4e12fd79814cfb9c16 diff --git a/lib/emojify b/lib/emojify deleted file mode 160000 index 38ae28d..0000000 --- a/lib/emojify +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 38ae28d95b58e9fb86a3495a2dda3e5de254c4fc diff --git a/lib/oauth2 b/lib/oauth2 deleted file mode 160000 index 1d352b3..0000000 --- a/lib/oauth2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1d352b3dcd186d93bce7baf26818967c022187e4 diff --git a/lib/request b/lib/request deleted file mode 160000 index db88fd2..0000000 --- a/lib/request +++ /dev/null @@ -1 +0,0 @@ -Subproject commit db88fd21d25399ff9940c208173665b12493992b diff --git a/lib/slack b/lib/slack deleted file mode 160000 index 3f76747..0000000 --- a/lib/slack +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3f76747d7424b0746b5397aab5c9ab5a79bba470 diff --git a/lib/websocket b/lib/websocket deleted file mode 160000 index 0d96ba2..0000000 --- a/lib/websocket +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0d96ba2ff5a25c6cd6c66f417cc9b5f38a4308ba -- 2.20.1