sync

1 files changed, 35 insertions, 54 deletions

diff --git a/config.org b/config.org
index 0914c7f..78591f5 100644
--- a/config.org
+++ b/config.org
@@ -50,7 +50,7 @@
  (add-to-list 'default-frame-alist '(alpha-background . 90))
 
 #+end_src
-* straight.el
+* straight.el /commented out/
 
 #+begin_src emacs-lisp
 ;; (setq straight-check-for-modifications nil)
@@ -133,7 +133,7 @@
     ;; Configure font settings based on the operating system.
     ;; Ok, this kickstart is meant to be used on the terminal, not on GUI.
     ;; But without this, I fear you could start Graphical Emacs and be sad :(
-    (set-face-attribute 'default nil :family "Fragment Mono"  :height 160)
+    (set-face-attribute 'default nil :family "Maple Mono NF"  :height 160)
     ;; (when (eq system-type 'darwin)       ;; Check if the system is macOS.
     ;; (setq mac-command-modifier 'meta)  ;; Set the Command key to act as the Meta key.
     ;; (set-face-attribute 'default nil :family "Fragment Mono" :height 130))
@@ -165,7 +165,7 @@
     (xterm-mouse-mode 1)         ;; Enable mouse support in terminal mode.
     (file-name-shadow-mode 1)    ;; Enable shadowing of filenames for clarity.
 
-    ;; Set the default coding system for files to UTF-8.
+;;oding system for files to UTF-8.
     (modify-coding-system-alist 'file "" 'utf-8)
 
     ;; Add a hook to run code after Emacs has fully initialized.
@@ -410,7 +410,7 @@ Disabled because nix is managing the flymake configuration.
       :ensure nil     
       :defer t
     :config
-    (require org-tempo)
+    (require 'org-tempo)
     (custom-set-faces
      '(org-document-title ((t (:height 1.6))))
      '(outline-1          ((t (:height 1.25))))
@@ -799,7 +799,7 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi
     eglot-inlay-hints-mode -1)
     (add-to-list 'eglot-server-programs '(nix-mode . ("nixd"))))
 #+end_src
-** eglot shut up
+** eglot-booster
 
 #+begin_src emacs-lisp
 (use-package eglot-booster
@@ -912,29 +912,15 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi
 * evil
 
 #+begin_src emacs-lisp
-  (use-package evil
-    :ensure t
-    :straight t
-    :after general
-    :init
-    (setq evil-want-integration t
-          evil-want-keybinding nil
-          evil-want-C-u-scroll t
-          evil-want-C-u-delete t
-          evil-want-C-i-jump nil)
-
-    :config
-    (evil-set-undo-system 'undo-tree)
-    (setq evil-leader/in-all-states t
-          evil-want-fine-undo t)
-
-    (evil-mode 1)
+(use-package evil
+:ensure t
+:init
+(setq evil-want-integration t)
+(setq evil-want-keybinding nil)
+(setq evil-want-C-u-delete t)       ;; Makes C-u delete on insert mode
 
-    (define-key evil-normal-state-map (kbd "SPC") nil)
-    (define-key evil-motion-state-map (kbd "SPC") nil)
-    (define-key evil-normal-state-map (kbd ",") nil)
-    (define-key evil-visual-state-map (kbd ",") nil)
-    (define-key evil-motion-state-map (kbd ",") nil))
+:config
+(evil-mode 1))
 
 
 #+end_src
@@ -969,33 +955,28 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi
 * evil packages
 
 #+begin_src emacs-lisp
-
-  (use-package evil-collection
-    :defer t
-    :straight t
-    :ensure t
-    :custom
-    (evil-collection-want-find-usages-bindings t)
-    ;; Hook to initialize `evil-collection' when `evil-mode' is activated.
-    :hook
-    (evil-mode . evil-collection-init))
+(use-package evil-collection
+  :after evil
+  :ensure t
+  :config
+  (evil-collection-init))
 
 
-  (use-package evil-surround
-    :ensure t
-    :straight t
-    :after evil-collection
-    :config
-    (global-evil-surround-mode 1))
+(use-package evil-surround
+  :ensure t
+  :straight t
+  :after evil-collection
+  :config
+  (global-evil-surround-mode 1))
 
 
 
-  (use-package evil-matchit
-    :ensure t
-    :straight t
-    :after evil-collection
-    :config
-    (global-evil-matchit-mode 1))
+(use-package evil-matchit
+  :ensure t
+  :straight t
+  :after evil-collection
+  :config
+  (global-evil-matchit-mode 1))
 #+end_src
 * undo-tree
 
@@ -1420,12 +1401,12 @@ mode-line-buffer-identification
 #+begin_src emacs-lisp
 (defvar cashmere/font-height 170)
 
-(when (member "Fragment Mono" (font-family-list))
-  (set-face-attribute 'default nil :font "Fragment Mono" :height cashmere/font-height)
-  (set-face-attribute 'fixed-pitch nil :family "Fragment Mono" :height cashmere/font-height))
+(when (member "Maple Mono NF" (font-family-list))
+  (set-face-attribute 'default nil :font "Maple Mono NF" :height cashmere/font-height)
+  (set-face-attribute 'fixed-pitch nil :family "Maple Mono NF" :height cashmere/font-height))
 
-(when (member "Open Sans" (font-family-list))
-  (set-face-attribute 'variable-pitch nil :family "Open Sans" :height cashmere/font-height))
+(when (member "Maple Mono NF" (font-family-list))
+  (set-face-attribute 'variable-pitch nil :family "Maple Mono NF" :height cashmere/font-height))
 #+end_src
 ** mixed pitch fonts (package)