From f597ccd59c416eef35dcad9818bbd7c2cd0b33fe Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Thu, 16 Nov 2023 12:50:37 +0000
Subject: [PATCH] Add perspective mode

---
 home/emacs/default.nix |  3 ++-
 home/emacs/init.el     | 32 +++++++++++++++++++-------------
 home/emacs/init.org    | 38 +++++++++++++++++++++++++-------------
 3 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index a0653d28..8715405f 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -31,7 +31,6 @@
 
         # ide-packages
         vterm
-        ibuffer-project
         treesit-grammars.with-all-grammars
         treesit-auto
         apheleia
@@ -58,6 +57,8 @@
         khalel
 
         # project-packages
+        ibuffer-project
+        perspective
         magit
         forge
 
diff --git a/home/emacs/init.el b/home/emacs/init.el
index 15a53475..69008fd8 100644
--- a/home/emacs/init.el
+++ b/home/emacs/init.el
@@ -30,13 +30,8 @@
 (delete-selection-mode)
 (recentf-mode -1)
 
-;; Misc useful keymaps
+
 (keymap-global-set "M-#" #'dictionary-lookup-definition)
-(keymap-global-set "C-c b" #'ibuffer)
-(keymap-global-set "C-c p l" #'list-packages)
-(keymap-global-set "C-c p r" #'package-refresh-contents)
-(keymap-global-set "C-c p i" #'package-install)
-(keymap-global-set "C-c p d" #'package-delete)
 
 ;; turn on spell checking, if available.
 (when (and (require 'ispell nil :noerror) (executable-find ispell-program-name))
@@ -75,6 +70,18 @@
 ;; Bind extra `describe-*' commands
 (keymap-global-set "C-h K" #'describe-keymap)
 
+(use-package ibuffer
+  :ensure t
+  :bind (("C-c b" . ibuffer)))
+
+(use-package ibuffer-project
+  :ensure t
+  :after ibuffer
+  :hook ((ibuffer . (lambda ()
+                      (setq ibuffer-filter-groups (ibuffer-project-generate-filter-groups))
+                      (unless (eq ibuffer-sorting-mode 'project-file-relative)
+                        (ibuffer-do-sort-by-project-file-relative))))))
+
 (use-package link-hint
   :ensure t
   :bind (("C-c l o" . link-hint-open-link)
@@ -402,13 +409,6 @@
   :bind (("C-c c f" . apheleia-format-buffer))
   :config (apheleia-global-mode +1))
 
-(use-package ibuffer-project
-  :ensure t
-  :hook ((ibuffer . (lambda ()
-                      (setq ibuffer-filter-groups (ibuffer-project-generate-filter-groups))
-                      (unless (eq ibuffer-sorting-mode 'project-file-relative)
-                        (ibuffer-do-sort-by-project-file-relative))))))
-
 (use-package treesit-auto
   :config (global-treesit-auto-mode +1))
 
@@ -432,6 +432,12 @@
         (project-find-dir "Find directory")
         (project-eshell "Eshell")))
 
+(use-package perspective
+  :ensure t
+  :demand t
+  :bind (("C-c p p" . persp-switch)
+         ("C-c p r" . persp-rename)))
+
 (setq magit-define-global-key-bindings nil
       magit-clone-default-directory "~/Projects/"
       magit-commit-show-diff nil
diff --git a/home/emacs/init.org b/home/emacs/init.org
index 0b77d258..66735c1b 100644
--- a/home/emacs/init.org
+++ b/home/emacs/init.org
@@ -38,13 +38,8 @@
   (delete-selection-mode)
   (recentf-mode -1)
 
-  ;; Misc useful keymaps
+
   (keymap-global-set "M-#" #'dictionary-lookup-definition)
-  (keymap-global-set "C-c b" #'ibuffer)
-  (keymap-global-set "C-c p l" #'list-packages)
-  (keymap-global-set "C-c p r" #'package-refresh-contents)
-  (keymap-global-set "C-c p i" #'package-install)
-  (keymap-global-set "C-c p d" #'package-delete)
 
   ;; turn on spell checking, if available.
   (when (and (require 'ispell nil :noerror) (executable-find ispell-program-name))
@@ -93,6 +88,21 @@
   (keymap-global-set "C-h K" #'describe-keymap)
 #+end_src
 
+** ibuffer
+#+begin_src emacs-lisp
+  (use-package ibuffer
+    :ensure t
+    :bind (("C-c b" . ibuffer)))
+
+  (use-package ibuffer-project
+    :ensure t
+    :after ibuffer
+    :hook ((ibuffer . (lambda ()
+                        (setq ibuffer-filter-groups (ibuffer-project-generate-filter-groups))
+                        (unless (eq ibuffer-sorting-mode 'project-file-relative)
+                          (ibuffer-do-sort-by-project-file-relative))))))
+#+end_src
+
 ** Link hint keymaps
 #+begin_src emacs-lisp
   (use-package link-hint
@@ -472,13 +482,6 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
     :bind (("C-c c f" . apheleia-format-buffer))
     :config (apheleia-global-mode +1))
 
-  (use-package ibuffer-project
-    :ensure t
-    :hook ((ibuffer . (lambda ()
-                        (setq ibuffer-filter-groups (ibuffer-project-generate-filter-groups))
-                        (unless (eq ibuffer-sorting-mode 'project-file-relative)
-                          (ibuffer-do-sort-by-project-file-relative))))))
-
   (use-package treesit-auto
     :config (global-treesit-auto-mode +1))
 
@@ -507,6 +510,15 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
           (project-find-dir "Find directory")
           (project-eshell "Eshell")))
 #+END_SRC
+*** Perspective
+#+begin_src emacs-lisp
+  (use-package perspective
+    :ensure t
+    :demand t
+    :bind (("C-c p p" . persp-switch)
+           ("C-c p r" . persp-rename)))
+#+end_src
+
 ** Version control
 *** Magit
 #+begin_src emacs-lisp