Skip to content

Commit

Permalink
Some doom changes
Browse files Browse the repository at this point in the history
  • Loading branch information
mrfluffy-dev committed Dec 24, 2023
1 parent 2a54560 commit 6c211f1
Show file tree
Hide file tree
Showing 19 changed files with 36 additions and 259 deletions.
66 changes: 31 additions & 35 deletions doom/.config/doom/config.el
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@
(add-hook 'prog-mode-hook 'fci-mode)

(custom-set-faces
'(org-level-1 ((t (:inherit outline-1 :height 1.4))))
'(org-level-2 ((t (:inherit outline-2 :height 1.3))))
'(org-level-3 ((t (:inherit outline-3 :height 1.2))))
'(org-level-4 ((t (:inherit outline-4 :height 1.1))))
'(org-level-5 ((t (:inherit outline-5 :height 1.0))))
)
'(org-level-1 ((t (:inherit outline-1 :height 1.4))))
'(org-level-2 ((t (:inherit outline-2 :height 1.3))))
'(org-level-3 ((t (:inherit outline-3 :height 1.2))))
'(org-level-4 ((t (:inherit outline-4 :height 1.1))))
'(org-level-5 ((t (:inherit outline-5 :height 1.0)))))


;; company mode delay 0
(setq company-idle-delay 0)
Expand All @@ -88,6 +88,9 @@

;;
;;
;;
(setq org-image-actual-width 300)

(setq fancy-splash-image (concat doom-user-dir "xenia.png"))

(setq ess-r--no-company-meta t)
Expand All @@ -96,7 +99,7 @@
(add-to-list 'default-frame-alist '(alpha-background . 90)) ; For all new frames henceforth


;undo fix
;undo fix
(setq undo-tree-enable-undo-in-region nil)
(setq undo-limit 8000000000)

Expand Down Expand Up @@ -146,17 +149,10 @@
:config
(setq x86-lookup-pdf "~/.config/doom/asm-ref.pdf"))

(setq openai-key (getenv "OPENAIKEY"))
(setq chatgpt-input-method 'minibuffer)


;; chatgpt stuff
(use-package! chatgpt
:defer t
:config
(unless (boundp 'python-interpreter)
(defvaralias 'python-interpreter 'python-shell-interpreter))
(setq chatgpt-repo-path (expand-file-name "straight/repos/ChatGPT.el/" doom-local-dir))
(set-popup-rule! (regexp-quote "*ChatGPT*")
:side 'bottom :size .5 :ttl nil :quit t :modeline nil)
:bind ("C-c q" . chatgpt-query))

;;discord rich presence
(require 'elcord)
Expand All @@ -167,24 +163,24 @@
(elcord-mode 1))))

(defun elcord--disable-elcord-if-no-frames (f)
(declare (ignore f))
(when (let ((frames (delete f (visible-frame-list))))
(or (null frames)
(and (null (cdr frames))
(eq (car frames) terminal-frame))))
(elcord-mode -1)
(add-hook 'after-make-frame-functions 'elcord--enable-on-frame-created)))

(defun elcord--enable-on-frame-created (f)
(declare (ignore f))
(elcord-mode +1))

(defun my/elcord-mode-hook ()
(if elcord-mode
(add-hook 'delete-frame-functions 'elcord--disable-elcord-if-no-frames)
(remove-hook 'delete-frame-functions 'elcord--disable-elcord-if-no-frames)))

(add-hook 'elcord-mode-hook 'my/elcord-mode-hook)
(declare (ignore f))
(when (let ((frames (delete f (visible-frame-list))))
(or (null frames)
(and (null (cdr frames))
(eq (car frames) terminal-frame))))
(elcord-mode -1)
(add-hook 'after-make-frame-functions 'elcord--enable-on-frame-created)))

(defun elcord--enable-on-frame-created (f)
(declare (ignore f))
(elcord-mode +1))

(defun my/elcord-mode-hook ()
(if elcord-mode
(add-hook 'delete-frame-functions 'elcord--disable-elcord-if-no-frames)
(remove-hook 'delete-frame-functions 'elcord--disable-elcord-if-no-frames)))

(add-hook 'elcord-mode-hook 'my/elcord-mode-hook)

(setq elcord-idle-message "Out doing your mom")

Expand Down
3 changes: 1 addition & 2 deletions doom/.config/doom/custom.el
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
;; 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.
'(elfeed-feeds
'("https://www.reddit.com/r/hentai.rss" "https://www.reddit.com/r/AnimeFeets.rss" "https://www.reddit.com/r/thighdeology.rss" "https://www.reddit.com/r/UndressingHentai.rss" "https://www.reddit.com/r/hentaibondage.rss" "https://www.reddit.com/r/ElegantR34.rss" "https://www.reddit.com/r/AnimeGirlsAndThongs.rss" "https://www.reddit.com/r/AnimeGirls.rss"))
'(elfeed-feeds '("https://www.reddit.com/r/pcmasterrace/rss"))
'(warning-suppress-log-types '((initialization)))
'(warning-suppress-types '((initialization) (initialization))))
(custom-set-faces
Expand Down
2 changes: 1 addition & 1 deletion doom/.config/doom/init.el
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
;;fsharp ; ML stands for Microsoft's Language
;;fstar ; (dependent) types and (monadic) effects and Z3
;;gdscript ; the language you waited for
;;(go +lsp) ; the hipster dialect
(go +lsp) ; the hipster dialect
(haskell +lsp) ; a language that's lazier than I am
;;hy ; readability of scheme w/ speed of python
;;idris ; a language you can depend on
Expand Down
220 changes: 0 additions & 220 deletions doom/.config/doom/lisp/chatgpt.el

This file was deleted.

Empty file added doom/.config/doom/lisp/test.el
Empty file.
4 changes: 3 additions & 1 deletion doom/.config/doom/packages.el
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@
:recipe (:host github :repo "zerolfx/copilot.el" :files ("*.el" "dist")))
(package! highlight-indent-guides)
(package! yuck-mode)
(package! openai
:recipe (:host github :repo "emacs-openai/openai" :files ("*.el")))
(package! chatgpt
:recipe (:host github :repo "joshcho/ChatGPT.el" :files ("dist" "*.el")))
:recipe (:host github :repo "mrfluffy-dev/chatgpt" :files ("*.el")))

(package! nasm-mode :pin "65ca6546fc395711fac5b3b4299e76c2303d43a8")
(package! haxor-mode :pin "6fa25a8e6b6a59481bc0354c2fe1e0ed53cbdc91")
Expand Down

0 comments on commit 6c211f1

Please sign in to comment.