From 9bfdb9bb0c6216551c729b3ea07dfcb2c479c95c Mon Sep 17 00:00:00 2001
From: Josh Wolfe <joshuafwolfe@gmail.com>
Date: Wed, 28 Nov 2018 14:16:00 -0500
Subject: [PATCH] Fixed persp mode bug and lazy load more stuff. Fixed rofi
 mode in i3

---
 emacs/.emacs.d/README.org | 39 ++++++++++++++++-----------------------
 i3/.config/i3/config      |  2 +-
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/emacs/.emacs.d/README.org b/emacs/.emacs.d/README.org
index feda6ac..381d2b9 100644
--- a/emacs/.emacs.d/README.org
+++ b/emacs/.emacs.d/README.org
@@ -1331,8 +1331,7 @@ Magic git interface from within emacs
     (use-package evil-magit)
     (setq magit-bury-buffer-function
           (lambda (con)
-            (kill-buffer)
-            (delete-window))))
+            (kill-buffer-and-window))))
 #+END_SRC
 
 ** Projectile
@@ -1406,16 +1405,15 @@ or don't exist for the language.
                       (persp-window-switch . nil)
                       (persp-frame-switch . nil)))))
 
-    (defun wolfe/persp-switch-project-action ()
+    (defun wolfe/persp-create-project-persp ()
       (let ((frame (selected-frame))
             (name (projectile-project-name)))
         (with-selected-frame frame
           (persp-add-new name)
           (persp-frame-switch name)
-          (persp-add-buffer wolfe/persp-shared-buffers (get-current-persp) nil)
-          (run-with-timer 0 nil (lambda () (persp-add-buffer (current-buffer)))))))
+          (persp-add-buffer wolfe/persp-shared-buffers (get-current-persp) nil))))
 
-    (add-hook 'projectile-after-switch-project-hook 'wolfe/persp-switch-project-action)
+    (add-hook 'projectile-before-switch-project-hook 'wolfe/persp-create-project-persp)
 
     (defun wolfe/persp-concat-name (count)
       (if (eq count 0)
@@ -1449,6 +1447,7 @@ or don't exist for the language.
 ** Generic Web
 #+BEGIN_SRC emacs-lisp :tangle yes
   (use-package web-mode
+    :defer t
     :mode ("\\.html\\'" "\\.php\\'" "\\.js\\'")
     :config
     (setq web-mode-enable-auto-closing t)
@@ -1476,13 +1475,15 @@ or don't exist for the language.
 #+END_SRC
 
 #+BEGIN_SRC emacs-lisp :tangle yes
-  (use-package indium)
+  (use-package indium
+    :defer t)
 #+END_SRC
 
 Basic editing mode for React.js files.
 
 #+BEGIN_SRC emacs-lisp :tangle yes
-  (use-package rjsx-mode)
+  (use-package rjsx-mode
+    :defer t)
 #+END_SRC
 
 ** Lisp Family
@@ -1514,14 +1515,8 @@ Basic editing mode for React.js files.
 ** Haskell
 
 #+BEGIN_SRC emacs-lisp :tangle yes
-  (use-package haskell-mode)
-#+END_SRC
-
-#+BEGIN_SRC emacs-lisp :tangle yes
-  (use-package flycheck-haskell
-    :after flycheck
-    :config
-    (add-hook 'haskell-mode-hook #'flycheck-haskell-setup))
+  (use-package haskell-mode
+    :defer t)
 #+END_SRC
 
 ** Latex
@@ -1542,6 +1537,7 @@ Basic editing mode for React.js files.
   (setq-default c-basic-offset 4)
 
   (use-package company-irony
+    :defer t
     :after company
     :config
     (add-hook 'c++-mode-hook 'irony-mode)
@@ -1554,6 +1550,7 @@ Basic editing mode for React.js files.
 
 #+BEGIN_SRC emacs-lisp :tangle yes
   (use-package omnisharp
+    :defer t
     :after company
     :config
     (when wolfe/windows?
@@ -1594,6 +1591,7 @@ and =elpy= together since elpy is a bit slow to load at startup.
 
 #+BEGIN_SRC emacs-lisp :tangle yes
   (use-package company-shell
+    :defer t
     :after company
     :config
     (add-to-list 'company-backends '(company-shell company-shell-env)))
@@ -1603,12 +1601,14 @@ and =elpy= together since elpy is a bit slow to load at startup.
 
 #+BEGIN_SRC emacs-lisp :tangle yes
   (use-package go-mode
+    :defer t
     :config
     (add-hook 'go-mode-hook (lambda () (setq tab-width 4))))
 #+END_SRC
 
 #+BEGIN_SRC emacs-lisp :tangle yes
   (use-package company-go
+    :defer t
     :after company
     :config
     (when wolfe/linux?
@@ -1616,13 +1616,6 @@ and =elpy= together since elpy is a bit slow to load at startup.
     (add-to-list 'company-backends 'company-go))
 #+END_SRC
 
-** Nim
-
-#+BEGIN_SRC emacs-lisp :tangle yes
-  (use-package nim-mode
-    :defer t)
-#+END_SRC
-
 ** Java
 
 #+BEGIN_SRC emacs-lisp :tangle yes
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index c1cdeb0..f8bf471 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -74,7 +74,7 @@ bindsym $mod+Shift+backslash exec emacs -light
 bindsym $mod+Shift+q kill
 
 # start dmenu (a program launcher)
-bindsym $mod+space exec rofi -show run
+bindsym $mod+space exec rofi -show drun
 bindsym $mod+d exec rofi-pass
 bindsym $mod+Shift+d exec "rofi-pass --insert"
 bindsym $mod+c exec firefox-developer-edition