From a991b44879b661b239007ba1c6004769f857f143 Mon Sep 17 00:00:00 2001 From: Simponic Date: Fri, 25 Nov 2022 11:21:06 -0700 Subject: [PATCH] Fix straight, added org-present --- .config/alacritty/alacritty.yml | 5 ++++ .emacs.d/init.el | 21 +++++++++++++++ .emacs.d/settings.org | 45 +++++++++++---------------------- 3 files changed, 41 insertions(+), 30 deletions(-) diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 14c0a1b..2b36535 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -1,6 +1,8 @@ font: normal: family: "CozetteVector" + options: + antialias: off bold: family: "CozetteVector" @@ -18,6 +20,9 @@ font: x: 0 y: 0 + + + window: padding: x: 12 diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 6496021..8803936 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1,5 +1,26 @@ (require 'org) +;; Install 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)) + +;; Install use-package +(straight-use-package 'use-package) + +;; Configure use-package to use straight.el by default +(use-package straight + :custom (straight-use-package-by-default t)) + (org-babel-load-file (expand-file-name "settings.org" user-emacs-directory)) diff --git a/.emacs.d/settings.org b/.emacs.d/settings.org index c20b013..06431ca 100644 --- a/.emacs.d/settings.org +++ b/.emacs.d/settings.org @@ -3,35 +3,12 @@ #+STARTUP: fold * Packages -** Straight -#+BEGIN_SRC emacs-lisp - (defvar bootstrap-version) - (let ((bootstrap-file - (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) - (bootstrap-version 6)) - (unless (file-exists-p bootstrap-file) - (with-current-buffer - (url-retrieve-synchronously - "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el" - 'silent 'inhibit-cookies) - (goto-char (point-max)) - (eval-print-last-sexp))) - (load bootstrap-file nil 'nomessage)) -#+END_SRC - ** Melpa #+BEGIN_SRC emacs-lisp (require 'package) (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) #+END_SRC -** use-package -#+BEGIN_SRC emacs-lisp - (dolist (package '(use-package)) - (unless (package-installed-p package) - (package-install package))) -#+END_SRC - * General emacs ** Tab bar mode #+BEGIN_SRC emacs-lisp @@ -73,12 +50,13 @@ #+END_SRC ** System path (macos) #+BEGIN_SRC emacs-lisp - ;; Use system path on macos - needed for node + ;; Use system path on macos - needed for node + (use-package exec-path-from-shell - :ensure t - :init - (when (memq window-system '(mac ns x)) - (exec-path-from-shell-initialize))) + :ensure t + :init + (when (memq window-system '(mac ns x)) + (exec-path-from-shell-initialize))) #+END_SRC * Theming @@ -195,6 +173,15 @@ :init (add-hook 'org-mode-hook 'org-appear-mode)) #+END_SRC +** Presentations +#+BEGIN_SRC emacs-lisp + (use-package org-present + :ensure t + :straight '(org-present + :type git + :host github + :repo "rlister/org-present")) +#+END_SRC * Development ** Git @@ -275,8 +262,6 @@ After installing the ~rust-analyzer~ program, the following can be used: (add-hook 'js2-mode-hook 'prettier-js-mode) (add-hook 'web-mode-hook 'prettier-js-mode) #+END_SRC - -#+RESULTS: **** Prisma #+BEGIN_SRC emacs-lisp (use-package prisma-mode