Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Basic solaire mode functionality #78

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+25 −11
Open

Basic solaire mode functionality #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
01ca28d
Basic solaire mode functionality
tefkah May 27, 2021
c4d3b46
Bad customization of modeline
tefkah May 28, 2021
8eb3d56
Better colors
tefkah May 28, 2021
be475e6
Better colors, again
tefkah May 28, 2021
98183d2
fixed 'invalid face' message
tefkah May 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions nano-modeline.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@
'face 'nano-face-header-faded))
(t (propertize status 'face 'nano-face-header-popout))))
(left (concat
(propertize " " 'face 'nano-face-header-default
(propertize " " 'face 'header-line
'display `(raise ,space-up))
(propertize name 'face 'nano-face-header-strong)
(propertize " " 'face 'nano-face-header-default
(propertize name 'face (list (list :weight (face-attribute 'nano-face-strong :weight)) 'header-line))
(propertize " " 'face 'header-line
'display `(raise ,space-down))
(propertize primary 'face 'nano-face-header-default)))
(propertize primary 'face 'header-line)))
(right (concat secondary " "))
(available-width (- (window-total-width)
(length prefix) (length left) (length right)
Expand All @@ -85,9 +85,9 @@
(concat prefix
left
(propertize (make-string available-width ?\ )
'face 'nano-face-header-default)
(propertize right 'face `(:inherit nano-face-header-default
:foreground ,nano-color-faded)))))
'face 'header-line)
(propertize right 'face (list `(:foreground ,nano-color-faded)
'header-line)))))

;; ---------------------------------------------------------------------
(defun nano-modeline-mu4e-dashboard-mode-p ()
Expand Down
22 changes: 18 additions & 4 deletions nano-theme.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,7 @@
(set-face-attribute 'header-line nil
:weight 'light
:foreground (face-foreground 'nano-face-default)
:background (face-background 'nano-face-default)

:background (face-background 'nano-face-subtle)
:overline nil
:underline nil
:box nil
Expand All @@ -165,7 +164,7 @@
;; :weight 'light
;; :foreground (face-foreground 'nano-face-default)
;; :background (face-background 'nano-face-subtle)
;; :inverse-video t
;; :inverse-video
;; :overline nil
;; :underline nil
;; :box nil
Expand Down Expand Up @@ -730,6 +729,20 @@ function is a convenience wrapper used by `describe-package-1'."
(set-face 'company-tooltip-annotation 'nano-face-default)
(set-face 'company-tooltip-annotation-selection '(nano-face-strong nano-face-subtle))))

(defun nano-theme--solaire ()
"Define faces compatible with 'solaire-mode'."
(with-eval-after-load 'solaire-mode
(set-face-attribute 'solaire-default-face nil
:background (color-darken-name nano-color-background 3 )
:foreground (color-darken-name nano-color-foreground 10))
(set-face-attribute 'solaire-hl-line-face nil
:background (color-darken-name nano-color-highlight 3))
(set-face-attribute 'solaire-line-number-face nil
:background (color-darken-name nano-color-background 3 ))
(set-face-attribute 'solaire-header-line-face nil
:background (color-darken-name nano-color-subtle 6)
:foreground (color-darken-name nano-color-foreground 10))))

(defun nano-theme ()
"Derive many, many faces from the core nano faces."
(nano-theme--basics)
Expand Down Expand Up @@ -763,6 +776,7 @@ function is a convenience wrapper used by `describe-package-1'."
(nano-theme--helm-ff)
(nano-theme--helm-grep)
(nano-theme--hl-line)
(nano-theme--company))
(nano-theme--company)
(nano-theme--solaire))

(provide 'nano-theme)