From 7df30b6e674ed5d0fd2da4a252e311d8f69def74 Mon Sep 17 00:00:00 2001 From: John Doty Date: Wed, 11 Mar 2026 12:36:43 +0000 Subject: [PATCH] [emacs] change the way package archives work I don't think I need the https workaround anymore, but also I don't run windows anymore, so. --- .emacs.d/custom.el | 9 ++++++++- .emacs.d/init.el | 12 ++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el index 04f6e7e..a3d801c 100644 --- a/.emacs.d/custom.el +++ b/.emacs.d/custom.el @@ -63,7 +63,14 @@ '(org-odd-levels-only t) '(org-todo-keywords '((sequence "TODO" "|" "DONE" "ABANDONED" "DEFERRED"))) '(package-check-signature nil) - '(package-selected-packages '(claudemacs)) + '(package-selected-packages + '(adaptive-wrap add-node-modules-path bazel blacken claudemacs clipetty + clojure-mode company dap-mode deadgrep doom-themes + earthfile-mode eglot-java filladapt fish-mode flycheck-elm + go-mode howm ink-mode jsonnet-mode magit poly-markdown + prettier-js protobuf-mode ron-mode rust-mode scala-ts-mode + sql-indent swift-mode terraform-mode typescript-mode + wgsl-mode xterm-color zig-mode)) '(package-vc-selected-packages '((claudemacs :url "https://github.com/cpoile/claudemacs"))) '(reb-re-syntax 'string) '(rmail-mail-new-frame t) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index ff50d10..356cc23 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -71,17 +71,9 @@ ;; ================================================================= ;; 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" . "https://elpa.gnu.org/packages/") - ("org" . "https://orgmode.org/elpa/") - )) +(add-to-list 'package-archives '("org" . "https://orgmode.org/elpa/")) +(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/")) - (add-to-list 'package-archives (cons "melpa" (concat proto "://melpa.org/packages/")) t) - ) (package-initialize) (unless package-archive-contents (package-refresh-contents))