From 889003e3cb9473726815f6b19156e5843bafe74e Mon Sep 17 00:00:00 2001 From: Mateus Pinto Rodrigues Date: Mon, 14 Oct 2019 18:14:09 -0300 Subject: [PATCH] Use straight.el instead of package.el to manage my packages --- .gitignore | 2 +- elisp/custom.el | 15 --------------- elisp/extras.el | 37 ++++++++++++++++++------------------- elisp/settings.el | 18 +++--------------- init.el | 24 +++++++++++++++++++++++- 5 files changed, 45 insertions(+), 51 deletions(-) delete mode 100644 elisp/custom.el diff --git a/.gitignore b/.gitignore index 0061fed..9b61199 100644 --- a/.gitignore +++ b/.gitignore @@ -8,5 +8,5 @@ eshell/ games/ url/ elpa/ +straight/ tramp - diff --git a/elisp/custom.el b/elisp/custom.el deleted file mode 100644 index ccee95d..0000000 --- a/elisp/custom.el +++ /dev/null @@ -1,15 +0,0 @@ -(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 - '(gnu-elpa-keyring-update tide rjsx-mode use-package org-brain poly-noweb julia-mode zenburn-theme xref-js2 slime racket-mode racer polymode paredit org-ref org lua-mode json-mode js2-refactor ivy-bibtex haskell-mode ess-smart-underscore counsel company-tern cargo auto-complete)) - '(send-mail-function 'smtpmail-send-it) - '(tramp-syntax 'default nil (tramp))) -(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/elisp/extras.el b/elisp/extras.el index 09f0744..62799cb 100644 --- a/elisp/extras.el +++ b/elisp/extras.el @@ -5,38 +5,39 @@ ;; Always use slant for italic, not underline '(italic ((t (:slant italic)))) -;; Load my packages -;; Check if packages are available (I guess) -(eval-when-compile - (require 'use-package)) +;;;; Load my packages +;;Default theme +(use-package zenburn-theme + :config + (load-theme 'zenburn t)) ;;R -(use-package ess-site - :ensure ess +(use-package ess :config (load "~/.emacs.d/elisp/ess-setup.el")) ;;Javascript (use-package js2-mode - :ensure t :config (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode)) ;better imenu (add-hook 'js2-mode-hook #'js2-imenu-extras-mode) (load "~/.emacs.d/elisp/javascript.el")) -(use-package rjsx-mode - :ensure t) +(use-package rjsx-mode) ;;Typescript (use-package tide - :ensure t :config (load "~/.emacs.d/elisp/typescript.el")) +;;Purescript +(use-package psc-ide + :config + (load "~/.emacs.d/elisp/purescript.el")) + (use-package org-brain :disabled - :ensure t :init (setq org-brain-path "~/repos/csphy/drafts") :config @@ -50,23 +51,21 @@ ;;Rust (use-package rust-mode - :ensure t :config (load "~/.emacs.d/elisp/rust-setup.el")) ;;Org (use-package org - :ensure t :config (load "~/.emacs.d/elisp/org-setup.el")) -(use-package ivy - :ensure ivy - :ensure ivy-bibtex - :config - (load "~/.emacs.d/elisp/ivy-setup.el")) +;; Ivy related stuff +(use-package ivy) +(use-package ivy-bibtex) +(use-package counsel) +(use-package swiper) -;(load "~/.emacs.d/elisp/polymode-setup.el") +(load "~/.emacs.d/elisp/ivy-setup.el") (load "~/.emacs.d/elisp/outline-keymap.el") (load "~/.emacs.d/elisp/bibtex-setup.el") diff --git a/elisp/settings.el b/elisp/settings.el index 5e7d3f5..bec662c 100644 --- a/elisp/settings.el +++ b/elisp/settings.el @@ -1,9 +1,6 @@ ;; Write custom set variables to different file (setq custom-file "~/.emacs.d/elisp/custom.el") -;; Set my color theme -(load-theme 'zenburn t) - ;; Set default encoding (setq current-language-environment "UTF-8") @@ -16,28 +13,19 @@ (show-paren-mode 1) ;; This is the binary name of my scheme implementation -(setq scheme-program-name "racket") +(setq scheme-program-name "guile") ;; C default style (add-hook 'c-mode-hook (lambda () (c-set-style "linux"))) -;; Adding MELPA -(when (>= emacs-major-version 24) - (require 'package) - (add-to-list - 'package-archives - '("melpa" . "http://melpa.org/packages/") - '("gnu" . "http://elpa.gnu.org/packages/"))) -(put 'erase-buffer 'disabled nil) - ;; remove trailing white spaces before saving (add-hook 'before-save-hook 'delete-trailing-whitespace) -;; disable bars +;; disable bars by default (tool-bar-mode -1) -;(menu-bar-mode -1) +(menu-bar-mode -1) (scroll-bar-mode -1) ;; disable cursor blinking diff --git a/init.el b/init.el index 654fe68..407fa00 100644 --- a/init.el +++ b/init.el @@ -1,4 +1,26 @@ -;(package-initialize) +;; Bootstrap straight.el package manager +(defvar bootstrap-version) +(let ((bootstrap-file + (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) + (bootstrap-version 5)) + (unless (file-exists-p bootstrap-file) + (with-current-buffer + (url-retrieve-synchronously + "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el" + 'silent 'inhibit-cookies) + (goto-char (point-max)) + (eval-print-last-sexp))) + (load bootstrap-file nil 'nomessage)) + +;; Always use straight.el to install packages with use-package +(straight-use-package 'use-package) +(setq straight-use-package-by-default t) + +;; Minimal package.el use so we can explore melpa packages +(require 'package) +(add-to-list 'package-archives + '("melpa" . "https://melpa.org/packages/") + '("gnu" . "http://elpa.gnu.org/packages/")) (add-to-list 'load-path "~/.emacs.d/elisp/")