Compare commits

..

No commits in common. "946ea868eba978ab77d39597094dc5ce9534e3b2" and "315694498a6400a3bee71d660d65f62e27e65dcf" have entirely different histories.

2 changed files with 42 additions and 42 deletions

82
init.el
View File

@ -1234,49 +1234,49 @@ Taken from https://howardism.org/Technical/Emacs/eshell-why.html"
:commands 'cube)
;; Emacs App Framework. Definitely pretty broken but it worked once
;; (unless (eq system-type 'windows-nt)
;; (use-package eaf
;; :git (:host github :repo "emacs-eaf/emacs-application-framework"
;; :files ("*.el" "*.py" "core" "app" "*.json")
;; :pre-build (("python" "install-eaf.py"
;; "--install" "pdf-viewer" "browser"
;; "--ignore-sys-deps")))
;; :commands (eaf-open-browser eaf-open-url-at-point)
;; :config (add-to-list 'load-path (expand-file-name "app/" eaf-source-dir))
;; (if (and (string= (getenv "XDG_CURRENT_DESKTOP") "Hyprland")
;; (featurep 'hypop))
;; (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.
(unless (eq system-type 'windows-nt)
(use-package eaf
:git (:host github :repo "emacs-eaf/emacs-application-framework"
:files ("*.el" "*.py" "core" "app" "*.json")
:pre-build (("python" "install-eaf.py"
"--install" "pdf-viewer" "browser"
"--ignore-sys-deps")))
:commands (eaf-open-browser eaf-open-url-at-point)
:config (add-to-list 'load-path (expand-file-name "app/" eaf-source-dir))
(if (and (string= (getenv "XDG_CURRENT_DESKTOP") "Hyprland")
(featurep 'hypop))
(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.
;; 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."
;; (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"))))
;; ((string-equal (getenv "XDG_CURRENT_DESKTOP") "Hyprland")
;; (let ((clients (json-parse-string (shell-command-to-string "hyprctl -j clients")))
;; (coordinate))
;; (dotimes (i (length clients))
;; (when (and (equal (gethash "pid" (aref clients i)) (emacs-pid))
;; (not (string= (gethash "title" (aref clients i)) hypop--frame-name)))
;; (setq coordinate (gethash "at" (aref clients i)))))
;; (list (aref coordinate 0) (aref coordinate 1))))
;; ((eaf-emacs-running-in-wayland-native)
;; (require 'dbus)
;; (let* ((coordinate (eaf--split-number
;; (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'.
;; (frame-x (truncate (/ (car coordinate) (frame-scale-factor))))
;; (frame-y (truncate (/ (cadr coordinate) (frame-scale-factor)))))
;; (list frame-x frame-y)))
;; (t (list 0 0)))))
;; (use-package eaf-browser
;; :git nil
;; :after eaf
;; :custom
;; (eaf-browser-continue-where-left-off t)
;; (eaf-browser-enable-adblocker t))))
This is redefined for use with `hypop' library because multiple Emacs frames may be open."
(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"))))
((string-equal (getenv "XDG_CURRENT_DESKTOP") "Hyprland")
(let ((clients (json-parse-string (shell-command-to-string "hyprctl -j clients")))
(coordinate))
(dotimes (i (length clients))
(when (and (equal (gethash "pid" (aref clients i)) (emacs-pid))
(not (string= (gethash "title" (aref clients i)) hypop--frame-name)))
(setq coordinate (gethash "at" (aref clients i)))))
(list (aref coordinate 0) (aref coordinate 1))))
((eaf-emacs-running-in-wayland-native)
(require 'dbus)
(let* ((coordinate (eaf--split-number
(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'.
(frame-x (truncate (/ (car coordinate) (frame-scale-factor))))
(frame-y (truncate (/ (cadr coordinate) (frame-scale-factor)))))
(list frame-x frame-y)))
(t (list 0 0)))))
(use-package eaf-browser
:git nil
:after eaf
:custom
(eaf-browser-continue-where-left-off t)
(eaf-browser-enable-adblocker t))))
(use-package dtache
:git (:repo "https://gitlab.com/niklaseklund/dtache")

View File

@ -78,7 +78,7 @@ console."
"neofetch resolution"))) "x")))
(resx (car resolution))
(resy (cadr resolution))
(font-height (/ resy 11)))
(font-height (+ 15 (/ resy 8))))
(set-face-attribute 'fixed-pitch nil :height font-height)
(set-face-attribute 'default nil :height font-height)
(set-face-attribute 'variable-pitch nil :height (+ font-height 10))))