Fix bar

files/.config/eww/eww.xml

@@ -11,6 +11,7 @@
 
     <def name="test">
       <box class="{{some_var}}"  space-evenly="false" spacing="10">
+        <box space-evenly="false" orientation="v">
           testing {{shit}} bruh
 
           is shit true? {{shit == true}}
@@ -41,18 +42,24 @@
           <if-else cond="{{shit == 'yea'}}">
             <box>hi</box>
             <box>ho</box>
-
           </if-else>
 
+          thingy: {{"lmao" =~ ".ma."}}
+          thingy: {{"lmao" =~ "^ma.$"}}
 
 
-         {{EWW_RAM}} {{EWW_DISK}} {{EWW_BATTERY}} {{EWW_CPU]}} {{EWW_NET}}
+        </box>
-          {{EWW_CORES}}
 
         <scale value="50" orientation="v" min="0" max="100" flipped="true" />
 
-        <button onclick="pgrep 'eww' &amp;&amp; echo '' || echo ''">Test bug</button>
+        <button onclick="pgrep 'eww' &amp;&amp; echo '' || echo ''" cursor="wait">Test bug</button>
-        <button onclick="notify-send 'ree' 'this is {{shit}}'">click me</button>
+        <button 
+          onclick="notify-send 'ree' 'this is {{shit}}'"
+          onmiddleclick="notify-send 'ree' 'MITTE'"
+          onrightclick="notify-send 'ree' 'RECHTS'"
+          >
+          click me
+      </button>
       <calendar show-heading="false" show-day-names="false" day="2" onclick="notify-send 'asdf' '{}'" />
         notify-send 'ree' 'this is {{shit}}'
       <multiple text="{{shit}}" />
@@ -178,14 +185,14 @@
 
         <windows>
           <window screen="0" name="px" stacking="fg" focusable="false">
-      <geometry anchor="center left" width="10px" height="100%" x="1px" y="0px"/>
+            <geometry anchor="center" width="10px" height="100%" x="1px" y="0px"/>
             <widget>
               <pxbar/>
             </widget>
           </window>
           <window screen="0" name="mw" stacking="fg" focusable="false">
             <!--<window screen="2" name="mw" stacking="fg" focusable="false">-->
-      <geometry anchor="top center" width="20%" height="20%" x="50px" y="50px"/>
+              <geometry anchor="center" width="20%" height="20%" x="50px" y="50px"/>
               <reserve side="left" distance="80px"/>
               <widget>
                 <test ree="test" />
@@ -210,4 +217,4 @@
                 </widget>
               </window>
             </windows>
-</eww>
+          </eww>

files/.config/nvim/fnl/init.fnl

@@ -59,8 +59,6 @@
 (se shell "bash")
 (se background "dark")
 
-
-(vim.cmd "colorscheme gruvbox")
 (vim-let &t_ut "")
 
 (vim.cmd "autocmd! BufReadPost *.hs :set shiftwidth=2")
@@ -90,6 +88,9 @@
 (utils.highlight-add :NormalFloat {:bg colors.dark0_hard})
 (utils.highlight-add :SignColumn {:bg colors.dark0})
 
+
+(utils.highlight ["StatusLine" "GalaxyLineInfo" "GalaxySpace" ] {:bg colors.dark1 :fg colors.light0})
+
 (vim.cmd "highlight link Function GruvboxGreen")
 
 

files/.config/nvim/fnl/keybinds.fnl

@@ -50,8 +50,8 @@
        "t" (cmd "Lspsaga signature_help"                  "Show signature help") 
        "n" (cmd "Lspsaga rename"                          "Rename") 
        "v" (cmd "Lspsaga code_action"                     "Apply codeaction") 
