diff --git a/emacs/init.el b/emacs/init.el
index cee344f..0db48ba 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -7,37 +7,28 @@
 
 (add-to-list 'load-path "~/.emacs.d/custom")
 
-(require 'package)
-(add-to-list 'package-archives
-             '(
-               "melpa" . "https://melpa.org/packages/") t)
-(add-to-list 'package-archives
-             '("org" . "https://orgmode.org/elpa/")
-             t)
-(package-initialize)
-(unless package-archive-contents
-  (package-refresh-contents))
+(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))
 
-(unless (package-installed-p 'use-package)
-  (package-refresh-contents)
-  (package-install 'use-package))
+(straight-use-package 'use-package)
 
-(eval-when-compile
-  (require 'use-package))
-
-(use-package no-littering
-  :ensure t
-  :config
-  (require 'recentf)
-  (eval-when-compile (defvar recentf-exclude))
-  (add-to-list 'recentf-exclude no-littering-var-directory)
-  (add-to-list 'recentf-exclude no-littering-etc-directory)
-  (setq auto-save-file-name-transforms
-        `((".*" ,(no-littering-expand-var-file-name "auto-save/") t)))
-  )
-
-(require 'use-package-ensure)
-(setq use-package-always-ensure t)
+(straight-use-package 'no-littering)
+(require 'no-littering)
+(require 'recentf)
+(add-to-list 'recentf-exclude no-littering-var-directory)
+(add-to-list 'recentf-exclude no-littering-etc-directory)
+(setq auto-save-file-name-transforms
+      `((".*" ,(no-littering-expand-var-file-name "auto-save/") t)))
 
 ;; Use UTF-8 pls
 (prefer-coding-system 'utf-8)
@@ -58,24 +49,21 @@
  '(display-line-numbers-grow-only t)
  '(display-line-numbers-type 'visual)
  '(display-line-numbers-width-start t)
+ '(epa-file-select-keys 'silent)
  '(epg-pinentry-mode 'loopback)
  '(evil-cross-lines t)
  '(global-whitespace-mode t)
  '(indent-tabs-mode nil)
  '(inhibit-startup-screen t)
  '(org-edit-src-content-indentation 0)
+ '(org-roam-encrypt-files t)
  '(org-src-preserve-indentation t)
- '(package-archives
-   '(("gnu" . "https://elpa.gnu.org/packages/")
-     ("melpa" . "https://melpa.org/packages/")
-     ("org" . "https://orgmode.org/elpa/")))
- '(package-selected-packages
-   '(dockerfile-mode systemd apache-mode magit-delta go-mode org-roam ox-jira consult embark-consult embark selectrum-prescient prescient marginalia consult-flycheck consult-selectrum selectrum lua-mode lsp-mode yaml-mode evil-lispy treemacs-magit treemacs-evil treemacs lsp-pyright lsp-ui rustic flycheck origami groovy-mode avy editorconfig org-crypt tree-sitter-langs tree-sitter centaur-tabs dashboard page-break-lines wakatime-mode super-save ox-pandoc evil-surround evil-collection undo-tree toc-org evil-org org-plus-contrib evil-goggles evil-expat evil-commentary auto-package-update lispy smartparens which-key git-gutter rainbow-delimiters auto-complete-distel auto-complete evil magit evil-magit))
  '(prescient-filter-method '(literal regexp initialism fuzzy))
  '(ring-bell-function 'ignore)
  '(rustic-format-trigger 'on-compile)
  '(rustic-indent-method-chain t)
  '(rustic-indent-where-clause t)
+ '(straight-use-package-by-default t)
  '(treemacs-collapse-dirs 3)
  '(treemacs-filewatch-mode t)
  '(treemacs-follow-mode t)
@@ -105,6 +93,7 @@
  '(evil-goggles-undo-redo-remove-face ((t (:inherit diff-removed))))
  '(evil-goggles-yank-face ((t (:inherit diff-changed))))
  '(italic ((t (:slant italic :family "Dank Mono"))))
+ '(magit-diff-hunk-heading-highlight ((t (:extend t :background "light green"))))
  '(whitespace-tab ((t (:inherit default :foreground "#65737d")))))
 
 ;; auto-package-update
@@ -198,6 +187,8 @@
   :config
   (evil-define-key 'normal 'global (kbd "<leader>a") 'avy-goto-char-timer))
 
+(use-package dash)
+
 ;; Magit
 (use-package magit
   :config
@@ -310,7 +301,8 @@
 ;; Org Mode
 (use-package org
   :mode (("\\.org$" . org-mode))
-  :ensure org-plus-contrib
+  :ensure org
+  :pin gnu
   :config
   (evil-define-key 'normal 'global (kbd "<leader> SPC s") 'org-store-link)
   (evil-define-key 'normal 'global (kbd "<leader> SPC a") 'org-agenda)
@@ -326,21 +318,26 @@
   (setq org-roam-index-file "Index")
   (add-hook 'after-init-hook 'org-roam-mode))
 
-(use-package epa-file
-  :ensure nil
-  :config
-  (setq epa-file-encrypt-to '("anthony@anthonycicchetti.com"))
-  :custom
-  (epa-file-select-keys 'silent))
+(setq epa-file-encrypt-to '("anthony@anthonycicchetti.com"))
+;; (use-package epa-file
+;;   :ensure nil
+;;   :config
+;;   (setq epa-file-encrypt-to '("anthony@anthonycicchetti.com"))
+;;   :custom
+;;   (epa-file-select-keys 'silent))
 
-(use-package org-crypt
-  :ensure nil ;; included with org-mode
-  :after org
-  :config
-  (org-crypt-use-before-save-magic)
-  (setq org-tags-exclude-from-inheritance '("crypt"))
-  :custom
-  (org-crypt-key "anthony@anthonycicchetti.com"))
+(require 'org-crypt)
+(org-crypt-use-before-save-magic)
+(setq org-tags-exclude-from-inheritance '("crypt"))
+(setq org-crypt-key "anthony@anthonycicchetti.com")
+;; (use-package org-crypt
+;;   :ensure nil ;; included with org-mode
+;;   :after org
+;;   :config
+;;   (org-crypt-use-before-save-magic)
+;;   (setq org-tags-exclude-from-inheritance '("crypt"))
+;;   :custom
+;;   (org-crypt-key "anthony@anthonycicchetti.com"))
 
 
 (use-package toc-org
diff --git a/zsh/starship.toml b/zsh/starship.toml
index 21c05aa..5b389e5 100644
--- a/zsh/starship.toml
+++ b/zsh/starship.toml
@@ -5,3 +5,6 @@ vicmd_symbol = "[ƴ](bold yellow)"
 
 [jobs]
 symbol = "+"
+
+[battery]
+disabled = true
\ No newline at end of file