diff --git a/.gitignore b/.gitignore index eaa2626..8f46dde 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,8 @@ auto-save-list eln-cache elpa emacs-backup -emojis +emojis/* +!emojis/custom history projects recentf diff --git a/dashboard-logo/Guru.png b/dashboard-logo/Guru.png new file mode 100644 index 0000000..f3eb00d Binary files /dev/null and b/dashboard-logo/Guru.png differ diff --git a/dashboard-logo/MSG.png b/dashboard-logo/MSG.png new file mode 100644 index 0000000..648aa94 Binary files /dev/null and b/dashboard-logo/MSG.png differ diff --git a/dashboard-logo/Manray.png b/dashboard-logo/Manray.png new file mode 100644 index 0000000..7ebbdb5 Binary files /dev/null and b/dashboard-logo/Manray.png differ diff --git a/dashboard-logo/Powerline.png b/dashboard-logo/Powerline.png new file mode 100644 index 0000000..84769d7 Binary files /dev/null and b/dashboard-logo/Powerline.png differ diff --git a/dashboard-logo/dbpee.gif b/dashboard-logo/dbpee.gif new file mode 100644 index 0000000..267e4a7 Binary files /dev/null and b/dashboard-logo/dbpee.gif differ diff --git a/dashboard-logo/gandalf.gif b/dashboard-logo/gandalf.gif new file mode 100644 index 0000000..44dd404 Binary files /dev/null and b/dashboard-logo/gandalf.gif differ diff --git a/emojis/custom/estus.png b/emojis/custom/estus.png new file mode 100644 index 0000000..021084b Binary files /dev/null and b/emojis/custom/estus.png differ diff --git a/emojis/custom/solaire.png b/emojis/custom/solaire.png new file mode 100644 index 0000000..4c5a790 Binary files /dev/null and b/emojis/custom/solaire.png differ diff --git a/init.el b/init.el index fbd7650..d927245 100644 --- a/init.el +++ b/init.el @@ -8,22 +8,9 @@ ;; 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-fold-core-style 'overlays) - '(org-safe-remote-resources - '("\\`https://fniessen\\.github\\.io/org-html-themes/org/theme-readtheorg\\.setup\\'")) '(package-selected-packages nil) '(package-vc-selected-packages - '((ultra-scroll :url "https://github.com/jdtsmith/ultra-scroll"))) - '(safe-local-variable-values - '((org-global-properties - (header-args - . ":tangle yes\12 :results none\12 :noweb yes")) - (eval add-hook 'after-save-hook - (lambda nil - (org-babel-with-temp-filebuffer - (concat (vc-root-dir) "publish.org") - (org-sbe "publish-project"))) - nil t)))) + '((ultra-scroll :url "https://github.com/jdtsmith/ultra-scroll")))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/src/modules/built-in/emacs.org b/src/modules/built-in/emacs.org index 2f17602..4c26062 100644 --- a/src/modules/built-in/emacs.org +++ b/src/modules/built-in/emacs.org @@ -30,6 +30,18 @@ ;; Enable SPC option in minibuffer ;;(define-key minibuffer-local-completion-map (kbd "SPC") 'self-insert-command) + ;; Enable SPC option in minibuffer + ;;(define-key minibuffer-local-completion-map (kbd "SPC") 'self-insert-command) + ;; Enable fido mode + ;;(setq fido-mode t) + ;;(fido-vertical-mode) + + ;;(defun my-icomplete-styles () + ;; (setq-local completion-styles '(orderless))) + ;;(add-hook 'icomplete-minibuffer-setup-hook 'my-icomplete-styles) + + + ;; Disable native comp warnings (setq native-comp-async-report-warnings-errors 'silent) diff --git a/src/modules/built-in/hyperbole.org b/src/modules/built-in/hyperbole.org index 2536d48..e0f1c4d 100644 --- a/src/modules/built-in/hyperbole.org +++ b/src/modules/built-in/hyperbole.org @@ -2,6 +2,7 @@ (use-package hyperbole :ensure t :defer t + :disabled :config (hyperbole-mode 1)) diff --git a/src/modules/built-in/org.org b/src/modules/built-in/org.org index 4d22bc1..712390c 100644 --- a/src/modules/built-in/org.org +++ b/src/modules/built-in/org.org @@ -8,6 +8,9 @@ :ensure t) #+end_src +#+begin_src elisp +(use-package ob-shell) +#+end_src #+begin_src elisp (use-package org @@ -21,7 +24,9 @@ (org-babel-do-load-languages 'org-babel-load-languages '((php . t) - (scheme . t))) + (scheme . t) + (sql . t) + (shell .t))) ;;(verb . t))) (add-to-list 'org-src-lang-modes '("php" . php-ts)) diff --git a/src/modules/completion/company.org b/src/modules/completion/company.org index a226909..ac9b3c0 100644 --- a/src/modules/completion/company.org +++ b/src/modules/completion/company.org @@ -1,7 +1,6 @@ #+begin_src elisp (use-package company :ensure t - :after (hyperbole) - :hook - (after-init . global-company-mode)) + :config + (add-hook 'after-init-hook 'global-company-mode)) #+end_src diff --git a/src/modules/completion/vertico.org b/src/modules/completion/vertico.org index fc98388..796ed33 100644 --- a/src/modules/completion/vertico.org +++ b/src/modules/completion/vertico.org @@ -1,6 +1,7 @@ #+begin_src elisp - (use-package vertico - :ensure t - :init - (vertico-mode)) +(use-package vertico + :ensure t + :init + (vertico-mode) + (vertico-mouse-mode)) #+end_src diff --git a/src/modules/interface/dashboard.org b/src/modules/interface/dashboard.org index 905ce10..6b302cd 100644 --- a/src/modules/interface/dashboard.org +++ b/src/modules/interface/dashboard.org @@ -1,7 +1,55 @@ #+begin_src elisp (use-package dashboard :ensure t + :after nerd-icons :config (dashboard-setup-startup-hook) - (setq dashboard-center-content t)) + + (setq dashboard-startupify-list '(dashboard-insert-banner + dashboard-insert-newline + dashboard-insert-banner-title + dashboard-insert-newline + dashboard-insert-navigator + dashboard-insert-newline + dashboard-insert-init-info + dashboard-insert-items + dashboard-insert-newline + dashboard-insert-footer)) + (setq dashboard-startup-banner '("~/.config/emacs/dashboard-logo/Powerline.png" "~/.config/emacs/dashboard-logo/Guru.png" "~/.config/emacs/dashboard-logo/Manray.png" "~/.config/emacs/dashboard-logo/dbpee.gif" "~/.config/emacs/dashboard-logo/MSG.png" "~/.config/emacs/dashboard-logo/gandalf.gif")) + (setq dashboard-banner-logo-title "Wumbology. The study of Wumbo.") + (setq dashboard-center-content t) + (setq dashboard-items '((recents . 5) + (projects . 5) + (bookmarks . 5) + (agenda . 5))) + (setq dashboard-display-icons-p t) + (setq dashboard-icon-type 'nerd-icons) + (setq dashboard-set-heading-icons t) + (setq dashboard-set-file-icons t) + (dashboard-modify-heading-icons '((recents . "nf-oct-file") + (bookmarks . "nf-oct-book") + (projects . "nf-oct-project") + (agenda . "nf-oct-calendar"))) + (setq dashboard-navigator-buttons + `(;; line1 + (("WORK" "" "" nil "" "" "")) + ((,(nerd-icons-mdicon "nf-md-bitbucket" :height 1.1 :v-adjust 0.0) + "Bitbucket" + "Browse Work Bitbucket" + (lambda (&rest _) (browse-url "https://bitbucket.org/c308/workspace/overview/"))) + (,(nerd-icons-mdicon "nf-md-jira" :height 1.1 :v-adjust 0.0) + "Jira" + "Browse Work Jira" + (lambda (&rest _) (browse-url "https://c308.atlassian.net/jira/your-work")))) + (("" "" "" () "" "" "")) + ;; line 2 + (("PERSONAL" "" "" nil "" "" "")) + ((,(nerd-icons-flicon "nf-linux-forgejo" :height 1.1 :v-adjust 0.0) + "Git" + "Browse Personal Forgejo" + (lambda (&rest _) (browse-url "https://forge.superkamiguru.org"))) + (,(nerd-icons-octicon "nf-oct-person_fill" :height 1.1 :v-adjust 0.0) + "Site" + "Browse Personal Website" + (lambda (&rest _) (browse-url "https://superkamiguru.org"))))))) #+end_src diff --git a/src/modules/interface/doom-modeline.org b/src/modules/interface/doom-modeline.org index 4555c3a..439c0bc 100644 --- a/src/modules/interface/doom-modeline.org +++ b/src/modules/interface/doom-modeline.org @@ -1,5 +1,6 @@ #+BEGIN_SRC elisp (use-package doom-modeline :ensure t + :after poke-line :init (doom-modeline-mode 1)) #+END_SRC diff --git a/src/modules/interface/emojify.org b/src/modules/interface/emojify.org index b118dd0..5659f7a 100644 --- a/src/modules/interface/emojify.org +++ b/src/modules/interface/emojify.org @@ -1,5 +1,16 @@ #+BEGIN_SRC elisp - (use-package emojify - :ensure t - :hook (after-init . global-emojify-mode)) +(use-package emojify + :ensure t + :hook (after-init . global-emojify-mode) + :config + (setq emojify-user-emojis '((":solaire:" . (("name" . "Solaire") + ("image" . "~/.config/emacs/emojis/custom/solaire.png") + ("style" . "github"))) + (":estus:" . (("name" . "Estus") + ("image" . "~/.config/emacs/emojis/custom/estus.png") + ("style" . "github"))))) + (when (featurep 'emojify) + (emojify-set-emoji-data))) #+END_SRC + + diff --git a/src/modules/languages/php.org b/src/modules/languages/php.org index d4f2a63..d6c8622 100644 --- a/src/modules/languages/php.org +++ b/src/modules/languages/php.org @@ -9,6 +9,6 @@ #+begin_src elisp (use-package company-php - ;;:disabled + :disabled :ensure t) -#+end_src \ No newline at end of file +#+end_src diff --git a/src/modules/languages/polymode.org b/src/modules/languages/polymode.org new file mode 100644 index 0000000..2395805 --- /dev/null +++ b/src/modules/languages/polymode.org @@ -0,0 +1,13 @@ +#+begin_src elisp +(use-package polymode + :disabled + :ensure t) +#+end_src + +#+begin_src elisp +(use-package poly-org + :disabled + :ensure t + :config + (add-to-list 'auto-mode-alist '("\\.org" . poly-org-mode))) +#+end_src diff --git a/src/modules/utility/dirvish.org b/src/modules/utility/dirvish.org new file mode 100644 index 0000000..93fdd93 --- /dev/null +++ b/src/modules/utility/dirvish.org @@ -0,0 +1,9 @@ +#+begin_src elisp +(use-package dirvish + :ensure t + :disabled + :config + (dirvish-override-dired-mode) + (setq dirvish-attributes + '(vc-state subtree-state all-the-icons collapse git-msg file-time file-size))) +#+end_src diff --git a/src/modules/utility/eaf.org b/src/modules/utility/eaf.org new file mode 100644 index 0000000..ebd0d8e --- /dev/null +++ b/src/modules/utility/eaf.org @@ -0,0 +1,8 @@ +#+begin_src elisp +(use-package eaf + :vc (:url "https://github.com/emacs-eaf/emacs-application-framework" + :branch "master") + :disabled + :config + (eaf-install-and-update)) +#+end_src diff --git a/src/modules/utility/fireplace.org b/src/modules/utility/fireplace.org new file mode 100644 index 0000000..48d5048 --- /dev/null +++ b/src/modules/utility/fireplace.org @@ -0,0 +1,4 @@ +#+begin_src elisp +(use-package fireplace + :ensure t) +#+end_src diff --git a/src/modules/utility/org-reminders.org b/src/modules/utility/org-reminders.org new file mode 100644 index 0000000..83f5f4a --- /dev/null +++ b/src/modules/utility/org-reminders.org @@ -0,0 +1,5 @@ +#+begin_src elisp +(use-package org-reminders + :vc (:url "https://github.com/ginqi7/org-reminders" + :branch "main")) +#+end_src \ No newline at end of file diff --git a/src/modules/utility/poke-line.org b/src/modules/utility/poke-line.org new file mode 100644 index 0000000..04de536 --- /dev/null +++ b/src/modules/utility/poke-line.org @@ -0,0 +1,7 @@ +#+begin_src elisp +(use-package poke-line + :ensure t + :config + (poke-line-global-mode 1) + (setq-default poke-line-pokemon "gengar")) +#+end_src