diff options
| -rw-r--r-- | bard-emacs-modules/bard-emacs-lang.el | 11 | ||||
| -rw-r--r-- | bard-emacs-modules/bard-emacs-org.el | 13 | ||||
| -rw-r--r-- | bard-emacs-modules/bard-emacs-package.el | 43 | ||||
| -rw-r--r-- | bard-emacs-modules/bard-emacs-ui.el | 15 | ||||
| -rw-r--r-- | bookmarks | 8 | ||||
| -rw-r--r-- | init.el | 6 |
6 files changed, 56 insertions, 40 deletions
diff --git a/bard-emacs-modules/bard-emacs-lang.el b/bard-emacs-modules/bard-emacs-lang.el index 3623718..3135007 100644 --- a/bard-emacs-modules/bard-emacs-lang.el +++ b/bard-emacs-modules/bard-emacs-lang.el @@ -31,7 +31,11 @@ (add-hook 'emacs-lisp-mode-hook 'bard/common-modes-hook) (add-hook 'haskell-mode-hook 'bard/common-modes-hook) +(add-hook 'haskell-mode-hook 'interactive-haskell-mode) +(add-hook 'haskell-mode-hook 'haskell-doc-mode) +(add-hook 'haskell-mode-hook 'haskell-indent-mode) (add-hook 'clojure-mode-hook 'bard/common-modes-hook) +(add-hook 'tuareg-mode-hook 'bard/common-modes-hook) ;; CPP Mode (defun bard/c++-mode-keybindings () @@ -41,9 +45,12 @@ (add-hook 'c++-mode 'bard/common-modes-hook) ;; Haskell -(setq exec-path (append exec-path '("/home/bard/.ghcup/bin/haskell-language-server-wrapper"))) -(setq exec-path (append exec-path '("/home/bard/.ghcup/bin/haskell-language-server-9.0.2"))) +;; (add-to-list 'company-backends 'company-dabbrev-code) +;; (add-to-list 'company-backends 'company-yasnippet) +;; (add-to-list 'company-backends 'company-files) + (add-to-list 'exec-path "/home/bard/.ghcup/bin") +(add-to-list 'exec-path "/home/bard/.cabal/bin") (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 b1f7e06..7f72b24 100644 --- a/bard-emacs-modules/bard-emacs-org.el +++ b/bard-emacs-modules/bard-emacs-org.el @@ -12,9 +12,10 @@ ;; Making org mode look nice (setq org-startup-indented t - org-hide-emphasis-markers t - org-startup-with-inline-images t - org-image-actual-width '(600)) + org-hide-emphasis-markers t + org-startup-with-inline-images t + org-image-actual-width '(600) + org-insert-heading-respect-content t) ;; Org todo keywords (setq org-todo-keywords '((sequence "TODO(t)" "WAIT(w)" "|" "DONE(d)" "KILLED(k)")) @@ -82,7 +83,7 @@ (require 'org-protocol) (setq org-capture-templates - '(("h" "Homework" entry (file+olp "~/Notes/Org-Roam/todo.org" "Inbox" "Homework") + '(("h" "Homework" entry (file+olp "~/Notes/Org-Roam/todo.org" "Inbox" "Important Stuff") "* TODO %?") ("e" "Extra/Coding" entry (file+olp "~/Notes/Org-Roam/todo.org" "Inbox" "Extra/Coding") "* TODO %?") @@ -110,11 +111,11 @@ :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+TITLE: ${title}\n") :unnarrowed t) ("b" "bio" plain - "#+ANKI_DECK: Bio \n\n* Tags :: [[id:cfe7bda9-b154-4d6b-989f-6af778a98cbd][Biology]] \n\n* %? \n" + "#+ANKI_DECK: Bio \n\n* Tags :: [[id:cfe7bda9-b154-4d6b-989f-6af778a98cbd][Biology]] \n\n* ${title}%? \n" :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+TITLE: ${title}\n") :unnarrowed t) ("u" "apush" plain - "#+ANKI_DECK: APUSH \n\n* Tags :: [[id:06334c1d-5c06-4b70-bfd8-a074c0c36706][APUSH]] \n\n* %? \n" + "#+ANKI_DECK: APUSH \n\n* Tags :: [[id:06334c1d-5c06-4b70-bfd8-a074c0c36706][APUSH]] \n\n* ${title}%? \n" :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+TITLE: ${title}\n") :unnarrowed t) ("s" "snapshot" plain diff --git a/bard-emacs-modules/bard-emacs-package.el b/bard-emacs-modules/bard-emacs-package.el index 078cb30..d0abaa4 100644 --- a/bard-emacs-modules/bard-emacs-package.el +++ b/bard-emacs-modules/bard-emacs-package.el @@ -38,8 +38,9 @@ ;; :ensure t ;; :config ;; ;; (load-theme 'ef-cyprus t) +;; (load-theme 'ef-winter t) ;; (define-key global-map (kbd "<f5>") #'ef-themes-toggle) -;; (setq ef-themes-to-toggle '(ef-autumn ef-cyprus))) +;; (setq ef-themes-to-toggle '(ef-winter ef-frost))) ;; (use-package modus-themes ;; :ensure t @@ -53,6 +54,9 @@ :config (load-theme 'zenburn t)) +(use-package gruvbox-theme + :ensure t) + (use-package rainbow-mode :ensure t) @@ -163,16 +167,17 @@ (use-package dashboard :ensure t :config - (dashboard-setup-startup-hook) - (setq dashboard-startup-banner "~/.emacs.d/img/catwithscarf.jpg") - (setq dashboard-banner-logo-width 50) - (setq dashboard-banner-logo-height 50) - (setq dashboard-center-content t) - (setq dashboard-items '((recents . 5) - (bookmarks . 5) - (projects . 5))) - (setq dashboard-banner-logo-title "An Old Farmer's Smile") - (setq dashboard-set-footer nil)) + (setq initial-buffer-choice 'dashboard-open) + (dashboard-setup-startup-hook) + (setq dashboard-startup-banner "~/.emacs.d/img/catwithscarf.jpg") + (setq dashboard-banner-logo-width 50) + (setq dashboard-banner-logo-height 50) + (setq dashboard-center-content t) + (setq dashboard-items '((recents . 5) + (bookmarks . 5) + (projects . 5))) + (setq dashboard-banner-logo-title "An Old Farmer's Smile") + (setq dashboard-set-footer nil)) (use-package elfeed :ensure t @@ -239,6 +244,9 @@ :init (global-flycheck-mode t)) +(use-package tuareg + :ensure t) + (use-package smartparens :ensure t :config @@ -288,17 +296,4 @@ (diminish 'eldoc-mode) (diminish 'company-mode)) -(use-package diminish - :ensure t - :config - (diminish 'rainbow-mode) - (diminish 'helm-mode) - (diminish 'flycheck-mode) - (diminish 'which-key-mode) - (diminish 'yas-minor-mode) - (diminish 'org-roam-ui-mode "ORUI") - (diminish 'auto-revert-mode) - (diminish 'eldoc-mode) - (diminish 'company-mode)) - (provide 'bard-emacs-package.el) diff --git a/bard-emacs-modules/bard-emacs-ui.el b/bard-emacs-modules/bard-emacs-ui.el index 929907a..9bd3efe 100644 --- a/bard-emacs-modules/bard-emacs-ui.el +++ b/bard-emacs-modules/bard-emacs-ui.el @@ -44,15 +44,22 @@ (setq display-time-mail-file nil) (display-time-mode 1) - ;; Fonts (set-face-attribute 'default nil :font "Iosevka Comfy" :height 140) (set-face-attribute 'fixed-pitch nil :font "Iosevka Comfy" :height 140) -(set-face-attribute 'variable-pitch nil :font "Iosevka Comfy Wide" :height 140) -;; (set-face-attribute 'variable-pitch nil :font "FreeSans" :height 140) +(set-face-attribute 'variable-pitch nil :font "Gentium Plus" :height 140) (add-to-list 'default-frame-alist '(font . "Iosevka Comfy-14.5")) +;; Switching themes +(defun bard/disable-all-themes () + "disable all active themes." + (dolist (i custom-enabled-themes) + (disable-theme i))) + +(defadvice load-theme (before disable-themes-first activate) + (bard/disable-all-themes)) + ;; olivetti (use-package olivetti :config @@ -63,11 +70,13 @@ (progn (text-scale-set 0.2) (setq olivetti-body-width 100) + (set-fringe-mode 0) (olivetti-mode t)) (progn (olivetti-mode 0) (text-scale-set 0) (mixed-pitch-mode 0) + (fringe-mode nil) (setq cursor-type 'box)))) :bind (("<f9>" . bard/olivetti-toggle))) @@ -8,10 +8,10 @@ (rear-context-string) (position . 1)) ("org-capture-last-stored" - (filename . "~/Notes/Org-Roam/todo.org") - (front-context-string . "*** TODO write s") - (rear-context-string . "esharing server\n") - (position . 980)) + (filename . "~/Notes/Org-Roam/20231208050212-election_of_1860_and_secession.org") + (front-context-string . "#+ANKI_DECK: APU") + (rear-context-string . "0 and Secession\n") + (position . 108)) ("School" (filename . "~/Documents/School/") (front-context-string . "APUSH.pdf\n -rw-") @@ -34,6 +34,7 @@ (defun load-directory (dir) "Load all .el files in the specified directory." (dolist (file (directory-files dir t "\\.el$")) + (message "Loading file: %s" file) (load file))) ;; Load all .el files in the bard-elisp directory @@ -78,8 +79,11 @@ ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. + '(org-format-latex-options + '(:foreground default :background default :scale 1.0 :html-foreground "Black" :html-background "Transparent" :html-scale 1.6 :matchers + ("begin" "$1" "$" "$$" "\\(" "\\["))) '(package-selected-packages - '(helm-rg helm smartparens smart-parens flycheck vterm zenburn-theme yasnippet-snippets which-key vertico use-package toc-org tao-theme sly rainbow-mode projectile pdf-tools org-roam-ui org-cliplink orderless olivetti multiple-cursors modus-themes mixed-pitch marginalia magit hl-todo haskell-mode expand-region elfeed-org elfeed-goodies ef-themes dashboard counsel company clojure-snippets cider))) + '(zenburn-theme gruber-darker-theme gruber-darker org-bullets org-bullet gruvbox-theme tuareg emacs-everywhere helm-gtags helm-rg helm smartparens smart-parens flycheck vterm yasnippet-snippets which-key vertico use-package toc-org tao-theme sly rainbow-mode projectile pdf-tools org-roam-ui org-cliplink orderless olivetti multiple-cursors modus-themes mixed-pitch marginalia magit hl-todo haskell-mode expand-region elfeed-org elfeed-goodies ef-themes dashboard counsel company clojure-snippets cider))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. |