Merge branch 'master' of http://git.nakadashi.lol/akko/doom-config

config.el

@@ -73,7 +73,7 @@
 
 (setq treemacs--width-is-locked nil)
 
-(setq doom-theme 'doom-old-hope)
+(setq doom-theme 'doom-ayu-mirage)
 
 (display-time-mode 1)
 
@@ -82,7 +82,9 @@
 (map! :leader
       "." #'counsel-find-file)
 
-(after! evil (evil-escape-mode nil))
+(after! evil-escape
+  (setq evil-escape-key-sequence "jj")
+  (setq-default evil-escape-delay 0.2))
 
 (setq ivy-read-action-function #'ivy-hydra-read-action)
 
@@ -261,6 +263,13 @@
       python-shell-interpreter-args "-i --simple-prompt")
 (setq python-shell-completion-native-disabled-interpreters '("ipython"))
 
+<<<<<<< HEAD
+=======
+(use-package! org-roam
+    :config
+    (setq org-roam-database-connector 'sqlite3))
+
+>>>>>>> 8a347a9b20ba0b636f21118b8d418ea946dfd2bd
 (setq org-roam-directory (file-truename "/mnt/tenma/srv/boymind"))
 (org-roam-db-autosync-mode)
 
@@ -269,6 +278,7 @@
  '((ledger . t)
    ))
 
+<<<<<<< HEAD
 (require 'elcord)
 (elcord-mode)
 
@@ -276,6 +286,8 @@
   :config
   (setq org-roam-database-connector 'sqlite3))
 
+=======
+>>>>>>> 8a347a9b20ba0b636f21118b8d418ea946dfd2bd
 (add-to-list 'org-agenda-files "/mnt/tenma/srv/boymind/20230727221433-agenda_akko.org")
 
 (setq org-roam-capture-templates '(("d" "default" plain "%?"