Merge branch 'master' of gitlab.com:chriscochrun/dotemacs
This commit is contained in:
commit
6badbaadee
94
README.org
94
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.
|
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
|
#+begin_src emacs-lisp
|
||||||
;;; init.el -*- lexical-binding: t; -*-
|
;;; init.el -*- lexical-binding: t; -*-
|
||||||
(setq inhibit-startup-message t)
|
(setq inhibit-startup-message t)
|
||||||
|
|
||||||
(scroll-bar-mode -1)
|
(scroll-bar-mode -1)
|
||||||
(tool-bar-mode -1)
|
(tool-bar-mode -1)
|
||||||
(tooltip-mode -1)
|
(tooltip-mode -1)
|
||||||
(set-fringe-mode 10)
|
(set-fringe-mode 10)
|
||||||
|
|
||||||
(menu-bar-mode -1)
|
(menu-bar-mode -1)
|
||||||
(blink-cursor-mode -1)
|
(blink-cursor-mode -1)
|
||||||
(column-number-mode +1)
|
(column-number-mode +1)
|
||||||
|
|
||||||
(if (string-equal (system-name) "chris-linuxlaptop")
|
(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 240)
|
||||||
(set-face-attribute 'default nil :font "VictorMono Nerd Font" :height 120))
|
(set-face-attribute 'default nil :font "VictorMono Nerd Font" :height 120))
|
||||||
(setq display-line-numbers-type 'relative)
|
(setq display-line-numbers-type 'relative)
|
||||||
#+end_src
|
#+end_src
|
||||||
|
@ -155,35 +155,36 @@ This evil-collection package includes a lot of other evil based things.
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package general
|
(use-package general
|
||||||
:init
|
:init
|
||||||
(general-evil-setup)
|
(general-evil-setup)
|
||||||
:config
|
:config
|
||||||
(general-create-definer chris/leader-keys
|
(general-create-definer chris/leader-keys
|
||||||
:keymaps '(normal visual emacs)
|
:keymaps '(normal visual emacs)
|
||||||
:prefix "SPC")
|
:prefix "SPC")
|
||||||
(chris/leader-keys
|
(chris/leader-keys
|
||||||
"b" '(:ignore t :which-key "buffer")
|
"b" '(:ignore t :which-key "buffer")
|
||||||
"t" '(:ignore t :which-key "toggle")
|
"t" '(:ignore t :which-key "toggle")
|
||||||
"f" '(:ignore t :which-key "file")
|
"f" '(:ignore t :which-key "file")
|
||||||
"w" '(:ignore t :which-key "window")
|
"w" '(:ignore t :which-key "window")
|
||||||
"s" '(:ignore t :which-key "search")
|
"s" '(:ignore t :which-key "search")
|
||||||
"o" '(:ignore t :which-key "open")
|
"o" '(:ignore t :which-key "open")
|
||||||
"bs" '(consult-buffer :which-key "buffer search")
|
"bs" '(consult-buffer :which-key "buffer search")
|
||||||
"tt" '(consult-theme :which-key "choose theme")
|
"bd" '(kill-this-buffer :which-key "kill buffer")
|
||||||
"ff" '(find-file :which-key "find file")
|
"tt" '(consult-theme :which-key "choose theme")
|
||||||
"fs" '(save-buffer :which-key "save")
|
"ff" '(find-file :which-key "find file")
|
||||||
"od" '(dired-jump :which-key "dired jump")
|
"fs" '(save-buffer :which-key "save")
|
||||||
"ss" '(consult-line :which-key "consult search")
|
"od" '(dired-jump :which-key "dired jump")
|
||||||
"ww" '(other-window :which-key "other window")
|
"ss" '(consult-line :which-key "consult search")
|
||||||
))
|
"ww" '(other-window :which-key "other window")
|
||||||
|
))
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package evil-escape
|
(use-package evil-escape
|
||||||
:after evil
|
:after evil
|
||||||
:init (evil-escape-mode +1)
|
:init (evil-escape-mode +1)
|
||||||
:config (setq evil-escape-key-sequence "fd"))
|
:config (setq evil-escape-key-sequence "fd"))
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
** Completion
|
** Completion
|
||||||
|
@ -325,23 +326,22 @@ Marginalia makes for some great decoration to our minibuffer completion items. W
|
||||||
** Org Mode
|
** Org Mode
|
||||||
Need to setup auto tangle yes
|
Need to setup auto tangle yes
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package org
|
(use-package org
|
||||||
:config
|
:config
|
||||||
(setq org-startup-indented t)
|
(setq org-startup-indented t)
|
||||||
(defun chris/org-babel-tangle-config ()
|
(defun chris/org-babel-tangle-config ()
|
||||||
(when (string-equal (buffer-file-name)
|
(when (string-equal (buffer-file-name)
|
||||||
(expand-file-name "~/.personal-emacs/init.org"))
|
(expand-file-name "~/.personal-emacs/init.org"))
|
||||||
(let ((org-confirm-babel-evaluate nil))
|
(let ((org-confirm-babel-evaluate nil))
|
||||||
(org-babel-tangle))))
|
(org-babel-tangle))))
|
||||||
|
|
||||||
(add-hook 'org-mode-hook (lambda () (add-hook 'after-save-hook #'chris/org-babel-tangle-config))))
|
|
||||||
|
|
||||||
|
(add-hook 'org-mode-hook (lambda () (add-hook 'after-save-hook #'chris/org-babel-tangle-config))))
|
||||||
#+end_src
|
#+end_src
|
||||||
** Magit
|
** Magit
|
||||||
Use magit, because why wouldn't you? duh!
|
Use magit, because why wouldn't you? duh!
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package magit
|
(use-package magit
|
||||||
:commands (magit-status magit-get-current-branch)
|
:commands (magit-status magit-get-current-branch)
|
||||||
:custom
|
: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
|
#+end_src
|
||||||
|
|
Loading…
Reference in a new issue