M init.el => init.el +6 -33
@@ 6,15 6,13 @@
;;; Code:
-;; (package-initialize)
-
;;; Install local user packages
(dolist (d (apply #'append (mapcar #'file-expand-wildcards
'("~/.local/share/emacs/site-lisp/*"
"/usr/local/share/emacs/site-lisp/*"
"/usr/share/emacs/site-lisp/*"))))
- (add-to-list 'load-path d t))
+ (add-to-list 'load-path d))
;;; Loading of personal config files
@@ 50,7 48,6 @@
(use-package markdown-mode
- :ensure t
:commands (markdown-mode gfm-mode)
:mode (("README\\.md\\'" . gfm-mode)
("\\.md\\'" . markdown-mode)
@@ 60,7 57,6 @@
;;; a minor mode for dealing with pairs
(use-package smartparens
- :ensure t
:config
(progn
(require 'smartparens-config)
@@ 69,7 65,6 @@
;;; magit: a Git Porcelain
(use-package magit
- :ensure t
:bind
(("C-x g" . magit-status)
("C-x M-g" . magit-dispatch-popup)))
@@ 77,7 72,6 @@
;;; Syntax/error checking
(use-package flycheck
- :ensure t
:init
(progn
(global-flycheck-mode)
@@ 87,7 81,6 @@
;;; Yasnippet: yet another snippet extension
(use-package yasnippet
- :ensure t
:bind
("C-c y" . yas-expand)
:config
@@ 95,13 88,11 @@
(use-package yasnippet-snippets
- :ensure t
:after yasnippet)
;;; Setup duckduckgo search engine
(use-package engine-mode
- :ensure t
:config
(defengine duckduckgo
"https://duckduckgo.com/?q=%s"
@@ 109,25 100,13 @@
(engine-mode))
-;;; Paradox: a modern package menu
-(use-package paradox
- :ensure t
- :commands (paradox-enable paradox-quit-and-close)
- :init
- (progn
- (paradox-enable)
- (evil-set-initial-state 'paradox-menu-mode 'motion)))
-
-
(use-package which-key
- :ensure t
:config
(which-key-mode))
;;; functions to manage packages on linux distros
-(use-package system-packages
- :ensure t)
+(use-package system-packages)
;;; setup the mu4e email client
@@ 136,13 115,12 @@
;;; statistics software and R-lang integration
-(use-package ess
- :ensure t)
+(use-package ess)
;;; TeX/LaTeX
(use-package tex
- :ensure auctex
+ :straight auctex
:init
(progn
(setq TeX-command-extra-options "-shell-escape")
@@ 154,13 132,11 @@
;;; ability to insert random text
-(use-package lorem-ipsum
- :ensure t)
+(use-package lorem-ipsum)
;;; number windows to easily switch between them
(use-package winum
- :ensure t
:config
(progn
(winum-mode)))
@@ 168,7 144,6 @@
;;; ledger
(use-package ledger-mode
- :ensure t
:defer t
:init
(progn
@@ 181,7 156,6 @@
;;; flycheck for ledger
(use-package flycheck-ledger
- :ensure t
:after ledger)
@@ 198,8 172,7 @@
;; If there is more than one, they won't work right.
'(flycheck-disabled-checkers (quote (emacs-lisp-checkdoc)))
'(initial-buffer-choice t)
- '(initial-scratch-message "")
- )
+ '(initial-scratch-message ""))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
M lisp/setup-appearance.el => lisp/setup-appearance.el +3 -1
@@ 29,7 29,9 @@
;;; Setup theme
(use-package darktooth-theme
- :ensure t)
+ :config
+ (progn
+ (enable-theme 'darktooth)))
(defun toggle-transparency ()
M lisp/setup-dev.el => lisp/setup-dev.el +1 -12
@@ 28,7 28,6 @@
;;; Company (complete anything) mode
(use-package company
- :ensure t
:init
(progn
(add-hook 'after-init-hook 'global-company-mode))
@@ 40,7 39,6 @@
;;; Quickhelp (documentation lookup) for company
(use-package company-quickhelp
- :ensure t
:after company
:config
(progn
@@ 50,7 48,6 @@
;;; company backend for C/C++ headers
(use-package company-c-headers
- :ensure t
:after company
:config
(progn
@@ 60,7 57,6 @@
(use-package projectile
- :ensure t
:defer nil
:bind
(:map mode-specific-map
@@ 71,27 67,22 @@
(use-package lsp-mode
- :ensure t
:commands lsp)
(use-package lsp-ui
- :ensure t
:commands lsp-ui-mode)
(use-package company-lsp
- :ensure t
:commands company-lsp)
(use-package zygospore
- :ensure t
:bind (("C-x 1" . zygospore-toggle-delete-other-windows)))
(use-package editorconfig
- :ensure t
:config
(progn
(editorconfig-mode 1)))
@@ 106,7 97,7 @@
(add-to-list 'semantic-new-buffer-setup-functions
(cons 'emacs-lisp-mode #'semantic-default-elisp-setup))
(semantic-mode 1)
-(use-package stickyfunc-enhance :ensure t)
+(use-package stickyfunc-enhance)
(defun rtags-hook ()
"Setup rtags and flycheck."
@@ 145,7 136,6 @@
(use-package zeal-at-point
- :ensure t
:bind
(("C-c d" . zeal-at-point))
:config
@@ 155,6 145,5 @@
(use-package pkgbuild-mode
- :ensure t
:mode ("\\`PKGBUILD\\'" . pkgbuild-mode)
:defer t)
M lisp/setup-go.el => lisp/setup-go.el +0 -2
@@ 1,10 1,8 @@
(use-package go-mode
- :ensure t
:defer t)
(use-package company-go
- :ensure t
:after company
:config
(progn
M lisp/setup-helm.el => lisp/setup-helm.el +1 -6
@@ 1,6 1,5 @@
;;; Helm: incremental completion and selection narrowing framework
(use-package helm
- :ensure t
:defer nil
:bind
(("M-x" . helm-M-x)
@@ 42,7 41,6 @@
;;; Helm extension for yasnippet
(use-package helm-c-yasnippet
- :ensure t
:after (yasnippet helm)
:init
(progn
@@ 51,7 49,6 @@
;;; Helm extension for gtags
(use-package helm-gtags
- :ensure t
:commands (helm-gtags-mode)
:init
(progn
@@ 82,7 79,6 @@
;;; Helm extension for projectile
(use-package helm-projectile
- :ensure t
:after (projectile helm)
:config
(helm-projectile-on)
@@ 90,5 86,4 @@
(setq projectile-indexing-method 'alien))
-(use-package helm-pass
- :ensure t)
+(use-package helm-pass)
M lisp/setup-keys.el => lisp/setup-keys.el +1 -7
@@ 1,6 1,5 @@
;;; Evil (extensible vi layer)
(use-package evil
- :ensure t
:init
(progn
(setq evil-want-C-u-scroll t
@@ 24,7 23,6 @@
(use-package evil-collection
- :ensure t
:after evil
:init
(evil-collection-init))
@@ 32,7 30,6 @@
;;; Easily surround text
(use-package evil-surround
- :ensure t
:after evil
:config
(progn
@@ 41,13 38,11 @@
;;; Evil keybindings for magit
(use-package evil-magit
- :after (evil magit)
- :ensure t)
+ :after (evil magit))
;;; Evil keybindings for org
(use-package evil-org
- :ensure t
:after (evil org)
:config
(progn
@@ 70,7 65,6 @@
(use-package evil-matchit
- :ensure t
:init
(progn
(add-hook 'python-mode-hook 'turn-on-evil-matchit-mode)))
M lisp/setup-lisp.el => lisp/setup-lisp.el +0 -4
@@ 1,5 1,4 @@
(use-package elisp-slime-nav
- :ensure t
:config
(progn
(dolist (map `(,emacs-lisp-mode-map
@@ 12,7 11,6 @@
(use-package auto-compile
- :ensure t
:defer t
:init
(progn
@@ 22,7 20,6 @@
(use-package slime
- :ensure t
:init
(progn
(slime-setup)
@@ 31,5 28,4 @@
(use-package common-lisp-snippets
- :ensure t
:after yasnippet)
M lisp/setup-org.el => lisp/setup-org.el +2 -2
@@ 1,7 1,7 @@
;;; Org mode for keeping notes, todo lists, planning, and fast
;;; documenting
(use-package org
- :ensure org-plus-contrib
+ :straight org-plus-contrib
:init
(progn
(if (not (file-exists-p "~/org"))
@@ 28,7 28,6 @@
;;; UTF-8 bullets for org-mode
(use-package org-bullets
- :ensure t
:after org
:config
(progn
@@ 36,6 35,7 @@
(use-package org-contacts
+ :straight nil
:after org
:config
(progn
M lisp/setup-packages.el => lisp/setup-packages.el +17 -33
@@ 1,36 1,20 @@
-(require 'package)
-(require 'tls)
+(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))
+
+
+(setq straight-use-package-by-default t)
+(straight-use-package 'use-package)
-(setq tls-checktrust t)
-
-
-(setq-default package-archives '(("gnu" . "https://elpa.gnu.org/packages/")))
-
-
-;;; Add org and melpa package archives
-(let* ((no-ssl (and (memq system-type '(windows-nt ms-dos))
- (not (gnutls-available-p))))
- (melpa-url (concat (if no-ssl "http" "https") "://melpa.org/packages/"))
- (org-url (concat (if no-ssl "http" "https") "://orgmode.org/elpa/")))
- (add-to-list 'package-archives (cons "melpa" melpa-url))
- (add-to-list 'package-archives (cons "org" org-url)))
-
-
-;;; Load and activate lisp packages
-(package-initialize)
-
-
-;;; Fetch the list of available packages
-(unless package-archive-contents
- (package-refresh-contents))
-
-
-;;; Install use-package for easy package configuration
-(unless (package-installed-p 'use-package)
- (package-install 'use-package))
-
-
-(require 'use-package)
-
(add-to-list 'Info-directory-list "~/.local/share/info/")
M lisp/setup-python.el => lisp/setup-python.el +0 -2
@@ 2,11 2,9 @@
(use-package pyvenv
- :ensure t
:commands (pyvenv-activate pyvenv-workon))
(use-package pipenv
- :ensure t
:hook (python-mode . pipenv-mode)
:commands (pipenv-activate))