diff --git a/.gitignore b/.gitignore index 8f46dde..15f8b60 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,10 @@ tree-sitter !.dir-locals.el eshell request +<<<<<<< HEAD >>>>>>> be5987a (added dir locals to allow emacs submodule as a project) +======= +/.cache/ +/mastodon.plstore +/persist/ +>>>>>>> c7ec4a3 (Added new packages/emojis) diff --git a/emojis/custom/guix.png b/emojis/custom/guix.png new file mode 100644 index 0000000..349bb3e Binary files /dev/null and b/emojis/custom/guix.png differ diff --git a/src/modules/built-in/emacs.org b/src/modules/built-in/emacs.org index 4c26062..4acfcf2 100644 --- a/src/modules/built-in/emacs.org +++ b/src/modules/built-in/emacs.org @@ -5,7 +5,7 @@ :config ;; Disable tool-bar (tool-bar-mode -1) - + ;; Enable horizontal mouse scroll (setq mouse-wheel-tilt-scroll t) diff --git a/src/modules/completion/vertico.org b/src/modules/completion/vertico.org index 796ed33..6d3c0b6 100644 --- a/src/modules/completion/vertico.org +++ b/src/modules/completion/vertico.org @@ -5,3 +5,20 @@ (vertico-mode) (vertico-mouse-mode)) #+end_src + +#+begin_src elisp +(use-package mini-popup + :vc (:url "https://github.com/minad/mini-popup" + :branch "main") + :disabled + :config + (mini-popup-mode)) +#+end_src + +#+begin_src elisp +(use-package vertico-posframe + :vc (:url "https://github.com/tumashu/vertico-posframe" + :branch "main") + :config + (vertico-posframe-mode 1)) +#+end_src diff --git a/src/modules/interface/all-the-icons.org b/src/modules/interface/all-the-icons.org new file mode 100644 index 0000000..f6338f9 --- /dev/null +++ b/src/modules/interface/all-the-icons.org @@ -0,0 +1,4 @@ +#+begin_src elisp +(use-package all-the-icons + :ensure t) +#+end_src diff --git a/src/modules/interface/dired-sidebar.org b/src/modules/interface/dired-sidebar.org index 157a477..7ffe9b3 100644 --- a/src/modules/interface/dired-sidebar.org +++ b/src/modules/interface/dired-sidebar.org @@ -1,6 +1,7 @@ #+begin_src elisp (use-package dired-sidebar :ensure t + :disabled :commands (dired-sidebar-toggle-sidebar) :config (setq dired-sidebar-theme 'nerd-icons)) diff --git a/src/modules/interface/doom-themes.org b/src/modules/interface/doom-themes.org index 834e726..f45b559 100644 --- a/src/modules/interface/doom-themes.org +++ b/src/modules/interface/doom-themes.org @@ -7,6 +7,9 @@ doom-themes-enable-italic t) ; if nil, italics is universally disabled (load-theme 'doom-one t) + (setq doom-themes-treemacs-theme "doom-atom") ; use "doom-colors" for less minimal icon theme + (doom-themes-treemacs-config) + ;; Enable flashing mode-line on errors (doom-themes-visual-bell-config) ;; Corrects (and improves) org-mode's native fontification. diff --git a/src/modules/interface/emojify.org b/src/modules/interface/emojify.org index 5659f7a..24cf0d1 100644 --- a/src/modules/interface/emojify.org +++ b/src/modules/interface/emojify.org @@ -8,7 +8,10 @@ ("style" . "github"))) (":estus:" . (("name" . "Estus") ("image" . "~/.config/emacs/emojis/custom/estus.png") - ("style" . "github"))))) + ("style" . "github"))) + (":guix:" . (("name" . "Guix") + ("image" . "~/.config/emacs/emojis/custom/guix.png") + ("style" . "github"))))) (when (featurep 'emojify) (emojify-set-emoji-data))) #+END_SRC diff --git a/src/modules/interface/treemacs.org b/src/modules/interface/treemacs.org new file mode 100644 index 0000000..40f3d3a --- /dev/null +++ b/src/modules/interface/treemacs.org @@ -0,0 +1,10 @@ +#+begin_src elisp +(use-package treemacs + :ensure t + :hook + (dashboard-after-initialize-hook . treemacs) + :config + (treemacs-project-follow-mode) + (setq treemacs-project-follow-into-home t)) + +#+end_src diff --git a/src/modules/utility/mastodon.org b/src/modules/utility/mastodon.org new file mode 100644 index 0000000..f93a9ab --- /dev/null +++ b/src/modules/utility/mastodon.org @@ -0,0 +1,7 @@ +#+begin_src elisp +(use-package mastodon + :ensure t + :config + (setq mastodon-instance-url "https://fosstodon.org" + mastodon-active-user "superkamiguru")) +#+end_src diff --git a/src/modules/utility/mpv.org b/src/modules/utility/mpv.org new file mode 100644 index 0000000..1626033 --- /dev/null +++ b/src/modules/utility/mpv.org @@ -0,0 +1,5 @@ +#+begin_src elisp +(use-package mpv + :ensure t) +#+end_src +