summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules21
-rw-r--r--init.org84
m---------lib/circe0
m---------lib/deferred0
m---------lib/emojify0
m---------lib/oauth20
m---------lib/request0
m---------lib/slack0
m---------lib/websocket0
9 files changed, 42 insertions, 63 deletions
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
-Subproject fedfa7eb8516a53fa70b6a1f4fce4b5ab66ea91
diff --git a/lib/deferred b/lib/deferred
deleted file mode 160000
-Subproject 2239671d94b38d92e9b28d4e12fd79814cfb9c1
diff --git a/lib/emojify b/lib/emojify
deleted file mode 160000
-Subproject 38ae28d95b58e9fb86a3495a2dda3e5de254c4f
diff --git a/lib/oauth2 b/lib/oauth2
deleted file mode 160000
-Subproject 1d352b3dcd186d93bce7baf26818967c022187e
diff --git a/lib/request b/lib/request
deleted file mode 160000
-Subproject db88fd21d25399ff9940c208173665b12493992
diff --git a/lib/slack b/lib/slack
deleted file mode 160000
-Subproject 3f76747d7424b0746b5397aab5c9ab5a79bba47
diff --git a/lib/websocket b/lib/websocket
deleted file mode 160000
-Subproject 0d96ba2ff5a25c6cd6c66f417cc9b5f38a4308b