This commit is contained in:
ry
2021-10-25 12:28:40 -07:00
parent c71112901a
commit 8e2964a63e
8 changed files with 107 additions and 165 deletions

View File

@@ -1,18 +1,61 @@
;; Keep emacs folder tidy.
(use-package no-littering)
;; Some functionality uses this to identify you, e.g. GPG configuration, email
;; clients, file templates and snippets.
(setq user-full-name "John Doe"
user-mail-address "john@doe.com")
;; Disables the doom splash screen
(setq inhibit-startup-message t)
(set-fringe-mode 10)
;; Doom exposes five (optional) variables for controlling fonts in Doom. Here
;; are the three important ones:
;;
;; + `doom-font'
;; + `doom-variable-pitch-font'
;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for
;; presentations or streaming.
;;
;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd
;; font string. You generally only need these two:
;; (setq doom-font (font-spec :family "monospace" :size 12 :weight 'semi-light)
;; doom-variable-pitch-font (font-spec :family "sans" :size 13))
;; scroll 1 line at a time
(setq scroll-step 1)
;; There are two ways to load a theme. Both assume the theme is installed and
;; available. You can either set `doom-theme' or manually load a theme with the
;; `load-theme' function. This is the default:
(setq doom-theme 'doom-one)
;; If you use `org' and don't want your org files in the default location below,
;; change `org-directory'. It must be set before org loads!
(setq org-directory "~/org/")
;; This determines the style of line numbers in effect. If set to `nil', line
;; numbers are disabled. For relative line numbers, set this to `relative'.
(setq display-line-numbers-type t)
;; Here are some additional functions/macros that could help you configure Doom:
;;
;; - `load!' for loading external *.el files relative to this one
;; - `use-package!' for configuring packages
;; - `after!' for running code after a package has loaded
;; - `add-load-path!' for adding directories to the `load-path', relative to
;; this file. Emacs searches the `load-path' when you load packages with
;; `require' or `use-package'.
;; - `map!' for binding new keys
;;
;; To get information about any of these functions/macros, move the cursor over
;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k').
;; This will open documentation for it, including demos of how they are used.
;;
;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
;; they are implemented.
;;butts
;; Set visible bell
(setq visible-bell t)
(dolist (mode '(org-mode-hook
shell-mode-hook))
term-mode-hook
shell-mode-hook
eshell-mode-hook))
(add-hook mode (lambda () (display-line-numbers-mode 0))))
;; Configure Modus theme
@@ -132,11 +175,3 @@
(defun connect-borg ()
(interactive)
(dired "/ssh:root@207.66.177.26#46668:/"))
(setq backup-directory-alist
`(("." . ,(concat user-emacs-directory "backups"))))
(customize-set-variable
'tramp-backup-directory-alist backup-directory-alist)
(setq tramp-auto-save-directory "~/.dotfiles/.config/emacs/backups/remote")

View File

@@ -1,50 +0,0 @@
(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.
'(ansi-color-faces-vector
[default default default italic underline success warning error])
'(ansi-color-names-vector
["black" "red3" "ForestGreen" "yellow3" "blue" "magenta3" "DeepSkyBlue" "gray50"])
'(custom-safe-themes
'("a0be7a38e2de974d1598cf247f607d5c1841dbcef1ccd97cded8bea95a7c7639" "97db542a8a1731ef44b60bc97406c1eb7ed4528b0d7296997cbb53969df852d6" "7eea50883f10e5c6ad6f81e153c640b3a288cd8dc1d26e4696f7d40f754cc703" "a7b20039f50e839626f8d6aa96df62afebb56a5bbd1192f557cb2efb5fcfb662" "613aedadd3b9e2554f39afe760708fc3285bf594f6447822dd29f947f0775d6c" "f91395598d4cb3e2ae6a2db8527ceb83fed79dbaf007f435de3e91e5bda485fb" "5784d048e5a985627520beb8a101561b502a191b52fa401139f4dd20acb07607" "4f1d2476c290eaa5d9ab9d13b60f2c0f1c8fa7703596fa91b235db7f99a9441b" "246a9596178bb806c5f41e5b571546bb6e0f4bd41a9da0df5dfbca7ec6e2250c" "745d03d647c4b118f671c49214420639cb3af7152e81f132478ed1c649d4597d" "d268b67e0935b9ebc427cad88ded41e875abfcc27abd409726a92e55459e0d01" "4b0e826f58b39e2ce2829fab8ca999bcdc076dec35187bf4e9a4b938cb5771dc" "028c226411a386abc7f7a0fba1a2ebfae5fe69e2a816f54898df41a6a3412bb5" "c5ded9320a346146bbc2ead692f0c63be512747963257f18cc8518c5254b7bf5" "8146edab0de2007a99a2361041015331af706e7907de9d6a330a3493a541e5a6" "a6e620c9decbea9cac46ea47541b31b3e20804a4646ca6da4cce105ee03e8d0e" "9b54ba84f245a59af31f90bc78ed1240fca2f5a93f667ed54bbf6c6d71f664ac" "333958c446e920f5c350c4b4016908c130c3b46d590af91e1e7e2a0611f1e8c5" "0466adb5554ea3055d0353d363832446cd8be7b799c39839f387abb631ea0995" "a9a67b318b7417adbedaab02f05fa679973e9718d9d26075c6235b1f0db703c8" "f7fed1aadf1967523c120c4c82ea48442a51ac65074ba544a5aefc5af490893b" "6c531d6c3dbc344045af7829a3a20a09929e6c41d7a7278963f7d3215139f6a7" "c2aeb1bd4aa80f1e4f95746bda040aafb78b1808de07d340007ba898efa484f5" "835868dcd17131ba8b9619d14c67c127aa18b90a82438c8613586331129dda63" "6c98bc9f39e8f8fd6da5b9c74a624cbb3782b4be8abae8fd84cbc43053d7c175" "1d5e33500bc9548f800f9e248b57d1b2a9ecde79cb40c0b1398dec51ee820daf" "f6665ce2f7f56c5ed5d91ed5e7f6acb66ce44d0ef4acfaa3a42c7cfe9e9a9013" "1704976a1797342a1b4ea7a75bdbb3be1569f4619134341bd5a4c1cfb16abad4" "7a7b1d475b42c1a0b61f3b1d1225dd249ffa1abb1b7f726aec59ac7ca3bf4dae" default))
'(exwm-floating-border-color "#d3c5a0")
'(fci-rule-color "#504945")
'(highlight-tail-colors ((("#eee4b4" "#f3f3c1") . 0) (("#e8e5bb" "#eff3cf") . 20)))
'(jdee-db-active-breakpoint-face-colors (cons "#f0f0f0" "#a89984"))
'(jdee-db-requested-breakpoint-face-colors (cons "#f0f0f0" "#79740e"))
'(jdee-db-spec-breakpoint-face-colors (cons "#f0f0f0" "#928374"))
'(objed-cursor-color "#9d0006")
'(package-selected-packages '(visual-fill))
'(pdf-view-midnight-colors (cons "#282828" "#fbf1c7"))
'(rustic-ansi-faces
["#fbf1c7" "#9d0006" "#79740e" "#b57614" "#076678" "#b16286" "#427b58" "#282828"])
'(vc-annotate-background "#fbf1c7")
'(vc-annotate-color-map
(list
(cons 20 "#79740e")
(cons 40 "#8d7410")
(cons 60 "#a17512")
(cons 80 "#b57614")
(cons 100 "#b3620e")
(cons 120 "#b14e08")
(cons 140 "#af3a03")
(cons 160 "#af472e")
(cons 180 "#b0545a")
(cons 200 "#b16286")
(cons 220 "#aa415b")
(cons 240 "#a32030")
(cons 260 "#9d0006")
(cons 280 "#9a2021")
(cons 300 "#97413c")
(cons 320 "#946258")
(cons 340 "#504945")
(cons 360 "#504945")))
'(vc-annotate-very-old-color nil))
(custom-set-faces
;; custom-set-faces 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.
)

