diff options
-rw-r--r-- | .config/hypr/hyprpaper.conf | 2 | ||||
-rw-r--r-- | .emacs.d/init.el | 21 | ||||
-rwxr-xr-x | org/emacs.org | 23 |
3 files changed, 26 insertions, 20 deletions
diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf index 59e7c18..e4b177d 100644 --- a/.config/hypr/hyprpaper.conf +++ b/.config/hypr/hyprpaper.conf @@ -6,4 +6,4 @@ wallpaper = DP-1, ~/dotfiles/pictures/wallpaper-cyberpunk.jpg wallpaper = HDMI-A-1, ~/dotfiles/pictures/wallpaper-cyberpunk.jpg -wallpaper = eDP-1, ~/dotfiles/pictures/wallpaper-cyberpunk.jpg
\ No newline at end of file +wallpaper = LVDS-1, ~/dotfiles/pictures/wallpaper-cyberpunk.jpg
\ No newline at end of file diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 52e1174..6a8a315 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -70,7 +70,8 @@ (setq package-archives '(("melpa" . "https://melpa.org/packages/") ("org" . "https://orgmode.org/elpa/") - ("elpa" . "https://elpa.gnu.org/packages/"))) + ("elpa" . "https://elpa.gnu.org/packages/") + ("jcs-elpa" . "https://jcs-emacs.github.io/jcs-elpa/packages/"))) (package-initialize) (unless package-archive-contents (package-refresh-contents)) @@ -138,6 +139,8 @@ Contains the list of packages that need to be installed.") (add-hook mode (lambda () (display-line-numbers-mode 0)))) (defvar apollo/default-font-size 140) +(when (equal (system-name) "hermes") + (setq apollo/default-font-size 110)) (set-face-attribute 'default nil :font "JetBrains Mono" @@ -551,14 +554,14 @@ Contains the list of packages that need to be installed.") :keymaps 'org-mode-map "3" 'org-insert-image-size-300) -(require 'quelpa-use-package) -(use-package chatgpt - :quelpa ((chatgpt :fetcher git :url "https://github.com/joshcho/ChatGPT.el.git") :upgrade t) - :init - (require 'python) - (setq chatgpt-repo-path (expand-file-name "chatgpt/" quelpa-build-dir)) - (setq python-interpreter "/usr/bin/python3") - :bind ("C-c q" . chatgpt-query)) +;; (require 'quelpa-use-package) +;; (use-package chatgpt +;; :quelpa ((chatgpt :fetcher git :url "https://github.com/joshcho/ChatGPT.el.git") :upgrade t) +;; :init +;; (require 'python) +;; (setq chatgpt-repo-path (expand-file-name "chatgpt/" quelpa-build-dir)) +;; (setq python-interpreter "/usr/bin/python3") +;; :bind ("C-c q" . chatgpt-query)) (add-hook 'org-mode-hook 'org-make-toc-mode) diff --git a/org/emacs.org b/org/emacs.org index 7b0a5ba..02a9cd7 100755 --- a/org/emacs.org +++ b/org/emacs.org @@ -88,7 +88,8 @@ Set our ~package-archives~, and install our packages #+begin_src emacs-lisp (setq package-archives '(("melpa" . "https://melpa.org/packages/") ("org" . "https://orgmode.org/elpa/") - ("elpa" . "https://elpa.gnu.org/packages/"))) + ("elpa" . "https://elpa.gnu.org/packages/") + ("jcs-elpa" . "https://jcs-emacs.github.io/jcs-elpa/packages/"))) (package-initialize) (unless package-archive-contents (package-refresh-contents)) @@ -112,7 +113,7 @@ Set our ~package-archives~, and install our packages (unless (package-installed-p 'use-package) (package-install 'use-package)) - + ;; set and load custom.el (setq custom-file (concat user-emacs-directory "custom.el")) (load custom-file 'noerror) @@ -161,6 +162,8 @@ Fonts and basic appearance settings (add-hook mode (lambda () (display-line-numbers-mode 0)))) (defvar apollo/default-font-size 140) + (when (equal (system-name) "hermes") + (setq apollo/default-font-size 110)) (set-face-attribute 'default nil :font "JetBrains Mono" @@ -606,14 +609,14 @@ Hook with ~dired-mode~ #+end_src ** ChatGPT #+begin_src emacs-lisp - (require 'quelpa-use-package) - (use-package chatgpt - :quelpa ((chatgpt :fetcher git :url "https://github.com/joshcho/ChatGPT.el.git") :upgrade t) - :init - (require 'python) - (setq chatgpt-repo-path (expand-file-name "chatgpt/" quelpa-build-dir)) - (setq python-interpreter "/usr/bin/python3") - :bind ("C-c q" . chatgpt-query)) + ;; (require 'quelpa-use-package) + ;; (use-package chatgpt + ;; :quelpa ((chatgpt :fetcher git :url "https://github.com/joshcho/ChatGPT.el.git") :upgrade t) + ;; :init + ;; (require 'python) + ;; (setq chatgpt-repo-path (expand-file-name "chatgpt/" quelpa-build-dir)) + ;; (setq python-interpreter "/usr/bin/python3") + ;; :bind ("C-c q" . chatgpt-query)) #+end_src * Org-mode Configuration ** org-make-toc |