Compare commits

...

5 commits

Author SHA1 Message Date
Henrik Lissner
5072c969c7
fix(dired): remove unneeded persp-mode hack 2025-09-23 00:55:16 -04:00
Henrik Lissner
bce3aff59a
fix: more vestigial references to persp-mode 2025-09-23 00:53:37 -04:00
Henrik Lissner
c626454ce6
fix(everywhere): update for tabspaces 2025-09-23 00:50:43 -04:00
Henrik Lissner
c75f4045f3
fix(tabs): update for tabspaces 2025-09-23 00:50:07 -04:00
Henrik Lissner
407eae5358
bump: :ui workspaces
mclear-tools/tabspaces@6c7c31b744 -> mclear-tools/tabspaces@d8fceb2406
2025-09-23 00:45:47 -04:00
9 changed files with 6 additions and 38 deletions

View file

@ -40,8 +40,4 @@
help-echo "This is an Emacs Everywhere window"))))
(add-hook! 'emacs-everywhere-mode-hook
(defun +everywhere-set-modeline ()
(doom-modeline-set-modeline 'emacs-everywhere))))
(add-hook! 'emacs-everywhere-init-hooks
(defun +everywhere-clear-persp-info-h ()
(when (bound-and-true-p persp-mode)
(setq persp-emacsclient-init-frame-behaviour-override nil)))))
(doom-modeline-set-modeline 'emacs-everywhere)))))

View file

@ -101,7 +101,7 @@ argument) is non-nil only show channels in current server."
;;;###autoload
(defun +irc--add-circe-buffer-to-workspace-h ()
(when (and (bound-and-true-p persp-mode)
(when (and (modulep! :ui workspaces)
(+workspaces-exists-p +irc--workspace-name))
(let ((buf (current-buffer)))
;; Add a new circe buffer to irc workspace when we're in another workspace

View file

@ -332,7 +332,7 @@ orderless."
'(doom/find-file-in-private-config . file)
'(doom/describe-active-minor-mode . minor-mode)
'(flycheck-error-list-set-filter . builtin)
'(persp-switch-to-buffer . buffer)
'(tabspaces-switch-to-buffer . buffer)
'(projectile-find-file . project-file)
'(projectile-recentf . project-file)
'(projectile-switch-to-buffer . buffer)

View file

@ -5,7 +5,6 @@
doom-localleader-alt-key "C-c l")
;; persp-mode and projectile in different prefixes
(setq! persp-keymap-prefix (kbd "C-c w"))
(after! projectile
(define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map))

View file

@ -161,21 +161,7 @@ Fixes #3939: unsortable dired entries on Windows."
(:prefix ("s" . "symlinks")
:n "s" #'dirvish-symlink
:n "S" #'dirvish-relative-symlink
:n "h" #'dirvish-hardlink))
;; HACK: Kill Dirvish session before switching projects/workspaces, otherwise
;; it errors out on trying to delete/change dedicated windows.
(add-hook! '(persp-before-kill-functions
persp-before-switch-functions
projectile-before-switch-project-hook)
(defun +dired--cleanup-dirvish-h (&rest _)
(when-let ((dv (cl-loop for w in (window-list)
if (window-dedicated-p w)
if (with-current-buffer (window-buffer w) (dirvish-curr))
return it)))
(let (dirvish-reuse-session)
(with-selected-window (dv-root-window dv)
(dirvish-quit)))))))
:n "h" #'dirvish-hardlink)))
(use-package! diredfl

View file

@ -295,15 +295,6 @@ Ugh, such an ugly hack."
(apply fn args)))
;;;###package persp-mode
(defadvice! +popup--persp-mode-restore-popups-a (&rest _)
"Restore popup windows when loading a perspective from file."
:after #'persp-load-state-from-file
(dolist (window (window-list))
(when (+popup-parameter 'popup window)
(+popup--init window nil))))
(after! pdf-tools
(setq tablist-context-window-display-action
'((+popup-display-buffer-stacked-side-window-fn)

View file

@ -35,8 +35,6 @@ clean up after itself and kill off buffers I mark as transient.
before entering the popup, rather than in a new window.
- [[doom-package:wgrep]] buffers are advised to close themselves when aborting or committing
changes.
- [[doom-package:persp-mode]] is advised to restore popup windows when loading a session from
file.
- Interactive calls to ~windmove-*~ commands (used by ~evil-window-*~ commands)
will ignore the ~no-other-window~ window parameter, allowing you to switch to
popup windows as if they're ordinary windows.

View file

@ -28,9 +28,7 @@
(when (buffer-live-p b)
(or (eq (current-buffer) b)
(not (doom-temp-buffer-p b)))))
(if (bound-and-true-p persp-mode)
(persp-buffer-list)
(buffer-list))))
(doom-buffer-list)))
(setq centaur-tabs-buffer-list-function #'+tabs-buffer-list)
(add-hook! '(+doom-dashboard-mode-hook +popup-buffer-mode-hook)

View file

@ -1,4 +1,4 @@
;; -*- no-byte-compile: t; -*-
;;; ui/workspaces/packages.el
(package! tabspaces :pin "6c7c31b7442b04e6369d33b2ccfe2045e631b374")
(package! tabspaces :pin "d8fceb24064ee8485fdcbcb4cc5de8c9a7d6e0ac")