From bb5a09d16ac6a1ce9fc5afdbc19dc658f5dd872b Mon Sep 17 00:00:00 2001 From: elkowar <5300871+elkowar@users.noreply.github.com> Date: Sun, 9 May 2021 17:43:05 +0200 Subject: [PATCH] Fix bar --- files/.config/eww/eww.xml | 287 +++++++++--------- files/.config/nvim/fnl/init.fnl | 5 +- files/.config/nvim/fnl/keybinds.fnl | 4 +- files/.config/nvim/fnl/macros.fnl | 9 +- files/.config/nvim/fnl/plugins.fnl | 9 +- files/.config/nvim/fnl/plugins/galaxyline.fnl | 16 +- files/.config/nvim/fnl/plugins/treesitter.fnl | 4 +- 7 files changed, 175 insertions(+), 159 deletions(-) diff --git a/files/.config/eww/eww.xml b/files/.config/eww/eww.xml index 82b3430..2beb0dd 100644 --- a/files/.config/eww/eww.xml +++ b/files/.config/eww/eww.xml @@ -4,58 +4,65 @@ - + - + - testing {{shit}} bruh + + testing {{shit}} bruh - is shit true? {{shit == true}} - is shit "shit"? {{shit == "shit"}} + is shit true? {{shit == true}} + is shit "shit"? {{shit == "shit"}} - true and false 🤔 - {{ true && false }} - - fancy ass math {{ 12 + 5 * 12 * 4 }} + true and false 🤔 + {{ true && false }} + + fancy ass math {{ 12 + 5 * 12 * 4 }} - bruh " < fuck > - " + bruh " < fuck > + " - + - - - - + + + notify-send 'ree' 'this is {{shit}}' - + @@ -72,142 +79,142 @@ {{text}} - + + {{date}} + {{date-tail}} + + - - - - - + + + + + - - - - - - - + - + - - - amixer sget 'Master' | grep 'Front Left:' | sed 's/.*\[\(.*\)%\].*/\1/g'; - LANG=C pactl subscribe | grep --line-buffered sink | while read -r _; do - amixer sget 'Master' | grep 'Front Left:' | sed 's/.*\[\(.*\)%\].*/\1/g' - done - + + + amixer sget 'Master' | grep 'Front Left:' | sed 's/.*\[\(.*\)%\].*/\1/g'; + LANG=C pactl subscribe | grep --line-buffered sink | while read -r _; do + amixer sget 'Master' | grep 'Front Left:' | sed 's/.*\[\(.*\)%\].*/\1/g' + done + - - true - - - + + true + + + - - true - - - - false - - - - - - while true; do - sleep 1; - notify-send 'hi' 'ho' - date - done - + + true + + + + false + + + + + + while true; do + sleep 1; + notify-send 'hi' 'ho' + date + done + - - date - + + date + - - cat ~/fuck - + + cat ~/fuck + - - {"hi": "ho"} - + + {"hi": "ho"} + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/files/.config/nvim/fnl/init.fnl b/files/.config/nvim/fnl/init.fnl index 59caef1..38a40c8 100644 --- a/files/.config/nvim/fnl/init.fnl +++ b/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") diff --git a/files/.config/nvim/fnl/keybinds.fnl b/files/.config/nvim/fnl/keybinds.fnl index 3e9c991..1d4966c 100644 --- a/files/.config/nvim/fnl/keybinds.fnl +++ b/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_line_diagnostics" "Line diagnostics") + "A" (cmd "Lspsaga show_cursor_diagnostics" "Cursor 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"] diff --git a/files/.config/nvim/fnl/macros.fnl b/files/.config/nvim/fnl/macros.fnl index d478253..9322fbf 100644 --- a/files/.config/nvim/fnl/macros.fnl +++ b/files/.config/nvim/fnl/macros.fnl @@ -44,13 +44,14 @@ :each-pair (fn [args ...] (let [[l# r# d#] args] - `(let [data# ,d#] - (for [i# 1 (a.count data#) 2] + `(let [a# (require "aniseed.core") + 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)] diff --git a/files/.config/nvim/fnl/plugins.fnl b/files/.config/nvim/fnl/plugins.fnl index f7e3945..b0e5c4a 100644 --- a/files/.config/nvim/fnl/plugins.fnl +++ b/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 {} diff --git a/files/.config/nvim/fnl/plugins/galaxyline.fnl b/files/.config/nvim/fnl/plugins/galaxyline.fnl index 74904eb..ebecea7 100644 --- a/files/.config/nvim/fnl/plugins/galaxyline.fnl +++ b/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))) + + diff --git a/files/.config/nvim/fnl/plugins/treesitter.fnl b/files/.config/nvim/fnl/plugins/treesitter.fnl index 619637d..71f280d 100644 --- a/files/.config/nvim/fnl/plugins/treesitter.fnl +++ b/files/.config/nvim/fnl/plugins/treesitter.fnl @@ -16,8 +16,8 @@ :scope_decremental "gsk"}} ; Might fuck with gitsigns - :rainbow {:enable true - :extended_mode true} + ;:rainbow {:enable true + ;:extended_mode true} :context_commentstring {:enable true}}) ;:indent {:enable true}