-       "a" (cmd "Lspsaga show_cursor_diagnostics"         "Cursor diagnostics") 
+       "A" (cmd "Lspsaga show_cursor_diagnostics"         "Cursor diagnostics") 
-       "A" (cmd "Lspsaga show_line_diagnostics"           "Line diagnostics")
+       "a" (cmd "Lspsaga show_line_diagnostics"           "Line diagnostics")
        "h" (cmd "RustToggleInlayHints"                    "Toggle inlay hints")
        "r" [#(trouble.open "lsp_references")              "Show references"] 
        "E" [#(trouble.open "lsp_document_diagnostics")    "List diagnostics"] 

files/.config/nvim/fnl/macros.fnl

@@ -44,13 +44,14 @@
   :each-pair
   (fn [args ...]
     (let [[l# r# d#] args]
-      `(let [data# ,d#]
+      `(let [a# (require "aniseed.core")
-        (for [i# 1 (a.count data#) 2]
+             data# ,d#]
+        (for [i# 1 (a#.count data#) 2]
           (let [,l# (. data# i#)
                 ,r# (. data# (+ i# 1))]
             ,...)))))
  
-  :use-macro
+  :packer-use
   (fn [...]
     (let [a (require "aniseed.core")
           fennel (require "aniseed.fennel")
@@ -62,7 +63,7 @@
           (a.assoc block 1 name)
           (when (. block :mod)
             (a.assoc block :config `#((. (require "utils") :safe-require) ,(. block :mod))))
-          (a.assoc block :mod nil)
+          (a.assoc block :mod)
           (table.insert use-statements block)))
   
       (let [use-sym (gensym)]

files/.config/nvim/fnl/plugins.fnl

@@ -2,7 +2,10 @@
   {require {}
    require-macros [macros]})
 
-(use-macro
+(packer-use
+  :gruvbox-community/gruvbox {:opt false
+                              :config #(vim.cmd "colorscheme gruvbox")}
+
   :nvim-telescope/telescope.nvim {:mod "plugins.telescope"
                                   :cmd ["Telescope"]
                                   :requires [:nvim-lua/popup.nvim :nvim-lua/plenary.nvim]}
@@ -27,7 +30,8 @@
   ; general purpose lua wrappers for nvim stuff
   :norcalli/nvim.lua {}
 
-  :glepnir/galaxyline.nvim {:mod "plugins.galaxyline"}
+  :glepnir/galaxyline.nvim {:mod "plugins.galaxyline"
+                            :after "gruvbox"}
   :akinsho/nvim-bufferline.lua {:mod "plugins.bufferline"}
 
   :sindrets/diffview.nvim {:mod "plugins.diffview"}
@@ -38,7 +42,6 @@
   
   :lewis6991/gitsigns.nvim {:mod "plugins.gitsigns"}
 
-  :gruvbox-community/gruvbox {}
 
   :tpope/vim-fugitive {}
   :preservim/nerdcommenter {}

files/.config/nvim/fnl/plugins/galaxyline.fnl

@@ -13,6 +13,8 @@
             
     require-macros [macros]})
 
+(def- bar-bg-col colors.dark1)
+
 (local modes 
  {:n   {:text "NORMAL"        :colors {:bg colors.neutral_aqua   :fg colors.dark0}}
   :i   {:text "INSERT"        :colors {:bg colors.neutral_yellow :fg colors.dark0}}
@@ -54,16 +56,16 @@
     (.. "  " modedata.text " "))) 
 
 
-(utils.highlight "StatusLine" {:bg colors.dark1 :fg colors.light0 })
+
 (set galaxyline.short_line_list ["dbui" "diff" "peekaboo" "undotree" "vista" "vista_markdown"])
 
 
 (set galaxyline.section.left
   [{:ViMode {:provider vim-mode-provider}}
    {:FileName {:provider get-current-file-name
-               :highlight [colors.light4 colors.dark1]}}
+               :highlight [colors.light4 bar-bg-col]}}
    {:Space {:provider (fn [] "")
-            :highlight [colors.light0 colors.dark1]}}])
+            :highlight [colors.light0 bar-bg-col]}}])
       
 (fn make-lsp-diagnostic-provider [kind]
   (fn []
@@ -76,9 +78,9 @@
   
 (set galaxyline.section.right
   [{:GitBranch {:provider git-branch-provider
-                :highlight [colors.light4 colors.dark1]}} 
+                :highlight [colors.light4 bar-bg-col]}} 
    {:FileType {:provider (fn [] nvim.bo.filetype)
-               :highlight [colors.neutral_aqua colors.dark1]}}
+               :highlight [colors.neutral_aqua bar-bg-col]}}
 
    {:DiagnosticInfo {:provider (make-lsp-diagnostic-provider "Info")
                      :highlight [colors.dark1 colors.neutral_blue]}}
@@ -94,7 +96,7 @@
 
 (do
   (fn add-segment-defaults [data] 
-    (a.merge {:highlight [colors.light0 colors.dark1] 
+    (a.merge {:highlight [colors.light0 bar-bg-col]
               :separator " " 
               :separator_highlight "StatusLine"} 
              data))
@@ -106,3 +108,5 @@
  
   (set galaxyline.section.left (map-gl-section add-segment-defaults galaxyline.section.left))
   (set galaxyline.section.right (map-gl-section add-segment-defaults galaxyline.section.right)))
+
+

files/.config/nvim/fnl/plugins/treesitter.fnl

@@ -16,8 +16,8 @@
                                      :scope_decremental "gsk"}}
 
    ; Might fuck with gitsigns
-   :rainbow {:enable true
+   ;:rainbow {:enable true
-             :extended_mode true}
+             ;:extended_mode true}
    :context_commentstring {:enable true}})
 
    ;:indent    {:enable true}