daniel/dotfiles
1
0
Fork 0
Code Activity Actions

nvim: Improved heirline spacing

Browse source
This commit is contained in:
Daniel Kempkens 2022-06-05 22:51:14 +02:00
parent 9dd7e8b025
commit f9bb110802
2 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
config/nvim/nifoc/statusline.fnl
View file

@ -26,10 +26,24 @@
(set mod.space {:provider " "}) (set mod.space {:provider " "})
(set mod.spacer {:provider " " :hl {:fg colors.bg :bg colors.bg}}) (set mod.spacer {:provider " " :hl {:fg colors.bg :bg colors.bg}})
(set mod.push-right {:provider "%="}) (set mod.push-right {:provider "%="})
(fn mod.insert-left-unless-empty [item left]
{:after (fn [self]
(if (and (not= self.stl nil) (> (length self.stl) 0))
(set self.stl (.. left self.stl))))
1 item})
(fn mod.insert-right-unless-empty [item right]
{:after (fn [self]
(if (and (not= self.stl nil) (> (length self.stl) 0))
(set self.stl (.. self.stl right))))
1 item})
;; Mode ;; Mode
(set mod.vi-mode {:init (fn [self] (set mod.vi-mode {:init (fn [self]
(let [mode (. (api.nvim_get_mode) :mode)] (let [mode (. (api.nvim_get_mode) :mode)]
(set self.mode mode))) (set self.mode mode)))
:update :ModeChanged
:static {:mode-names {:n :NORMAL :static {:mode-names {:n :NORMAL
:no :O-PENDING :no :O-PENDING
:nov :O-PENDING :nov :O-PENDING
@ -148,30 +162,20 @@
(set self.git-head git-status.head) (set self.git-head git-status.head)
(set self.git-added (or git-status.added 0)) (set self.git-added (or git-status.added 0))
(set self.git-removed (or git-status.removed 0)) (set self.git-removed (or git-status.removed 0))
(set self.git-changed (or git-status.changed 0)) (set self.git-changed (or git-status.changed 0))))
(set self.has-changes?
(or (> self.git-added 0) (> self.git-removed 0)
(> self.git-changed 0)))))
1 {:provider #(.. "  " $1.git-head " ") 1 {:provider #(.. "  " $1.git-head " ")
:hl {:fg colors.black :bg colors.orange :bold true} :hl {:fg colors.black :bg colors.orange :bold true}
:on_click {:name :heirline_git_branch :on_click {:name :heirline_git_branch
:callback #(neogit.open {:kind :split})}} :callback #(neogit.open {:kind :split})}}
2 {:condition #$1.has-changes? :provider " "} 2 {:provider " "}
3 {:provider (fn [self] 3 {:provider (fn [self]
(let [spacer (if (or (> self.git-removed 0) (.. " " self.git-added " "))
(> self.git-changed 0))
" " "")]
(when (> self.git-added 0)
(.. " " self.git-added spacer))))
:hl {:fg colors.bright_green}} :hl {:fg colors.bright_green}}
4 {:provider (fn [self] 4 {:provider (fn [self]
(let [spacer (if (> self.git-changed 0) " " "")] (.. " " self.git-removed " "))
(when (> self.git-removed 0)
(.. " " self.git-removed spacer))))
:hl {:fg colors.bright_red}} :hl {:fg colors.bright_red}}
5 {:provider (fn [self] 5 {:provider (fn [self]
(when (> self.git-changed 0) (.. " " self.git-changed))
(.. " " self.git-changed)))
:hl {:fg colors.cyan}}}) :hl {:fg colors.cyan}}})
;; Diagnostics ;; Diagnostics
(set mod.diagnostics {:condition heirline-conditions.has_diagnostics (set mod.diagnostics {:condition heirline-conditions.has_diagnostics
@ -189,6 +193,7 @@
(set self.hints (set self.hints
(length (d.get 0 (length (d.get 0
{:severity d.severity.HINT}))))) {:severity d.severity.HINT})))))
:update [:DiagnosticChanged :BufEnter]
1 {:provider (fn [self] 1 {:provider (fn [self]
(let [spacer (if (or (> self.warnings 0) (let [spacer (if (or (> self.warnings 0)
(> self.info 0) (> self.info 0)

7
config/nvim/plugins/heirline.fnl
View file

@ -4,9 +4,10 @@
ns (require :nifoc.statusline)] ns (require :nifoc.statusline)]
(local default-statusline [;; Left (local default-statusline [;; Left
ns.vi-mode ns.vi-mode
(utils.surround [" " ""] nil ns.git) (ns.insert-left-unless-empty ns.git " ")
(utils.surround [" " ""] nil ns.diagnostics) (ns.insert-left-unless-empty ns.diagnostics " ")
(utils.surround [" " ""] nil ns.current-function) (ns.insert-left-unless-empty ns.current-function
" ")
;; Right ;; Right
ns.push-right ns.push-right
ns.filetype-block ns.filetype-block