Merge branch 'master' of github.com:DeCarabas/Init-Files

This commit is contained in:
John Doty 2020-04-01 07:51:10 -07:00
commit 72e70ccb8b
4 changed files with 84 additions and 12 deletions

View file

@ -61,7 +61,7 @@
((sequence "TODO" "|" "DONE" "ABANDONED" "DEFERRED"))))
'(package-selected-packages
(quote
(gnu-elpa-keyring-update xah-lookup lsp-hack hack-mode rust-mode filladapt vc-hgcmd lsp-ui yaml-mode wgrep fsharp-mode company-lsp cquery mustache-mode clang-format projectile dash-functional mocha add-node-modules-path rjsx-mode xref-js2 js2-refactor company omnisharp geiser cider clojure-mode graphviz-dot-mode multi-term xterm-color thrift markdown-mode tuareg merlin ag use-package flycheck dockerfile-mode js2-mode web-mode zencoding-mode tss switch-window python-mode paredit magit lua-mode go-mode go-autocomplete exec-path-from-shell csharp-mode color-theme-monokai auto-complete auto-complete-nxml flymake flyspell json-mode popup ruby-mode company-jedi tide ahg elm-mode monky)))
(esup gnu-elpa-keyring-update lsp-hack hack-mode rust-mode filladapt lsp-ui yaml-mode wgrep fsharp-mode company-lsp cquery mustache-mode clang-format projectile dash-functional mocha add-node-modules-path rjsx-mode xref-js2 js2-refactor company omnisharp geiser cider clojure-mode graphviz-dot-mode multi-term xterm-color thrift markdown-mode tuareg merlin ag use-package flycheck dockerfile-mode js2-mode web-mode tss switch-window python-mode paredit magit lua-mode go-mode go-autocomplete exec-path-from-shell csharp-mode color-theme-monokai auto-complete auto-complete-nxml flymake flyspell json-mode popup ruby-mode company-jedi tide elm-mode monky)))
'(reb-re-syntax (quote string))
'(rmail-mail-new-frame t)
'(safe-local-variable-values

View file

@ -88,12 +88,13 @@
;; =================================================================
;; Packages
;; =================================================================
;; See http://dotyl.ink/l/qbmhz43kju
(let* ((no-ssl (and (memq system-type '(windows-nt ms-dos))
(not (gnutls-available-p))))
(proto (if no-ssl "http" "https")))
(setq package-archives
'(("gnu" . "http://elpa.gnu.org/packages/")
("org" . "http://orgmode.org/elpa/")
'(("gnu" . "https://elpa.gnu.org/packages/")
("org" . "https://orgmode.org/elpa/")
))
(add-to-list 'package-archives (cons "melpa" (concat proto "://melpa.org/packages/")) t)
@ -101,20 +102,20 @@
(package-initialize)
(unless package-archive-contents
(package-refresh-contents))
(package-install-selected-packages)
(package-refresh-contents)
(package-install-selected-packages))
;; =================================================================
;; Common stuff that's needed once
;; =================================================================
(require 'cl)
(require 'saveplace)
(require 'ffap)
(require 'uniquify)
(require 'saveplace) ;; Am I using this?
(require 'ffap) ;; Am I using this?
(require 'uniquify) ;; Unique buffers based on file name.
(require 'ansi-color)
(require 'recentf)
(require '50-arc)
(when is-fb-environment
(require '50-arc))
(prefer-coding-system 'utf-8)