diff --git a/config/plugins/editor/neo-tree.nix b/config/plugins/editor/neo-tree.nix index f8552c0..b4c391e 100644 --- a/config/plugins/editor/neo-tree.nix +++ b/config/plugins/editor/neo-tree.nix @@ -1,53 +1,56 @@ { plugins.neo-tree = { enable = true; - sources = [ - "filesystem" - "buffers" - "git_status" - "document_symbols" - ]; - addBlankLineAtTop = false; - filesystem = { - bindToCwd = false; - followCurrentFile = { - enabled = true; - }; - }; + settings = { + sources = [ + "filesystem" + "buffers" + "git_status" + "document_symbols" + ]; + add_blank_line_at_top = false; - defaultComponentConfigs = { - indent = { - withExpanders = true; - expanderCollapsed = "󰅂"; - expanderExpanded = "󰅀"; - expanderHighlight = "NeoTreeExpander"; - }; - - gitStatus = { - symbols = { - added = " "; - conflict = "󰩌 "; - deleted = "󱂥"; - ignored = " "; - modified = " "; - renamed = "󰑕"; - staged = "󰩍"; - unstaged = ""; - untracked = " "; + filesystem = { + bind_to_cwd = false; + follow_current_file = { + enabled = true; }; }; + + default_component_configs = { + indent = { + with_expanders = true; + expander_collapsed = "󰅂"; + expander_expanded = "󰅀"; + expander_highlight = "NeoTreeExpander"; + }; + + git_status = { + symbols = { + added = " "; + conflict = "󰩌 "; + deleted = "󱂥"; + ignored = " "; + modified = " "; + renamed = "󰑕"; + staged = "󰩍"; + unstaged = ""; + untracked = " "; + }; + }; + }; + + keymaps = [ + { + mode = [ "n" ]; + key = "e"; + action = "Neotree toggle"; + options = { + desc = "Open/Close Neotree"; + }; + } + ]; }; }; - - keymaps = [ - { - mode = [ "n" ]; - key = "e"; - action = "Neotree toggle"; - options = { - desc = "Open/Close Neotree"; - }; - } - ]; } diff --git a/config/plugins/editor/treesitter.nix b/config/plugins/editor/treesitter.nix index 4b6648e..e3d79ef 100644 --- a/config/plugins/editor/treesitter.nix +++ b/config/plugins/editor/treesitter.nix @@ -6,56 +6,58 @@ indent.enable = true; highlight.enable = true; }; - folding = false; + folding.enable = false; nixvimInjections = true; grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars; }; plugins.treesitter-textobjects = { enable = false; - select = { - enable = true; - lookahead = true; - keymaps = { - "aa" = "@parameter.outer"; - "ia" = "@parameter.inner"; - "af" = "@function.outer"; - "if" = "@function.inner"; - "ac" = "@class.outer"; - "ic" = "@class.inner"; - "ii" = "@conditional.inner"; - "ai" = "@conditional.outer"; - "il" = "@loop.inner"; - "al" = "@loop.outer"; - "at" = "@comment.outer"; + settings = { + select = { + enable = true; + lookahead = true; + keymaps = { + "aa" = "@parameter.outer"; + "ia" = "@parameter.inner"; + "af" = "@function.outer"; + "if" = "@function.inner"; + "ac" = "@class.outer"; + "ic" = "@class.inner"; + "ii" = "@conditional.inner"; + "ai" = "@conditional.outer"; + "il" = "@loop.inner"; + "al" = "@loop.outer"; + "at" = "@comment.outer"; + }; }; - }; - move = { - enable = true; - gotoNextStart = { - "]m" = "@function.outer"; - "]]" = "@class.outer"; + move = { + enable = true; + goto_next_start = { + "]m" = "@function.outer"; + "]]" = "@class.outer"; + }; + goto_next_end = { + "]M" = "@function.outer"; + "][" = "@class.outer"; + }; + goto_previous_start = { + "[m" = "@function.outer"; + "[[" = "@class.outer"; + }; + goto_previous_end = { + "[M" = "@function.outer"; + "[]" = "@class.outer"; + }; }; - gotoNextEnd = { - "]M" = "@function.outer"; - "][" = "@class.outer"; - }; - gotoPreviousStart = { - "[m" = "@function.outer"; - "[[" = "@class.outer"; - }; - gotoPreviousEnd = { - "[M" = "@function.outer"; - "[]" = "@class.outer"; - }; - }; - swap = { - enable = true; - swapNext = { - "a" = "@parameters.inner"; - }; - swapPrevious = { - "A" = "@parameter.outer"; + swap = { + enable = true; + swap_next = { + "a" = "@parameters.inner"; + }; + swap_previous = { + "A" = "@parameter.outer"; + }; }; }; }; diff --git a/config/plugins/ui/startup.nix b/config/plugins/ui/startup.nix index a665f22..e65cd89 100644 --- a/config/plugins/ui/startup.nix +++ b/config/plugins/ui/startup.nix @@ -2,12 +2,23 @@ plugins.startup = { enable = true; - colors = { - background = "#ffffff"; - foldedSection = "#ffffff"; - }; + settings = { + colors = { + background = "#ffffff"; + foldedSection = "#ffffff"; + }; + options = { + paddings = [ + 1 + 3 + ]; + }; + + parts = [ + "header" + "body" + ]; - sections = { header = { type = "text"; oldfilesDirectory = false; @@ -72,17 +83,5 @@ oldfilesAmount = 0; }; }; - - options = { - paddings = [ - 1 - 3 - ]; - }; - - parts = [ - "header" - "body" - ]; }; }