aboutsummaryrefslogtreecommitdiff
path: root/bard-emacs-modules
diff options
context:
space:
mode:
Diffstat (limited to 'bard-emacs-modules')
-rw-r--r--bard-emacs-modules/bard-emacs-emms.el12
-rw-r--r--bard-emacs-modules/bard-emacs-lang.el10
-rw-r--r--bard-emacs-modules/bard-emacs-org.el23
-rw-r--r--bard-emacs-modules/bard-emacs-package.el26
-rw-r--r--bard-emacs-modules/bard-emacs-ui.el11
5 files changed, 68 insertions, 14 deletions
diff --git a/bard-emacs-modules/bard-emacs-emms.el b/bard-emacs-modules/bard-emacs-emms.el
index 4056486..c1e0777 100644
--- a/bard-emacs-modules/bard-emacs-emms.el
+++ b/bard-emacs-modules/bard-emacs-emms.el
@@ -2,19 +2,23 @@
;; | EMMS |
;; |------------------------------------|
-(require 'emms-setup)
-(require 'emms-mpris)
+(require 'emms-info-mediainfo)
+(add-to-list 'emms-info-functions 'emms-info-mediainfo)
(emms-all)
(emms-default-players)
(emms-mpris-enable)
(setq emms-player-list '(emms-player-mpv)
- emms-info-functions '(emms-info-native)
- emms-playlist-buffer-name "*Music*")
+ emms-info-functions '(emms-info-native))
+
+(setq emms-browser-covers 'emms-browser-cache-thumbnail)
;; Keymaps
(define-key global-map (kbd "<f8>") #'emms)
(define-key global-map (kbd "M-<f8>") #'emms-browser)
(define-key emms-playlist-mode-map (kbd "A") #'emms-add-directory)
+(define-key emms-playlist-mode-map (kbd "T") #'emms-add-directory-tree)
+(define-key emms-playlist-mode-map (kbd "L") #'emms-toggle-repeat-track)
+(define-key emms-playlist-mode-map (kbd "<mouse-3>") #'emms-pause)
(provide 'bard-emacs-emms)
diff --git a/bard-emacs-modules/bard-emacs-lang.el b/bard-emacs-modules/bard-emacs-lang.el
index b8da4f4..eebdd68 100644
--- a/bard-emacs-modules/bard-emacs-lang.el
+++ b/bard-emacs-modules/bard-emacs-lang.el
@@ -24,9 +24,14 @@
;;; Commentary:
;;; Code:
+
+;; Snippet directories
+(setq yasnippet-snippets-dir '("/home/bard/.emacs.d/elpa/yasnippet-snippets-20231219.1505/snippets" "/home/bard/.emacs.d/snippets/"))
+
(defun bard/common-modes-hook ()
"Commonly used modes, bundled in one hook."
(display-line-numbers-mode 1)
+ (bard/set-up-whitespace-handling)
(hl-todo-mode 1))
(add-hook 'prog-mode-hook 'bard/common-modes-hook)
@@ -56,5 +61,10 @@
(add-to-list 'exec-path "/home/bard/.cabal/bin")
(add-to-list 'exec-path "/home/bard/.local/bin")
+;; GGTAGS
+(with-eval-after-load 'ggtags
+ (define-key ggtags-mode-map (kbd "M->") nil)
+ (define-key ggtags-mode-map (kbd "M-<") nil))
+
(provide 'bard-emacs-lang.el)
;;; bard-emacs-lang.el ends here
diff --git a/bard-emacs-modules/bard-emacs-org.el b/bard-emacs-modules/bard-emacs-org.el
index df94bf9..9c9a8ca 100644
--- a/bard-emacs-modules/bard-emacs-org.el
+++ b/bard-emacs-modules/bard-emacs-org.el
@@ -3,6 +3,8 @@
;; |------------------------------------|
(require 'bard-emacs-ui)
+(require 'org)
+(require 'ox)
;; Org Variables
(setq org-directory "~/Notes/Org-Roam/")
@@ -18,11 +20,12 @@
org-insert-heading-respect-content t)
(with-eval-after-load "org-mode"
- (setq org-format-latex-options (plist-put org-format-latex-options :scale 1.6)))
-
+ (setq org-format-latex-options (plist-put org-format-latex-options :scale 1.6))
+ )
;; Org todo keywords - changed to using hl-todo faces fixed by modus/ef themes
(setq org-todo-keywords '((sequence "TODO(t)" "WAIT(w)" "|" "DONE(d)" "KILLED(k)")))
+(add-hook 'org-mode-hook 'hl-todo-mode)
;; org-todo-keyword-faces '(("TODO" . (:weight bold :foreground "#CC9393" :weight bold))
;; ("WAIT" . (:weight bold :foreground "#DFAF8F" :weight bold))
;; ("DONE" . (:weight bold :weight bold :foreground "#AFD8AF"))
@@ -42,7 +45,7 @@
;; (add-hook 'org-mode-hook 'fly-spell-mode)
;; Org Agenda Faces
-;; (custom-set-faces '(org-agenda-structure ((t (:inherit bold :foreground "#70a89f" :height 1.5 :family "Iosevka Comfy Motion Duo")))))
+(custom-set-faces '(org-agenda-structure ((t (:inherit bold :height 1.5 :family "Iosevka Comfy Motion")))))
;; Org Agenda
(defun bard/choose-agenda ()
@@ -135,3 +138,17 @@
"\n* Tags: \n%? \n\n"
:if-new (file+head "Ideas/%<%Y%m%d%H%M%S>-${slug}.org" "#+TITLE: ${title}\n")
:unnarrowed t)))
+
+;; Blogging with Jekyll
+(setq org-publish-project-alist
+ '(("bardmandev" ;; my blog project (just a name)
+ ;; Path to org files.
+ :base-directory "~/Code/bardmandev/_org/"
+ :base-extension "org"
+ ;; Path to Jekyll Posts
+ :publishing-directory "~/Code/bardmandev/_posts/"
+ :recursive t
+ :publishing-function org-html-publish-to-html
+ :headline-levels 4
+ :html-extension "html"
+ :body-only t)))
diff --git a/bard-emacs-modules/bard-emacs-package.el b/bard-emacs-modules/bard-emacs-package.el
index 2e67386..b5b7887 100644
--- a/bard-emacs-modules/bard-emacs-package.el
+++ b/bard-emacs-modules/bard-emacs-package.el
@@ -52,14 +52,14 @@ The exact color values are taken from the active Ef theme."
("TEMP" . ,red)
("FIXME" . ,red-warmer)
("XXX+" . ,red-warmer)
+ ("KILLED" . ,cyan)
("REVIEW" . ,red)
("DEPRECATED" . ,yellow)))))
-(add-hook 'ef-themes-post-load-hook #'bard/ef-themes-hl-todo-faces)
-
- (load-theme 'ef-spring t)
+ (add-hook 'ef-themes-post-load-hook #'bard/ef-themes-hl-todo-faces)
(define-key global-map (kbd "M-<f5>") #'ef-themes-toggle)
- (setq ef-themes-to-toggle '(ef-melissa-dark ef-melissa-light)))
+ (setq ef-themes-to-toggle '(ef-melissa-dark ef-melissa-light))
+ (load-theme 'ef-melissa-dark t))
(use-package modus-themes
:ensure t
@@ -92,6 +92,7 @@ The exact color values are taken from the active Ef theme."
("FIXME" . ,red-warmer)
("XXX+" . ,red-warmer)
("REVIEW" . ,red)
+ ("KILLED" . ,cyan)
("DEPRECATED" . ,yellow)))))
(add-hook 'modus-themes-post-load-hook #'bard/modus-themes-hl-todo-faces)
@@ -122,6 +123,11 @@ The exact color values are taken from the active Ef theme."
(use-package magit
:ensure t)
+(use-package magit-todos
+ :ensure t
+ :config
+ (magit-todos-mode 1))
+
;; Vertico completion
(use-package vertico
:ensure t
@@ -297,11 +303,21 @@ The exact color values are taken from the active Ef theme."
(diminish 'org-roam-ui-mode "ORUI")
(diminish 'auto-revert-mode)
(diminish 'eldoc-mode)
- (diminish 'company-mode))
+ (diminish 'company-mode)
+ (diminish 'whitespace-mode))
(use-package eshell-git-prompt
:ensure t
:config
(eshell-git-prompt-use-theme 'robbyrussell))
+(use-package shell-pop
+ :ensure t)
+
+(use-package circe
+ :ensure t
+ :bind (("C-t" . shell-pop))
+ :config
+ (setq shell-pop-term-shell "/bin/bash"))
+
(provide 'bard-emacs-package.el)
diff --git a/bard-emacs-modules/bard-emacs-ui.el b/bard-emacs-modules/bard-emacs-ui.el
index 2388bb6..0964e5f 100644
--- a/bard-emacs-modules/bard-emacs-ui.el
+++ b/bard-emacs-modules/bard-emacs-ui.el
@@ -38,6 +38,13 @@
(menu-bar-mode -1)
(tool-bar-mode 0)
+;; Whitespace, used in bard-emacs-lang.el
+(defun bard/set-up-whitespace-handling ()
+ (interactive)
+ (whitespace-mode 1))
+
+(setq whitespace-style '(face tabs spaces trailing space-before-tab newline indentation empty space-after-tab space-mark tab-mark))
+
;; Modeline
(setq display-time-format "%Y-%m-%d %H:%M")
(setq display-time-default-load-average nil)
@@ -70,13 +77,13 @@
(progn
(text-scale-set 0.2)
(setq olivetti-body-width 100)
- (set-fringe-mode 0)
+ (set-fringe-mode 0)
(olivetti-mode t))
(progn
(olivetti-mode 0)
(text-scale-set 0)
(mixed-pitch-mode 0)
- (fringe-mode nil)
+ (fringe-mode nil)
(setq cursor-type 'box))))
:bind
(("<f9>" . bard/olivetti-toggle)))
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-06 11:06:34 +0000