Merge pull request 'doom_bankruptcy' (#14) from doom_bankruptcy into master

Reviewed-on: #14

emacs/+company.el

@@ -0,0 +1,8 @@
+;;; +company.el -*- lexical-binding: t; -*-
+
+;; Make company a little faster to respond.
+(after! company
+  (setq company-idle-delay 0.5
+        company-minimum-prefix-length 2)
+  (setq company-show-numbers t)
+  (add-hook 'evil-normal-state-entry-hook #'company-abort)) ;; make aborting less annoying.

emacs/+mail.el

@@ -1,4 +1,4 @@
-;;; init.el -*- lexical-binding: t; -*-
+;;; +mail.el -*- lexical-binding: t; -*-
 
 
 ; I use ProtonMail with my domainname via ProtonBridge synced via mbsync to mu.

emacs/+modeline.el

@@ -0,0 +1,12 @@
+;;; +modeline.el -*- lexical-binding: t; -*-
+
+;; Only let us know when the encoding is NOT LF UTF-8.
+(defun doom-modeline-conditional-buffer-encoding ()
+  "We expect the encoding to be LF UTF-8, so only show the modeline when this is not the case"
+  (setq-local doom-modeline-buffer-encoding
+              (unless (and (memq (plist-get (coding-system-plist buffer-file-coding-system) :category)
+                                 '(coding-category-undecided coding-category-utf-8))
+                           (not (memq (coding-system-eol-type buffer-file-coding-system) '(1 2))))
+                t)))
+
+(add-hook 'after-change-major-mode-hook #'doom-modeline-conditional-buffer-encoding)

emacs/+org.el

@@ -1,4 +1,4 @@
-;;; init.el -*- lexical-binding: t; -*-
+;;; +org.el -*- lexical-binding: t; -*-
 (require 'org)
 
 (custom-set-variables '(org-directory "~/org/"))
@@ -27,9 +27,14 @@
 ;; recursive search for deft
 (setq deft-recursive t)
 
+
 ; Enable word wrap
 (add-hook 'org-mode-hook #'visual-line-mode)
 
+; Enable spell checking
+(add-hook 'org-mode-hook 'turn-on-flyspell)
+
+
 ;Custom bullets
 (setq org-superstar-headline-bullets-list '("⁜" "☰" "☱" "☲" "☳" "☴" "☵" "☶" "☷"))
 
@@ -38,3 +43,62 @@
 
 ;; org-journal-file-format
 (customize-set-variable 'org-journal-date-format "%A, %d %B %Y")
+
+
+;;; Making OrgMode it better looking
+; User Mix Pitch Mode for orgmode
+(add-hook! 'org-mode-hook #'+org-pretty-mode #'mixed-pitch-mode)
+
+
+; Add Padding
+(add-hook 'org-mode-hook (lambda ()
+  "Add padding left and right margins to orgmode"
+  (display-line-numbers-mode -1)
+  ;(text-scale-set 2)
+  (setq left-margin-width 2)
+  (setq right-margin-width 2)
+  (set-window-buffer nil (current-buffer))))
+
+(custom-set-faces!
+  '(default :height 1)
+  '(org-document-title :height 2.2))
+
+(setq org-agenda-deadline-faces
+      '((1.001 . error)
+        (1.0 . org-warning)
+        (0.5 . org-upcoming-deadline)
+        (0.0 . org-upcoming-distant-deadline)))
+
+;; Use appear to make org syntax easier to not fuck up.
+;(use-package! org-appear
+;  :hook (org-mode . org-appear-mode)
+;  :config
+;  (setq org-appear-autoemphasis t
+;        org-appear-autosubmarkers t
+;        org-appear-autolinks nil)
+;  ;; for proper first-time setup, `org-appear--set-elements'
+;  ;; needs to be run after other hooks have acted.
+;  (run-at-time nil nil #'org-appear--set-elements))
+
+;; Added Org-mode
+(add-hook 'org-mode-hook (lambda ()
+   "Beautify Org Checkbox Symbol"
+   (push '("[ ]" . "☐") prettify-symbols-alist)
+   (push '("[X]" . "☑" ) prettify-symbols-alist)
+   (push '("[-]" . "⊟" ) prettify-symbols-alist)
+   (prettify-symbols-mode)))
+
+
+
+;;; Org-Agenda Options
+(use-package! org-super-agenda
+  :commands (org-super-agenda-mode))
+(after! org-agenda
+  (org-super-agenda-mode))
+
+(setq org-agenda-skip-scheduled-if-done t
+      org-agenda-skip-deadline-if-done t
+      org-agenda-include-deadlines t
+      org-agenda-block-separator nil
+      org-agenda-tags-column 100 ;; from testing this seems to be a good value
+      org-agenda-compact-blocks t)

emacs/+window.el

@@ -0,0 +1,17 @@
+;;; window.org.el -*- lexical-binding: t; -*-
+
+(setq doom-fallback-buffer-name "Doom"
+      +doom-dashboard-name "Doom Dashboard")
+
+(setq frame-title-format
+      '(""
+        (:eval
+         (if (s-contains-p org-roam-directory (or buffer-file-name ""))
+             (replace-regexp-in-string
+              ".*/[0-9]*-?" "☰ "
+              (subst-char-in-string ?_ ?  buffer-file-name))
+           "%b"))
+        (:eval
+         (let ((project-name (projectile-project-name)))
+           (unless (string= "-" project-name)
+             (format (if (buffer-modified-p)  " ♢ %s" " ♦ %s") project-name))))))

emacs/config.el

@@ -3,12 +3,11 @@
 ;; Use "," as leader.
 (setq doom-localleader-key ",")
 
-;; Firacode is broken with Emacs-plus on osx. Fallback to Hasklig.
+;; Firacode is broken with Emacs-plus on osx. Fallback to Hasklig
-(if IS-MAC
+(setq doom-font (font-spec :family "Hasklig" :size 12)
-  (setq doom-font (font-spec :family "Hasklig" :size 12))
+      doom-variable-pitch-font (font-spec :family "ETbembo"  :size 16)
-  (setq doom-font (font-spec :family "FiraCode Nerd Font" :size 12))
+      doom-big-font (font-spec :family "Hasklig" :size 16))
-  )
+
-;;
 ;; Set font
 (pcase (system-name)
   ("zuk"
@@ -22,3 +21,6 @@
 
 (load! "+mail")
 (load! "+org")
+(load! "+company")
+(load! "+modeline")
+(load! "+window")

emacs/init.el

@@ -1,65 +1,60 @@
 ;;; init.el -*- lexical-binding: t; -*-
 
-;; This file controls what Doom modules are enabled and what order they load in.
+;; This file controls what Doom modules are enabled and what order they load
-;; Remember to run 'doom sync' after modifying it!
+;; in. Remember to run 'doom sync' after modifying it!
 
 ;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's
-;;      documentation. There you'll find information about all of Doom's modules
+;;      documentation. There you'll find a "Module Index" link where you'll find
-;;      and what flags they support.
+;;      a comprehensive list of Doom's modules and what flags they support.
 
 ;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or
-;;      'C-c g k' for non-vim users) to view its documentation. This works on
+;;      'C-c c k' for non-vim users) to view its documentation. This works on
 ;;      flags as well (those symbols that start with a plus).
 ;;
-;;      Alternatively, press 'gd' (or 'C-c g d') on a module to browse its
+;;      Alternatively, press 'gd' (or 'C-c c d') on a module to browse its
 ;;      directory (for easy access to its source code).
 
 (doom! :input
        ;;chinese
        ;;japanese
+       ;;layout            ; auie,ctsrnm is the superior home row
 
        :completion
-       (company                ; the ultimate code completion backend.
+       (company           ; the ultimate code completion backend
-         +childframe)          ; Use company-box.
+        +childframe)
-       ;;(helm                 ; because sometimes I prefer what I know.
+       ;;helm              ; the *other* search engine for love and life
-       ;; +fuzzy)              ; woh typse aynthing write teh first time.
        ;;ido               ; the other *other* search engine...
        (ivy               ; a search engine for love and life
-        +fuzzy                 ; Enables fuzzy completion for Ivy searches.
+        +prescient
-        +icons                 ; Enables file icons for stuff.
+        +icons
-        +childframe            ; display in a floating child frame, above Emacs.
+        +childframe
-        +prescient)            ; He who knows the past
+        )
 
        :ui
        deft              ; notational velocity for Emacs
        doom              ; what makes DOOM look the way it does
-       doom-dashboard          ; a nifty splash screen for Emaclints
+       doom-dashboard    ; a nifty splash screen for Emacs
        doom-quit         ; DOOM quit-message prompts when you quit Emacs
        ;;(emoji +unicode)  ; 🙂
-       fill-column             ; a `fill-column' indicator
+       ;;fill-column       ; a `fill-column' indicator
        hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
        ;;hydra
-       ;;indent-guides         ; highlighted indent columns
+       indent-guides     ; highlighted indent columns
-       (ligatures              ; replace bits of code with pretty symbols
+       ;;ligatures         ; ligatures and symbols to make your code pretty again
-        (:if IS-MAC +hasklig)  ; Firacode doesn't work on OSX. Fallback to hasklig.
-        (:if IS-LINUX +fira)   ; Fira is kind of what I'm used to.
-        )
        ;;minimap           ; show a map of the code on the side
        modeline          ; snazzy, Atom-inspired modeline, plus API
-       nav-flash               ; blink the current line after jumping
+       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                  ; tame sudden yet inevitable temporary windows
+       (popup +defaults)   ; tame sudden yet inevitable temporary windows
-        +all                   ; catch all popups that start with an asterix
+       ;;tabs              ; a tab bar for Emacs
-        +defaults)             ; default popup rules
-       ;;tabs                    ; an 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
+       ;;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
@@ -71,58 +66,60 @@
        ;;multiple-cursors  ; editing in many places at once
        ;;objed             ; text object editing for the innocent
        ;;parinfer          ; turn lisp into python, sort of
-       rotate-text             ; cycle region at point between text candidates
+       ;;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]
-         +ranger               ; bringing the goodness of ranger to dired
+        +icons)
-         +icons)               ; colorful icons for dired-mode
        electric          ; smarter, keyword-based electric-indent
-       ibuffer                 ; interactive buffer management
+       ;;ibuffer         ; interactive buffer management
-       (undo +tree )           ; persistent, smarter undo for your inevitable mistakes
+       undo              ; persistent, smarter undo for your inevitable mistakes
        vc                ; version-control and Emacs, sitting in a tree
 
        :term
-       ;;eshell                ; a consistent, cross-platform shell (WIP)
+       ;;eshell            ; the elisp shell that works everywhere
-       ;;shell                 ; a terminal REPL for Emacs
+       ;;shell             ; simple shell REPL for Emacs
-       ;;term                  ; terminals in Emacs
+       ;;term              ; basic terminal emulator for Emacs
-       vterm                   ; another terminals in Emacs
+       vterm             ; the best terminal emulation in Emacs
 
        :checkers
        syntax              ; tasing you for every semicolon you forget
-       spell                   ; tasing you for misspelling mispelling
+       (spell              ; tasing you for misspelling mispelling
+        +hunspell
+        +everywhere)
        grammar           ; tasing grammar mistake every you make
 
        :tools
        ansible
        debugger          ; FIXME stepping through code, to help you add bugs
        ;;direnv
-       (docker +lsp)
+       ;;docker
        editorconfig      ; let someone else argue about tabs vs spaces
        ;;ein               ; tame Jupyter notebooks with emacs
        (eval +overlay)     ; run code, run (also, repls)
        ;;gist              ; interacting with github gists
-       (lookup                 ; helps you navigate your code and documentation
+       (lookup              ; navigate your code and its documentation
-        +dictionary
+        +docsets
-        +docsets               ; ...or in Dash docsets locally
+        +dictionary)
-        +offline
+       (lsp
-        +xwidget)
+        +peek)
-       lsp
+       magit             ; a git porcelain for Emacs
-       ;;macos                 ; MacOS-specific commands
+       ;;make              ; run make tasks from Emacs
-       (magit                   ; a git porcelain for Emacs
-        +forge)
-       ;make                   ; run make   tasks from Emacs
        pass              ; password manager for nerds
        ;;pdf               ; pdf enhancements
        ;;prodigy           ; FIXME managing external services & code builders
        rgb               ; creating color strings
-       taskrunner              ; for running task™
+       taskrunner        ; taskrunner for all your projects
        ;;terraform         ; infrastructure as code
-       ;;tmux                  ; an API for interacting with tmux
+       tmux              ; an API for interacting with tmux
        ;;upload            ; map local to remote projects via ssh/ftp
 
+       :os
+       (:if IS-MAC macos)  ; improve compatibility with macOS
+       ;;tty               ; improve the terminal Emacs experience
+
        :lang
        ;;agda              ; types of types of types of types...
        ;;cc                ; C/C++/Obj-C madness
@@ -142,13 +139,14 @@
        ;;fsharp            ; ML stands for Microsoft's Language
        ;;fstar             ; (dependent) types and (monadic) effects and Z3
        ;;gdscript          ; the language you waited for
-       (go +lsp)               ; the hipster dialect
+       ;;(go +lsp)         ; the hipster dialect
        ;;(haskell +dante)  ; a language that's lazier than I am
        ;;hy                ; readability of scheme w/ speed of python
-       ;;idris                 ;
+       ;;idris             ; a language you can depend on
-       json                    ; At least it ain't XML
+       (json              ; At least it ain't XML
-       ;;(java +lsp)           ; the poster child for carpal tunnel syndrome
+        +lsp)
-       (javascript +lsp)       ; all(hope(abandon(ye(who(enter(here))))))
+       ;;(java +meghanada) ; the poster child for carpal tunnel syndrome
+       ;;javascript        ; all(hope(abandon(ye(who(enter(here))))))
        ;;julia             ; a better, faster MATLAB
        ;;kotlin            ; a better, slicker Java(Script)
        ;;latex             ; writing papers in Emacs has never been so fun
@@ -161,32 +159,26 @@
        ;;nix               ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel
        (org               ; organize your plain life in plain text
-        +journal               ; Enables org-journal integration.
+        +dragndrop
-        +dragndrop             ; drag & drop files/images into org buffers
+        +journal
-        ;;+hugo                ; use Emacs for hugo blogging
+        +pandoc
-        ;;+jupyter             ; ipython/jupyter support for babel
+        +pomodoro
-        +pandoc                ; export-with-pandoc support
+        +pretty            ;weirdly expensive
-        +pomodoro              ; be fruitful with the tomato technique
-        ;;+present             ; using org-mode for presentations
-        +pretty
-        ;;+roam                ; Enables org-roam integration.
         )
-       ;;perl                  ; write code no one else can comprehend
        ;;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
-        +lsp
-        +poetry)
        ;;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               ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
-        +lsp                   ; LSP really do make things easier huh?
+        +lsp
-        +rails                 ; ruby != rails but rails == ruby
+        +rails
-        (:if IS-MAC +rbenv)    ;
+        (:if IS-MAC +rbenv)
-        (:if IS-LINUX +chruby) ;
+        (:if IS-LINUX +chruby)
         )
        ;;rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
        ;;scala             ; java, but good
@@ -200,22 +192,18 @@
        yaml              ; JSON, but readable
 
        :email
-       mu4e
+       ;;(mu4e +gmail)
        ;;notmuch
        ;;(wanderlust +gmail)
 
        :app
        ;;calendar
+       ;;emms
+       ;;everywhere        ; *leave* Emacs!? You must be joking
        ;;irc               ; how neckbeards socialize
        ;;(rss +org)        ; emacs as an RSS reader
        ;;twitter           ; twitter client https://twitter.com/vnought
 
        :config
-       ;; For literate config users. This will tangle+compile a config.org
-       ;; literate config in your `doom-private-dir' whenever it changes.
        ;;literate
-
-       ;; The default module sets reasonable defaults for Emacs. It also
-       ;; provides a Spacemacs-inspired keybinding scheme and a smartparens
-       ;; config. Use it as a reference for your own modules.
        (default +bindings +smartparens))

emacs/packages.el

@@ -2,8 +2,11 @@
 ;;; ~/.doom.d/packages.el
 
 (package! vimrc-mode)
-(package! graphviz-dot-mode)
+(package! graphviz-dot-mode :pin "3642a0a5f4...")
-
+(package! systemd :pin "b6ae63a236...")
+(package! org-super-agenda :pin "f5e80e4d0d...")
+(package! selectric-mode :pin "1840de71f7...")
+(package! spray :pin "74d9dcfa2e...")
 (package! postcss-sorting)
 ;;; Examples:
 ;; (package! pretty-mode)