From 1cad98a7ac6698916e324b90da07c5e48f1ef74c Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Sun, 29 Sep 2024 20:37:48 +0300 Subject: [PATCH] Nvim : Fix Trouble & add transparency plugin. --- flake.lock | 17 ++++++++++++ flake.nix | 4 +++ home/config/nvim/default.nix | 3 ++- home/config/nvim/module/config/Etc.nix | 2 +- home/config/nvim/module/key/Todo.nix | 6 ----- home/config/nvim/module/key/Trouble.nix | 9 +++++-- .../config/nvim/module/plugin/Transparent.nix | 26 +++++++++++++++++++ 7 files changed, 57 insertions(+), 10 deletions(-) delete mode 100644 home/config/nvim/module/key/Todo.nix create mode 100644 home/config/nvim/module/plugin/Transparent.nix diff --git a/flake.lock b/flake.lock index e58f50f..64282a0 100644 --- a/flake.lock +++ b/flake.lock @@ -753,6 +753,22 @@ "type": "github" } }, + "nvimTransparent": { + "flake": false, + "locked": { + "lastModified": 1724573095, + "narHash": "sha256-6jOLgcWqnVzabT2+CehY92Z4mYzJHiRiInn5T5OXqZE=", + "owner": "xiyaowong", + "repo": "transparent.nvim", + "rev": "8a2749a2fa74f97fe6557f61b89ac7fd873f3c21", + "type": "github" + }, + "original": { + "owner": "xiyaowong", + "repo": "transparent.nvim", + "type": "github" + } + }, "nvimTree": { "flake": false, "locked": { @@ -848,6 +864,7 @@ "nvimTelescope": "nvimTelescope", "nvimTodo": "nvimTodo", "nvimTokyonight": "nvimTokyonight", + "nvimTransparent": "nvimTransparent", "nvimTree": "nvimTree", "nvimTreesitter": "nvimTreesitter", "nvimTrouble": "nvimTrouble", diff --git a/flake.nix b/flake.nix index 65de8a7..86c3228 100644 --- a/flake.nix +++ b/flake.nix @@ -106,6 +106,10 @@ url = "github:folke/tokyonight.nvim"; flake = false; }; + nvimTransparent = { + url = "github:xiyaowong/transparent.nvim"; + flake = false; + }; nvimTree = { url = "github:nvim-tree/nvim-tree.lua"; flake = false; diff --git a/home/config/nvim/default.nix b/home/config/nvim/default.nix index 9563d42..153642e 100644 --- a/home/config/nvim/default.nix +++ b/home/config/nvim/default.nix @@ -33,6 +33,7 @@ in { "${inputs.nvimTelescope}" "${inputs.nvimTodo}" "${inputs.nvimTokyonight}" + "${inputs.nvimTransparent}" "${inputs.nvimTreesitter}" "${inputs.nvimTree}" "${inputs.nvimTrouble}" @@ -61,6 +62,7 @@ in { ./module/plugin/Fold.nix ./module/plugin/Ollama.nix ./module/plugin/Colorizer.nix + ./module/plugin/Transparent.nix ./module/plugin/lsp/Haskell.nix ./module/plugin/lsp/Rust.nix ./module/plugin/lsp/Tex.nix @@ -77,7 +79,6 @@ in { ./module/key/Sort.nix ./module/key/Telescope.nix ./module/key/Terminal.nix - ./module/key/Todo.nix ./module/key/Trouble.nix ]; }; diff --git a/home/config/nvim/module/config/Etc.nix b/home/config/nvim/module/config/Etc.nix index 89768fc..22e6192 100644 --- a/home/config/nvim/module/config/Etc.nix +++ b/home/config/nvim/module/config/Etc.nix @@ -4,7 +4,7 @@ vim.opt.clipboard = "unnamedplus" vim.opt.cursorline = false vim.opt.fixeol = false - vim.opt.incsearch = true; + vim.opt.incsearch = true vim.opt.number = true vim.opt.scrolloff = 4 vim.opt.splitbelow = true diff --git a/home/config/nvim/module/key/Todo.nix b/home/config/nvim/module/key/Todo.nix deleted file mode 100644 index 8385aab..0000000 --- a/home/config/nvim/module/key/Todo.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: { - text = '' - -- Toggle To-do window. - rekey_normal("3", "TroubleToggle todo") - ''; -} diff --git a/home/config/nvim/module/key/Trouble.nix b/home/config/nvim/module/key/Trouble.nix index c427432..5b1bd2d 100644 --- a/home/config/nvim/module/key/Trouble.nix +++ b/home/config/nvim/module/key/Trouble.nix @@ -1,6 +1,11 @@ -{ ... }: { +{ ... }: let + focus = true; +in { text = '' -- Toggle diagnostics window. - rekey_normal("2", "TroubleToggle document_diagnostics") + rekey_normal("2", "Trouble diagnostics toggle focus=${toString focus}") + + -- Toggle To-do window. + rekey_normal("3", "Trouble todo toggle focus=${toString focus}") ''; } diff --git a/home/config/nvim/module/plugin/Transparent.nix b/home/config/nvim/module/plugin/Transparent.nix new file mode 100644 index 0000000..eb0ad43 --- /dev/null +++ b/home/config/nvim/module/plugin/Transparent.nix @@ -0,0 +1,26 @@ +{ ... }: { + text = '' + vim.g.transparent_enabled = true + + -- Optional, you don't have to run setup. + require("transparent").setup({ + -- table: default groups + -- groups = { + -- 'Normal', 'NormalNC', 'Comment', 'Constant', 'Special', 'Identifier', + -- 'Statement', 'PreProc', 'Type', 'Underlined', 'Todo', 'String', 'Function', + -- 'Conditional', 'Repeat', 'Operator', 'Structure', 'LineNr', 'NonText', + -- 'SignColumn', 'CursorLine', 'CursorLineNr', 'StatusLine', 'StatusLineNC', + -- 'EndOfBuffer', + -- }, + -- table: additional groups that should be cleared + extra_groups = { + 'NormalFloat', + }, + -- table: groups you don't want to clear + exclude_groups = {}, + -- function: code to be executed after highlight groups are cleared + -- Also the user event "TransparentClear" will be triggered + on_clear = function() end, + }) + ''; +}