summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.emacs.d/init.el19
-rw-r--r--emacs.org6
2 files changed, 6 insertions, 19 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 0f5d21a..59cb9e4 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -321,9 +321,9 @@ Contains the list of packages that need to be installed.")
;; ~/.guix-profile. Otherwise we use /bin/zsh.
(if
(or (string= (system-name) "hephaestus")
- (string= (system-name) "heisenberg"))
+ (string= (system-name) "zeus"))
(setq vterm-shell "~/.guix-profile/bin/bash")
- (setq vterm-shell "/bin/zsh")))
+ (setq vterm-shell "/bin/bash")))
(use-package eshell
:ensure nil
@@ -770,7 +770,7 @@ you have the correctly set the OPENAI_API_KEY variable"
'((emacs-lisp . t)
(python . t)))
-(add-to-list 'org-structure-template-alist '("sh" . "src shell"))
+(add-to-list 'org-structure-template-alist '("ex" . "SRC EXAMPLE"))
(add-to-list 'org-structure-template-alist '("b" . "src bash"))
(add-to-list 'org-structure-template-alist '("el" . "src emacs-lisp"))
(add-to-list 'org-structure-template-alist '("py" . "src python"))
@@ -961,16 +961,3 @@ you have the correctly set the OPENAI_API_KEY variable"
(setq message-send-mail-function 'smtpmail-send-it
smtpmail-stream-type 'ssl))
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; 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.
- '(package-selected-packages
- '(desktop-environment telega magit-popup geiser-guile edit-indirect tablist diminish ement yaml-mode which-key weblorg typescript-mode toc-org sudo-edit simple-httpd sicp rjsx-mode rainbow-delimiters quelpa-use-package pyvenv python-mode paredit org-superstar org-snooze org-modern org-make-toc org-auto-tangle monkeytype mastodon magit lsp-ui json-mode helpful haskell-mode general flycheck fancy-battery exwm-mff exwm-firefox-core eshell-syntax-highlighting emojify elfeed-goodies doom-themes doom-modeline dashboard dap-mode counsel corfu consult company-box circe alsamixer all-the-icons-ivy-rich all-the-icons-dired)))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; 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.
- )
diff --git a/emacs.org b/emacs.org
index 717bae5..1e7f679 100644
--- a/emacs.org
+++ b/emacs.org
@@ -406,9 +406,9 @@ Hook with ~dired-mode~
;; ~/.guix-profile. Otherwise we use /bin/zsh.
(if
(or (string= (system-name) "hephaestus")
- (string= (system-name) "heisenberg"))
+ (string= (system-name) "zeus"))
(setq vterm-shell "~/.guix-profile/bin/bash")
- (setq vterm-shell "/bin/zsh")))
+ (setq vterm-shell "/bin/bash")))
#+end_src
** Eshell
#+begin_src emacs-lisp
@@ -883,7 +883,7 @@ Hook with ~dired-mode~
'((emacs-lisp . t)
(python . t)))
- (add-to-list 'org-structure-template-alist '("sh" . "src shell"))
+ (add-to-list 'org-structure-template-alist '("ex" . "SRC EXAMPLE"))
(add-to-list 'org-structure-template-alist '("b" . "src bash"))
(add-to-list 'org-structure-template-alist '("el" . "src emacs-lisp"))
(add-to-list 'org-structure-template-alist '("py" . "src python"))