Merge branch 'master' of gitlab.com:chriscochrun/dotemacs

README.org

@@ -55,19 +55,19 @@ As of right now I haven't fully setup my early-init file, this does not export i
 Let's start by making some basic ui changes like turning off the scrollbar, toolbar, menu, tooltips, and setting our font and some things.
 #+begin_src emacs-lisp
     ;;; init.el -*- lexical-binding: t; -*-
-     (setq inhibit-startup-message t)
+    (setq inhibit-startup-message t)
 
-      (scroll-bar-mode -1)
-      (tool-bar-mode -1)
-      (tooltip-mode -1)
-      (set-fringe-mode 10)
+    (scroll-bar-mode -1)
+    (tool-bar-mode -1)
+    (tooltip-mode -1)
+    (set-fringe-mode 10)
 
-      (menu-bar-mode -1)
-      (blink-cursor-mode -1)
-      (column-number-mode +1)
+    (menu-bar-mode -1)
+    (blink-cursor-mode -1)
+    (column-number-mode +1)
 
-  (if (string-equal (system-name) "chris-linuxlaptop")
-      (set-face-attribute 'default nil :font "VictorMono Nerd Font" :height 240)
+    (if (string-equal (system-name) "chris-linuxlaptop")
+        (set-face-attribute 'default nil :font "VictorMono Nerd Font" :height 240)
       (set-face-attribute 'default nil :font "VictorMono Nerd Font" :height 120))
     (setq display-line-numbers-type 'relative)
 #+end_src
@@ -155,35 +155,36 @@ This evil-collection package includes a lot of other evil based things.
 #+end_src
 
 #+begin_src emacs-lisp
-  (use-package general
-    :init
-    (general-evil-setup)
-    :config
-    (general-create-definer chris/leader-keys
-      :keymaps '(normal visual emacs)
-      :prefix "SPC")
-    (chris/leader-keys
-     "b" '(:ignore t :which-key "buffer")
-     "t" '(:ignore t :which-key "toggle")
-     "f" '(:ignore t :which-key "file")
-     "w" '(:ignore t :which-key "window")
-     "s" '(:ignore t :which-key "search")
-     "o" '(:ignore t :which-key "open")
-     "bs" '(consult-buffer :which-key "buffer search")
-     "tt" '(consult-theme :which-key "choose theme")
-     "ff" '(find-file :which-key "find file")
-     "fs" '(save-buffer :which-key "save")
-     "od" '(dired-jump :which-key "dired jump")
-     "ss" '(consult-line :which-key "consult search")
-     "ww" '(other-window :which-key "other window")
-     ))
+(use-package general
+  :init
+  (general-evil-setup)
+  :config
+  (general-create-definer chris/leader-keys
+    :keymaps '(normal visual emacs)
+    :prefix "SPC")
+  (chris/leader-keys
+   "b" '(:ignore t :which-key "buffer")
+   "t" '(:ignore t :which-key "toggle")
+   "f" '(:ignore t :which-key "file")
+   "w" '(:ignore t :which-key "window")
+   "s" '(:ignore t :which-key "search")
+   "o" '(:ignore t :which-key "open")
+   "bs" '(consult-buffer :which-key "buffer search")
+   "bd" '(kill-this-buffer :which-key "kill buffer")
+   "tt" '(consult-theme :which-key "choose theme")
+   "ff" '(find-file :which-key "find file")
+   "fs" '(save-buffer :which-key "save")
+   "od" '(dired-jump :which-key "dired jump")
+   "ss" '(consult-line :which-key "consult search")
+   "ww" '(other-window :which-key "other window")
+   ))
 #+end_src
 
 #+begin_src emacs-lisp
     (use-package evil-escape
-    :after evil
-  :init (evil-escape-mode +1)
-  :config (setq evil-escape-key-sequence "fd"))
+      :after evil
+      :init (evil-escape-mode +1)
+      :config (setq evil-escape-key-sequence "fd"))
 #+end_src
 
 ** Completion
@@ -325,23 +326,22 @@ Marginalia makes for some great decoration to our minibuffer completion items. W
 ** Org Mode
 Need to setup auto tangle yes
 #+begin_src emacs-lisp
-  (use-package org
-    :config
-    (setq org-startup-indented t)
-    (defun chris/org-babel-tangle-config ()
-      (when (string-equal (buffer-file-name)
-                          (expand-file-name "~/.personal-emacs/init.org"))
+(use-package org
+  :config
+  (setq org-startup-indented t)
+  (defun chris/org-babel-tangle-config ()
+    (when (string-equal (buffer-file-name)
+                        (expand-file-name "~/.personal-emacs/init.org"))
       (let ((org-confirm-babel-evaluate nil))
-      (org-babel-tangle))))
-
-    (add-hook 'org-mode-hook (lambda () (add-hook 'after-save-hook #'chris/org-babel-tangle-config))))
+        (org-babel-tangle))))
 
+  (add-hook 'org-mode-hook (lambda () (add-hook 'after-save-hook #'chris/org-babel-tangle-config))))
 #+end_src
 ** Magit
 Use magit, because why wouldn't you? duh!
 #+begin_src emacs-lisp
-    (use-package magit
-    :commands (magit-status magit-get-current-branch)
+(use-package magit
+  :commands (magit-status magit-get-current-branch)
   :custom
-(magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1))
+  (magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1))
 #+end_src