Skip to content

Commit

Permalink
Merge pull request #286 from NotAShelf/minor-lang-refactor
Browse files Browse the repository at this point in the history
modules/languages: minor refactor; add bash formatter
  • Loading branch information
NotAShelf authored May 7, 2024
2 parents 12fd9d6 + 96b92b5 commit 26755a6
Show file tree
Hide file tree
Showing 28 changed files with 384 additions and 656 deletions.
23 changes: 13 additions & 10 deletions configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ inputs: let
configuration.imports = modules;
};

tidalConfig = {
config.vim.languages.tidal.enable = true;
};

mainConfig = isMaximal: {
config.vim = {
viAlias = true;
Expand Down Expand Up @@ -58,21 +54,28 @@ inputs: let
enableTreesitter = true;
enableExtraDiagnostics = true;

# Nim LSP is broken on Darwin and therefore
# should be disabled by default. Users may still enable
# `vim.languages.vim` to enable it, this does not restrict
# that.
# See: <https://github.com/PMunch/nimlsp/issues/178#issue-2128106096>
nim.enable = false;

nix.enable = true;

markdown.enable = isMaximal;
html.enable = isMaximal;
css.enable = isMaximal;
sql.enable = isMaximal;
java.enable = isMaximal;
ts.enable = isMaximal;
svelte.enable = isMaximal;
go.enable = isMaximal;
elixir.enable = isMaximal;
zig.enable = isMaximal;
python.enable = isMaximal;
dart.enable = isMaximal;
elixir.enable = isMaximal;
bash.enable = isMaximal;
terraform.enable = isMaximal;
nim.enable = false;
tailwind.enable = isMaximal;
typst.enable = isMaximal;
clang = {
Expand All @@ -82,14 +85,14 @@ inputs: let

rust = {
enable = isMaximal;
crates.enable = true;
crates.enable = isMaximal;
};
};

visuals = {
enable = true;
nvimWebDevicons.enable = true;
scrollBar.enable = true;
scrollBar.enable = isMaximal;
smoothScroll.enable = true;
cellularAutomaton.enable = false;
fidget-nvim.enable = true;
Expand Down Expand Up @@ -252,5 +255,5 @@ inputs: let
};
};
in {
inherit neovimConfiguration mainConfig tidalConfig;
inherit neovimConfiguration mainConfig;
}
6 changes: 0 additions & 6 deletions docs/manual/try-it-out.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ Below are the commands you may run to try out different configurations provided
configurations are provided:

- Nix
- Tidal
- Maximal

You may try out any of the provided configurations using the `nix run` command on a system where Nix is installed.
Expand All @@ -22,7 +21,6 @@ once you garbage collect.

```console
$ nix run github:notashelf/nvf#nix
$ nix run github:notashelf/nvf#tidal
$ nix run github:notashelf/nvf#maximal
```

Expand All @@ -33,10 +31,6 @@ $ nix run github:notashelf/nvf#maximal
`Nix` configuration by default provides LSP/diagnostic support for Nix alongisde a set of visual and functional plugins.
By running `nix run .#`, which is the default package, you will build Neovim with this config.

#### Tidal {#sec-configs-tidal}

Tidal is an alternative config that adds vim-tidal on top of the plugins from the Nix configuration.

#### Maximal {#sec-configs-maximal}

`Maximal` is the ultimate configuration that will enable support for more commonly used language as well as additional
Expand Down
17 changes: 15 additions & 2 deletions docs/release-notes/rl-0.7.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Release notes for release 0.7

[ItsSorae](https://github.com/ItsSorae):

- Added support for [typst](https://typst.app/) under `vim.languages.typst`.
This will enable the `typst-lsp` language server, and the `typstfmt` formatter.
- Added support for [typst](https://typst.app/) under `vim.languages.typst`
This will enable the `typst-lsp` language server, and the `typstfmt` formatter

[frothymarrow](https://github.com/frothymarrow):

Expand All @@ -18,3 +18,16 @@ Release notes for release 0.7
[horriblename](https://github.com/horriblename):

- Fix broken treesitter-context keybinds in visual mode

[NotAShelf](https://github.com/notashelf)

- Add `deno fmt` as the default Markdown formatter. This will be enabled
automatically if you have autoformatting enabled, but can be disabled manually
if you choose to.

- Refactor `programs.languages.elixir` to use lspconfig and none-ls for LSP and
formatter setups respectively. Diagnostics support is considered, and may be
added once the [credo](https://github.com/rrrene/credo) linter has been added
to nixpkgs. A pull request is currently open.

- Remove vim-tidal and friends
183 changes: 4 additions & 179 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 26755a6

Please sign in to comment.