updating melpa stuff, removing font stuff

init.el

@@ -13,11 +13,11 @@
 (global-display-line-numbers-mode)
 
 ;;disable line numbers for modes where it's weird
-(dolist (mode '(org-mode-hook
+;(dolist (mode '(org-mode-hook
-		term-mode-hook
+;		term-mode-hook
-		shell-mode-hook
+;		shell-mode-hook
-		eshell-mode-hook))
+;		eshell-mode-hook))
-  (add-hook mode (lambda () (display-line-numbers-mode 0))))
+;  (add-hook mode (lambda () (display-line-numbers-mode 0))))
 
 
 ;;disable file backups
@@ -28,21 +28,12 @@
 (setq vc-follows-symlinks t
       find-file-visit-truename t)
 
-;; Font Stuff ------------------------------------------------------------------
+;; sync clipboard with wayland
-(defvar rh/default-font-size 180)
-(set-face-attribute 'default nil :font "Fira Code Retina" :height rh/default-font-size)
-
-;; Set the fixed pitch face
-(set-face-attribute 'fixed-pitch nil :font "Fira Code Retina" :height 260)
-
-;; Set the variable pitch face
-(set-face-attribute 'variable-pitch nil :font "Cantarell" :height 295 :weight 'regular)
 
 ;; Package Manager -------------------------------------------------------------
 (require 'package)
 
-(setq package-archives '(("mepla" . "https://melpa.org/packages/")
+(setq package-archives '(("melpa" . "https://melpa.org/packages/")
-			 ("org" . "https://orgmode.org/elpa")
 			 ("elpa" . "https://elpa.gnu.org/packages/")))
 
 (package-initialize)
@@ -133,7 +124,7 @@
     :prefix "SPC"
     :global-prefix "C-SPC")
 
-  (rune/leader-keys
+  (rh/leader-keys
     "t"  '(:ignore t :which-key "toggles")
     "tt" '(counsel-load-theme :which-key "choose theme")))
 
@@ -203,16 +194,17 @@
   ;; Use default terminal for SSH (if relevant)
   (magit-process-find-password-functions '(magit-process-password-auth-source)))
 
-(use-package evil-magit
-  :after magit)
-
 ;; IDK what this stuff is but it shows up automatically ------------------------
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(package-selected-packages nil))
+ '(package-selected-packages
+   '(all-the-icons consult-projectile doom-modeline embark-consult
+		   evil-collection evil-magit general gruvbox-theme
+		   hydra magit marginalia orderless org-bullets
+		   rainbow-delimiters vertico visual-fill-column)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
@@ -232,27 +224,7 @@
   ;; Replace list hyphen with dot
   (font-lock-add-keywords 'org-mode
                           '(("^ *\\([-]\\) "
-                             (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•"))))))
+                             (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•")))))))
-
-  ;; Set faces for heading levels
-  (dolist (face '((org-level-1 . 1.2)
-                  (org-level-2 . 1.1)
-                  (org-level-3 . 1.05)
-                  (org-level-4 . 1.0)
-                  (org-level-5 . 1.1)
-                  (org-level-6 . 1.1)
-                  (org-level-7 . 1.1)
-                  (org-level-8 . 1.1)))
-    (set-face-attribute (car face) nil :font "Cantarell" :weight 'regular :height (cdr face)))
-
-  ;; Ensure that anything that should be fixed-pitch in Org files appears that way
-  (set-face-attribute 'org-block nil :foreground nil :inherit 'fixed-pitch)
-  (set-face-attribute 'org-code nil   :inherit '(shadow fixed-pitch))
-  (set-face-attribute 'org-table nil   :inherit '(shadow fixed-pitch))
-  (set-face-attribute 'org-verbatim nil :inherit '(shadow fixed-pitch))
-  (set-face-attribute 'org-special-keyword nil :inherit '(font-lock-comment-face fixed-pitch))
-  (set-face-attribute 'org-meta-line nil :inherit '(font-lock-comment-face fixed-pitch))
-  (set-face-attribute 'org-checkbox nil :inherit 'fixed-pitch))
 
 (use-package org
   :hook (org-mode . rh/org-mode-setup)
@@ -265,11 +237,3 @@
   :hook (org-mode . org-bullets-mode)
   :custom
   (org-bullets-bullet-list '("◉" "○" "●" "○" "●" "○" "●")))
-
-(defun rh/org-mode-visual-fill ()
-  (setq visual-fill-column-width 100
-        visual-fill-column-center-text t)
-  (visual-fill-column-mode 1))
-
-(use-package visual-fill-column
-  :hook (org-mode . rh/org-mode-visual-fill))