From 7a0d0c8cd0e52c32fa9de1e8b667db1266ea9c58 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 30 Nov 2015 05:32:55 -0500
Subject: [PATCH] Improve workgroups2 integration

---
 core/core-workgroups.el | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/core/core-workgroups.el b/core/core-workgroups.el
index 67a8cb3d4..172448b59 100644
--- a/core/core-workgroups.el
+++ b/core/core-workgroups.el
@@ -2,26 +2,28 @@
 ;; see lib/workgroup-defuns.el
 
 (use-package workgroups2
-  :when window-system
+  :when (display-graphic-p)
   :init
-  (setq split-height-threshold 8
+  (setq-default
+   wg-session-file          (expand-file-name "wg-default" narf-temp-dir)
+   wg-workgroup-directory   (expand-file-name "workgroups" narf-temp-dir)
+   wg-first-wg-name         "main"
+   wg-session-load-on-start t
+   wg-mode-line-display-on  nil
+   wg-mess-with-buffer-list t
+   wg-emacs-exit-save-behavior           'save ; Options: 'save 'ask nil
+   wg-workgroups-mode-exit-save-behavior 'save
+   wg-log-level 0
 
-        wg-session-file          (expand-file-name "wg-default" narf-temp-dir)
-        wg-workgroup-directory   (expand-file-name "workgroups" narf-temp-dir)
-        wg-first-wg-name         "main"
-        wg-session-load-on-start t
-        wg-mode-line-display-on  nil
-        wg-mess-with-buffer-list t
-        wg-emacs-exit-save-behavior           'save ; Options: 'save 'ask nil
-        wg-workgroups-mode-exit-save-behavior 'save
-        wg-log-level 0
-
-        wg-list-display-decor-divider         " : "
-        wg-list-display-decor-current-left    "["
-        wg-list-display-decor-current-right   "]"
-        wg-list-display-decor-previous-left   ""
-        wg-list-display-decor-previous-right  "")
+   wg-list-display-decor-divider         " : "
+   wg-list-display-decor-current-left    "["
+   wg-list-display-decor-current-right   "]"
+   wg-list-display-decor-previous-left   ""
+   wg-list-display-decor-previous-right  "")
   :config
+  ;; Don't mess with the modeline!
+  (advice-add 'wg-change-modeline :override 'ignore)
+
   (defvar narf/helm-source-wg
     '((name       . "Workgroups")
       (candidates . wg-workgroup-names)
@@ -33,6 +35,8 @@
     ;; Create a new workgroup on switch-project
     (setq projectile-switch-project-action 'narf/wg-projectile-switch-project))
 
+  ;; Don't remember popwin windows
+  (add-hook! kill-emacs 'popwin:close-popup-window)
   (add-hook! wg-before-switch-to-workgroup 'popwin:close-popup-window)
 
   ;; Initialize!