From bd949936d57a6b796706c832b9a1fb5286771d9b Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 25 May 2021 16:39:15 +0300
Subject: [PATCH] emacs: use chemacs2

---
 deploy.sh                             | 6 +++---
 home/.bashrc-bloated                  | 2 +-
 home/.config/chemacs/profiles.el      | 2 ++
 home/.config/doom/config.el           | 2 ++
 home/.config/doom/packages.el         | 2 +-
 home/.config/fish/conf.d/aliases.fish | 2 +-
 home/.config/zsh/aliases.zsh          | 2 +-
 7 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 home/.config/chemacs/profiles.el

diff --git a/deploy.sh b/deploy.sh
index 9c94f90..b095aab 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -23,13 +23,11 @@ case ${shell} in
     ;;
   zsh)
     cp -rfv ./home/.bashrc           ~/.bashrc
-    cp -rfv ./home/.bash_profile     ~/.bash_profile
     cp -rfv ./home/.config/zsh/      ~/.config/zsh/
     cp -rfv ./home/.local/share/zsh/ ~/.local/share/zsh/
     ;;
   fish)
     cp -rfv ./home/.bashrc       ~/.bashrc
-    cp -rfv ./home/.bash_profile ~/.bash_profile
     cp -rfv ./home/.config/fish/ ~/.config/fish/
     ;;
   *)
@@ -98,6 +96,7 @@ cp -rfv ./home/.config/aria2/            ~/.config/aria2/
 cp -rfv ./home/.config/bat/              ~/.config/bat/
 cp -rfv ./home/.config/bottom/           ~/.config/bottom/
 cp -rfv ./home/.config/cava/             ~/.config/cava/
+cp -rfv ./home/.config/chemacs/          ~/.config/chemacs/
 cp -rfv ./home/.config/cht.sh/           ~/.config/cht.sh/
 cp -rfv ./home/.config/cointop/          ~/.config/cointop/
 cp -rfv ./home/.config/doom/             ~/.config/doom/
@@ -140,7 +139,8 @@ cp -rfv ./home/.local/share/gnupg/       ~/.local/share/gnupg/
 echo "
 ~~~ Cloning submodules ~~~
 "
-[ -d ~/.config/emacs ] || git clone https://github.com/hlissner/doom-emacs ~/.config/emacs
+[ -d ~/.config/emacs ] || git clone https://github.com/plexus/chemacs2 ~/.config/emacs
+[ -d ~/.config/emacs-config/doom ] || git clone https://github.com/hlissner/doom-emacs ~/.config/emacs-config/doom
 [ -d ~/.config/tmux/plugins/tpm ] || git clone https://github.com/tmux-plugins/tpm ~/.config/tmux/plugins/tpm
 [ -d ~/.config/ranger/plugins/ranger_devicons ] || git clone https://github.com/FollieHiyuki/ranger_devicons ~/.config/ranger/plugins/ranger_devicons
 
diff --git a/home/.bashrc-bloated b/home/.bashrc-bloated
index 669b6ad..24acd89 100644
--- a/home/.bashrc-bloated
+++ b/home/.bashrc-bloated
@@ -400,7 +400,7 @@ alias ip="ip -color=always"
 alias v="nvim"
 alias vi='fzf | xargs -r nvim -o'
 # emacs
-alias doom="$HOME/.config/emacs/bin/doom"
+alias doom="$HOME/.config/emacs-config/doom/bin/doom"
 alias e="emacs -nw"
 alias em="emacsclient -c -a 'emacs'"
 # rsync
diff --git a/home/.config/chemacs/profiles.el b/home/.config/chemacs/profiles.el
new file mode 100644
index 0000000..415bb73
--- /dev/null
+++ b/home/.config/chemacs/profiles.el
@@ -0,0 +1,2 @@
+(("default" . ((user-emacs-directory . "~/.config/emacs-config/doom")))
+ ("myconfig" . ((user-emacs-directory . "~/.config/emacs-config/myconfig"))))
diff --git a/home/.config/doom/config.el b/home/.config/doom/config.el
index 1728b52..128e278 100644
--- a/home/.config/doom/config.el
+++ b/home/.config/doom/config.el
@@ -76,6 +76,8 @@
     '(mode-line-inactive :height 0.98))
   (setq doom-modeline-major-mode-icon t
         doom-modeline-major-mode-color-icon t
+        doom-modeline-buffer-encoding t
+        doom-modeline-enable-word-count t
         doom-modeline-unicode-fallback t))
 (custom-set-faces!
   '(doom-modeline-buffer-modified :foreground "orange"))
diff --git a/home/.config/doom/packages.el b/home/.config/doom/packages.el
index d760131..c30b2ce 100644
--- a/home/.config/doom/packages.el
+++ b/home/.config/doom/packages.el
@@ -69,7 +69,7 @@
 (package! license-templates)
 (package! keycast)
 (package! eshell-info-banner
-  :recipe (:host github :repo "phundrak/eshell-info-banner.el"))
+  :recipe (:host github :repo "Phundrak/eshell-info-banner.el"))
 ;;(package! gemini-mode)
 ;;(package! page-break-lines)
 ;;(package! vlf)
diff --git a/home/.config/fish/conf.d/aliases.fish b/home/.config/fish/conf.d/aliases.fish
index 2017938..ec7fcc5 100644
--- a/home/.config/fish/conf.d/aliases.fish
+++ b/home/.config/fish/conf.d/aliases.fish
@@ -30,7 +30,7 @@ alias ip='ip -color=always'
 abbr v nvim
 abbr vi 'fzf | xargs -r nvim -o'
 # emacs
-alias doom='$HOME/.config/emacs/bin/doom'
+alias doom='$HOME/.config/emacs-config/doom/bin/doom'
 abbr e 'emacs -nw'
 abbr em "emacsclient -c -a 'emacs'"
 # rsync
diff --git a/home/.config/zsh/aliases.zsh b/home/.config/zsh/aliases.zsh
index edb9e7f..0af5cab 100644
--- a/home/.config/zsh/aliases.zsh
+++ b/home/.config/zsh/aliases.zsh
@@ -23,7 +23,7 @@ alias ip="ip -color=always"
 alias v="nvim"
 alias vi='fzf | xargs -r nvim -o'
 # emacs
-alias doom="$HOME/.config/emacs/bin/doom"
+alias doom="$HOME/.config/emacs-config/doom/bin/doom"
 alias e="emacs -nw"
 alias em="emacsclient -c -a 'emacs'"
 # rsync