Compare commits
2 Commits
315694498a
...
946ea868eb
Author | SHA1 | Date | |
---|---|---|---|
946ea868eb | |||
6c53a9dad4 |
82
init.el
82
init.el
@ -1234,49 +1234,49 @@ Taken from https://howardism.org/Technical/Emacs/eshell-why.html"
|
|||||||
:commands 'cube)
|
:commands 'cube)
|
||||||
|
|
||||||
;; Emacs App Framework. Definitely pretty broken but it worked once
|
;; Emacs App Framework. Definitely pretty broken but it worked once
|
||||||
(unless (eq system-type 'windows-nt)
|
;; (unless (eq system-type 'windows-nt)
|
||||||
(use-package eaf
|
;; (use-package eaf
|
||||||
:git (:host github :repo "emacs-eaf/emacs-application-framework"
|
;; :git (:host github :repo "emacs-eaf/emacs-application-framework"
|
||||||
:files ("*.el" "*.py" "core" "app" "*.json")
|
;; :files ("*.el" "*.py" "core" "app" "*.json")
|
||||||
:pre-build (("python" "install-eaf.py"
|
;; :pre-build (("python" "install-eaf.py"
|
||||||
"--install" "pdf-viewer" "browser"
|
;; "--install" "pdf-viewer" "browser"
|
||||||
"--ignore-sys-deps")))
|
;; "--ignore-sys-deps")))
|
||||||
:commands (eaf-open-browser eaf-open-url-at-point)
|
;; :commands (eaf-open-browser eaf-open-url-at-point)
|
||||||
:config (add-to-list 'load-path (expand-file-name "app/" eaf-source-dir))
|
;; :config (add-to-list 'load-path (expand-file-name "app/" eaf-source-dir))
|
||||||
(if (and (string= (getenv "XDG_CURRENT_DESKTOP") "Hyprland")
|
;; (if (and (string= (getenv "XDG_CURRENT_DESKTOP") "Hyprland")
|
||||||
(featurep 'hypop))
|
;; (featurep 'hypop))
|
||||||
(defun eaf--get-frame-coordinate ()
|
;; (defun eaf--get-frame-coordinate ()
|
||||||
"We need fetch Emacs coordinate to adjust coordinate of EAF if it running on system not support cross-process reparent technology.
|
;; "We need fetch Emacs coordinate to adjust coordinate of EAF if it running on system not support cross-process reparent technology.
|
||||||
|
|
||||||
Such as, wayland native, macOS etc.
|
;; Such as, wayland native, macOS etc.
|
||||||
|
|
||||||
This is redefined for use with `hypop' library because multiple Emacs frames may be open."
|
;; This is redefined for use with `hypop' library because multiple Emacs frames may be open."
|
||||||
(cond ((string-equal (getenv "XDG_CURRENT_DESKTOP") "sway")
|
;; (cond ((string-equal (getenv "XDG_CURRENT_DESKTOP") "sway")
|
||||||
(eaf--split-number (shell-command-to-string (concat eaf-build-dir "swaymsg-treefetch/swaymsg-rectfetcher.sh emacs"))))
|
;; (eaf--split-number (shell-command-to-string (concat eaf-build-dir "swaymsg-treefetch/swaymsg-rectfetcher.sh emacs"))))
|
||||||
((string-equal (getenv "XDG_CURRENT_DESKTOP") "Hyprland")
|
;; ((string-equal (getenv "XDG_CURRENT_DESKTOP") "Hyprland")
|
||||||
(let ((clients (json-parse-string (shell-command-to-string "hyprctl -j clients")))
|
;; (let ((clients (json-parse-string (shell-command-to-string "hyprctl -j clients")))
|
||||||
(coordinate))
|
;; (coordinate))
|
||||||
(dotimes (i (length clients))
|
;; (dotimes (i (length clients))
|
||||||
(when (and (equal (gethash "pid" (aref clients i)) (emacs-pid))
|
;; (when (and (equal (gethash "pid" (aref clients i)) (emacs-pid))
|
||||||
(not (string= (gethash "title" (aref clients i)) hypop--frame-name)))
|
;; (not (string= (gethash "title" (aref clients i)) hypop--frame-name)))
|
||||||
(setq coordinate (gethash "at" (aref clients i)))))
|
;; (setq coordinate (gethash "at" (aref clients i)))))
|
||||||
(list (aref coordinate 0) (aref coordinate 1))))
|
;; (list (aref coordinate 0) (aref coordinate 1))))
|
||||||
((eaf-emacs-running-in-wayland-native)
|
;; ((eaf-emacs-running-in-wayland-native)
|
||||||
(require 'dbus)
|
;; (require 'dbus)
|
||||||
(let* ((coordinate (eaf--split-number
|
;; (let* ((coordinate (eaf--split-number
|
||||||
(dbus-call-method :session "org.gnome.Shell" "/org/eaf/wayland" "org.eaf.wayland" "get_emacs_window_coordinate" :timeout 1000)
|
;; (dbus-call-method :session "org.gnome.Shell" "/org/eaf/wayland" "org.eaf.wayland" "get_emacs_window_coordinate" :timeout 1000)
|
||||||
","))
|
;; ","))
|
||||||
;; HiDPI need except by `frame-scale-factor'.
|
;; ;; HiDPI need except by `frame-scale-factor'.
|
||||||
(frame-x (truncate (/ (car coordinate) (frame-scale-factor))))
|
;; (frame-x (truncate (/ (car coordinate) (frame-scale-factor))))
|
||||||
(frame-y (truncate (/ (cadr coordinate) (frame-scale-factor)))))
|
;; (frame-y (truncate (/ (cadr coordinate) (frame-scale-factor)))))
|
||||||
(list frame-x frame-y)))
|
;; (list frame-x frame-y)))
|
||||||
(t (list 0 0)))))
|
;; (t (list 0 0)))))
|
||||||
(use-package eaf-browser
|
;; (use-package eaf-browser
|
||||||
:git nil
|
;; :git nil
|
||||||
:after eaf
|
;; :after eaf
|
||||||
:custom
|
;; :custom
|
||||||
(eaf-browser-continue-where-left-off t)
|
;; (eaf-browser-continue-where-left-off t)
|
||||||
(eaf-browser-enable-adblocker t))))
|
;; (eaf-browser-enable-adblocker t))))
|
||||||
|
|
||||||
(use-package dtache
|
(use-package dtache
|
||||||
:git (:repo "https://gitlab.com/niklaseklund/dtache")
|
:git (:repo "https://gitlab.com/niklaseklund/dtache")
|
||||||
|
@ -78,7 +78,7 @@ console."
|
|||||||
"neofetch resolution"))) "x")))
|
"neofetch resolution"))) "x")))
|
||||||
(resx (car resolution))
|
(resx (car resolution))
|
||||||
(resy (cadr resolution))
|
(resy (cadr resolution))
|
||||||
(font-height (+ 15 (/ resy 8))))
|
(font-height (/ resy 11)))
|
||||||
(set-face-attribute 'fixed-pitch nil :height font-height)
|
(set-face-attribute 'fixed-pitch nil :height font-height)
|
||||||
(set-face-attribute 'default nil :height font-height)
|
(set-face-attribute 'default nil :height font-height)
|
||||||
(set-face-attribute 'variable-pitch nil :height (+ font-height 10))))
|
(set-face-attribute 'variable-pitch nil :height (+ font-height 10))))
|
||||||
|
Loading…
Reference in New Issue
Block a user