diff --git a/eww-bar/.config/eww-bar/eww.yuck b/eww-bar/.config/eww-bar/eww.yuck index 76e8e94..af78eec 100644 --- a/eww-bar/.config/eww-bar/eww.yuck +++ b/eww-bar/.config/eww-bar/eww.yuck @@ -46,7 +46,7 @@ (defwidget music-button [] (button :onclick "playerctl play-pause" - "${music_data.status == "Playing" ? "⏸" : "▶"}")) + "${music_data == "" ? "⏸" : music_data.status == "Playing" ? "⏸" : "▶"}")) (defwidget volume [] (box :class "volume-metric" @@ -118,6 +118,7 @@ :anchor "top left" :reserve (struts :distance "40px" :side "left") (bar :screen 1)) + (defwindow bar_2 :monitor 2 :geometry (geometry :x 0 :y 0 :width "40px" :height "100%") @@ -129,18 +130,18 @@ ;(defwidget music-popup [] - ;(if-else :cond {music_data.status == "Stopped" || music_data.status == ""} - ;"No music playing" - ;(box :orientation "h" - ;:valign "fill" - ;:space-evenly false - ;:spacing 10 - ;(button :onclick "playerctl previous" "⏮") - ;"${music_data.artist} - ${music_data.title}" - ;(button :onclick "playerctl next" "⏭")))) +;(if-else :cond {music_data.status == "Stopped" || music_data.status == ""} +;"No music playing" +;(box :orientation "h" +;:valign "fill" +;:space-evenly false +;:spacing 10 +;(button :onclick "playerctl previous" "⏮") +;"${music_data.artist} - ${music_data.title}" +;(button :onclick "playerctl next" "⏭")))) ;(defwindow music_popup - ;:monitor 1 - ;:anchor "bottom left" - ;:geometry (geometry :x "30px" :y "10px" :height "65px") - ;(music-popup)) +;:monitor 1 +;:anchor "bottom left" +;:geometry (geometry :x "30px" :y "10px" :height "65px") +;(music-popup)) diff --git a/nvim/.config/nvim/fnl/dots/plugins.fnl b/nvim/.config/nvim/fnl/dots/plugins.fnl index 1c0a6e2..15018a4 100644 --- a/nvim/.config/nvim/fnl/dots/plugins.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins.fnl @@ -66,7 +66,7 @@ ; json query stuff ;:gennaro-tedesco/nvim-jqx {:ft ["json"]} - :Olical/aniseed {:branch "develop"}; :tag "v3.16.0"} + :Olical/aniseed {:branch "master"}; :tag "v3.16.0"} ;:Olical/aniseed {}; :tag "v3.16.0"} ; general purpose lua wrappers for nvim stuff diff --git a/nvim/.config/nvim/fnl/dots/plugins/coq-nvim.fnl b/nvim/.config/nvim/fnl/dots/plugins/coq-nvim.fnl index c6e7d40..12d874e 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/coq-nvim.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/coq-nvim.fnl @@ -2,6 +2,9 @@ {autoload {utils dots.utils coq coq}}) -(set vim.g.coq_settings {:limits.completion_auto_timeout 1}) +(set vim.g.coq_settings {:limits.completion_auto_timeout 1 + :clients.lsp.weight_adjust 2 + :clients.tree_sitter.enabled false}) + (vim.cmd "autocmd! InsertEnter * COQnow --shut-up") diff --git a/nvim/.config/nvim/fnl/dots/plugins/feline.fnl b/nvim/.config/nvim/fnl/dots/plugins/feline.fnl index 7addcbc..5487a49 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/feline.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/feline.fnl @@ -68,23 +68,20 @@ (or-empty (str.join " | " s)))) -(def components - {:left {:active {} :inactive {}} - :mid {:active {} :inactive {}} - :right {:active {} :inactive {}}}) +(def components {:active {} :inactive {}}) -(set components.left.active +(tset components.active 1 [{:provider #(.. " " (or (. modes (vim.fn.mode) :text) vim.fn.mode) " ") :hl #(vim-mode-hl false)} {:provider get-current-filepath :left_sep " "} {:provider git-status-provider :left_sep " " :hl #(vim-mode-hl true)}]) -(set components.mid.active +(tset components.active 2 [{:provider lsp-progress-provider :enabled #(< 0 (length (vim.lsp.buf_get_clients)))}]) -(set components.right.active +(tset components.active 3 [{:provider #vim.bo.filetype :hl #(vim-mode-hl true) :right_sep " "} @@ -97,7 +94,7 @@ (feline.setup - {:default_bg bar-bg - :default_fg colors.dark4 + {:colors {:bg bar-bg + :fg colors.dark4} :components components}) diff --git a/nvim/.config/nvim/fnl/dots/plugins/treesitter.fnl b/nvim/.config/nvim/fnl/dots/plugins/treesitter.fnl index f3331c3..040744c 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/treesitter.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/treesitter.fnl @@ -19,11 +19,11 @@ ; Might fuck with gitsigns ;:rainbow {:enable true ;:extended_mode true} - :context_commentstring {:enable true :disable ["rust"]} + :context_commentstring {:enable true :disable ["rust" "fennel"]} :playground {:enable true - :disable {} + :disable ["fennel"] :updatetime 25 ; Debounced time for highlighting nodes in the playground from source code :persist_queries false ; Whether the query persists across vim sessions :keybindings diff --git a/nvim/.config/nvim/fnl/dots/smart-compe-conjure.fnl b/nvim/.config/nvim/fnl/dots/smart-compe-conjure.fnl index 41e2adc..02d38e1 100644 --- a/nvim/.config/nvim/fnl/dots/smart-compe-conjure.fnl +++ b/nvim/.config/nvim/fnl/dots/smart-compe-conjure.fnl @@ -4,8 +4,8 @@ str aniseed.string view aniseed.view popup popup - compe compe - help dots.help-thingy} + compe compe} + ;help dots.help-thingy} require-macros [macros]})