From 751876015c6cd85d349e03c566d9ff5b5a4933b6 Mon Sep 17 00:00:00 2001
From: elkowar <5300871+elkowar@users.noreply.github.com>
Date: Fri, 30 Apr 2021 10:23:30 +0200
Subject: [PATCH] cleanup config

---
 files/.config/eww/eww.xml                     |  4 ++
 files/.config/nvim/fnl/plugins/bufferline.fnl | 18 ++++-----
 files/.config/nvim/fnl/plugins/lsp.fnl        | 37 +++++++++++--------
 3 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/files/.config/eww/eww.xml b/files/.config/eww/eww.xml
index 5ca034f..980a1ba 100644
--- a/files/.config/eww/eww.xml
+++ b/files/.config/eww/eww.xml
@@ -37,6 +37,10 @@
         </if-else>
 
 
+
+        {{EWW_CORES}} {{EWW_RAM}} {{EWW_DISK}} {{EWW_BATTERY}} {{EWW_CPU]}} {{EWW_NET_UP}} {{EWW_NET_DOWN}}
+
+
         <scale value="50" orientation="v" min="0" max="100" flipped="true" />
 
         <button onclick="pgrep 'eww' &amp;&amp; echo '' || echo ''">Test bug</button>
diff --git a/files/.config/nvim/fnl/plugins/bufferline.fnl b/files/.config/nvim/fnl/plugins/bufferline.fnl
index bdd6866..ec9a0d6 100644
--- a/files/.config/nvim/fnl/plugins/bufferline.fnl
+++ b/files/.config/nvim/fnl/plugins/bufferline.fnl
@@ -40,17 +40,17 @@
         :duplicate_visible visible
         :duplicate_selected selected
 
-        :diagnostic {:guibg colors.dark1 :guifg colors.neutral_red}
-        :diagnostic_visible {:guibg colors.dark1 :guifg colors.neutral_red}
-        :diagnostic_selected {:guibg colors.neutral_aqua :guifg colors.faded_red}
+        :diagnostic          { :gui "" :guibg colors.dark1        :guifg colors.neutral_red}
+        :diagnostic_visible  { :gui "" :guibg colors.dark1        :guifg colors.neutral_red}
+        :diagnostic_selected { :gui "" :guibg colors.neutral_aqua :guifg colors.faded_red}
 
-        :info_diagnostic {:guibg "blue" :guifg colors.neutral_yellow}
-        :info_diagnostic_visible {:guibg "blue" :guifg colors.neutral_yellow}
-        :info_diagnostic_selected {:guibg "blue" :guifg colors.faded_yellow}
+        :info_diagnostic          { :gui "" :guibg "blue" :guifg colors.neutral_yellow}
+        :info_diagnostic_visible  { :gui "" :guibg "blue" :guifg colors.neutral_yellow}
+        :info_diagnostic_selected { :gui "" :guibg "blue" :guifg colors.faded_yellow}
 
-        :warning_diagnostic {:guibg colors.dark1 :guifg colors.neutral_yellow}
-        :warning_diagnostic_visible {:guibg colors.dark1 :guifg colors.neutral_yellow}
-        :warning_diagnostic_selected {:guibg colors.neutral_aqua :guifg colors.faded_yellow}
+        :warning_diagnostic          { :gui "" :guibg colors.dark1        :guifg colors.neutral_yellow}
+        :warning_diagnostic_visible  { :gui "" :guibg colors.dark1        :guifg colors.neutral_yellow}
+        :warning_diagnostic_selected { :gui "" :guibg colors.neutral_aqua :guifg colors.faded_yellow}
 
         :separator visible
         :indicator_selected {:guibg colors.neutral_aqua :guifg colors.neutral_aqua}
diff --git a/files/.config/nvim/fnl/plugins/lsp.fnl b/files/.config/nvim/fnl/plugins/lsp.fnl
index c6bca49..37527a6 100644
--- a/files/.config/nvim/fnl/plugins/lsp.fnl
+++ b/files/.config/nvim/fnl/plugins/lsp.fnl
@@ -15,6 +15,11 @@
 
 (local colors (utils.colors))
 
+(symbols-outline.setup { :highlight_hovered_item true :show_guides true})
+(set vim.o.signcolumn "yes")
+
+; LSP config -------------------------------------------------------------------------------- {{{{{
+
 (fn on_attach [client bufnr]
   (lsp_signature.on_attach)
   (if client.resolved_capabilities.document_highlight
@@ -63,11 +68,9 @@
 
 
 ;(lsp.vimls.setup { :on_attach on_attach})
-  
-
-(symbols-outline.setup { :highlight_hovered_item true :show_guides true})
-
+; }}}}}
 
+; compe -------------------------------------------------------------------------------- {{{{{
 (compe.setup 
   { :enabled true
     :autocomplete false
@@ -88,6 +91,9 @@
               :nvim_lua true 
               :vsnip false}})
 
+; }}}}}
+
+; LSP saga  -------------------------------------------------------------------------------- {{{{{
 
 (saga.init_lsp_saga 
   { :border_style 1
@@ -109,6 +115,16 @@
 (utils.highlight "TargetWord"               {:fg colors.bright_aqua})
 
 
+; }}}}}
+
+; LSP trouble -------------------------------------------------------------------------------- {{{{{
+(trouble.setup
+  {:icons false
+   :auto_preview true
+   :auto_close true
+   :auto_open false})
+  
+
 (utils.highlight "LspTroubleFoldIcon" {:bg "NONE" :fg colors.bright_orange})
 (utils.highlight "LspTroubleCount"    {:bg "NONE" :fg colors.bright_green})
 (utils.highlight "LspTroubleText"     {:bg "NONE" :fg colors.light0})
@@ -118,15 +134,6 @@
 (utils.highlight "LspTroubleSignInformation" {:bg "NONE" :fg colors.bright_aqua})
 (utils.highlight "LspTroubleSignHint"        {:bg "NONE" :fg colors.bright_blue})
 
+; }}}}}
 
-(set vim.o.signcolumn "yes")
-
-
-
-
-(trouble.setup
-  {:icons false
-   :auto_preview true
-   :auto_close true
-   :auto_open false})
-  
+ ; vim:foldmarker={{{{{,}}}}}