diff options
Diffstat (limited to 'shoshimacs.el')
| -rw-r--r-- | shoshimacs.el | 111 |
1 files changed, 15 insertions, 96 deletions
diff --git a/shoshimacs.el b/shoshimacs.el index b3071e6..76741d3 100644 --- a/shoshimacs.el +++ b/shoshimacs.el @@ -25,7 +25,7 @@ (string-trim (with-temp-buffer (shell-command "hostname" t) (buffer-string)))) (defvar my-themes-to-install - '(cyberpunk-theme dracula-theme nano-theme ef-themes) + '(cyberpunk-theme dracula-theme ef-themes kaolin-themes) "List of themes to install when loading shoshimacs config.") (defvar my-chosen-themes @@ -37,8 +37,7 @@ "List of themes I prefer for narrowing and random selection.") ;;; Package Management -(when (< emacs-major-version 28) - (add-to-list 'package-archives '("nongnu" . "https://elpa.nongnu.org/nongnu/"))) +(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) (package-initialize) (package-refresh-contents) ;; this will make internet requests on start up @@ -134,12 +133,15 @@ (define-key vertico-map (kbd "M-DEL") #'vertico-directory-delete-word) (define-key vertico-map (kbd "M-j") #'vertico-quick-insert) -(package-install 'company) +(package-install 'corfu) +(setq corfu-auto t + corfu-cycle t + corfu-quit-no-match t) +(global-corfu-mode t) -(setq company-minimum-prefix-length 2 - company-idle-delay 0.3) ;; default is 0.2 - -(add-hook 'after-init-hook 'global-company-mode) +(package-install 'corfu-terminal) +(unless (display-graphic-p) + (corfu-terminal-mode +1)) (package-install 'which-key) (which-key-mode) @@ -153,6 +155,7 @@ (package-install 'markdown-mode) +(setq org-directory "~/org") (setq org-default-notes-file (concat org-directory "/notes.org")) (setq org-capture-templates @@ -197,56 +200,7 @@ ;;; Programming (setq inferior-lisp-program "sbcl") -(defvar slime-repo "https://github.com/slime/slime") -(defvar slime-src-dir (expand-file-name "~/src/slime/")) - -(unless (file-directory-p slime-src-dir) - (shell-command - (format "git clone %s %s" slime-repo slime-src-dir))) - -(add-to-list 'load-path slime-src-dir) -(require 'slime-autoloads) - -(let ((default-directory (concat slime-src-dir "doc/")) - (buf (get-buffer-create "*slime-make-info*"))) - (unless (file-exists-p "slime.info") - (shell-command "make clean" "*slime-make-info*") - (shell-command "make slime.info" "*slime-make-info*"))) - -(defvar slime-company-repo "https://github.com/anwyn/slime-company") -(defvar slime-company-src-dir (expand-file-name "~/src/slime-company/")) - -(unless (file-directory-p slime-company-src-dir) - (shell-command - (format "git clone %s %s" slime-company-repo slime-company-src-dir))) - -(add-to-list 'load-path slime-company-src-dir) -(setq slime-company-completion 'fuzzy - slime-company-display-arglist 1) - -(setq slime-contribs - '( - slime-fancy ;; default value, includes many fundamental contribs - slime-company - slime-mrepl - inferior-slime - slime-fuzzy - slime-asdf - slime-banner - slime-presentations - slime-xref-browser - slime-highlight-edits - slime-quicklisp - )) - -(slime-setup) - -(defun my-slime-return (_) - "Function to advise `slime-repl-return' to make <RET> inspect the presentation at point." - (when (slime-presentation-around-or-before-point-p) - (slime-inspect-presentation-at-point (point)))) - -(advice-add 'slime-repl-return :before #'my-slime-return) +(package-install 'sly) (package-install 'json-mode) @@ -257,15 +211,7 @@ (when (executable-find "pry") (setq inf-ruby-default-implementation "pry")) -(defvar minitest-emacs-repo "https://github.com/arthurnn/minitest-emacs.git") -(defvar minitest-emacs-src-dir "~/src/minitest-emacs") - -(unless (file-directory-p minitest-emacs-src-dir) - (shell-command - (format "git clone %s %s" minitest-emacs-repo minitest-emacs-src-dir))) - -(add-to-list 'load-path minitest-emacs-src-dir) -(require 'minitest) +(package-install 'minitest) (package-install 'haml-mode) @@ -275,15 +221,7 @@ (define-key flymake-mode-map (kbd "M-n") 'flymake-goto-next-error) (define-key flymake-mode-map (kbd "M-p") 'flymake-goto-prev-error)) -(defvar plantuml-mode-repo "https://github.com/skuro/plantuml-mode") -(defvar plantuml-mode-src-dir "~/src/plantuml-mode") - -(unless (file-directory-p plantuml-mode-src-dir) - (shell-command - (format "git clone %s %s" plantuml-mode-repo plantuml-mode-src-dir))) - -(add-to-list 'load-path plantuml-mode-src-dir) -(require 'plantuml-mode) +(package-install 'plantuml-mode) (customize-set-value 'plantuml-default-exec-mode 'executable) ;;; Projects @@ -335,15 +273,7 @@ (kill-new url) (message "Pasted to %s (on kill ring)" url)))) -(defvar restclient-repo "https://github.com/pashky/restclient.el.git") -(defvar restclient-dir "~/src/restclient.el") - -(unless (file-directory-p restclient-dir) - (shell-command - (format "git clone %s %s" restclient-repo restclient-dir))) - -(add-to-list 'load-path restclient-dir) -(require 'restclient) +(package-install 'restclient) ;;; User Interface (when (display-graphic-p) @@ -363,17 +293,6 @@ (mapc #'package-install my-themes-to-install) -(defvar emacs-kaolin-repo "https://github.com/ogdenwebb/emacs-kaolin-themes") -(defvar emacs-kaolin-src-dir (expand-file-name "~/src/emacs-kaolin/")) - -(unless (file-directory-p emacs-kaolin-src-dir) - (shell-command - (format "git clone %s %s" emacs-kaolin-repo emacs-kaolin-src-dir))) - -(add-to-list 'load-path emacs-kaolin-src-dir) - -(require 'kaolin-themes) - (package-install 'autothemer) (setq telephone-line-lhs |