diff --git a/config/options.nix b/config/options.nix index 5806957..f199c07 100644 --- a/config/options.nix +++ b/config/options.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ colorscheme = "shades_of_purple"; opts = { @@ -10,20 +11,19 @@ globals.mapleader = " "; extraPlugins = with pkgs; [ + # TODO add from flake.nix { - plugin = pkgs.vimUtils.buildVimPlugin - { - pname = "shades_of_purple"; - version = "1.0.2"; # dummy version - src = pkgs.fetchFromGitea - { - domain = "git.4o1x5.dev"; - owner = "4o1x5"; - repo = "shades-of-purple-nvim"; - rev = "bf962ffd82f7fce5f89cc6e54e995a90f37feb4b"; - hash = "sha256-NokpQsg/mUpjkhRRthNyLvCf9ZEmxlbvNmFUlL0y+Y0="; - }; + plugin = pkgs.vimUtils.buildVimPlugin { + pname = "shades_of_purple"; + version = "1.0.2"; # dummy version + src = pkgs.fetchFromGitea { + domain = "git.4o1x5.dev"; + owner = "4o1x5"; + repo = "shades-of-purple-nvim"; + rev = "2db251e8efa16e4cb7574092686a941448252fa7"; + hash = "sha256-DsswRJgpv04pSunRlAFTJ0CmwLg+oZwxdsX1BkAe6V0="; }; + }; } vimPlugins.lush-nvim diff --git a/config/plugins/lang/elixir.nix b/config/plugins/lang/elixir.nix index e440d88..2a6bd83 100644 --- a/config/plugins/lang/elixir.nix +++ b/config/plugins/lang/elixir.nix @@ -16,5 +16,12 @@ # linters.elixir.cmd = "${pkgs.elixir}/bin/mix deps.get"; #}; + treesitter.settings.ensure_installed = [ + "eex" + "elixir" + "erlang" + "heex" + ]; + }; } diff --git a/config/plugins/lsp/default.nix b/config/plugins/lsp/default.nix index 050ffab..95f4368 100644 --- a/config/plugins/lsp/default.nix +++ b/config/plugins/lsp/default.nix @@ -1,4 +1,5 @@ -{ pkgs, lib, ... }: { +{ pkgs, lib, ... }: +{ imports = [ ./trouble.nix @@ -11,14 +12,22 @@ enable = true; settings = { autoEnableSources = true; - experimental = { ghost_text = true; }; + experimental = { + ghost_text = true; + }; performance = { debounce = 60; fetchingTimeout = 200; maxViewEntries = 30; }; - formatting = { fields = [ "kind" "abbr" "menu" ]; }; + formatting = { + fields = [ + "kind" + "abbr" + "menu" + ]; + }; sources = [ { name = "nvim_lsp"; } { @@ -33,8 +42,12 @@ ]; window = { - completion = { border = "solid"; }; - documentation = { border = "solid"; }; + completion = { + border = "solid"; + }; + documentation = { + border = "solid"; + }; }; mapping = { @@ -65,10 +78,9 @@ }; # Language server - plugins.lsp = - { - enable = true; - }; + plugins.lsp = { + enable = true; + }; plugins.none-ls = { enable = true; @@ -126,8 +138,13 @@ plugins.ts-autotag = { enable = true; }; + # Needed for autotagging plugins.treesitter = { enable = true; + settings = { + highlight.enable = true; # It's defaulted to true but just to make sure... + }; }; + } diff --git a/config/plugins/ui/default.nix b/config/plugins/ui/default.nix index a90a553..352101a 100644 --- a/config/plugins/ui/default.nix +++ b/config/plugins/ui/default.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ # "Smooth" scrolling plugins.neoscroll = { enable = true; @@ -39,7 +40,6 @@ # Highlight TODO FIXME comments plugins.todo-comments.enable = true; - # Inline git blame plugins.gitsigns = { enable = true; @@ -49,13 +49,12 @@ }; }; - plugins.trouble = { enable = true; settings = { }; }; - # Clean notifications + # Clean notifications plugins.fidget = { enable = true; logger = { @@ -187,4 +186,5 @@ plugins.bufferline = { enable = true; }; + }