From c46c2d8c04ed0a084c6ffdcbe51f207ecf64494f Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 31 Mar 2021 16:14:13 +0300
Subject: [PATCH] Various changes

---
 home/.config/doom/config.el             | 59 +++++++++++++++++++++++++
 home/.config/doom/exwm.el               | 59 -------------------------
 home/.config/doom/packages.el           |  1 +
 home/.config/fish/conf.d/env.fish       |  2 +-
 home/.config/mako/config                |  2 +-
 home/.config/nvim/vim-plug/vim-plug.vim |  1 +
 6 files changed, 63 insertions(+), 61 deletions(-)

diff --git a/home/.config/doom/config.el b/home/.config/doom/config.el
index 29fdff8..1d8bc58 100644
--- a/home/.config/doom/config.el
+++ b/home/.config/doom/config.el
@@ -221,6 +221,65 @@
   (setq magit-diff-refine-hunk 'all))
 ;;(add-hook 'magit-mode-hook (lambda () (magit-delta-mode +1)))
 
+;; Elfeed
+(setq rmh-elfeed-org-files (list (expand-file-name "elfeed.org" doom-private-dir)))
+;;(add-hook! 'elfeed-search-mode-hook 'elfeed-update)
+
+;; Elpher
+(defun elpher--init-hook ()
+  (setq visual-fill-column-center-text t)
+  (visual-fill-column-mode 1))
+(use-package! elpher
+  :defer t
+  :config
+  (setq elpher-use-tls t
+        elpher-auto-disengage-TLS t
+        elpher-connection-timeout 10
+        elpher-gemini-max-fill-width 80
+        elpher-gemini-TLS-cert-checks nil)
+  (add-hook 'elpher-mode-hook 'elpher--init-hook))
+
+;; mu4e
+(use-package! mu4e
+  :commands mu4e mu4e-compose-new
+  :config
+  (setq mu4e-update-interval (* 10 60)
+        mu4e-view-image-max-width 600
+        mu4e-context-policy 'always-ask
+        mu4e-compose-context-policy 'always-ask
+        mu4e-index-cleanup nil
+        mu4e-index-lazy-check t))
+(set-email-account! "Gmail"
+  '((mu4e-sent-folder       . "/[Gmail]/Sent Mail")
+    (mu4e-drafts-folder     . "/[Gmail]/Drafts")
+    (mu4e-trash-folder      . "/[Gmail]/Trash")
+    (mu4e-refile-folder     . "/[Gmail]/All Mail")
+    (smtpmail-smtp-user     . "example@gmail.com")
+    (smtpmail-smtp-server   . "smtp.gmail.com")
+    (smtpmail-smtp-service  . 465)
+    (smtpmail-stream-type   . ssl)
+    (user-full-name         . "FGoogle")
+    (user-mail-address      . "example@gmail.com")
+    (mu4e-compose-signature . "---\nfgoogle"))
+  t)
+
+;; circe
+(defun my-fetch-password (&rest params)
+  (require 'auth-source)
+  (let ((match (car (apply #'auth-source-search params))))
+    (if match
+        (let ((secret (plist-get match :secret)))
+          (if (functionp secret)
+              (funcall secret)
+            secret))
+      (error "Password not found for %S" params))))
+(set-irc-server! "chat.freenode.net"
+  '(:tls t
+    :port 6697
+    :nick "FollieHiyuki"
+    :sasl-password (my-fetch-password :user "FollieHiyuki" :host "irc.freenode.net")
+    :channels ("#voidlinux" "#river" "#archlinux" "#nixos")))
+
 ;; Here are some additional functions/macros that could help you configure Doom:
 ;;
 ;; - `load!' for loading external *.el files relative to this one
diff --git a/home/.config/doom/exwm.el b/home/.config/doom/exwm.el
index 791a99b..080f928 100644
--- a/home/.config/doom/exwm.el
+++ b/home/.config/doom/exwm.el
@@ -169,10 +169,6 @@
 ;;  :config
 ;;  (setq system-packages-use-sudo t))
 
-;; Elfeed
-(setq rmh-elfeed-org-files (list (expand-file-name "elfeed.org" doom-private-dir)))
-;;(add-hook! 'elfeed-search-mode-hook 'elfeed-update)
-
 ;; playerctl status on modeline
 ;; (use-package! doom-modeline-now-playing
 ;;   :after doom-modeline
@@ -257,20 +253,6 @@
   (setq counsel-web-search-dynamic-update nil)
   (exwm-input-set-key (kbd "s-d") #'counsel-web-search))
 
-;; Elpher
-(defun elpher--init-hook ()
-  (setq visual-fill-column-center-text t)
-  (visual-fill-column-mode 1))
-(use-package! elpher
-  :defer t
-  :config
-  (setq elpher-use-tls t
-        elpher-auto-disengage-TLS t
-        elpher-connection-timeout 10
-        elpher-gemini-max-fill-width 80
-        elpher-gemini-TLS-cert-checks nil)
-  (add-hook 'elpher-mode-hook 'elpher--init-hook))
-
 ;; Function keys
 (use-package! desktop-environment
   :after exwm
@@ -352,44 +334,3 @@
   (interactive)
   (start-process-shell-command "greenclip" nil "pkill greenclip && greenclip clear")
   (follie/run-in-background "greenclip daemon"))
-
-;; mu4e
-(use-package! mu4e
-  :commands mu4e mu4e-compose-new
-  :config
-  (setq mu4e-update-interval (* 10 60)
-        mu4e-view-image-max-width 600
-        mu4e-context-policy 'always-ask
-        mu4e-compose-context-policy 'always-ask
-        mu4e-index-cleanup nil
-        mu4e-index-lazy-check t))
-(set-email-account! "Gmail"
-  '((mu4e-sent-folder       . "/[Gmail]/Sent Mail")
-    (mu4e-drafts-folder     . "/[Gmail]/Drafts")
-    (mu4e-trash-folder      . "/[Gmail]/Trash")
-    (mu4e-refile-folder     . "/[Gmail]/All Mail")
-    (smtpmail-smtp-user     . "example@gmail.com")
-    (smtpmail-smtp-server   . "smtp.gmail.com")
-    (smtpmail-smtp-service  . 465)
-    (smtpmail-stream-type   . ssl)
-    (user-full-name         . "FGoogle")
-    (user-mail-address      . "example@gmail.com")
-    (mu4e-compose-signature . "---\nfgoogle"))
-  t)
-
-;; circe
-(defun my-fetch-password (&rest params)
-  (require 'auth-source)
-  (let ((match (car (apply #'auth-source-search params))))
-    (if match
-        (let ((secret (plist-get match :secret)))
-          (if (functionp secret)
-              (funcall secret)
-            secret))
-      (error "Password not found for %S" params))))
-(set-irc-server! "chat.freenode.net"
-  '(:tls t
-    :port 6697
-    :nick "FollieHiyuki"
-    :sasl-password (my-fetch-password :user "FollieHiyuki" :host "irc.freenode.net")
-    :channels ("#voidlinux" "#river" "#archlinux" "#nixos")))
diff --git a/home/.config/doom/packages.el b/home/.config/doom/packages.el
index 6144bfd..d6af1b1 100644
--- a/home/.config/doom/packages.el
+++ b/home/.config/doom/packages.el
@@ -57,6 +57,7 @@
 (package! elpher)
 (package! pinentry)
 (package! sudoku)
+(package! xonsh-mode)
 (package! vimrc-mode)
 (package! gemini-mode)
 (package! lsp-treemacs)
diff --git a/home/.config/fish/conf.d/env.fish b/home/.config/fish/conf.d/env.fish
index 15cb8db..0baab83 100644
--- a/home/.config/fish/conf.d/env.fish
+++ b/home/.config/fish/conf.d/env.fish
@@ -65,7 +65,7 @@ set -gx FZF_DEFAULT_OPTS "--multi --layout=reverse --inline-info
 #  --color info:#98c379,prompt:#61afef,pointer:#be5046,marker:#e5c07b,spinner:#61afef,header:#61afef"
 set -gx FZF_DEFAULT_COMMAND "fd --type f --follow --hidden --exclude .git"
 set -gx FZF_CTRL_T_OPTS "--no-height --preview-window 'left:60%' --preview '$HOME/.local/bin/garbage/preview {} 2>/dev/null'"
-set -gx FZF_CTRL_T_COMMAND "fd --follow --hidden --exclude .git"
+set -gx FZF_CTRL_T_COMMAND "fd . \$dir --follow --hidden --exclude .git"
 set -gx FZF_ALT_C_OPTS "--preview 'exa -1a --color always --icons {} 2>/dev/null'"
 set -gx FZF_ALT_C_COMMAND "fd --type d --follow --hidden --exclude .git"
 set -gx FZF_TMUX 1
diff --git a/home/.config/mako/config b/home/.config/mako/config
index aee3b74..22c7829 100644
--- a/home/.config/mako/config
+++ b/home/.config/mako/config
@@ -1,7 +1,7 @@
 font=Sarasa Mono J 12
 border-size=4
 border-radius=10
-margin=10,10,10
+margin=20,10,10
 width=300
 max-visible=10
 default-timeout=5000
diff --git a/home/.config/nvim/vim-plug/vim-plug.vim b/home/.config/nvim/vim-plug/vim-plug.vim
index a0e6119..58c66a4 100644
--- a/home/.config/nvim/vim-plug/vim-plug.vim
+++ b/home/.config/nvim/vim-plug/vim-plug.vim
@@ -28,6 +28,7 @@ Plug 'glepnir/dashboard-nvim'
 " Plug 'mhinz/vim-startify'
 "=================================================
 " Syntax
+" Plug 'linkinpark342/xonsh-vim'
 Plug 'sheerun/vim-polyglot'
 Plug 'mechatroner/rainbow_csv'
 Plug 'jackguo380/vim-lsp-cxx-highlight'