marcuskammer/emacs.d
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of git.sr.ht:~marcuskammer/emacs.d

Browse source
This commit is contained in:
Marcus Kammer 2023-10-23 08:40:15 +02:00
commit 005b84220e
2 changed files with 30 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
bundle/bundle--gui.el
View file

@ -23,28 +23,36 @@
(add-hook 'after-make-frame-functions 'center-frame) (add-hook 'after-make-frame-functions 'center-frame)
(defun my-vc-info ()
(when vc-mode
(concat (substring vc-mode 5)
" ["
(substring (vc-working-revision (buffer-file-name)) 0 8)
"] ")))
(defun my-project-name ()
(file-name-base (directory-file-name (project-root (project-current)))))
(setq-default header-line-format (setq-default header-line-format
(list "%b %l:%c %i %p " (list "%b %*%n %l:%c %p "
'(:eval mode-name) '(:eval mode-name) " "
'(:eval (format-mode-line minor-mode-alist)) '(:eval (my-vc-info))
" "
'(:eval (when vc-mode
(concat (substring vc-mode 5)
" ["
(substring (vc-working-revision (buffer-file-name)) 0 8)
"] ")))
'(:eval (if mode-line-process (concat ":" mode-line-process) "")) '(:eval (if mode-line-process (concat ":" mode-line-process) ""))
'(:eval (file-name-directory buffer-file-name))
" "
"-%-")) "-%-"))
(setq-default mode-line-format (setq-default mode-line-format
(list "" (list ""
'(:eval (when-let ((project (project-current))) '(:eval (my-project-name)) " "
(concat (file-name-base (directory-file-name (project-root project))) " ")))
global-mode-string global-mode-string
'(:eval (concat system-name " " user-login-name)) '(:eval (concat system-name " " user-login-name))
" " " "
"-%-")) "-%-"))
(set-face-attribute 'mode-line nil :weight 'bold)
(set-face-attribute 'header-line nil :weight 'bold)
(use-package all-the-icons (use-package all-the-icons
:if (display-graphic-p) :if (display-graphic-p)
:commands all-the-icons-install-fonts :commands all-the-icons-install-fonts
@ -86,19 +94,16 @@
(use-package ace-window :init (global-set-key (kbd "M-o") 'ace-window)) (use-package ace-window :init (global-set-key (kbd "M-o") 'ace-window))
;; (use-package emojify (use-package emojify
;; ;; https://ianyepan.github.io/posts/emacs-emojis/ :config
;; :config (when (member "Segoe UI Emoji" (font-family-list))
;; (when (member "Segoe UI Emoji" (font-family-list)) ;; https://ianyepan.github.io/posts/emacs-emojis/
;; (set-fontset-font (set-fontset-font t 'symbol (font-spec :family "Segoe UI Emoji") nil 'prepend)
;; t 'symbol (font-spec :family "Segoe UI Emoji") nil 'prepend)) (setq emojify-display-style 'unicode)
;; (setq emojify-display-style 'unicode) (setq emojify-emoji-styles '(unicode))))
;; (setq emojify-emoji-styles '(unicode)))
;; (use-package vertico :init (vertico-mode)) ;; (use-package vertico :init (vertico-mode))
(use-package emojify)
(use-package webjump (use-package webjump
:bind ("C-c j" . webjump) :bind ("C-c j" . webjump)
:custom :custom

6
bundle/bundle--package.el
View file

@ -574,8 +574,10 @@ Uses `mk/hyperspec-dir-locations' to find the directory."
(use-package plantuml-mode (use-package plantuml-mode
:defer t :defer t
:mode ("\\.puml\\'" "\\.plantuml\\'")
:custom :custom
(plantuml-default-exec-mode 'jar) (plantuml-default-exec-mode 'jar)
(plantuml-jar-path "~/plantuml.jar")
:config :config
(when (eq system-type 'windows-nt) (when (eq system-type 'windows-nt)
(let ((jar-path "~/AppData/Local/Programs/plantuml/plantuml.jar")) (let ((jar-path "~/AppData/Local/Programs/plantuml/plantuml.jar"))
@ -610,5 +612,5 @@ Uses `mk/hyperspec-dir-locations' to find the directory."
epg-gpg-program "c:/Program Files (x86)/GnuPG/bin/gpg.exe" epg-gpg-program "c:/Program Files (x86)/GnuPG/bin/gpg.exe"
epg-gpgconf-program "c:/Program Files (x86)/GnuPG/bin/gpgconf.exe"))) epg-gpgconf-program "c:/Program Files (x86)/GnuPG/bin/gpgconf.exe")))
(use-package which-key) (use-package which-key
(which-key-mode) :init (which-key-mode))