moved theme config to zt-theme.el

3 files changed, 29 insertions, 28 deletions

diff --git a/.doom.d/custom.el b/.doom.d/custom.el
index 2dc5a26..3a05390 100644
--- a/.doom.d/custom.el
+++ b/.doom.d/custom.el
@@ -26,20 +26,8 @@
     (setq web-mode-markup-indent-offset 2)))
 
 (custom-set-faces!
-  ;'(default :background "#100b13")
-  '(default :background "#0e0911")
-  '(window-divider :foreground "#9b1bed")
-  ;'(window-divider :foreground "#1ca09d")
-  '(hl-line :background "#21242b")
-  '(region :background "#71279f")
-  '(selection :background "#9b1bed")
-  ;'(cursor :background "#ff0aa3")
-  ;'(cursor :background "#0ec685" :foreground)
-  '(cursor :background "#9b1bed" :foreground)
-  '(highlight :background "#ff0aa3")
-  '(tide-hl-identifier-face :background "#0ec685" :foreground "#232627")
-  '(line-number :slant normal :background "#0e0911")
-  '(line-number-current-line :slant normal :background "#21242b"))
+  '(line-number :slant normal)
+  '(line-number-current-line :slant normal))
 
 ; window transparency
 (add-to-list 'default-frame-alist '(alpha . 90))
diff --git a/.doom.d/init.el b/.doom.d/init.el
index e662dbf..af5bb68 100644
--- a/.doom.d/init.el
+++ b/.doom.d/init.el
@@ -31,23 +31,23 @@
        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
-       ;;(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
        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
+       ;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
        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
 
@@ -58,7 +58,7 @@
        ;;(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
+       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
@@ -68,7 +68,7 @@
        :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
 
@@ -100,7 +100,7 @@
        ;;pass              ; password manager for nerds
        pdf               ; pdf enhancements
        ;;prodigy           ; FIXME managing external services & code builders
-       ;;rgb               ; creating color strings
+       rgb               ; creating color strings
        ;;taskrunner        ; taskrunner for all your projects
        ;;terraform         ; infrastructure as code
        ;;tmux              ; an API for interacting with tmux
@@ -113,7 +113,7 @@
        :lang
        ;;agda              ; types of types of types of types...
        ;;beancount         ; mind the GAAP
-       ;;cc                ; C > C++ == 1
+       cc                ; C > C++ == 1
        ;;clojure           ; java with a lisp
        ;;common-lisp       ; if you've seen one lisp, you've seen them all
        ;;coq               ; proofs-as-programs
@@ -141,7 +141,7 @@
        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
+       latex             ; writing papers in Emacs has never been so fun
        ;;lean              ; for folks with too much to prove
        ;;ledger            ; be audit you can be
        ;;lua               ; one-based indices? one-based indices
@@ -160,7 +160,7 @@
        rest              ; Emacs as a REST client
        ;;rst               ; ReST in peace
        ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
-       ;;rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
        ;;scala             ; java, but good
        ;;(scheme +guile)   ; a fully conniving family of lisps
        sh                ; she sells {ba,z,fi}sh shells on the C xor
diff --git a/.doom.d/themes/zt-theme.el b/.doom.d/themes/zt-theme.el
index cce1957..4e02ade 100644
--- a/.doom.d/themes/zt-theme.el
+++ b/.doom.d/themes/zt-theme.el
@@ -12,7 +12,6 @@
 ;; This themepack's flagship theme.
 ;;
 ;;; Code:
-
 (require 'doom-themes)
 
 
@@ -136,8 +135,22 @@ Can be an integer to determine the exact padding."
 
 
   ;;;; Base theme face overrides
-  (((line-number &override) :foreground magenta)
-   ((line-number-current-line &override) :foreground magenta)
+  (
+   ((line-number &override) :foreground magenta :background bg-alt)
+   ((line-number-current-line &override) :foreground magenta :background "#21242b")
+   ((cursor &override) :background "#9b1bed")
+   ((region &override) :background "#71279f")
+   ;((region &override) :background "#9a30a4")
+   ((hl-line &override) :background "#21242b")
+   ((highlight &override) :background "#ff0aa3")
+   ;((tide-hl-identifier-face &override) :background "#0ec685" :foreground "#232627")
+   ((tide-hl-identifier-face &override) :background "#9b1bed" :foreground "#232627")
+   ((selection &override) :background "#9b1bed")
+   ((default &override) :background "#0e0911")
+   ((window-divider &override) :foreground "#9b1bed")
+
+
+
    ((font-lock-comment-face &override)
     :background (if zt-brighter-comments (doom-lighten bg 0.05)))
    (mode-line