diff --git a/eww-bar/.config/eww-bar/eww.yuck b/eww-bar/.config/eww-bar/eww.yuck index d20e3f8..04f089c 100644 --- a/eww-bar/.config/eww-bar/eww.yuck +++ b/eww-bar/.config/eww-bar/eww.yuck @@ -22,7 +22,7 @@ :class "time" hour min sec)) -(defwidget bottom [screen ] +(defwidget bottom [screen] (box :orientation "v" :valign "end" :space-evenly true @@ -46,7 +46,7 @@ (defwidget music-button [] (button :onclick "playerctl play-pause" - "${music_data.status == "Playing" ? "⏸" : "▶"}")) + "${music_data.status == "Playing" ? "⏸" : "▶"}")) (defwidget volume [] (box :class "volume-metric" @@ -90,7 +90,7 @@ (deflisten music_data :initial `{"status": ""}` ` - playerctl metadata || echo '{"status": ""}'; + playerctl metadata --format '{ "status": "{{status}}", "artist": "{{artist}}", "title": "{{title}}"}' || echo '{"status": ""}'; playerctl --follow metadata --format '{ "status": "{{status}}", "artist": "{{artist}}", "title": "{{title}}"}' `) diff --git a/nvim/.config/nvim/fnl/dots/keybinds.fnl b/nvim/.config/nvim/fnl/dots/keybinds.fnl index e79494a..daa739e 100644 --- a/nvim/.config/nvim/fnl/dots/keybinds.fnl +++ b/nvim/.config/nvim/fnl/dots/keybinds.fnl @@ -63,8 +63,8 @@ "e" (cmd "Trouble lsp_workspace_diagnostics" "Show diagnostics") "t" [vim.lsp.buf.declaration "Go to declaration"] "g" [vim.lsp.buf.definition "Go to definition"] - "i" [vim.lsp.buf.implementation "Show implementation"] - "f" [format "format file"] + "i" (cmd "Trouble lsp_implementations" "Show implementation") + "f" [format "format file"] "," (cmd "RustRunnables" "Run rust stuff")} "f" {:name "+folds" diff --git a/nvim/.config/nvim/fnl/dots/plugins.fnl b/nvim/.config/nvim/fnl/dots/plugins.fnl index 288631a..1adc5d8 100644 --- a/nvim/.config/nvim/fnl/dots/plugins.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins.fnl @@ -108,14 +108,21 @@ ; code-related ----------------------------------------- <<< :ray-x/lsp_signature.nvim {:events [:BufEnter]} - :folke/lsp-trouble.nvim {:mod "dots.plugins.trouble" - :cmd ["Trouble" "TroubleClose" "TroubleRefresh" "TroubleToggle"]} + "/home/leon/coding/prs/trouble.nvim" {:mod "dots.plugins.trouble" + :cmd ["Trouble" "TroubleClose" "TroubleRefresh" "TroubleToggle"]} + ;:folke/lsp-trouble.nvim {:mod "dots.plugins.trouble" + ;:cmd ["Trouble" "TroubleClose" "TroubleRefresh" "TroubleToggle"]} :simrat39/symbols-outline.nvim {:mod "dots.plugins.symbols-outline"} :neovim/nvim-lspconfig {} ;:hrsh7th/nvim-compe {:mod "dots.plugins.compe"} - :/home/leon/coding/prs/nvim-compe {:event [:InsertEnter] - :mod "dots.plugins.compe"} + ;:/home/leon/coding/prs/nvim-compe {:event [:InsertEnter] + ;:mod "dots.plugins.compe"} + :ms-jpq/coq_nvim {:mod "dots.plugins.coq-nvim" + :branch "coq"} + + :ms-jpq/coq.artifacts {:branch "artifacts"} + @@ -143,7 +150,9 @@ ;:bhurlow/vim-parinfer {:ft ["fennel" "carp" "lisp" "elisp"]} - :eraserhd/parinfer-rust {:run "cargo build --release"} + ;:eraserhd/parinfer-rust {:run "cargo build --release"} + "elkowar/parinfer-rust" {:run "cargo build --release" + :branch "configure-filetypes"} :bduggan/vim-raku {:ft ["raku"]} :LnL7/vim-nix {:ft ["nix"]} diff --git a/nvim/.config/nvim/fnl/dots/plugins/coq-nvim.fnl b/nvim/.config/nvim/fnl/dots/plugins/coq-nvim.fnl new file mode 100644 index 0000000..43c1e5b --- /dev/null +++ b/nvim/.config/nvim/fnl/dots/plugins/coq-nvim.fnl @@ -0,0 +1,7 @@ +(module dots.plugins.coq-nvim + {autoload {utils dots.utils + coq coq}}) + +;(set vim.g.coq_settings {:limits.completion_auto_timeout 1}) + +(vim.cmd "autocmd! InsertEnter * COQnow --shut-up") diff --git a/nvim/.config/nvim/fnl/dots/plugins/trouble.fnl b/nvim/.config/nvim/fnl/dots/plugins/trouble.fnl index f8cca5c..6abd1c7 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/trouble.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/trouble.fnl @@ -8,6 +8,7 @@ :auto_preview true :auto_close true :auto_open false + :auto_jump ["lsp_definitions" "lsp_workspace_diagnostics"] :action_keys {:jump "o" :jump_close "" diff --git a/nvim/.config/nvim/fnl/init.fnl b/nvim/.config/nvim/fnl/init.fnl index d528156..e92d8ba 100644 --- a/nvim/.config/nvim/fnl/init.fnl +++ b/nvim/.config/nvim/fnl/init.fnl @@ -120,6 +120,7 @@ (set vim.g.conjure#client#fennel#aniseed#aniseed_module_prefix "aniseed.") (set vim.g.vim_parinfer_filetypes ["carp" "fennel" "clojure"]) +(set vim.g.parinfer_additional_filetypes ["yuck"]) ; foldend