cleanup

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 == ""}
+;(if-else :cond {music_data.status == "Stopped" || music_data.status == ""}
-    ;"No music playing"
+;"No music playing"
-    ;(box :orientation "h" 
+;(box :orientation "h" 
-         ;:valign "fill"
+;:valign "fill"
-         ;:space-evenly false 
+;:space-evenly false 
-         ;:spacing 10
+;:spacing 10
-      ;(button :onclick "playerctl previous" "⏮")
+;(button :onclick "playerctl previous" "⏮")
-      ;"${music_data.artist} - ${music_data.title}"
+;"${music_data.artist} - ${music_data.title}"
-      ;(button :onclick "playerctl next" "⏭"))))
+;(button :onclick "playerctl next" "⏭"))))
 
 ;(defwindow music_popup
-  ;:monitor 1
+;:monitor 1
-  ;:anchor "bottom left"
+;:anchor "bottom left"
-  ;:geometry (geometry :x "30px" :y "10px" :height "65px")
+;:geometry (geometry :x "30px" :y "10px" :height "65px")
-  ;(music-popup))
+;(music-popup))

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

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")

nvim/.config/nvim/fnl/dots/plugins/feline.fnl

@@ -68,23 +68,20 @@
       (or-empty (str.join " | " s))))
 
 
-(def components
+(def components {:active {} :inactive {}})
-   {:left  {:active {} :inactive {}}
-    :mid   {:active {} :inactive {}}
-    :right {: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
+   {:colors {:bg bar-bg
-    :default_fg colors.dark4
+             :fg colors.dark4}
     :components components})
 

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

nvim/.config/nvim/fnl/dots/smart-compe-conjure.fnl

@@ -4,8 +4,8 @@
              str aniseed.string
              view aniseed.view
              popup popup
-             compe compe
+             compe compe}
-             help dots.help-thingy}
+             ;help dots.help-thingy}
    require-macros [macros]})