Merge branch 'master' of http://git.tr909.sh/ry/dotfiles

.config/doom/config.el

@@ -1,22 +1,23 @@
 (add-to-list 'load-path "~/bin/emacs-ob-racket")
-;; Some functionality uses this to identify you, e.g. GPG configuration, email
+
-;; clients, file templates and snippets.
+;; Setting general info
 (setq user-full-name "Ry"
       user-mail-address "ry@opal.sh")
 
-;; There are two ways to load a theme. Both assume the theme is installed and
+;; load theme
-;; 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-operandi)
 
-;; If you use `org' and don't want your org files in the default location below,
+;; Set org agenda dir
-;; 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
+;; Set line number
-;; numbers are disabled. For relative line numbers, set this to `relative'.
 (setq display-line-numbers-type t)
 
+;; Keeps text lines from going off screen.
+(set-default 'truncate-lines nil)
+;; Add this hook to ERC if I run into trouble with truncated lines in other modes.
+;; (add-hook 'erc-mode-hook (lambda () (setq-default truncate-lines nil)))
+
 ;; Set visible bell
 (setq visible-bell t)
 

.config/doom/init.el

@@ -29,22 +29,22 @@
        :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
-       ;;ligatures         ; ligatures and symbols to make your code pretty again
+       ligatures         ; ligatures and symbols to make your code pretty again
        ;;minimap           ; show a map of the code on the side
        modeline          ; snazzy, Atom-inspired modeline, plus API
        ;;nav-flash         ; blink cursor line after big motions
        ;;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
@@ -55,7 +55,7 @@
        (evil +everywhere); come to the dark side, we have cookies
        file-templates    ; auto-snippets for empty files
        fold              ; (nigh) universal code folding
-       ;;(format +onsave)  ; automated prettiness
+       (format +onsave)  ; automated prettiness
        ;;god               ; run Emacs commands without modifier keys
        ;;lispy             ; vim for lisp, for people who don't like vim
        ;;multiple-cursors  ; editing in many places at once
@@ -63,12 +63,12 @@
        ;;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]
        electric          ; smarter, keyword-based electric-indent
-       ;;ibuffer         ; interactive buffer management
+       ibuffer         ; interactive buffer management
        undo              ; persistent, smarter undo for your inevitable mistakes
        vc                ; version-control and Emacs, sitting in a tree
 
@@ -81,7 +81,7 @@
        :checkers
        syntax              ; tasing you for every semicolon you forget
        ;;(spell +flyspell) ; tasing you for misspelling mispelling
-       ;;grammar           ; tasing grammar mistake every you make
+       grammar           ; tasing grammar mistake every you make
 
        :tools
        ansible
@@ -107,7 +107,7 @@
 
        :os
        (:if IS-MAC macos)  ; improve compatibility with macOS
-       ;;tty               ; improve the terminal Emacs experience
+       tty               ; improve the terminal Emacs experience
 
        :lang
        ;;agda              ; types of types of types of types...

Emacs.org

@@ -5,39 +5,30 @@
 
 This document contains the fundamental elements of my Emacs configuration. Changes made to this file will reflect in init.el.
 
-* Doom Startup Configuration
-
-I need to test that I can remove this still.
-
-#+begin_src emacs-lisp
-(add-to-list 'load-path "~/bin/emacs-ob-racket")
-;; Some functionality uses this to identify you, e.g. GPG configuration, email
-;; clients, file templates and snippets.
-(setq user-full-name "Ry"
-      user-mail-address "ry@opal.sh")
-
-;; 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-operandi)
-
-;; 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
-
-#+RESULTS:
-: t
-
 * General Configuration
 
 #+begin_src emacs-lisp
 
+(add-to-list 'load-path "~/bin/emacs-ob-racket")
+
+;; Setting general info
+(setq user-full-name "Ry"
+      user-mail-address "ry@opal.sh")
+
+;; load theme
+(setq doom-theme 'modus-operandi)
+
+;; Set org agenda dir
+(setq org-directory "~/org/")
+
+;; Set line number
+(setq display-line-numbers-type t)
+
+;; Keeps text lines from going off screen.
+(set-default 'truncate-lines nil)
+;; Add this hook to ERC if I run into trouble with truncated lines in other modes.
+;; (add-hook 'erc-mode-hook (lambda () (setq-default truncate-lines nil)))
+
 ;; Set visible bell
 (setq visible-bell t)