-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"
@@ -53,55 +53,57 @@
     "M-s" #'occur)
 
   (leader
-    "!" #'async-shell-command
-    "f" '(:ignore t :wk "File")
-    "s" '(:ignore t :wk "Search")
-    "b" '(:ignore t :wk "Buffer"))
+   "!" #'async-shell-command
+   "f" '(:ignore t :wk "File")
+   "s" '(:ignore t :wk "Search")
+   "b" '(:ignore t :wk "Buffer"))
 
   (general-def
     :states 'visual
     "gr" #'eval-region)
 
   (leader
-    :infix "b"
-    "n" #'next-buffer
-    "p" #'previous-buffer
-    "b" #'counsel-switch-buffer
-    "i" #'ibuffer)
+   :infix "b"
+   "n" #'next-buffer
+   "p" #'previous-buffer
+   "b" #'counsel-switch-buffer
+   "i" #'ibuffer)
 
   (leader
-    :infix "o"
-    "-" #'dired)
+   :infix "o"
+   "-" #'dired)
 
   (leader
-    :infix "f"
-    "s" #'save-buffer
-    "f" #'find-file
-    "p" #'((lambda () (interactive) (find-file "~/.config/emacs/init.el"))
-	   :wk "Open init.el")))
+   :infix "f"
+   "s" #'save-buffer
+   "f" #'find-file
+   "p" #'((lambda () (interactive) (find-file "~/.config/emacs/init.el"))
+          :wk "Open init.el")))
 
 (use-package counsel
+  :ensure t
   :general
   (leader
-    "SPC" #'counsel-M-x)
+   "SPC" #'counsel-M-x)
   (leader
-    :infix "s"
-    "s" #'(swiper :wk "Search buffer")
-    "r" #'(counsel-rg :wk "Ripgrep"))
+   :infix "s"
+   "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
@@ -112,17 +114,17 @@
 
   ;; Set telephone line faces
   (setq telephone-line-faces
-    '((evil . (my-evil-dark . my-evil-dark))
-       (modal . telephone-line-modal-face)
-       (ryo . telephone-line-ryo-modal-face)
-       (accent . (my-accent-dark . telephone-line-accent-inactive))
-       (nil mode-line . mode-line-inactive)))
+        '((evil . (my-evil-dark . my-evil-dark))
+          (modal . telephone-line-modal-face)
+          (ryo . telephone-line-ryo-modal-face)
+          (accent . (my-accent-dark . telephone-line-accent-inactive))
+          (nil mode-line . mode-line-inactive)))
 
                                         ; Seperators
   (setq telephone-line-primary-left-separator    'telephone-line-abs-left
-    telephone-line-secondary-left-separator  'telephone-line-identity-hollow-left
-    telephone-line-primary-right-separator   'telephone-line-abs-right
-    telephone-line-secondary-right-separator 'telephone-line-identity-hollow-right)
+        telephone-line-secondary-left-separator  'telephone-line-identity-hollow-left
+        telephone-line-primary-right-separator   'telephone-line-abs-right
+        telephone-line-secondary-right-separator 'telephone-line-identity-hollow-right)
 
                                         ; LSP segment
   (telephone-line-defsegment +oreoline-lsp-segment ()
@@ -132,22 +134,22 @@
 
                                         ; LHS
   (setq telephone-line-lhs
-    '((evil   . (telephone-line-evil-tag-segment
-                 telephone-line-buffer-modified-segment))
-       (accent . (telephone-line-vc-segment
-                   telephone-line-filesize-segment
-                   telephone-line-buffer-name-segment
-                   telephone-line-erc-modified-channels-segment
-                   telephone-line-process-segment))
-       (nil    . ())))
+        '((evil   . (telephone-line-evil-tag-segment
+                     telephone-line-buffer-modified-segment))
+          (accent . (telephone-line-vc-segment
+                     telephone-line-filesize-segment
+                     telephone-line-buffer-name-segment
+                     telephone-line-erc-modified-channels-segment
+                     telephone-line-process-segment))
+          (nil    . ())))
 
                                         ; RHS
   (setq telephone-line-rhs
-    '((nil    . (telephone-line-misc-info-segment))
-       (accent . (telephone-line-major-mode-segment
-                   +oreoline-lsp-segment
-                   telephone-line-flycheck-segment))
-       (evil   . (telephone-line-airline-position-segment))))
+        '((nil    . (telephone-line-misc-info-segment))
+          (accent . (telephone-line-major-mode-segment
+                     +oreoline-lsp-segment
+                     telephone-line-flycheck-segment))
+          (evil   . (telephone-line-airline-position-segment))))
   (telephone-line-mode +1)
   :config
   (size-indication-mode +1))