From 409741397a58bb0c8fd43424ee4f74815689605a Mon Sep 17 00:00:00 2001 From: BirDt_ Date: Sat, 27 Sep 2025 16:38:14 +0800 Subject: [PATCH] Android specific window placement --- userland/browser.el | 13 +++++++------ userland/dired-custom.el | 2 +- userland/git-interace.el | 6 +++--- userland/scratch.el | 29 +++++++++++++++-------------- window-utils.el | 10 ++++++---- workflows/org-custom.el | 29 +++++++++++++++-------------- 6 files changed, 47 insertions(+), 42 deletions(-) diff --git a/userland/browser.el b/userland/browser.el index b0c0781..d962fe9 100644 --- a/userland/browser.el +++ b/userland/browser.el @@ -46,12 +46,13 @@ (switch-to-buffer "*weather*") (eww (concat "wttr.in/" theurgy-city "?0")))) -(add-to-list 'display-buffer-alist - '("\\*weather\\*" - (display-buffer-in-side-window) - (side . left) - (slot . 4) - (window-width . 0.15))) +(unless (equal system-type 'android) + (add-to-list 'display-buffer-alist + '("\\*weather\\*" + (display-buffer-in-side-window) + (side . left) + (slot . 4) + (window-width . 0.15)))) (provide 'browser) diff --git a/userland/dired-custom.el b/userland/dired-custom.el index 3dc1b77..26c5380 100644 --- a/userland/dired-custom.el +++ b/userland/dired-custom.el @@ -99,7 +99,7 @@ "iso\\|" "epub" "\\)")) - (dired-preview-global-mode 1)) + (unless (equal system-type 'android) (dired-preview-global-mode 1))) ;; Automatically kill preview buffers when opening a file (add-hook 'find-file-hook (lambda () diff --git a/userland/git-interace.el b/userland/git-interace.el index 478fc9e..61a38d7 100644 --- a/userland/git-interace.el +++ b/userland/git-interace.el @@ -29,10 +29,10 @@ :config (magit-todos-mode 1)) (add-to-list 'display-buffer-alist - '("magit:" + `("magit:" (display-buffer-in-side-window) - (side . right) - (slot . 4) + (side . ,(if (equal system-type 'android) 'top 'right)) + (slot . ,(if (equal system-type 'android) 0 4)) (window-width . 0.2))) (provide 'git-interface) diff --git a/userland/scratch.el b/userland/scratch.el index 3cff518..3508aa9 100644 --- a/userland/scratch.el +++ b/userland/scratch.el @@ -71,27 +71,28 @@ (delete-window (get-buffer-window "org scratch")) (switch-to-buffer "*org scratch*"))) -(add-to-list 'display-buffer-alist - '("\\*elisp scratch\\*" - (display-buffer-in-side-window) - (side . right) - (slot . 1) - (window-width . 0.2))) +(unless (equal system-type 'android) + (add-to-list 'display-buffer-alist + '("\\*elisp scratch\\*" + (display-buffer-in-side-window) + (side . right) + (slot . 1) + (window-width . 0.2))) -(add-to-list 'display-buffer-alist - '("\\*org scratch\\*" - (display-buffer-in-side-window) - (side . right) - (slot . 2) - (window-width . 0.2))) + (add-to-list 'display-buffer-alist + '("\\*org scratch\\*" + (display-buffer-in-side-window) + (side . right) + (slot . 2) + (window-width . 0.2)))) (use-package tmr) (add-to-list 'display-buffer-alist - '("\\\\*tmr-tabulated-view\\\\*" + `("\\\\*tmr-tabulated-view\\\\*" (display-buffer-in-side-window) (side . top) - (slot . 4) + (slot . ,(if (equal system-type 'android) 0 4)) (window-height . 0.1))) (provide 'scratch) diff --git a/window-utils.el b/window-utils.el index 7c897ce..973b49d 100644 --- a/window-utils.el +++ b/window-utils.el @@ -37,13 +37,15 @@ (define-key global-map (kbd "C-S-x 1") #'delete-other-windows) ;; left, top, right, bottom -(setq window-sides-slots '(5 1 5 1)) +(setq window-sides-slots (if (equal system-type 'android) + '(1 1 0 1) + '(5 1 5 1))) (add-to-list 'display-buffer-alist - '("\\*Help\\*" + `("\\*Help\\*" (display-buffer-in-side-window) - (side . right) - (slot . 4) + (side . ,(if (equal system-type 'android) 'bottom 'right)) + (slot . ,(if (equal system-type 'android) 0 4)) (window-height . 0.2))) (provide 'window-utils) diff --git a/workflows/org-custom.el b/workflows/org-custom.el index 7cc46f4..8eb8f50 100644 --- a/workflows/org-custom.el +++ b/workflows/org-custom.el @@ -187,10 +187,10 @@ (org-side-tree))) (add-to-list 'display-buffer-alist - '(".+\.org" + `(".+\.org" (display-buffer-in-side-window) (side . left) - (slot . 1) + (slot . ,(if (equal system-type 'android) 0 1)) (window-height . 0.2))) (define-key org-mode-map (kbd "C-") #'theurgy-toggle-org-side-tree) @@ -527,19 +527,20 @@ (define-key global-map (kbd "C-c a") #'org-agenda) (define-key global-map (kbd "C-c c") #'org-capture) -(add-to-list 'display-buffer-alist - '("\\*Org Agenda\\*" - (display-buffer-in-side-window) - (side . right) - (slot . 3) - (window-width . 0.2))) +(unless (equal system-type 'android) + (add-to-list 'display-buffer-alist + '("\\*Org Agenda\\*" + (display-buffer-in-side-window) + (side . right) + (slot . 3) + (window-width . 0.2))) -(add-to-list 'display-buffer-alist - '("\\*capture\\*\\|CAPTURE-" - (display-buffer-in-side-window) - (side . right) - (slot . 2) - (window-width . 0.2))) + (add-to-list 'display-buffer-alist + '("\\*capture\\*\\|CAPTURE-" + (display-buffer-in-side-window) + (side . right) + (slot . 2) + (window-width . 0.2)))) ;; Org roam (use-package org-roam