Snoooopy/dtos-dotfiles
1
0
Fork 0
mirror of https://gitlab.com/dwt1/dotfiles.git synced 2026-04-21 03:04:38 +10:00
Code Issues Packages Projects Releases Wiki Activity

Reverting to old config, new config horribly broken.

Browse Source
This commit is contained in:
Derek Taylor
2021-03-20 18:31:24 -05:00
parent 37692f19c2
commit d08b9a3915
4 changed files with 338 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

212
.config/doom/config.el
View File

@@ -1,7 +1,9 @@
(map! :leader
(:prefix ("b". "buffer")
:desc "List bookmarks" "L" #'list-bookmarks
:desc "Save current bookmarks to bookmark file" "w" #'bookmark-save))
:desc "List bookmarks"
"b L" #'list-bookmarks
:leader
:desc "Save current bookmarks to bookmark file"
"b w" #'bookmark-save)
(setq centaur-tabs-set-bar 'over
centaur-tabs-set-icons t
@@ -11,21 +13,30 @@
centaur-tabs-style "bar"
centaur-tabs-modified-marker "•")
(map! :leader
:desc "Toggle tabs globally" "t c" #'centaur-tabs-mode
:desc "Toggle tabs local display" "t C" #'centaur-tabs-local-mode)
:desc "Toggle tabs globally"
"t c" #'centaur-tabs-mode
:leader
:desc "Toggle tabs local display"
"t C" #'centaur-tabs-local-mode)
(evil-define-key 'normal centaur-tabs-mode-map (kbd "g <right>") 'centaur-tabs-forward ; default Doom binding is 'g t'
(kbd "g <left>") 'centaur-tabs-backward ; default Doom binding is 'g T'
(kbd "g <down>") 'centaur-tabs-forward-group
(kbd "g <up>") 'centaur-tabs-backward-group)
(map! :leader
(:prefix ("d" . "dired")
:desc "Open dired" "d" #'dired
:desc "Dired jump to current" "j" #'dired-jump)
:desc "Dired"
"d d" #'dired
:leader
:desc "Dired jump to current"
"d j" #'dired-jump
(:after dired
(:map dired-mode-map
:desc "Peep-dired image previews" "d p" #'peep-dired
:desc "Dired view file" "d v" #'dired-view-file)))
(:map dired-mode-map
:leader
:desc "Peep-dired image previews"
"d p" #'peep-dired
:leader
:desc "Dired view file"
"d v" #'dired-view-file)))
;; Make 'h' and 'l' go back and forward in dired. Much faster to navigate the directory structure!
(evil-define-key 'normal dired-mode-map
(kbd "h") 'dired-up-directory
@@ -45,9 +56,10 @@
("mkv" . "mpv")
("mp4" . "mpv")))
(setq doom-theme 'doom-dracula)
(setq doom-theme 'doom-one)
(map! :leader
:desc "Load new theme" "h t" #'counsel-load-theme)
:desc "Load new theme"
"h t" #'counsel-load-theme)
(custom-set-variables
'(elfeed-feeds
@@ -68,29 +80,56 @@
("http://lxer.com/module/newswire/headlines.rss" lxer linux)
("https://distrowatch.com/news/dwd.xml" distrowatch linux)))))
(emms-all)
(emms-default-players)
(emms-mode-line 1)
(emms-playing-time 1)
(setq emms-source-file-default-directory "~/Music/Non-Classical/70s-80s/"
emms-playlist-buffer-name "*Music*"
emms-info-asynchronously t
emms-source-file-directory-tree-function 'emms-source-file-directory-tree-find)
(map! :leader
:desc "Go to emms playlist"
"a a" #'emms-playlist-mode-go
:leader
:desc "Emms pause track"
"a x" #'emms-pause
:leader
:desc "Emms stop track"
"a s" #'emms-stop
:leader
:desc "Emms play previous track"
"a p" #'emms-previous
:leader
:desc "Emms play next track"
"a n" #'emms-next)
(map! :leader
(:prefix ("e". "evaluate/EWW")
:desc "Evaluate elisp in buffer" "b" #'eval-buffer
:desc "Evaluate defun" "d" #'eval-defun
:desc "Evaluate elisp expression" "e" #'eval-expression
:desc "Evaluate last sexpression" "l" #'eval-last-sexp
:desc "Evaluate elisp in region" "r" #'eval-region))
:desc "Evaluate elisp in buffer"
"e b" #'eval-buffer
:leader
:desc "Evaluate defun"
"e d" #'eval-defun
:leader
:desc "Evaluate elisp expression"
"e e" #'eval-expression
:leader
:desc "Evaluate last sexpression"
"e l" #'eval-last-sexp
:leader
:desc "Evaluate elisp in region"
"e r" #'eval-region)
(setq browse-url-browser-function 'eww-browse-url)
(map! :leader
(:prefix ("e" . "evaluate/EWW")
:desc "Eww web browser" "e w" #'eww
:desc "Eww reload page" "e R" #'eww-reload
:desc "Search web for text between BEG/END" "s w" #'eww-search-words))
(setq ispell-dictionary "english")
:desc "Eww web browser"
"e w" #'eww
:leader
:desc "Eww reload page"
"e R" #'eww-reload
:leader
:desc "Search web for text between BEG/END"
"s w" #'eww-search-words)
(setq doom-font (font-spec :family "Mononoki Nerd Font" :size 15)
doom-variable-pitch-font (font-spec :family "Ubuntu" :size 15)
@@ -121,17 +160,28 @@
(ivy-posframe-mode 1) ; 1 enables posframe-mode, 0 disables it.
(map! :leader
:desc "Ivy push view" "v p" #'ivy-push-view
:desc "Ivy switch view" "v s" #'ivy-switch-view)
:desc "Ivy push view"
"v p" #'ivy-push-view
:leader
:desc "Ivy switch view"
"v s" #'ivy-switch-view)
(setq display-line-numbers-type t)
(map! :leader
:desc "Comment or uncomment lines" "TAB TAB" #'comment-line
(:prefix ("t" . "toggle")
:desc "Toggle line numbers" "l" #'doom/toggle-line-numbers
:desc "Toggle line highlight in frame" "h" #'hl-line-mode
:desc "Toggle line highlight globally" "H" #'global-hl-line-mode
:desc "Toggle truncate lines" "t" #'toggle-truncate-lines))
:desc "Comment or uncomment lines"
"TAB TAB" #'comment-line
:leader
:desc "Toggle line numbers"
"t l" #'doom/toggle-line-numbers
:leader
:desc "Toggle line highlight in frame"
"t h" #'hl-line-mode
:leader
:desc "Toggle line highlight globally"
"t H" #'global-hl-line-mode
:leader
:desc "Toggle truncate lines"
"t t" #'toggle-truncate-lines)
(after! mastodon
(setq mastodon-instance-url "https://mastodon.technology/"))
@@ -231,17 +281,27 @@
(after! doom-themes
(setq doom-neotree-enable-variable-pitch t))
(map! :leader
(:prefix ("t" . "toggle")
:desc "Toggle neotree file viewer" "n" #'neotree-toggle
:desc "Open directory in neotree" "N" #'neotree-dir))
:desc "Toggle neotree file viewer"
"t n" #'neotree-toggle
:leader
:desc "Open directory in neotree"
"d n" #'neotree-dir)
(map! :leader
(:prefix ("-" . "open file")
:desc "Edit agenda file" "a" #'(lambda () (interactive) (find-file "~/Org/agenda.org"))
:desc "Edit doom config.org" "c" #'(lambda () (interactive) (find-file "~/.doom.d/config.org"))
:desc "Edit eshell aliases" "e" #'(lambda () (interactive) (find-file "~/.doom.d/aliases"))
:desc "Edit doom init.el" "i" #'(lambda () (interactive) (find-file "~/.doom.d/init.el"))
:desc "Edit doom packages.el" "p" #'(lambda () (interactive) (find-file "~/.doom.d/packages.el")))
:desc "Edit agenda file"
"- a" #'(lambda () (interactive) (find-file "~/Org/agenda.org"))
:leader
:desc "Edit doom config.org"
"- c" #'(lambda () (interactive) (find-file "~/.doom.d/config.org"))
:leader
:desc "Edit eshell aliases"
"- e" #'(lambda () (interactive) (find-file "~/.doom.d/aliases"))
:leader
:desc "Edit doom init.el"
"- i" #'(lambda () (interactive) (find-file "~/.doom.d/init.el"))
:leader
:desc "Edit doom packages.el"
"- p" #'(lambda () (interactive) (find-file "~/.doom.d/packages.el")))
(after! org
(add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
@@ -294,25 +354,45 @@
(dt/org-babel-tangle-async (buffer-file-name)))
(map! :leader
(:prefix ("r" . "registers")
:desc "Copy to register" "c" #'copy-to-register
:desc "Frameset to register" "f" #'frameset-to-register
:desc "Insert contents of register" "i" #'insert-register
:desc "Jump to register" "j" #'jump-to-register
:desc "List registers" "l" #'list-registers
:desc "Number to register" "n" #'number-to-register
:desc "Interactively choose a register" "r" #'counsel-register
:desc "View a register" "v" #'view-register
:desc "Window configuration to register" "w" #'window-configuration-to-register
:desc "Increment register" "+" #'increment-register
:desc "Point to register" "SPC" #'point-to-register))
:desc "Copy to register"
"r c" #'copy-to-register
:leader
:desc "Frameset to register"
"r f" #'frameset-to-register
:leader
:desc "Insert contents of register"
"r i" #'insert-register
:leader
:desc "Jump to register"
"r j" #'jump-to-register
:leader
:desc "List registers"
"r l" #'list-registers
:leader
:desc "Number to register"
"r n" #'number-to-register
:leader
:desc "Interactively choose a register"
"r r" #'counsel-register
:leader
:desc "View a register"
"r v" #'view-register
:leader
:desc "Window configuration to register"
"r w" #'window-configuration-to-register
:leader
:desc "Increment register"
"r +" #'increment-register
:leader
:desc "Point to register"
"r SPC" #'point-to-register)
(map! :leader
(:prefix ("\\" . "ssh")
:desc "Ssh into distrotube.com"
"d" #'(lambda () (interactive) (find-file "/scp:derek@distrotube.com"))
"\\ d" #'(lambda () (interactive) (find-file "/scp:derek@distrotube.com"))
:leader
:desc "Ssh into my nextcloud"
"n" #'(lambda () (interactive) (find-file "/scp:derek@distrotube.net"))))
"\\ n" #'(lambda () (interactive) (find-file "/scp:derek@distrotube.net")))
(setq shell-file-name "/bin/fish"
eshell-aliases-file "~/.doom.d/aliases"
@@ -324,24 +404,20 @@
eshell-visual-commands'("bash" "fish" "htop" "ssh" "top" "zsh")
vterm-max-scrollback 5000)
(map! :leader
<<<<<<< HEAD:.config/doom/config.org
:desc "Counsel eshell history" "e h" #'counsel-esh-history)
=======
:desc "Eshell"
"e s" #'eshell
:leader
:desc "Counsel eshell history"
"e h" #'counsel-esh-history)
>>>>>>> 45486bac887a31725e135dde053925d8ff28cb78:.doom.d/config.org
(defun prefer-horizontal-split ()
(set-variable 'split-height-threshold nil t)
(set-variable 'split-width-threshold 40 t)) ; make this as low as needed
(add-hook 'markdown-mode-hook 'prefer-horizontal-split)
(map! :leader
:desc "Clone indirect buffer other window" "b c" #'clone-indirect-buffer-other-window)
:desc "Clone indirect buffer other window"
"b c" #'clone-indirect-buffer-other-window)
(map! :leader
(:prefix ("w" . "window")
:desc "Winner redo" "<right>" #'winner-redo
:desc "Winner undo" "<left>" #'winner-undo))
:desc "Winner redo"
"w <right>" #'winner-redo
:leader
:desc "Winner undo"
"w <left>" #'winner-undo)

246
.config/doom/config.org
View File

@@ -13,7 +13,6 @@
- [[#emms][EMMS]]
- [[#evaluate-elisp-expressions][EVALUATE ELISP EXPRESSIONS]]
- [[#eww][EWW]]
- [[#flyspellispellaspell][FLYSPELL/ISPELL/ASPELL]]
- [[#fonts][FONTS]]
- [[#ivy][IVY]]
- [[#ivy-posframe][IVY-POSFRAME]]
@@ -33,17 +32,19 @@
- [[#splits][SPLITS]]
- [[#winner-mode][WINNER MODE]]
* ABOUT THIS CONFIG
This is my personal Doom Emacs config. Doom Emacs is a distribution of Emacs that uses the "evil" keybindings (Vim keybindings) and includes a number of nice extensions and a bit of configuration out of the box. I am maintaining this config not just for myself, but also for those that want to explore some of what is possible with Emacs. I will add a lot of examples of plugins and settings, some of them I may not even use personally. I do this because many people following me on YouTube look at my configs as "documentation".
* ABOUT THIS CONFIG
This is my personal Doom Emacs config. Doom Emacs is a distribution of Emacs that uses the "evil" keybindings (Vim keybindings) and includes a number of nice extensions and a bit of configuration out of the box. I am maintaing this config not just for myself, but also for those that want to explore some of what is possible with Emacs. I will add a lot of examples of plugins and settings, some of them I may not even use personally. I do this because many people following me on YouTube look at my configs as "documentation".
* BOOKMARKS AND BUFFERS
Doom Emacs uses 'SPC b' for keybindings related to bookmarks and buffers. Bookmarks are somewhat like registers in that they record positions you can jump to. Unlike registers, they have long names, and they persist automatically from one Emacs session to the next. The prototypical use of bookmarks is to record where you were reading in various files. Regarding /buffers/, the text you are editing in Emacs resides in an object called a /buffer/. Each time you visit a file, a buffer is used to hold the file’s text. Each time you invoke Dired, a buffer is used to hold the directory listing.
#+BEGIN_SRC emacs-lisp
(map! :leader
(:prefix ("b". "buffer")
:desc "List bookmarks" "L" #'list-bookmarks
:desc "Save current bookmarks to bookmark file" "w" #'bookmark-save))
:desc "List bookmarks"
"b L" #'list-bookmarks
:leader
:desc "Save current bookmarks to bookmark file"
"b w" #'bookmark-save)
#+END_SRC
* CENTAUR-TABS
@@ -67,8 +68,11 @@ To use tabs in Doom Emacs, be sure to uncomment "tabs" in Doom's init.el. Displ
centaur-tabs-style "bar"
centaur-tabs-modified-marker "•")
(map! :leader
:desc "Toggle tabs globally" "t c" #'centaur-tabs-mode
:desc "Toggle tabs local display" "t C" #'centaur-tabs-local-mode)
:desc "Toggle tabs globally"
"t c" #'centaur-tabs-mode
:leader
:desc "Toggle tabs local display"
"t C" #'centaur-tabs-local-mode)
(evil-define-key 'normal centaur-tabs-mode-map (kbd "g <right>") 'centaur-tabs-forward ; default Doom binding is 'g t'
(kbd "g <left>") 'centaur-tabs-backward ; default Doom binding is 'g T'
(kbd "g <down>") 'centaur-tabs-forward-group
@@ -91,13 +95,19 @@ Dired is the file manager within Emacs. Below, I setup keybindings for image pr
#+BEGIN_SRC emacs-lisp
(map! :leader
(:prefix ("d" . "dired")
:desc "Open dired" "d" #'dired
:desc "Dired jump to current" "j" #'dired-jump)
:desc "Dired"
"d d" #'dired
:leader
:desc "Dired jump to current"
"d j" #'dired-jump
(:after dired
(:map dired-mode-map
:desc "Peep-dired image previews" "d p" #'peep-dired
:desc "Dired view file" "d v" #'dired-view-file)))
(:map dired-mode-map
:leader
:desc "Peep-dired image previews"
"d p" #'peep-dired
:leader
:desc "Dired view file"
"d v" #'dired-view-file)))
;; Make 'h' and 'l' go back and forward in dired. Much faster to navigate the directory structure!
(evil-define-key 'normal dired-mode-map
(kbd "h") 'dired-up-directory
@@ -122,9 +132,10 @@ Dired is the file manager within Emacs. Below, I setup keybindings for image pr
Setting the theme to doom-one. To try out new themes, I set a keybinding for counsel-load-theme with 'SPC h t'.
#+BEGIN_SRC emacs-lisp
(setq doom-theme 'doom-dracula)
(setq doom-theme 'doom-one)
(map! :leader
:desc "Load new theme" "h t" #'counsel-load-theme)
:desc "Load new theme"
"h t" #'counsel-load-theme)
#+END_SRC
* ELFEED
@@ -152,14 +163,40 @@ An RSS newsfeed reader for Emacs.
#+END_SRC
* EMMS
EMMS is now a default module in doom, so you only have to pass in your music folder.
One of the media players available for Emacs is emms, which stands for Emacs Multimedia System. By default, Doom Emacs does not use 'SPC a',' so the format I use for these bindings is 'SPC a' plus 'key'.
| COMMAND | DESCRIPTION | KEYBINDING |
|-----------------------+-----------------------------------+------------|
| emms-playlist-mode-go | /Switch to the playlist buffer/ | SPC a a |
| emms-pause | /Pause the track/ | SPC a x |
| emms-stop | /Stop the track/ | SPC a s |
| emms-previous | /Play previous track in playlist/ | SPC a p |
| emms-next | /Play next track in playlist/ | SPC a n |
#+BEGIN_SRC emacs-lisp
(emms-all)
(emms-default-players)
(emms-mode-line 1)
(emms-playing-time 1)
(setq emms-source-file-default-directory "~/Music/Non-Classical/70s-80s/"
emms-playlist-buffer-name "*Music*"
emms-info-asynchronously t
emms-source-file-directory-tree-function 'emms-source-file-directory-tree-find)
(map! :leader
:desc "Go to emms playlist"
"a a" #'emms-playlist-mode-go
:leader
:desc "Emms pause track"
"a x" #'emms-pause
:leader
:desc "Emms stop track"
"a s" #'emms-stop
:leader
:desc "Emms play previous track"
"a p" #'emms-previous
:leader
:desc "Emms play next track"
"a n" #'emms-next)
#+END_SRC
* EVALUATE ELISP EXPRESSIONS
@@ -175,36 +212,36 @@ Changing some keybindings from their defaults to better fit with Doom Emacs, and
#+Begin_src emacs-lisp
(map! :leader
(:prefix ("e". "evaluate/EWW")
:desc "Evaluate elisp in buffer" "b" #'eval-buffer
:desc "Evaluate defun" "d" #'eval-defun
:desc "Evaluate elisp expression" "e" #'eval-expression
:desc "Evaluate last sexpression" "l" #'eval-last-sexp
:desc "Evaluate elisp in region" "r" #'eval-region))
:desc "Evaluate elisp in buffer"
"e b" #'eval-buffer
:leader
:desc "Evaluate defun"
"e d" #'eval-defun
:leader
:desc "Evaluate elisp expression"
"e e" #'eval-expression
:leader
:desc "Evaluate last sexpression"
"e l" #'eval-last-sexp
:leader
:desc "Evaluate elisp in region"
"e r" #'eval-region)
#+END_SRC
* EWW
EWW is the Emacs Web Wowser, the builtin browser in Emacs. Below I set URLs to open in a specific browser (eww) with browse-url-browser-function. By default, Doom Emacs does not use 'SPC e' for anything, so I choose to use the format 'SPC e' plus 'key' for these (I also use 'SPC e' for 'eval' keybindings). I chose to use 'SPC s w' for eww-search-words because Doom Emacs uses 'SPC s' for 'search' commands.
EWW is the Emacs Web Wowser, the builtin browser in Emacs. Below I set urls to open in a specific browser (eww) with browse-url-browser-function. By default, Doom Emacs does not use 'SPC e' for anything, so I choose to use the format 'SPC e' plus 'key' for these (I also use 'SPC e' for 'eval' keybindings). I chose to use 'SPC s w' for eww-search-words because Doom Emacs uses 'SPC s' for 'search' commands.
#+BEGIN_SRC emacs-lisp
(setq browse-url-browser-function 'eww-browse-url)
(map! :leader
(:prefix ("e" . "evaluate/EWW")
:desc "Eww web browser" "e w" #'eww
:desc "Eww reload page" "e R" #'eww-reload
:desc "Search web for text between BEG/END" "s w" #'eww-search-words))
#+END_SRC
* FLYSPELL/ISPELL/ASPELL
I installed 'aspell' and 'aspell-en' from the Arch Linux repos to get spellchecking to work. I also made a table listing some of the default Doom Emac's keybindings for flycheck/flyspell. They are listed here for reference.
| COMMAND | DESCRIPTION | KEYBINDING |
|---------------+--------------------------------+------------|
| flycheck-mode | /Toggle enable/disable flycheck/ | SPC t f |
| flyspell-mode | /Toggle enable/disable flyspell/ | SPC t s |
#+BEGIN_SRC emacs-lisp
(setq ispell-dictionary "english")
:desc "Eww web browser"
"e w" #'eww
:leader
:desc "Eww reload page"
"e R" #'eww-reload
:leader
:desc "Search web for text between BEG/END"
"s w" #'eww-search-words)
#+END_SRC
* FONTS
@@ -271,8 +308,11 @@ By default, Doom Emacs does not use 'SPC v', so the format I use for these bindi
#+BEGIN_SRC emacs-lisp
(map! :leader
:desc "Ivy push view" "v p" #'ivy-push-view
:desc "Ivy switch view" "v s" #'ivy-switch-view)
:desc "Ivy push view"
"v p" #'ivy-push-view
:leader
:desc "Ivy switch view"
"v s" #'ivy-switch-view)
#+END_SRC
* LINE SETTINGS
@@ -289,12 +329,20 @@ I set comment-line to 'SPC TAB TAB' which is a rather comfortable keybinding for
#+BEGIN_SRC emacs-lisp
(setq display-line-numbers-type t)
(map! :leader
:desc "Comment or uncomment lines" "TAB TAB" #'comment-line
(:prefix ("t" . "toggle")
:desc "Toggle line numbers" "l" #'doom/toggle-line-numbers
:desc "Toggle line highlight in frame" "h" #'hl-line-mode
:desc "Toggle line highlight globally" "H" #'global-hl-line-mode
:desc "Toggle truncate lines" "t" #'toggle-truncate-lines))
:desc "Comment or uncomment lines"
"TAB TAB" #'comment-line
:leader
:desc "Toggle line numbers"
"t l" #'doom/toggle-line-numbers
:leader
:desc "Toggle line highlight in frame"
"t h" #'hl-line-mode
:leader
:desc "Toggle line highlight globally"
"t H" #'global-hl-line-mode
:leader
:desc "Toggle truncate lines"
"t t" #'toggle-truncate-lines)
#+END_SRC
* MASTODON
@@ -420,10 +468,10 @@ The following function can be used to select an account. This function then nee
* NEOTREE
Neotree is a file tree viewer. When you open neotree, it jumps to the current file thanks to neo-smart-open. The neo-window-fixed-size setting makes the neotree width be adjustable. Doom Emacs had no keybindings set for neotree. Since Doom Emacs uses 'SPC t' for 'toggle' keybindings, I used 'SPC t n' for toggle-neotree.
| COMMAND | DESCRIPTION | KEYBINDING |
|----------------+-----------------------------+------------|
| COMMAND | DESCRIPTION | KEYBINDING |
|----------------+---------------------------+------------|
| neotree-toggle | /Toggle neotree/ | SPC t n |
| neotree- dir | /Open directory in neotree/ | SPC t N |
| neotree- dir | /Open directory in neotree/ | SPC d n |
#+BEGIN_SRC emacs-lisp
(after! neotree
@@ -432,9 +480,11 @@ Neotree is a file tree viewer. When you open neotree, it jumps to the current f
(after! doom-themes
(setq doom-neotree-enable-variable-pitch t))
(map! :leader
(:prefix ("t" . "toggle")
:desc "Toggle neotree file viewer" "n" #'neotree-toggle
:desc "Open directory in neotree" "N" #'neotree-dir))
:desc "Toggle neotree file viewer"
"t n" #'neotree-toggle
:leader
:desc "Open directory in neotree"
"d n" #'neotree-dir)
#+END_SRC
* OPEN SPECIFIC FILES
@@ -450,12 +500,20 @@ Keybindings to open files that I work with all the time using the find-file comm
#+BEGIN_SRC emacs-lisp
(map! :leader
(:prefix ("-" . "open file")
:desc "Edit agenda file" "a" #'(lambda () (interactive) (find-file "~/Org/agenda.org"))
:desc "Edit doom config.org" "c" #'(lambda () (interactive) (find-file "~/.doom.d/config.org"))
:desc "Edit eshell aliases" "e" #'(lambda () (interactive) (find-file "~/.doom.d/aliases"))
:desc "Edit doom init.el" "i" #'(lambda () (interactive) (find-file "~/.doom.d/init.el"))
:desc "Edit doom packages.el" "p" #'(lambda () (interactive) (find-file "~/.doom.d/packages.el")))
:desc "Edit agenda file"
"- a" #'(lambda () (interactive) (find-file "~/Org/agenda.org"))
:leader
:desc "Edit doom config.org"
"- c" #'(lambda () (interactive) (find-file "~/.doom.d/config.org"))
:leader
:desc "Edit eshell aliases"
"- e" #'(lambda () (interactive) (find-file "~/.doom.d/aliases"))
:leader
:desc "Edit doom init.el"
"- i" #'(lambda () (interactive) (find-file "~/.doom.d/init.el"))
:leader
:desc "Edit doom packages.el"
"- p" #'(lambda () (interactive) (find-file "~/.doom.d/packages.el")))
#+END_SRC
* ORG MODE
@@ -537,18 +595,38 @@ Emacs registers are compartments where you can save text, rectangles and positio
#+BEGIN_SRC emacs-lisp
(map! :leader
(:prefix ("r" . "registers")
:desc "Copy to register" "c" #'copy-to-register
:desc "Frameset to register" "f" #'frameset-to-register
:desc "Insert contents of register" "i" #'insert-register
:desc "Jump to register" "j" #'jump-to-register
:desc "List registers" "l" #'list-registers
:desc "Number to register" "n" #'number-to-register
:desc "Interactively choose a register" "r" #'counsel-register
:desc "View a register" "v" #'view-register
:desc "Window configuration to register" "w" #'window-configuration-to-register
:desc "Increment register" "+" #'increment-register
:desc "Point to register" "SPC" #'point-to-register))
:desc "Copy to register"
"r c" #'copy-to-register
:leader
:desc "Frameset to register"
"r f" #'frameset-to-register
:leader
:desc "Insert contents of register"
"r i" #'insert-register
:leader
:desc "Jump to register"
"r j" #'jump-to-register
:leader
:desc "List registers"
"r l" #'list-registers
:leader
:desc "Number to register"
"r n" #'number-to-register
:leader
:desc "Interactively choose a register"
"r r" #'counsel-register
:leader
:desc "View a register"
"r v" #'view-register
:leader
:desc "Window configuration to register"
"r w" #'window-configuration-to-register
:leader
:desc "Increment register"
"r +" #'increment-register
:leader
:desc "Point to register"
"r SPC" #'point-to-register)
#+END_SRC
* REMOTE CONNECTIONS
@@ -561,11 +639,11 @@ Keybindings for ssh'ing into remote machines. By default, Doom Emacs does not u
#+BEGIN_SRC emacs-lisp
(map! :leader
(:prefix ("\\" . "ssh")
:desc "Ssh into distrotube.com"
"d" #'(lambda () (interactive) (find-file "/scp:derek@distrotube.com"))
"\\ d" #'(lambda () (interactive) (find-file "/scp:derek@distrotube.com"))
:leader
:desc "Ssh into my nextcloud"
"n" #'(lambda () (interactive) (find-file "/scp:derek@distrotube.net"))))
"\\ n" #'(lambda () (interactive) (find-file "/scp:derek@distrotube.net")))
#+END_SRC
* SHELLS
@@ -584,15 +662,8 @@ Settings for the various shells and terminal emulators within Emacs.
eshell-visual-commands'("bash" "fish" "htop" "ssh" "top" "zsh")
vterm-max-scrollback 5000)
(map! :leader
<<<<<<< HEAD:.config/doom/config.org
:desc "Counsel eshell history" "e h" #'counsel-esh-history)
=======
:desc "Eshell"
"e s" #'eshell
:leader
:desc "Counsel eshell history"
"e h" #'counsel-esh-history)
>>>>>>> 45486bac887a31725e135dde053925d8ff28cb78:.doom.d/config.org
#+END_SRC
* SPLITS
@@ -604,7 +675,8 @@ I set splits to default to opening on the right using 'prefer-horizontal-split'.
(set-variable 'split-width-threshold 40 t)) ; make this as low as needed
(add-hook 'markdown-mode-hook 'prefer-horizontal-split)
(map! :leader
:desc "Clone indirect buffer other window" "b c" #'clone-indirect-buffer-other-window)
:desc "Clone indirect buffer other window"
"b c" #'clone-indirect-buffer-other-window)
#+END_SRC
* WINNER MODE
@@ -612,7 +684,9 @@ Winner mode has been included with GNU Emacs since version 20. This is a global
#+BEGIN_SRC emacs-lisp
(map! :leader
(:prefix ("w" . "window")
:desc "Winner redo" "<right>" #'winner-redo
:desc "Winner undo" "<left>" #'winner-undo))
:desc "Winner redo"
"w <right>" #'winner-redo
:leader
:desc "Winner undo"
"w <left>" #'winner-undo)
#+END_SRC

45
.config/doom/init.el
View File

@@ -23,13 +23,13 @@
company ; the ultimate code completion backend
;;helm ; the *other* search engine for love and life
;;ido ; the other *other* search engine...
(ivy +fonts +childframe) ; a search engine for love and life
(ivy +fonts +ivyposframe) ; a search engine for love and life
:ui
;;deft ; notational velocity for Emacs
doom ; what makes DOOM look the way it does
doom-dashboard ; a nifty splash screen for Emacs
;;doom-quit ; DOOM quit-message prompts when you quit Emacs
doom-quit ; DOOM quit-message prompts when you quit Emacs
(emoji +unicode) ; 🙂
;;fill-column ; a `fill-column' indicator
hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
@@ -49,7 +49,7 @@
vi-tilde-fringe ; fringe tildes to mark beyond EOB
;;window-select ; visually switch windows
workspaces ; tab emulation, persistence & separate workspaces
zen ; distraction-free coding or writing
;;zen ; distraction-free coding or writing
:editor
(evil +everywhere); come to the dark side, we have cookies
@@ -66,7 +66,7 @@
;;word-wrap ; soft wrapping with language-aware indent
:emacs
(dired +icons) ; making dired pretty [functional]
dired ; making dired pretty [functional]
electric ; smarter, keyword-based electric-indent
ibuffer ; interactive buffer management
undo ; persistent, smarter undo for your inevitable mistakes
@@ -80,7 +80,7 @@
:checkers
syntax ; tasing you for every semicolon you forget
(spell +aspell) ; tasing you for misspelling mispelling
(spell +flyspell) ; tasing you for misspelling mispelling
;;grammar ; tasing grammar mistake every you make
:tools
@@ -93,7 +93,7 @@
(eval +overlay) ; run code, run (also, repls)
;;gist ; interacting with github gists
lookup ; navigate your code and its documentation
lsp
;;lsp
magit ; a git porcelain for Emacs
;;make ; run make tasks from Emacs
;;pass ; password manager for nerds
@@ -129,28 +129,28 @@
;;fstar ; (dependent) types and (monadic) effects and Z3
;;gdscript ; the language you waited for
;;(go +lsp) ; the hipster dialect
(haskell +lsp) ; a language that's lazier than I am
(haskell +dante) ; a language that's lazier than I am
;;hy ; readability of scheme w/ speed of python
;;idris ; a language you can depend on
(json +lsp) ; At least it ain't XML
json ; At least it ain't XML
;;(java +meghanada) ; the poster child for carpal tunnel syndrome
(javascript +lsp) ; all(hope(abandon(ye(who(enter(here))))))
javascript ; all(hope(abandon(ye(who(enter(here))))))
;;julia ; a better, faster MATLAB
;;kotlin ; a better, slicker Java(Script)
(latex +lsp) ; writing papers in Emacs has never been so fun
latex ; writing papers in Emacs has never been so fun
;;lean
;;factor
;;ledger ; an accounting system in Emacs
(lua +lsp) ; one-based indices? one-based indices
lua ; one-based indices? one-based indices
markdown ; writing docs for people to ignore
;;nim ; python + lisp at the speed of c
;;nix ; I hereby declare "nix geht mehr!"
;;ocaml ; an objective camel
(org +pretty) ; organize your plain life in plain text
(org +org-bullets +org-ql) ; organize your plain life in plain text
php ; perl's insecure younger brother
;;plantuml ; diagrams for confusing people more
;;purescript ; javascript, but functional
(python +lsp) ; 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
@@ -160,27 +160,34 @@
;;rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
;;scala ; java, but good
;;scheme ; a fully conniving family of lisps
(sh +fish +lsp) ; she sells {ba,z,fi}sh shells on the C xor
sh ; she sells {ba,z,fi}sh shells on the C xor
;;sml
;;solidity ; do you need a blockchain? No.
;;swift ; who asked for emoji variables?
;;terra ; Earth and Moon in alignment for performance.
(web +lsp) ; the tubes
(yaml +lsp) ; JSON, but readable
web ; the tubes
yaml ; JSON, but readable
:email
mu4e
smtpmail
;;notmuch
;;(wanderlust +gmail)
:app
;;calendar
emms
;;emms
;;everywhere ; *leave* Emacs!? You must be joking
;;irc ; how neckbeards socialize
rss ; emacs as an RSS reader
;;(rss +org) ; emacs as an RSS reader
;;twitter ; twitter client https://twitter.com/vnought
:emms
emms-setup
emms-info
emms-cue
emms-mode-line
:config
literate
;;literate
(default +bindings +smartparens))

8
.config/doom/packages.el
View File

@@ -48,12 +48,19 @@
;(unpin! pinned-package another-pinned-package)
;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
;(unpin! t)
(package! all-the-icons-dired)
(package! flycheck-aspell)
(package! async)
(package! dired-open)
(package! dmenu)
(package! elfeed)
(package! elpher)
(package! emms)
(package! emojify)
(package! evil-tutor)
(package! ivy-posframe)
(package! mastodon)
(package! org-bullets)
(package! org-ql)
(package! peep-dired)
(package! pianobar)
@@ -61,3 +68,4 @@
(package! resize-window)
(package! tldr)
(package! wc-mode)
(package! writeroom-mode)