From 62dd664426b0f807625378fb15528b83efe373cb Mon Sep 17 00:00:00 2001 From: Akko Date: Mon, 22 Jul 2024 12:52:31 +0200 Subject: [PATCH] idk --- config.el | 56 ++++++----------------------------------------- config.org | 62 +++++++++-------------------------------------------- init.el | 23 +++++++++++--------- packages.el | 3 +++ 4 files changed, 32 insertions(+), 112 deletions(-) diff --git a/config.el b/config.el index f47ac6a..ee787c7 100644 --- a/config.el +++ b/config.el @@ -18,6 +18,7 @@ (if (string= (system-name) "illya") (set-frame-font "Monoflow 12" nil t) (set-frame-font "Monoflow Medium 20" nil t)) +(set-frame-font "Mononoki Medium 12") (setq doom-theme 'doom-ayu-mirage) @@ -72,6 +73,8 @@ (defadvice projectile-project-root (around ignore-remote first activate) (unless (file-remote-p default-directory) ad-do-it)) +(setq aw-scope 'global) + (setq web-mode-script-padding 0 js-indent-level 2 js2-strict-missing-semi-warning nil @@ -210,9 +213,11 @@ (org-publish-all)) (map! :leader - (:prefix ("a" . "akko") + (:prefix-map + ("a" . "akko") :desc "Publish Blog" "b" #'akko/publish-blog + :desc "Force Publish Blog" "f" #'akko/force-publish-blog)) (setq org-html-htmlize-output-type 'css) @@ -230,52 +235,3 @@ (setq shell-file-name (executable-find "bash")) (setq-default vterm-shell (executable-find "fish")) (setq-default explicit-shell-file-name (executable-find "fish")) - -(use-package! eaf - :load-path "~/.elisp/emacs-application-framework" - :init - :custom - (eaf-browser-continue-where-left-off t) - (eaf-browser-enable-adblocker t) - (browse-url-browser-function 'eaf-open-browser) ;; Make EAF Browser my default browser - :config - (defalias 'browse-web #'eaf-open-browser) - - ;(require 'eaf-file-manager) - ;(require 'eaf-music-player) - ;(require 'eaf-image-viewer) - ;(require 'eaf-camera) - ;(require 'eaf-demo) - ;(require 'eaf-airshare) - ;(require 'eaf-terminal) - ;(require 'eaf-markdown-previewer) - ;(require 'eaf-video-player) - ;(require 'eaf-vue-demo) - ;(require 'eaf-file-sender) - ;(require 'eaf-pdf-viewer) - ;(require 'eaf-mindmap) - ;(require 'eaf-netease-cloud-music) - ;(require 'eaf-jupyter) - ;(require 'eaf-org-previewer) - ;(require 'eaf-system-monitor) - ;(require 'eaf-rss-reader) - ;(require 'eaf-file-browser) - (require 'eaf-browser) - ;(require 'eaf-org) - ;(require 'eaf-mail) - ;(require 'eaf-git) - (when (display-graphic-p) - (require 'eaf-all-the-icons)) - - (require 'eaf-evil) - (define-key key-translation-map (kbd "SPC") - (lambda (prompt) - (if (derived-mode-p 'eaf-mode) - (pcase eaf--buffer-app-name - ("browser" (if (string= (eaf-call-sync "call_function" eaf--buffer-id "is_focus") "True") - (kbd "SPC") - (kbd eaf-evil-leader-key))) - ("pdf-viewer" (kbd eaf-evil-leader-key)) - ("image-viewer" (kbd eaf-evil-leader-key)) - (_ (kbd "SPC"))) - (kbd "SPC"))))) diff --git a/config.org b/config.org index 224ae6c..6f05d8f 100644 --- a/config.org +++ b/config.org @@ -27,6 +27,7 @@ Honestly I barely remember what some of this stuff is supposed to do, this is th (if (string= (system-name) "illya") (set-frame-font "Monoflow 12" nil t) (set-frame-font "Monoflow Medium 20" nil t)) +(set-frame-font "Mononoki Medium 12") #+END_SRC ** Theme #+BEGIN_SRC emacs-lisp @@ -103,6 +104,12 @@ Honestly I barely remember what some of this stuff is supposed to do, this is th (unless (file-remote-p default-directory) ad-do-it)) #+END_SRC +** Ace-window +Make ace-window work across frames +#+BEGIN_SRC emacs-lisp +(setq aw-scope 'global) +#+END_SRC + * Major modes ** web-mode #+BEGIN_SRC emacs-lisp @@ -266,9 +273,11 @@ Honestly I barely remember what some of this stuff is supposed to do, this is th (org-publish-all)) (map! :leader - (:prefix ("a" . "akko") + (:prefix-map + ("a" . "akko") :desc "Publish Blog" "b" #'akko/publish-blog + :desc "Force Publish Blog" "f" #'akko/force-publish-blog)) (setq org-html-htmlize-output-type 'css) @@ -291,54 +300,3 @@ Honestly I barely remember what some of this stuff is supposed to do, this is th (setq-default explicit-shell-file-name (executable-find "fish")) #+END_SRC -* eaf shit -#+BEGIN_SRC emacs-lisp -(use-package! eaf - :load-path "~/.elisp/emacs-application-framework" - :init - :custom - (eaf-browser-continue-where-left-off t) - (eaf-browser-enable-adblocker t) - (browse-url-browser-function 'eaf-open-browser) ;; Make EAF Browser my default browser - :config - (defalias 'browse-web #'eaf-open-browser) - - ;(require 'eaf-file-manager) - ;(require 'eaf-music-player) - ;(require 'eaf-image-viewer) - ;(require 'eaf-camera) - ;(require 'eaf-demo) - ;(require 'eaf-airshare) - ;(require 'eaf-terminal) - ;(require 'eaf-markdown-previewer) - ;(require 'eaf-video-player) - ;(require 'eaf-vue-demo) - ;(require 'eaf-file-sender) - ;(require 'eaf-pdf-viewer) - ;(require 'eaf-mindmap) - ;(require 'eaf-netease-cloud-music) - ;(require 'eaf-jupyter) - ;(require 'eaf-org-previewer) - ;(require 'eaf-system-monitor) - ;(require 'eaf-rss-reader) - ;(require 'eaf-file-browser) - (require 'eaf-browser) - ;(require 'eaf-org) - ;(require 'eaf-mail) - ;(require 'eaf-git) - (when (display-graphic-p) - (require 'eaf-all-the-icons)) - - (require 'eaf-evil) - (define-key key-translation-map (kbd "SPC") - (lambda (prompt) - (if (derived-mode-p 'eaf-mode) - (pcase eaf--buffer-app-name - ("browser" (if (string= (eaf-call-sync "call_function" eaf--buffer-id "is_focus") "True") - (kbd "SPC") - (kbd eaf-evil-leader-key))) - ("pdf-viewer" (kbd eaf-evil-leader-key)) - ("image-viewer" (kbd eaf-evil-leader-key)) - (_ (kbd "SPC"))) - (kbd "SPC"))))) -#+END_SRC diff --git a/init.el b/init.el index 82f7290..6f46116 100644 --- a/init.el +++ b/init.el @@ -20,6 +20,9 @@ +prescient +icons) + vertico ;;todo checkout + + :checkers syntax @@ -27,7 +30,7 @@ ;;deft ; notational velocity for Emacs doom ; what makes DOOM look the way it does doom-dashboard ; a nifty splash screen for Emacs - doom-quit ; DOOM quit-message prompts when you quit Emacs + ;;doom-quit ; DOOM quit-message prompts when you quit Emacs ;;fill-column ; a `fill-column' indicator hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW ;;hydra @@ -84,7 +87,7 @@ ;;direnv ;;docker editorconfig ; let someone else argue about tabs vs spaces - ein ; tame Jupyter notebooks with emacs + ;;ein ; tame Jupyter notebooks with emacs (eval +overlay) ; run code, run (also, repls) flycheck ; tasing you for every semicolon you forget ;;flyspell ; tasing you for misspelling mispelling @@ -101,7 +104,7 @@ ;;pass ; password manager for nerds pdf ; pdf enhancements ;;prodigy ; FIXME managing external services & code builders - ;;rgb ; creating color strings + rgb ; creating color strings ;;terraform ; infrastructure as code ;;tmux ; an API for interacting with tmux ;;upload ; map local to remote projects via ssh/ftp @@ -126,7 +129,7 @@ ;;fsharp ; ML stands for Microsoft's Language ;;go ; the hipster dialect (haskell +lsp) ; a language that's lazier than I am - hy ; readability of scheme w/ speed of python + ;;hy ; readability of scheme w/ speed of python ;;idris ; ;;(java +meghanada) ; the poster child for carpal tunnel syndrome (javascript +lsp) ; all(hope(abandon(ye(who(enter(here)))))) @@ -155,21 +158,21 @@ ;;plantuml ; diagrams for confusing people more ;;purescript ; javascript, but functional (python ; beautiful is better than ugly - +conda + ;; +conda +lsp) - qt ; the 'cutest' gui framework ever - racket ; a DSL for DSLs + ;;qt ; the 'cutest' gui framework ever + ;;racket ; a DSL for DSLs ;;rest ; Emacs as a REST client ;;rst ; ReST in peace ;;ruby ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + ;;rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() ;;scala ; java, but good scheme ; a fully conniving family of lisps (sh +fish +lsp) ; she sells {ba,z,fi}sh shells on the C xor - solidity ; do you need a blockchain? No. + ;;solidity ; do you need a blockchain? No. ;;swift ; who asked for emoji variables? ;;terra ; Earth and Moon in alignment for performance. - web ; the tubes + (web +lsp) ; the tubes :email ;;(mu4e +gmail) diff --git a/packages.el b/packages.el index 7cdad16..f5df68a 100644 --- a/packages.el +++ b/packages.el @@ -14,3 +14,6 @@ (package! ob-ledger :recipe (:local-repo "lisp/ob-ledger")) (package! elcord) (package! emacsql-sqlite3) + +(package! sly-overlay + :recipe (:host sourcehut :repo "fosskers/sly-overlay") :pin "916b50297a1f3bb110f840b89b8717d194623e5f")