-straight and ~formatting

Emacs/.config/emacs/init.el

@@ -1,42 +1,42 @@
-(setq user-emacs-directory (expand-file-name "~/.config/emacs/"))
-(setq straight-use-package-by-default t)
+;;; init.el -- My custom emacs config
+;;; Commentary:
+;;; Simple Emacs config that uses org-babel to execute org files which contain a literate config
+;;; Code:
 
-(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))
+(require 'package)
+(add-to-list 'package-archives (cons "melpa" "https://melpa.org/packages/") t)
+(package-initialize)
+(unless (fboundp 'use-package)
+  (package-install 'use-package))
 
-(straight-use-package 'use-package)
-(setq ring-bell-function 'ignore)
+(setq user-emacs-directory (expand-file-name "~/.config/emacs/")
+      ring-bell-function 'ignore
+      inhibit-startup-screen t)
 
 (tool-bar-mode -1)
 (scroll-bar-mode -1)
 (tab-bar-mode -1)
-(add-hook 'prog-mode-hook #'hs-minor-mode)
 (load-theme 'tango-dark)
+(add-hook 'prog-mode-hook #'hs-minor-mode)
 
 (use-package evil
+  :ensure t
   :config
   (evil-mode +1))
 
 (use-package evil-surround
+  :ensure t
   :after (evil)
   :config
   (evil-surround-mode +1))
 
 (use-package which-key
+  :ensure t
   :config
   (which-key-mode +1))
 
 (use-package general
+  :ensure t
   :config
   (general-create-definer leader
     :prefix "SPC"
@@ -81,6 +81,7 @@
           :wk "Open init.el")))
 
 (use-package counsel
+  :ensure t
   :general
   (leader
    "SPC" #'counsel-M-x)
@@ -89,19 +90,20 @@
    "s" #'(swiper :wk "Search buffer")
    "r" #'(counsel-rg :wk "Ripgrep"))
   (general-def
-    :keymaps 'ivy-mode-map
+    :keymaps 'ivy-minibuffer-map
     "C-j" #'ivy-next-line-or-history
     "C-k" #'ivy-previous-line-or-history)
   :init
   (counsel-mode +1))
 
-(use-package org)
+(use-package org :ensure t)
 
-(use-package magit)
+(use-package magit :ensure t)
 
-(use-package evil-magit)
+(use-package evil-magit :ensure t)
 
 (use-package telephone-line
+  :ensure t
   :hook (after-init . telephone-line-mode)
   :init
                                         ; Faces