Added shell-pop and removed treemacs

emacs/.emacs.d/README.org

@@ -1240,8 +1240,7 @@ Customizable popup menus.
       "a"  'org-agenda
       "g"  'magit-status
       "''" 'org-edit-src-exit
-      "#"  'wolfe/csharp-project
-      "t"    (lambda() (interactive) (wolfe/if-else-projectile 'treemacs-projectile 'treemacs))
+      "t"  'shell-pop
       "f"    (lambda() (interactive) (wolfe/if-else-projectile 'counsel-projectile-ag 'counsel-ag))
       "p"    (lambda() (interactive) (funcall wolfe/hydra-projectile))
       ";"    (lambda() (interactive) (save-excursion (end-of-line) (insert-char ?\;)))
@@ -1353,24 +1352,6 @@ Project management
     (projectile-mode))
 #+END_SRC
 
-** Treemacs
-
-#+BEGIN_SRC emacs-lisp :tangle yes
-  (use-package treemacs
-    :config
-    (setq treemacs-follow-after-init t
-          treemacs-width             35
-          treemacs-indentation       2))
-#+END_SRC
-
-#+BEGIN_SRC emacs-lisp :tangle yes
-  (use-package treemacs-evil)
-#+END_SRC
-
-#+BEGIN_SRC emacs-lisp :tangle yes
-  (use-package treemacs-projectile)
-#+END_SRC
-
 ** Dumb Jump
 
 Automatically =grep= or =ag= through a project for a definition. This
@@ -1401,7 +1382,7 @@ or don't exist for the language.
           persp-auto-resume-time -1
           persp-nil-hidden t
           persp-add-buffer-on-find-file t
-          persp-add-buffer-on-after-change-major-mode nil
+          persp-add-buffer-on-after-change-major-mode t
           persp-hook-up-emacs-buffer-completion t)
 
     ;; Make ivy play nice
@@ -1555,6 +1536,8 @@ Basic editing mode for React.js files.
         gdb-show-main t
         company-clang-insert-arguments nil)
 
+  (setq-default c-basic-offset 4)
+
   (use-package company-irony
     :after company
     :config
@@ -1669,7 +1652,6 @@ Edit all instances of a string
 #+BEGIN_SRC emacs-lisp :tangle yes
   (use-package iedit
     :config
-    (set-face-attribute 'iedit-occurrence nil :foreground (face-attribute 'match :foreground))
     (setq iedit-toggle-key-default nil))
 #+END_SRC
 
@@ -1967,3 +1949,9 @@ Stores all backups and temp files in =~/.bak.emacs/=
       (unless already-open (kill-buffer buf))
       (reverse comments)))
 #+END_SRC
+** Vterm
+
+#+BEGIN_SRC emacs-lisp :tangle yes
+  (add-to-list 'load-path "~/emacs-libvterm/")
+  (require 'vterm)
+#+END_SRC