From 6c1962a889d1756729a9fe70394ebca161671c90 Mon Sep 17 00:00:00 2001
From: Steve Purcell <steve@sanityinc.com>
Date: Thu, 1 Feb 2024 14:21:42 +0000
Subject: [PATCH] Use display-buffer-alist instead of the fullframe package

---
 lisp/init-docker.el  | 10 +++++-----
 lisp/init-elpa.el    |  4 ----
 lisp/init-git.el     |  7 +++----
 lisp/init-ibuffer.el |  2 ++
 lisp/init-utils.el   |  8 ++++++++
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/lisp/init-docker.el b/lisp/init-docker.el
index 8a116c5093..99cfcc677d 100644
--- a/lisp/init-docker.el
+++ b/lisp/init-docker.el
@@ -3,11 +3,11 @@
 ;;; Code:
 
 (when (maybe-require-package 'docker)
-  (fullframe docker-images tablist-quit)
-  (fullframe docker-machines tablist-quit)
-  (fullframe docker-volumes tablist-quit)
-  (fullframe docker-networks tablist-quit)
-  (fullframe docker-containers tablist-quit))
+  (sanityinc/fullframe-mode 'docker-image-mode)
+  (sanityinc/fullframe-mode 'docker-machine-mode)
+  (sanityinc/fullframe-mode 'docker-volume-mode)
+  (sanityinc/fullframe-mode 'docker-network-mode)
+  (sanityinc/fullframe-mode 'docker-container-mode))
 (maybe-require-package 'dockerfile-mode)
 (maybe-require-package 'docker-compose-mode)
 
diff --git a/lisp/init-elpa.el b/lisp/init-elpa.el
index 3063215a38..d7901d50be 100644
--- a/lisp/init-elpa.el
+++ b/lisp/init-elpa.el
@@ -109,10 +109,6 @@ advice for `require-package', to which ARGS are passed."
               (package--save-selected-packages
                (seq-uniq (append sanityinc/required-packages package-selected-packages))))))
 
-
-(require-package 'fullframe)
-(fullframe list-packages quit-window)
-
 
 (let ((package-check-signature nil))
   (require-package 'gnu-elpa-keyring-update))
diff --git a/lisp/init-git.el b/lisp/init-git.el
index fac54186e9..c96f0de587 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -17,6 +17,9 @@
 (when (maybe-require-package 'magit)
   (setq-default magit-diff-refine-hunk 'all)
 
+  (sanityinc/fullframe-mode 'magit-status-mode)
+  (setq-default magit-bury-buffer-function 'magit-restore-window-configuration)
+
   ;; Hint: customize `magit-repository-directories' so that you can use C-u M-F12 to
   ;; quickly open magit on any one of your projects.
   (global-set-key [(meta f12)] 'magit-status)
@@ -41,10 +44,6 @@
 
 (maybe-require-package 'magit-todos)
 
-(require-package 'fullframe)
-(with-eval-after-load 'magit
-  (fullframe magit-status magit-mode-quit-window))
-
 (when (maybe-require-package 'git-commit)
   (add-hook 'git-commit-mode-hook 'goto-address-mode))
 
diff --git a/lisp/init-ibuffer.el b/lisp/init-ibuffer.el
index 91823b4c1d..acc2960f5e 100644
--- a/lisp/init-ibuffer.el
+++ b/lisp/init-ibuffer.el
@@ -17,6 +17,8 @@
 
 (setq-default ibuffer-show-empty-filter-groups nil)
 
+(sanityinc/fullframe-mode 'ibuffer-mode)
+
 
 (with-eval-after-load 'ibuffer
   ;; Use human readable Size column instead of original one
diff --git a/lisp/init-utils.el b/lisp/init-utils.el
index 808b340408..9c93d7665e 100644
--- a/lisp/init-utils.el
+++ b/lisp/init-utils.el
@@ -2,6 +2,14 @@
 ;;; Commentary:
 ;;; Code:
 
+(defmacro sanityinc/fullframe-mode (mode)
+  "Configure buffers that open in MODE to start out full-frame."
+  `(add-to-list 'display-buffer-alist
+                (cons (cons 'major-mode ,mode)
+                      (list 'display-buffer-full-frame))))
+
+(sanityinc/fullframe-mode 'package-menu-mode)
+
 
 ;; Handier way to add modes to auto-mode-alist
 (defun add-auto-mode (mode &rest patterns)