View File

@@ -14,8 +14,6 @@
;; Alternatively, press 'gd' (or 'C-c c d') on a module to browse its
;; directory (for easy access to its source code).
(defvar native-comp-deferred-compilation-deny-list nil)
(doom! :input
;;chinese
;;japanese
@@ -31,9 +29,9 @@
:ui
;;deft ; notational velocity for Emacs
doom ; what makes DOOM look the way it does
doom-dashboard ; a nifty splash screen for Emacs
doom-dashboard ; a nifty splash screen for Emacs
doom-quit ; DOOM quit-message prompts when you quit Emacs
(emoji +unicode) ; 🙂
;;(emoji +unicode) ; 🙂
hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
;;hydra
;;indent-guides ; highlighted indent columns
@@ -44,9 +42,9 @@
;;neotree ; a project drawer, like NERDTree for vim
ophints ; highlight the region an operation acts on
(popup +defaults) ; tame sudden yet inevitable temporary windows
tabs ; a tab bar for Emacs
;;tabs ; a tab bar for Emacs
;;treemacs ; a project drawer, like neotree but cooler
unicode ; extended unicode support for various languages
;;unicode ; extended unicode support for various languages
vc-gutter ; vcs diff in the fringe
vi-tilde-fringe ; fringe tildes to mark beyond EOB
;;window-select ; visually switch windows
@@ -65,7 +63,7 @@
;;parinfer ; turn lisp into python, sort of
;;rotate-text ; cycle region at point between text candidates
snippets ; my elves. They type so I don't have to
word-wrap ; soft wrapping with language-aware indent
;;word-wrap ; soft wrapping with language-aware indent
:emacs
dired ; making dired pretty [functional]
@@ -78,7 +76,7 @@
;;eshell ; the elisp shell that works everywhere
;;shell ; simple shell REPL for Emacs
;;term ; basic terminal emulator for Emacs
vterm ; the best terminal emulation in Emacs
;;vterm ; the best terminal emulation in Emacs
:checkers
syntax ; tasing you for every semicolon you forget
@@ -86,10 +84,10 @@
;;grammar ; tasing grammar mistake every you make
:tools
ansible
;;ansible
;;debugger ; FIXME stepping through code, to help you add bugs
;;direnv
docker
;;docker
;;editorconfig ; let someone else argue about tabs vs spaces
;;ein ; tame Jupyter notebooks with emacs
(eval +overlay) ; run code, run (also, repls)
@@ -99,7 +97,7 @@
magit ; a git porcelain for Emacs
;;make ; run make tasks from Emacs
;;pass ; password manager for nerds
pdf ; pdf enhancements
;;pdf ; pdf enhancements
;;prodigy ; FIXME managing external services & code builders
;;rgb ; creating color strings
;;taskrunner ; taskrunner for all your projects
@@ -115,7 +113,7 @@
;;agda ; types of types of types of types...
;;beancount ; mind the GAAP
;;cc ; C > C++ == 1
clojure ; java with a lisp
;;clojure ; java with a lisp
;;common-lisp ; if you've seen one lisp, you've seen them all
;;coq ; proofs-as-programs
;;crystal ; ruby at the speed of c
@@ -154,13 +152,13 @@
;;php ; perl's insecure younger brother
;;plantuml ; diagrams for confusing people more
;;purescript ; javascript, but functional
python ; beautiful is better than ugly
;;python ; beautiful is better than ugly
;;qt ; the 'cutest' gui framework ever
;;racket ; a DSL for DSLs
;;raku ; the artist formerly known as perl6
;;rest ; Emacs as a REST client
;;rst ; ReST in peace
(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
;;rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
;;scala ; java, but good
;;(scheme +guile) ; a fully conniving family of lisps
@@ -174,16 +172,16 @@
;;zig ; C, but simpler
:email
(mu4e +org +gmail)
;;(mu4e +org +gmail)
;;notmuch
;;(wanderlust +gmail)
:app
calendar
;;calendar
;;emms
;;everywhere ; *leave* Emacs!? You must be joking
irc ; how neckbeards socialize
(rss +org) ; emacs as an RSS reader
;;irc ; how neckbeards socialize
;;(rss +org) ; emacs as an RSS reader
;;twitter ; twitter client https://twitter.com/vnought
:config

View File

@@ -6,11 +6,11 @@
;; use 'M-x doom/reload'.
(package! org-bullets)
(package! cider)
(package! modus-themes)
(package! visual-fill-column)
(package! no-littering)
(package! cider)
(package! org-pomodoro)
(package! visual-fill-column)
;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
;(package! some-package)

View File

@@ -17,6 +17,8 @@ export PATH=/home/ry/scripts/cron-scripts:$PATH
export PATH=/home/ry/.cargo/bin:$PATH
# bin
export PATH=/bin:$PATH
# doom
export PATH=~/.config/emacs/bin:$PATH
# --- locale --- #
export LANG=en_US.UTF-8

11
.gitignore vendored Normal file
View File

@@ -0,0 +1,11 @@
.*
!Emacs.org
!.config/nvim/init.vim
!.zshenv
!.config/zsh/.zshrc
!.config/zsh/.zprofile
!.config/alacritty
!.config/doom
!.config/user-dirs.dirs
!.gitignore
!.stow-local-ignore

39
.gitmodules vendored
View File

@@ -1,39 +0,0 @@
[submodule ".config/oh-my-zsh"]
path = .config/oh-my-zsh
url = https://github.com/ohmyzsh/ohmyzsh.git
[submodule ".config/nvim/plugged/vlime"]
path = .config/nvim/plugged/vlime
url = https://github.com/vlime/vlime.git
[submodule ".config/nvim/plugged/vimwiki"]
path = .config/nvim/plugged/vimwiki
url = https://github.com/vimwiki/vimwiki.git
[submodule ".config/nvim/plugged/vimling"]
path = .config/nvim/plugged/vimling
url = https://github.com/lukesmithxyz/vimling.git
[submodule ".config/nvim/plugged/vimagit"]
path = .config/nvim/plugged/vimagit
url = https://github.com/jreybert/vimagit.git
[submodule ".config/nvim/plugged/vim-surround"]
path = .config/nvim/plugged/vim-surround
url = https://github.com/tpope/vim-surround.git
[submodule ".config/nvim/plugged/vim-go"]
path = .config/nvim/plugged/vim-go
url = https://github.com/fatih/vim-go.git
[submodule ".config/nvim/plugged/vim-css-color"]
path = .config/nvim/plugged/vim-css-color
url = https://github.com/ap/vim-css-color.git
[submodule ".config/nvim/plugged/vim-commentary"]
path = .config/nvim/plugged/vim-commentary
url = https://github.com/tpope/vim-commentary.git
[submodule ".config/nvim/plugged/vim-airline"]
path = .config/nvim/plugged/vim-airline
url = https://github.com/vim-airline/vim-airline.git
[submodule ".config/nvim/plugged/nerdtree"]
path = .config/nvim/plugged/nerdtree
url = https://github.com/preservim/nerdtree.git
[submodule ".config/nvim/plugged/goyo.vim"]
path = .config/nvim/plugged/goyo.vim
url = https://github.com/junegunn/goyo.vim.git
[submodule ".config/emacs"]
path = .config/emacs
url = https://github.com/hlissner/doom-emacs

View File

@@ -1,44 +1,48 @@
#+title: Emacs Custom Configuration File
#+PROPERTY: header-args:emacs-lisp :tangle ~/.dotfiles/.config/doom/config.el
#+PROPERTY: header-args:emacs-lisp :tangle ~/dotfiles/.config/doom/config.el :mkdirp yes :lexical yes
* Preface
This document contains the fundamental elements of my Emacs configuration. Changes made to this file will reflect in init.el.
* Table of Contents
:PROPERTIES:
:TOC: :include all :ignore this
:END:
* Doom Startup Configuration
* General Configuration
** Keep Folders Clean
Emacs package configuration files aren't standardized and as a result sometimes packages litter the emacs config folder. no-littering ensures that packages are kept organized.
I need to test that I can remove this still.
#+begin_src emacs-lisp
;; Some functionality uses this to identify you, e.g. GPG configuration, email
;; clients, file templates and snippets.
(setq user-full-name "John Doe"
user-mail-address "john@doe.com")
;; Keep emacs folder tidy.
(use-package no-littering)
;; There are two ways to load a theme. Both assume the theme is installed and
;; available. You can either set `doom-theme' or manually load a theme with the
;; `load-theme' function. This is the default:
(setq doom-theme 'modus-vivendi)
;; If you use `org' and don't want your org files in the default location below,
;; change `org-directory'. It must be set before org loads!
(setq org-directory "~/org/")
;; This determines the style of line numbers in effect. If set to `nil', line
;; numbers are disabled. For relative line numbers, set this to `relative'.
(setq display-line-numbers-type t)
#+end_src
* General Configuration
** User Interface
#+begin_src emacs-lisp
;; Disables the doom splash screen
(setq inhibit-startup-message t)
(set-fringe-mode 10)
;; scroll 1 line at a time
(setq scroll-step 1)
;; Set visible bell
(setq visible-bell t)
(dolist (mode '(org-mode-hook
shell-mode-hook))
term-mode-hook
shell-mode-hook
eshell-mode-hook))
(add-hook mode (lambda () (display-line-numbers-mode 0))))
#+end_src
@@ -96,8 +100,6 @@ Using [[https://github.com/tonsky/FiraCode][Fira Code]] + Fira Code Retina.
#+end_src
#+RESULTS:
| ~/org/planner.org |
** General Configuration
@@ -252,20 +254,3 @@ Since we don't want to have to manually use the org-babel-tangle function everyt
(dired "/ssh:root@207.66.177.26#46668:/"))
#+end_src
* Change Auto-Save Directory
#+begin_src emacs-lisp
(setq backup-directory-alist
`(("." . ,(concat user-emacs-directory "backups"))))
(customize-set-variable
'tramp-backup-directory-alist backup-directory-alist)
(setq tramp-auto-save-directory "~/.dotfiles/.config/emacs/backups/remote")
#+end_src