Merge branch 'main' into single-monitor

This commit is contained in:
Andrew Scott 2022-03-17 14:58:08 -04:00
commit cdf1524fdb
Signed by: a
GPG key ID: 3EB62D0BBB8DB381

View file

@ -1,3 +1,6 @@
;; Disable package.el early so it won't start loading packages before init is loaded
(setq package-enable-at-startup nil)
;; No thanks ;; No thanks
(setq inhibit-startup-message t) ; Disable startup message (setq inhibit-startup-message t) ; Disable startup message
(scroll-bar-mode -1) ; Disable visible scrollbar (scroll-bar-mode -1) ; Disable visible scrollbar
@ -63,40 +66,60 @@
(dolist (mode '(org-mode-hook)) (dolist (mode '(org-mode-hook))
(add-hook mode (lambda () (display-line-numbers-mode 0)))) (add-hook mode (lambda () (display-line-numbers-mode 0))))
;; Install and load straight.el
(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))
;;;;;;;;;;;;;; Not needed when using straight.el ;;;;;;;;;;;;;;
;; Initialize package sources ;; Initialize package sources
(require 'package) ;(require 'package)
(setq package-archives '(("melpa" . "https://melpa.org/packages/") ;(setq package-archives '(("melpa" . "https://melpa.org/packages/")
("org" . "https://orgmode.org/elpa/") ; ("org" . "https://orgmode.org/elpa/")
("elpa" . "https://elpa.gnu.org/packages/"))) ; ("elpa" . "https://elpa.gnu.org/packages/")))
(package-initialize) ;(package-initialize)
(unless package-archive-contents ;(unless package-archive-contents
(package-refresh-contents)) ; (package-refresh-contents))
;; Initialize use-package on non-Linux platforms ;; Initialize use-package on non-Linux platforms
(unless (package-installed-p 'use-package) ;(unless (package-installed-p 'use-package)
(package-install 'use-package)) ; (package-install 'use-package))
(require 'use-package) ;(require 'use-package)
(setq use-package-always-ensure t) ;(setq use-package-always-ensure t)
;;;;;;;;;;;;;;
;;; Packages ;; Install use-package
(straight-use-package 'use-package)
;; Make use-package use straight.el
(use-package straight
:custom (straight-use-package-by-default t))
;; Theme ;; Theme
(setq custom-safe-themes t) (setq custom-safe-themes t)
;(use-package darktooth-theme ;(use-package zenburn-theme
; :config ; :config
; (load-theme `darktooth t)) ; (load-theme `zenburn t))
(use-package zenburn-theme (use-package everforest-hard-dark-theme
:straight (everforest-hard-dark-theme :type git :repo "https://git.sr.ht/~theorytoe/everforest-hard-dark-theme")
:config :config
(load-theme `zenburn t)) (load-theme 'everforest-hard-dark))
;; (use-package ample-theme
;; :config
;; (load-theme `ample-flat t))
;; (use-package base16-theme ;; (use-package base16-theme
;; :ensure t ;; :ensure t
@ -114,9 +137,6 @@
;; Modeline ;; Modeline
;; (use-package simple-modeline
;; :hook (after-init . simple-modeline-mode))
(use-package minions (use-package minions
:hook (doom-modeline-mode . minions-mode) :hook (doom-modeline-mode . minions-mode)
(simple-modeline-mode . minions-mode)) (simple-modeline-mode . minions-mode))