From 37dd411698bd6eae8365260dde39b8ae9c7cbd36 Mon Sep 17 00:00:00 2001
From: Peter Son Struschka <me@peter-struschka.com>
Date: Sun, 30 Aug 2020 20:56:36 +0800
Subject: all: overhaul, move dotfile specifics to .local/share/dotfiles and
 more

---
 doom-emacs/.config/doom/init.el                            | 13 ++++++-------
 doom-emacs/.emacs.d                                        |  2 +-
 doom-emacs/.local/bin/doom.cmd                             |  1 +
 doom-emacs/.local/share/dotfiles/edit-config.d/doom-config |  1 +
 doom-emacs/.local/share/dotfiles/edit-config.d/doom-init   |  1 +
 5 files changed, 10 insertions(+), 8 deletions(-)
 create mode 120000 doom-emacs/.local/bin/doom.cmd
 create mode 120000 doom-emacs/.local/share/dotfiles/edit-config.d/doom-config
 create mode 120000 doom-emacs/.local/share/dotfiles/edit-config.d/doom-init

(limited to 'doom-emacs')

diff --git a/doom-emacs/.config/doom/init.el b/doom-emacs/.config/doom/init.el
index 722c555..735cb8e 100644
--- a/doom-emacs/.config/doom/init.el
+++ b/doom-emacs/.config/doom/init.el
@@ -38,12 +38,11 @@
        nav-flash         ; blink the current line after jumping
        ;;neotree           ; a project drawer, like NERDTree for vim
        ophints           ; highlight the region an operation acts on
-       (popup +defaults) ; tame sudden yet inevitable temporary windows
-       ;;(pretty-code)     ; replace bits of code with pretty symbols
-       ;; +fira)
-       tabs              ; a tab bar for Emacs
-       treemacs          ; a project drawer, like neotree but cooler
-       unicode           ; extended unicode support for various languages
+       (popup +defaults)   ; tame sudden yet inevitable temporary windows
+       ;;pretty-code       ; ligatures or substitute text with pretty symbols
+       ;;tabs              ; a tab bar for Emacs
+       ;;treemacs          ; a project drawer, like neotree but cooler
+       ;;unicode           ; extended unicode support for various languages
        vc-gutter         ; vcs diff in the fringe
        vi-tilde-fringe   ; fringe tildes to mark beyond EOB
        window-select     ; visually switch windows
@@ -92,7 +91,7 @@
        (eval +overlay)   ; run code, run (also, repls)
        ;;gist              ; interacting with github gists
        lookup              ; navigate your code and its documentation
-       ;;lsp
+       lsp
        ;;macos             ; MacOS-specific commands
        magit             ; a git porcelain for Emacs
        make              ; run make tasks from Emacs
diff --git a/doom-emacs/.emacs.d b/doom-emacs/.emacs.d
index 348a2d6..b3077c9 160000
--- a/doom-emacs/.emacs.d
+++ b/doom-emacs/.emacs.d
@@ -1 +1 @@
-Subproject commit 348a2d6c6e1ce63067e8f479ca6877530600f835
+Subproject commit b3077c96258cd8569fb1523251b5823199e2433a
diff --git a/doom-emacs/.local/bin/doom.cmd b/doom-emacs/.local/bin/doom.cmd
new file mode 120000
index 0000000..c8f7159
--- /dev/null
+++ b/doom-emacs/.local/bin/doom.cmd
@@ -0,0 +1 @@
+../../.emacs.d/bin/doom.cmd
\ No newline at end of file
diff --git a/doom-emacs/.local/share/dotfiles/edit-config.d/doom-config b/doom-emacs/.local/share/dotfiles/edit-config.d/doom-config
new file mode 120000
index 0000000..b8b8295
--- /dev/null
+++ b/doom-emacs/.local/share/dotfiles/edit-config.d/doom-config
@@ -0,0 +1 @@
+../../../../.config/doom/config.org
\ No newline at end of file
diff --git a/doom-emacs/.local/share/dotfiles/edit-config.d/doom-init b/doom-emacs/.local/share/dotfiles/edit-config.d/doom-init
new file mode 120000
index 0000000..596c3f8
--- /dev/null
+++ b/doom-emacs/.local/share/dotfiles/edit-config.d/doom-init
@@ -0,0 +1 @@
+../../../../.config/doom/init.el
\ No newline at end of file
-- 
cgit v1.2.3