Merge branch 'master' of https://gitlab.com/destroyer449/dotfiles

.config/doom/config.el

@@ -131,6 +131,8 @@
       :desc "Search web for text between BEG/END"
       "s w" #'eww-search-words)
 
+(setq ispell-dictionary "english")
+
 (setq doom-font (font-spec :family "Mononoki Nerd Font" :size 15)
       doom-variable-pitch-font (font-spec :family "Ubuntu" :size 15)
       doom-big-font (font-spec :family "Mononoki Nerd Font" :size 24))
@@ -404,6 +406,9 @@
       eshell-visual-commands'("bash" "fish" "htop" "ssh" "top" "zsh")
       vterm-max-scrollback 5000)
 (map! :leader
+      :desc "Eshell"
+      "e s" #'eshell
+      :leader
       :desc "Counsel eshell history"
       "e h" #'counsel-esh-history)
 

.config/doom/config.org

@@ -13,6 +13,7 @@
 - [[#emms][EMMS]]
 - [[#evaluate-elisp-expressions][EVALUATE ELISP EXPRESSIONS]]
 - [[#eww][EWW]]
+- [[#flyspellispellaspell][FLYSPELL/ISPELL/ASPELL]]
 - [[#fonts][FONTS]]
 - [[#ivy][IVY]]
   - [[#ivy-posframe][IVY-POSFRAME]]
@@ -183,7 +184,7 @@ Changing some keybindings from their defaults to better fit with Doom Emacs, and
 #+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)
@@ -194,6 +195,18 @@ EWW is the Emacs Web Wowser, the builtin browser in Emacs.  Below I set urls to
       :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")
+#+END_SRC
+
 * FONTS
 Settings related to fonts within Doom Emacs:
 + 'doom-font' -- standard monospace font that is used for most things in Emacs.
@@ -571,7 +584,15 @@ 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

.config/doom/init.el

@@ -29,7 +29,7 @@
        ;;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
@@ -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,7 +129,7 @@
        ;;fstar             ; (dependent) types and (monadic) effects and Z3
        ;;gdscript          ; the language you waited for
        ;;(go +lsp)         ; the hipster dialect
-       (haskell +dante)  ; a language that's lazier than I am
+       (haskell +dante +lsp)  ; a language that's lazier than I am
        ;;hy                ; readability of scheme w/ speed of python
        ;;idris             ; a language you can depend on
        json              ; At least it ain't XML
@@ -150,7 +150,7 @@
        php               ; perl's insecure younger brother
        ;;plantuml          ; diagrams for confusing people more
        ;;purescript        ; javascript, but functional
-       python            ; beautiful is better than ugly
+       (python +lsp)           ; beautiful is better than ugly
        ;;qt                ; the 'cutest' gui framework ever
        ;;racket            ; a DSL for DSLs
        ;;raku              ; the artist formerly known as perl6
@@ -160,7 +160,7 @@
        ;;rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
        ;;scala             ; java, but good
        ;;scheme            ; a fully conniving family of lisps
-       sh                ; she sells {ba,z,fi}sh shells on the C xor
+       (sh +fish +lsp)                ; 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?

.config/doom/packages.el

@@ -48,7 +48,6 @@
 ;(unpin! pinned-package another-pinned-package)
 ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
 ;(unpin! t)
-(package! flycheck-aspell)
 (package! async)
 (package! dired-open)
 (package! dmenu)