Merge pull request #48 from NotAShelf/feature/neovim0.9

feature/neovim-0.9

docs/languages.adoc

@@ -1,71 +1,17 @@
 [[ch-languages]]
 == Language Support
 
-Language specific support combines some combination of language specific plugins, `treesitter` support, `nvim-lspconfig` langauge servers, and `null-ls` integration. This gets you capabilities ranging from autocompletion to formatting to diagnostics. The following languages have support beyond just `treesitter` highlighting.
+Language specific support means there is a combination of language specific plugins, `treesitter` support, `nvim-lspconfig` language servers, and `null-ls` integration. This gets you capabilities ranging from autocompletion to formatting to diagnostics. The following languages have sections under the `vim.languages` attribute. See the configuration docs for details.
 
-[[sec-languages-rust]]
+* Rust: <<opt-vim.languages.rust.enable>>
-=== Rust
+* Nix: <<opt-vim.languages.nix.enable>>
+* SQL: <<opt-vim.languages.sql.enable>>
+* C/C++: <<opt-vim.languages.clang.enable>>
+* Typescript/Javascript: <<opt-vim.languages.ts.enable>>
+* Python: <<opt-vim.languages.python.enable>>:
+* Zig: <<opt-vim.languages.zig.enable>>
+* Markdown: <<opt-vim.languages.markdown.enable>>
+* HTML: <<opt-vim.languages.html.enable>>
 
-*LSP Server*: https://github.com/rust-analyzer/rust-analyzer[rust-analyzer]
+Adding support for more languages, and improving support for existing ones are great places where you can contribute with a PR.
 
-*Formatting*: Built into LSP, uses https://github.com/rust-lang/rustfmt[rustfmt]
-
-*Plugins*: See <<sec-plugins-rust,here>>
-
-[[sec-languages-nix]]
-=== Nix
-
-*LSP Server*: Choice between https://github.com/oxalica/nil[nil] and https://github.com/nix-community/rnix-lsp[rnix-lsp]
-
-*Formatting*: Choice between https://github.com/kamadorueda/alejandra[alejandra] and https://github.com/nix-community/nixpkgs-fmt[nixpkgs-fmt]
-
-[[sec-languages-sql]]
-=== SQL
-
-*LSP Server*: https://github.com/lighttiger2505/sqls[sqls]
-
-*Formatting*: Disabled LSP formatting, instead using https://github.com/sqlfluff/sqlfluff[sqlfluff]
-
-*Linting*: https://github.com/sqlfluff/sqlfluff[sqlfluff]
-
-*Plugins*: See <<sec-plugins-sql,here>>
-
-[[sec-languages-clang]]
-=== C/C++
-
-*LSP Server*: https://github.com/MaskRay/ccls[ccls]
-
-*Formatting*: Built into language server
-
-[[sec-languages-typescript]]
-=== Typescript
-
-*LSP Server*: https://github.com/typescript-language-server/typescript-language-server[typescript-language-server]
-
-*Formatting*: Disabled LSP formatting, instead using https://github.com/prettier/prettier[prettier]
-
-*Linting*: https://github.com/prettier/prettier[eslint]
-
-[[sec-languages-python]]
-=== Python
-
-*LSP Server*: https://github.com/microsoft/pyright[pyright]
-
-*Formatting*: https://github.com/psf/black[black]
-
-[[sec-languages-zig]]
-=== Zig
-
-*LSP Server*: https://github.com/zigtools/zls[zls]
-
-*Formatting*: Built into LSP, uses `zig fmt`.
-
-[[sec-languages-markdown]]
-=== Markdown
-
-*Plugins*: See <<sec-plugins-markdown,here>>
-
-[[sec-languages-html]]
-=== HTML
-
-*Plugins*: See <<sec-plugins-html,here>>

docs/manual.xml

@@ -21,7 +21,6 @@
  <xi:include href="custom-configs.xml"/>
  <xi:include href="home-manager.xml"/>
  <xi:include href="languages.xml"/>
- <xi:include href="plugins.xml"/>
  <appendix xml:id="ch-options">
   <title>Configuration Options</title>
   <xi:include href="./nmd-result/neovim-flake-options.xml" />

docs/plugins.adoc

@@ -1,184 +0,0 @@
-[[ch-plugins]]
-== Plugins
-
-The following are the neovim plugins used within neovim-flake. Some plugins are explicitly enabled by the user, while others are enabled implicitly.
-
-[[sec-plugins-autopairs]]
-=== Autopairs
-
-* https://github.com/windwp/nvim-autopairs[nvim-autopairs] an autopair plugin for neovim
-
-
-[[sec-plugins-assistant]]
-=== Coding Assistants
-
-* https://github.com/zbirenbaum/copilot.lua[copilot.lua] a lua replacement for github.vim, the license nightmare AI assistant
-* https://github.com/codota/tabnine-nvim[tabnine-nvim] neovim plugin for the more ethically acceptable AI assistant TabNine
-
-[[sec-plugins-buffer]]
-=== Buffers
-
-* https://github.com/akinsho/bufferline.nvim[nvim-bufferline-lua] a buffer line with tab integration
-* https://github.com/famiu/bufdelete.nvim[bufdelete-nvim] delete buffers without losing window layout
-
-[[sec-plugins-commenting]]
-=== Commenting
-
-* https://github.com/b3nj5m1n/kommentary[kommentary] neovim plugin to comment text in and out, written in lua. Supports commenting out the current line, a visual selection and a motion
-* https://github.com/folke/todo-comments.nvim[todo-comments.nvim] plugin to highlight and search for todo comments like TODO, HACK, BUG in your codebase
-
-[[sec-plugins-completions]]
-=== Completions
-
-* https://github.com/hrsh7th/nvim-cmp[nvim-cmp] a completion engine that utilizes sources
-** https://github.com/hrsh7th/cmp-buffer[cmp-buffer] a source for buffer words
-** https://github.com/hrsh7th/cmp-nvim-lsp[cmp-nvim-lsp] a source for builtin LSP client
-** https://github.com/hrsh7th/cmp-vsnip[cmp-vsnip] a source for vim-vsnip autocomplete
-** https://github.com/hrsh7th/cmp-path[cmp-path] a source for path autocomplete
-** https://github.com/ray-x/cmp-treesitter[cmp-treesitter] treesitter nodes autcomplete
-
-[[sec-plugins-dashboard]]
-=== Dashboard
-
-* https://github.com/glepnir/dashboard-nvim[dashboard.nvim] fancy and blazing fast start screen plugin for Neovim
-* https://github.com/goolord/alpha-nvim[alpha.nvim] a fast and fully programmable greeter for neovim
-* https://github.com/mhinz/vim-startify[vim-startify] a fancy start screen for {neo,}vim
-
-[[sec-plugins-server]]
-=== Language Server
-
-* https://github.com/neovim/nvim-lspconfig[nvim-lspconfig] common configurations for built-in language server
-* https://github.com/jose-elias-alvarez/null-ls.nvim[null-ls.nvim] neovim as a language server to inject LSP diagnostics, code actions, etc.
-* https://github.com/glepnir/lspsaga.nvim[lspsaga.nvim] useful UI and tools for lsp
-* https://github.com/folke/trouble.nvim[trouble.nvim] pretty list of lsp data
-* https://github.com/weilbith/nvim-code-action-menu[nvim-code-action-menu] a better code action menu with diff support
-* https://github.com/ray-x/lsp_signature.nvim[lsp-signature] show function signatures as you type
-* https://github.com/onsails/lspkind-nvim[lspkind-nvim] for pictograms in lsp (with support for nvim-cmp)
-
-
-[[sec-plugins-statuslines]]
-=== Statuslines
-
-* https://github.com/hoob3rt/lualine.nvim[lualine.nvim] statusline written in lua.
-
-[[sec-plugins-filetrees]]
-=== Filetrees
-
-* https://github.com/kyazdani42/nvim-tree.lua[nvim-tree-lua] a file explorer tree written in lua. Using
-
-[[sec-plugins-git]]
-=== Git
-
-* https://github.com/lewis6991/gitsigns.nvim[gitsigns.nvim] a variety of git decorations
-
-[[sec-plugins-treesitter]]
-=== Treesitter
-
-* https://github.com/romgrk/nvim-treesitter-context[nvim-treesitter-context] a context bar using tree-sitter
-
-[[sec-plugins-visuals]]
-=== Visuals
-
-* https://github.com/lukas-reineke/indent-blankline.nvim[indent-blankline] for indentation guides
-* https://github.com/kyazdani42/nvim-web-devicons[nvim-web-devicons] plugins and colors for icons. Requires patched font
-* https://github.com/declancm/cinnamon.nvim[cinnamon.nvim] smooth scrolling for ANY movement command
-* https://github.com/nvim-cursorline[nvim-cursorline] a plugin for neovim that highlights cursor words and lines 
-* https://github.com/petertriho/nvim-scrollbar[nvim-scrollbar] a scrollbar plugin for neovim
-* https://github.com/Eandrju/cellular-automaton.nvim[cellular-automaton] a vanity to plugin to help you procrastinate more efficiently
-
-[[sec-plugins-minimap]]
-=== Minimap
-
-* https://github.com/wfxr/minimap.vim[minimap.vim] a blazing fast minimap plugin for neovim. Depends on code-minimap
-* https://github.com/gorbit99/codewindow.nvim[codewindow.nvim] a simple, configurable minimap plugin for neovim with no external dependencies
-
-[[sec-plugins-notifications]]
-=== Notifications
-
-* https://github.com/rcarriga/nvim-notify[nvim-notify] simple notification plugin that also integrates with noice.nvim
-
-[[sec-plugins-notes]]
-=== Note-taking
-
-* https://github.com/obsidian.nvim[obsidian.nvim] a neovim plugin that deeply integrates with the obsidian markdown editor. Also works standalone
-* https://github.com/nvim-orgmode/orgmode[orgmode] a neovim replacement for emac orgmode
-
-[[sec-plugins-session-management]]
-=== Session Management
-
-* https://github.com/Shatur/neovim-session-manager[neovim-session-manager] a simple wrapper around :mksession
-
-[[sec-plugins-snippets]]
-=== Snippets
-
-* https://github.com/hrsh7th/vim-vsnip[vim-vsnip] a snippet plugin that supports LSP/VSCode's snippet format
-
-
-[[sec-plugins-terminal]]
-=== Terminal
-
-* https://github.com/akinsho/toggleterm.nvim[toggleterm.nvim] a simple terminal plugin that opens a terminal buffer on demand
-
-[[sec-plugins-themes]]
-=== Themes
-
-* https://github.com/navarasu/onedark.nvim[onedark] a dark colorscheme with multiple options
-* https://github.com/folke/tokyonight.nvim[tokyonight-nvim] a neovim theme with multiple color options
-* https://github.com/catppuccin/nvim[catppuccin] a pastel theme with 4 color options
-
-
-[[sec-plugins-utilities]]
-=== Utilities
-
-* https://github.com/nvim-telescope/telescope.nvim[telescope] an extendable fuzzy finder of lists. Working ripgrep and fd
-* https://github.com/folke/which-key.nvim[which-key] a popup that displays possible keybindings of command being typed
-* https://github.com/sudormrfbin/cheatsheet.nvim[cheatsheet.nvim] a searchable cheatsheet for neovim from within the editor using Telescope
-* https://github.com/ga-rosa/ccc.nvim[ccc.nvim] super powerful color picker and colorizer plugin. 
-* https://github.com/ziontee113/icon-picker.nvim[icon-picker.nvim] an icon picker plugin that provides access to thousands of icons
-* https://github.com/jbyuki/venn.nvim[venn.nvim] draw venn diagrams inside neovim
-
-[[sec-plugins-ui]]
-=== UI Elements
-
-* https://github.com/folke/noice.nvim[noice.nvim] an experimental neovim plugin that replaces some UI components of neovim
-
-
-[[sec-plugins-presence]]
-=== Rich Presence
-
-* https://github.com/andweeb/presence.nvim[presence.nvim] light and powerful discord rich presence plugin
-
-[[sec-plugins-markdown]]
-=== Markdown
-
-* https://github.com/ellisonleao/glow.nvim[glow.nvim] a markdown preview directly in neovim using glow
-
-[[sec-plugins-rust]]
-=== Rust
-
-* https://github.com/simrat39/rust-tools.nvim[rust-tools] provides tools for rust
-* https://github.com/Saecki/crates.nvim[crates.nvim] provides tools for working with `cargo.toml`
-
-[[sec-plugins-tidalcycles]]
-=== Tidal Cycles
-
-* https://github.com/tidalcycles/vim-tidal[vim-tidal] for tidal cycles integration into vim
-
-[[sec-plugins-sql]]
-=== SQL
-
-* https://github.com/nanotee/sqls.nvim[sqls.nvim] for useful actions that leverage `sqls` LSP
-
-[[sec-plugins-html]]
-=== HTML
-
-* https://github.com/windwp/nvim-ts-autotag[nvim-ts-autotag] uses treesitter to autoclose/rename html tags
-
-[[sec-plugins-dependencies]]
-=== Dependencies
-
-* https://github.com/nvim-lua/plenary.nvim[plenary] which is a dependency of some plugins, installed automatically if needed
-* https://github.comstevearc/dressing.nvim[dressing.nvim] which is a dependency for icon-picker.nvim
-* https://github.com/preservim/vim-markdown[vim-markdown] which is a dependency for obsidian.nvim
-* https://github.comgodlygeek/tabular[tabular] which is a dependency for vim-markdown
-* https://github.com/MunifTanjim/nui.nvim[nui.nvim] which is a dependency for nui-nvim

docs/release-notes/rl-0.3.adoc

@@ -0,0 +1,17 @@
+* Treesitter grammars are now configurable with <<opt-vim.treesitter.grammars>>. Utilizes the nixpkgs `nvim-treesitter` plugin rather than a custom input in order to take advantage of build support of pinned versions. See https://discourse.nixos.org/t/psa-if-you-are-on-unstable-try-out-nvim-treesitter-withallgrammars/23321?u=snowytrees[discourse] for more information. Packages can be found under the `pkgs.vimPlugins.nvim-treesitter.builtGrammars` attribute. Treesitter grammars for supported languages should be enabled within the module. By default no grammars are installed, thus the following grammars which do not have a language section are not included anymore: comment, toml, make, html, css, graphql, json.
+
+* A new section has been added for language support: `vim.languages.<language>`. The options <<opt-vim.languages.enableLSP>>, <<opt-vim.languages.enableTreesitter>>, etc. will enable the respective section for all languages that have been enabled.
+** All LSP languages have been moved here
+** `plantuml` and `markdown` have been moved here
+** A new section has been added for `html`. The old `vim.treesitter.autotagHtml` can be found at <<opt-vim.languages.html.treesitter.autotagHtml>>.
+
+* <<opt-vim.git.gitsigns.codeActions>> has been added allowing you to turn on gitsigns codeactions.
+
+* Removed the plugins document in the docs. Was too unwieldy to keep updated.
+
+
+* `vim.visual.lspkind` has been moved to <<opt-vim.lsp.lspkind.enable>>
+
+* Improved handling of completion formatting. When setting <<opt-vim.autocomplete.sources>>, can also include optional menu mapping. And can provide your own function with <<opt-vim.autocomplete.formatting.format>>.
+
+* For <<opt-vim.visuals.indentBlankline.fillChar>> and <<opt-vim.visuals.indentBlankline.eolChar>> turning them off should use `null` rather than `""` now.

extra.nix

@@ -13,6 +13,10 @@ inputs: let
       configuration.imports = modules;
     };
 
+  tidalConfig = {
+    config.vim.languages.tidal.enable = true;
+  };
+
   mainConfig = isMaximal: {
     config = {
       vim = {
@@ -26,25 +30,35 @@ inputs: let
       };
 
       vim.lsp = {
-        enable = true;
         formatOnSave = true;
+        lspkind.enable = false;
         lightbulb.enable = true;
         lspsaga.enable = false;
         nvimCodeActionMenu.enable = true;
         trouble.enable = true;
         lspSignature.enable = true;
-        elixir.enable = isMaximal;
+      };
-        rust.enable = isMaximal;
+
-        python = isMaximal;
+      vim.languages = {
+        enableLSP = true;
+        enableFormat = true;
+        enableTreesitter = true;
+        enableExtraDiagnostics = true;
+
+        nix.enable = true;
+        html.enable = isMaximal;
         clang.enable = isMaximal;
-        sql = isMaximal;
+        sql.enable = isMaximal;
-        ts = isMaximal;
+        rust = {
-        go = isMaximal;
+          enable = isMaximal;
-        zig.enable = isMaximal;
+          crates.enable = true;
-        nix = {
-          enable = true;
-          formatter = "alejandra";
         };
+        ts.enable = isMaximal;
+        go.enable = isMaximal;
+        zig.enable = isMaximal;
+        python.enable = isMaximal;
+        dart.enable = isMaximal;
+        elixir.enable = isMaximal;
       };
 
       vim.visuals = {
@@ -54,11 +68,10 @@ inputs: let
         smoothScroll.enable = true;
         cellularAutomaton.enable = true;
         fidget-nvim.enable = true;
-        lspkind.enable = true;
         indentBlankline = {
           enable = true;
-          fillChar = "";
+          fillChar = null;
-          eolChar = "";
+          eolChar = null;
           showCurrContext = true;
         };
         cursorWordline = {
@@ -89,6 +102,9 @@ inputs: let
       vim.filetree = {
         nvimTreeLua = {
           enable = true;
+          renderer = {
+            rootFolderLabel = null;
+          };
           view = {
             width = 25;
           };
@@ -99,28 +115,19 @@ inputs: let
         nvimBufferline.enable = true;
       };
 
-      vim.treesitter = {
+      vim.treesitter.context.enable = true;
-        enable = true;
-        context.enable = true;
-      };
 
       vim.binds = {
         whichKey.enable = true;
         cheatsheet.enable = true;
       };
 
-      vim.telescope = {
+      vim.telescope.enable = true;
-        enable = true;
-      };
-
-      vim.markdown = {
-        enable = true;
-        glow.enable = true;
-      };
 
       vim.git = {
         enable = true;
         gitsigns.enable = true;
+        gitsigns.codeActions = true;
       };
 
       vim.minimap = {
@@ -201,5 +208,5 @@ inputs: let
     };
   };
 in {
-  inherit neovimConfiguration mainConfig;
+  inherit neovimConfiguration mainConfig tidalConfig;
 }

flake.lock

@@ -3,11 +3,11 @@
     "alpha-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1679422215,
+        "lastModified": 1681755353,
-        "narHash": "sha256-jNJ/0ueUXgArpWHypIkNA4hKrwYjthva7gK9JuE4VWM=",
+        "narHash": "sha256-yiwFWoz7C+VYL0hrDobTINE4K1v4sbB8koZuURAKlzw=",
         "owner": "goolord",
         "repo": "alpha-nvim",
-        "rev": "dafa11a6218c2296df044e00f88d9187222ba6b0",
+        "rev": "87c204040e3f5d4c1c95067b35905d8f8a2f2545",
         "type": "github"
       },
       "original": {
@@ -35,11 +35,11 @@
     "catppuccin": {
       "flake": false,
       "locked": {
-        "lastModified": 1679888068,
+        "lastModified": 1681530540,
-        "narHash": "sha256-UrHoESRYwALPo6LFFocEIM0CZa740tjxjvmYES7O5Rw=",
+        "narHash": "sha256-RPwRyuGTbVMAApdRsVUyHlcHYWRQ9bHlumJTov81Z0c=",
         "owner": "catppuccin",
         "repo": "nvim",
-        "rev": "73587f9c454da81679202f1668c30fea6cdafd5e",
+        "rev": "fa9a4465672fa81c06b23634c0f04f6a5d622211",
         "type": "github"
       },
       "original": {
@@ -147,11 +147,11 @@
     "cmp-treesitter": {
       "flake": false,
       "locked": {
-        "lastModified": 1679830722,
+        "lastModified": 1680745848,
-        "narHash": "sha256-t1xEQn6NXcNG215ldm0ivKZdgaoGFwDiZUb8ROBeZHU=",
+        "narHash": "sha256-WOcg6w4M20gpMCZjZ3DpPIA55SGLjV75fhckefiVfU0=",
         "owner": "ray-x",
         "repo": "cmp-treesitter",
-        "rev": "c8e3a74b51597d69d240085a258636972ce98e15",
+        "rev": "389eadd48c27aa6dc0e6b992644704f026802a2e",
         "type": "github"
       },
       "original": {
@@ -179,11 +179,11 @@
     "codewindow-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1676695329,
+        "lastModified": 1681491118,
-        "narHash": "sha256-q9mLpMLp3pLn+7D+JSod0ST3ke7EodRh3SoHfPzVic0=",
+        "narHash": "sha256-AwGNTrfa/oro22yBKkzJNlVavnboFdEpMM4qXOZhQ/4=",
         "owner": "gorbit99",
         "repo": "codewindow.nvim",
-        "rev": "46b005fc5c40d512a2ec8e55e21b64afa6aaed00",
+        "rev": "985046dfb2b35cd3b214b70a9a056ec89b0c5498",
         "type": "github"
       },
       "original": {
@@ -195,11 +195,11 @@
     "colorizer": {
       "flake": false,
       "locked": {
-        "lastModified": 1680271664,
+        "lastModified": 1681750992,
-        "narHash": "sha256-UQwIf96eG79iEBDhQvfjByrAc+LXyKiT4EVrPe1+YmY=",
+        "narHash": "sha256-TXKYJY4+ozr54jBa3rUuJuO1Y4nrHfsX0yrQs3wtMDQ=",
         "owner": "uga-rosa",
         "repo": "ccc.nvim",
-        "rev": "3e07b8ffc9dab162cd2940e75601da75ed0cebbe",
+        "rev": "a4a79302c2389f6852b1a655b47ea2edecccb081",
         "type": "github"
       },
       "original": {
@@ -211,11 +211,11 @@
     "comment-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1678452935,
+        "lastModified": 1681289112,
-        "narHash": "sha256-mVJJJ9fUJYgVyGZnW8e6P5QWB0K8nuhTwSWzlBvxv2M=",
+        "narHash": "sha256-Zrxf50YlAaCERZFAbg4Ece+wI4buHl+K2IIw0qpASGA=",
         "owner": "numToStr",
         "repo": "Comment.nvim",
-        "rev": "8d3aa5c22c2d45e788c7a5fe13ad77368b783c20",
+        "rev": "a89339ffbee677ab0521a483b6dac7e2e67c907e",
         "type": "github"
       },
       "original": {
@@ -227,11 +227,11 @@
     "copilot-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1680027228,
+        "lastModified": 1681223911,
-        "narHash": "sha256-3u+2azMRm24mp5iOrxwYg9QrM2xJHnSjGsldIDRS6HQ=",
+        "narHash": "sha256-ttF9LW6PNKk/BBWET2BUqtq5f7OIZ7ohtQevAaP8srg=",
         "owner": "zbirenbaum",
         "repo": "copilot.lua",
-        "rev": "f0b41fb89ef2ed7ab4e8cd5208a30755aa638fc4",
+        "rev": "a4a37dda9e48986e5d2a90d6a3cbc88fca241dbb",
         "type": "github"
       },
       "original": {
@@ -243,11 +243,11 @@
     "crates-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1680384424,
+        "lastModified": 1680387248,
-        "narHash": "sha256-0fgC3wEMc2fmxHPLHyt0UTdpvuAOkdhdfEDWJ6qA9Q0=",
+        "narHash": "sha256-Qt3x9I1RzFtknxy3qJaaZczSLvO10OQ6N1+RLhfuQ7I=",
         "owner": "Saecki",
         "repo": "crates.nvim",
-        "rev": "097da7b79246247b8e660815c12908706031e09a",
+        "rev": "1d4bb1e7a0fe8bae3f97061be5fbf6f9081a27e2",
         "type": "github"
       },
       "original": {
@@ -259,11 +259,11 @@
     "dashboard-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1680074354,
+        "lastModified": 1681720765,
-        "narHash": "sha256-V16XxNlFBGFtKsquqPy44+IFWiBZcs3OY/6SF+7bdrA=",
+        "narHash": "sha256-7RBjr3svkEYgmWeB3GwksoHS8Ps74YcqNYBfynUaXvM=",
         "owner": "glepnir",
         "repo": "dashboard-nvim",
-        "rev": "4c2b038c5cfa70f90506f1551e5fd2d040174e08",
+        "rev": "275e7c8579858c3ee06f32c16bdc687153ca7204",
         "type": "github"
       },
       "original": {
@@ -275,11 +275,11 @@
     "diffview-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1680290718,
+        "lastModified": 1681231146,
-        "narHash": "sha256-t4YC8xAjRA+6p7IPM71lL5wWY0pAwTqL7vom3cDSV44=",
+        "narHash": "sha256-rtJafQUurQP4sVoKZlC8nrl8OwfY7jKI/RyfNfY8Fik=",
         "owner": "sindrets",
         "repo": "diffview.nvim",
-        "rev": "932d10de327bccdedee439d9d55f4d857caa334e",
+        "rev": "63720aa5a70ce4aa386be407d0e612cd9e63861a",
         "type": "github"
       },
       "original": {
@@ -305,14 +305,30 @@
         "type": "github"
       }
     },
+    "dracula": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1681364507,
+        "narHash": "sha256-RJT+fYJyTD+8krT/+M6644ycJ2rzenPBd9NQpGjAMGw=",
+        "owner": "Mofiqul",
+        "repo": "dracula.nvim",
+        "rev": "b5bd9c7e4c6c8f4712610bda92140c735fe90521",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mofiqul",
+        "repo": "dracula.nvim",
+        "type": "github"
+      }
+    },
     "dressing-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1677218794,
+        "lastModified": 1681303966,
-        "narHash": "sha256-89HwP+zxMN5CPPN3dd3yMfCB07mtBhv6lcWuEWnedfw=",
+        "narHash": "sha256-8HSxDkHxrjNCT9OpI3Fxt4bwLM49UmdH2TtQWGzyzXo=",
         "owner": "stevearc",
         "repo": "dressing.nvim",
-        "rev": "5f44f829481640be0f96759c965ae22a3bcaf7ce",
+        "rev": "0e3e1eba147fee6e638ac1ac28f0495bcde17319",
         "type": "github"
       },
       "original": {
@@ -324,11 +340,11 @@
     "elixir-ls": {
       "flake": false,
       "locked": {
-        "lastModified": 1681462421,
+        "lastModified": 1681745218,
-        "narHash": "sha256-pIwZFiCLJ0f7OXi1iTza04KSn7rpFpvUsNYrFh0FoEM=",
+        "narHash": "sha256-b3mlcwV4eHR90e9BExhb51T5A7dQVMwXRRIGqKEFBzg=",
         "owner": "elixir-lsp",
         "repo": "elixir-ls",
-        "rev": "85cfc5604edeadb0a6a683c41abff60a0c959de7",
+        "rev": "bf9db5a29efb2331da6cfbc526ecbfc10d372abc",
         "type": "github"
       },
       "original": {
@@ -340,11 +356,11 @@
     "elixir-tools": {
       "flake": false,
       "locked": {
-        "lastModified": 1681453321,
+        "lastModified": 1681746276,
-        "narHash": "sha256-7QgWrdq4p5t8WVnFhL5P948JFPR0i2C06kisxl30D2U=",
+        "narHash": "sha256-1ZCFU79xZW52Dtx864hxeANzn+L15fnfso2NBnzBvOU=",
         "owner": "elixir-tools",
         "repo": "elixir-tools.nvim",
-        "rev": "8ccb696c048eca667486ee005f4386c0db8c5e14",
+        "rev": "7b42d9131521a11cfd504b450bb445757cf2ef63",
         "type": "github"
       },
       "original": {
@@ -385,32 +401,16 @@
         "type": "github"
       }
     },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1679737941,
+        "lastModified": 1680392223,
-        "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=",
+        "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c",
+        "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5",
         "type": "github"
       },
       "original": {
@@ -420,12 +420,15 @@
       }
     },
     "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
       "locked": {
-        "lastModified": 1678901627,
+        "lastModified": 1681202837,
-        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
         "type": "github"
       },
       "original": {
@@ -435,21 +438,6 @@
       }
     },
     "flake-utils_2": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
       "locked": {
         "lastModified": 1659877975,
         "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@@ -467,11 +455,11 @@
     "flutter-tools": {
       "flake": false,
       "locked": {
-        "lastModified": 1680456818,
+        "lastModified": 1681573333,
-        "narHash": "sha256-VNSrYJZKcQ92+2ko5ZkOOiAM/sXqbJtpkYvxFr1qtWk=",
+        "narHash": "sha256-WKvHoSv8OaVGtrGMq8YUGnnvuuEXLNigT4NQwtx5HC4=",
         "owner": "akinsho",
         "repo": "flutter-tools.nvim",
-        "rev": "0a7e6b40aebd874e957ed630420a267e6cac0967",
+        "rev": "dedb571b15e6639792fea528b8c3040558f4ef0d",
         "type": "github"
       },
       "original": {
@@ -483,11 +471,11 @@
     "gesture-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1680321931,
+        "lastModified": 1680956101,
-        "narHash": "sha256-WXH71e+9MLbylq1StuwWQX61brYtS4Kx10OGWlfi/FY=",
+        "narHash": "sha256-oeP8PRBZ8c1iyT1pL95NYgYaWB/6sB0TVxNoS5Jiug4=",
         "owner": "notomo",
         "repo": "gesture.nvim",
-        "rev": "5fa0d76b890717081786c74b4824546052e14671",
+        "rev": "c302def60859f62deda34b06f00848b49d05b3ac",
         "type": "github"
       },
       "original": {
@@ -499,11 +487,11 @@
     "gitsigns-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1680209380,
+        "lastModified": 1680593514,
-        "narHash": "sha256-IoWMURofYoLSy9QVE3m1gAcj2s7iRA30gOts47J3rcU=",
+        "narHash": "sha256-nUVVEO06giiJURxT7qNHbX9C1ljZtchUeOdEoCQBk3E=",
         "owner": "lewis6991",
         "repo": "gitsigns.nvim",
-        "rev": "f412f51d0eaf0905a2759c8087090071689bb8fb",
+        "rev": "372d5cb485f2062ac74abc5b33054abac21d8b58",
         "type": "github"
       },
       "original": {
@@ -595,11 +583,11 @@
     "leap-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1678823512,
+        "lastModified": 1681071698,
-        "narHash": "sha256-bzmsib8Qr2Whu1FqHzvrsIfSKf/CFutsaM3Sz8gaTLo=",
+        "narHash": "sha256-CDNaQCbEQZQGklIQ8zvX+kL8AgFz4/otuRf9U5qZYP0=",
         "owner": "ggandor",
         "repo": "leap.nvim",
-        "rev": "f74473d23ebf60957e0db3ff8172349a82e5a442",
+        "rev": "98a72ad93c629c49bd7127d342960cc1b159b620",
         "type": "github"
       },
       "original": {
@@ -611,11 +599,11 @@
     "lsp-signature": {
       "flake": false,
       "locked": {
-        "lastModified": 1679524823,
+        "lastModified": 1681633928,
-        "narHash": "sha256-krQ0ihqbrsG4u8HdYlgaq0fOyIIDX4KDdffMRaJKQ78=",
+        "narHash": "sha256-z/jGs2syMW8dp12bUwYkd+k/AFxyid/lJHGww10XukU=",
         "owner": "ray-x",
         "repo": "lsp_signature.nvim",
-        "rev": "1882019270be445a8cad4353f1530574f2b2d02d",
+        "rev": "72b0d4ece23338fe2d03fc7b6fd8c8bace6bb441",
         "type": "github"
       },
       "original": {
@@ -659,11 +647,11 @@
     "lualine": {
       "flake": false,
       "locked": {
-        "lastModified": 1680275227,
+        "lastModified": 1681033736,
-        "narHash": "sha256-bZSt9rBaeO5CjExu9Si3Ch/k0H/mzBE89KeeTCg4AbU=",
+        "narHash": "sha256-u79S3wFJ72vcLp7F0f/s21Kvl/pMRI8CkB+8usPQob4=",
         "owner": "hoob3rt",
         "repo": "lualine.nvim",
-        "rev": "9170434aa100f3967b43d5d34bb9adc56fae1986",
+        "rev": "84ffb80e452d95e2c46fa29a98ea11a240f7843e",
         "type": "github"
       },
       "original": {
@@ -691,11 +679,11 @@
     "minimap-vim": {
       "flake": false,
       "locked": {
-        "lastModified": 1680280122,
+        "lastModified": 1681226039,
-        "narHash": "sha256-xrKkVTVVna9wc38K/CGCnQmWrofUAYJ0f92NR/ycfZ4=",
+        "narHash": "sha256-vOFbYUd+manGcJqgk7QuArsDuAukmIS77YCZFtsY98g=",
         "owner": "wfxr",
         "repo": "minimap.vim",
-        "rev": "15dce1b667d4df0eec715798ab94c0850316e8a3",
+        "rev": "868a809302f9f5d4c408ef8aef7eb9bd5893f801",
         "type": "github"
       },
       "original": {
@@ -741,52 +729,6 @@
         "type": "github"
       }
     },
-    "neovim-flake": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "neovim-nightly-overlay",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "dir": "contrib",
-        "lastModified": 1680310604,
-        "narHash": "sha256-2jop/z79HYhmV/hrdGvhjfTMouvzQvNRgFTkPhwWVcg=",
-        "owner": "neovim",
-        "repo": "neovim",
-        "rev": "75e1b1d5c934aa3a12693a7df58795563fb7877e",
-        "type": "github"
-      },
-      "original": {
-        "dir": "contrib",
-        "owner": "neovim",
-        "repo": "neovim",
-        "type": "github"
-      }
-    },
-    "neovim-nightly-overlay": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "neovim-flake": "neovim-flake",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1680336751,
-        "narHash": "sha256-otSdFRXsNyPYOsbo+49vN4UGwZrVoLDrEp0EkyVJ/rY=",
-        "owner": "nix-community",
-        "repo": "neovim-nightly-overlay",
-        "rev": "d56f32281f4d6d74ce925a99946713dc6b5a0e30",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "neovim-nightly-overlay",
-        "type": "github"
-      }
-    },
     "nil": {
       "inputs": {
         "flake-utils": [
@@ -798,11 +740,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1680185050,
+        "lastModified": 1681412802,
-        "narHash": "sha256-MtyaP3j1yxwrqPFUsLD0qFyyH7d/h0D/whfErxS2UFM=",
+        "narHash": "sha256-IcEala6vFQ7SFNOPCeXBh9Jbl8nL2QOtLmO7RbDsBbo=",
         "owner": "oxalica",
         "repo": "nil",
-        "rev": "0718fca59b82e53aef07699db7e1bbd86ba8dacf",
+        "rev": "1d5bc81023c21b22cfbea06a8b4b82963c01b941",
         "type": "github"
       },
       "original": {
@@ -813,11 +755,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1680273054,
+        "lastModified": 1681753173,
-        "narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=",
+        "narHash": "sha256-MrGmzZWLUqh2VstoikKLFFIELXm/lsf/G9U9zR96VD4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3364b5b117f65fe1ce65a3cdd5612a078a3b31e3",
+        "rev": "0a4206a51b386e5cda731e8ac78d76ad924c7125",
         "type": "github"
       },
       "original": {
@@ -830,11 +772,11 @@
     "nixpkgs-lib": {
       "locked": {
         "dir": "lib",
-        "lastModified": 1678375444,
+        "lastModified": 1680213900,
-        "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=",
+        "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e",
+        "rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
         "type": "github"
       },
       "original": {
@@ -912,11 +854,11 @@
     "noice-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1679827108,
+        "lastModified": 1681713054,
-        "narHash": "sha256-05/yAwaoz7mAAKXP1CsRXUoqsTW/z1wAT0OodiYJw6M=",
+        "narHash": "sha256-do/L2UpxyuKlTBBicMJHp0du71MzbuVM+P1dOAURAuY=",
         "owner": "folke",
         "repo": "noice.nvim",
-        "rev": "1da4edfba3e9278e98fc9723d7235d9ab3889744",
+        "rev": "5c63a32fde4e87631ddd768f5d7674ec5988c1a2",
         "type": "github"
       },
       "original": {
@@ -928,11 +870,11 @@
     "nui-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1680113440,
+        "lastModified": 1681244240,
-        "narHash": "sha256-pDroyXtkrBGbEZs0mcf+96ba72c0leNMW0AlM50RDJ8=",
+        "narHash": "sha256-IlbOt9fCBklx3i8OY2DZwa/8OV+yGOLBm8HUeVLseIw=",
         "owner": "MunifTanjim",
         "repo": "nui.nvim",
-        "rev": "4eaec2ac66af2ca6ddddd3f665ad0909b90ae36a",
+        "rev": "ecd9def93891b9260b15b5fcef542eaabf4145c9",
         "type": "github"
       },
       "original": {
@@ -944,11 +886,11 @@
     "null-ls": {
       "flake": false,
       "locked": {
-        "lastModified": 1680311856,
+        "lastModified": 1681223720,
-        "narHash": "sha256-JViLNL2LLzm+ZQYnR4HF3e2mBa7AbDK7jWn4ZhjKYbY=",
+        "narHash": "sha256-L3inC3YpiNdFdArqHdqR0n7g//moTvLYybQafFgkbDE=",
         "owner": "jose-elias-alvarez",
         "repo": "null-ls.nvim",
-        "rev": "defa0518762abb32279d601443344fb9773f9330",
+        "rev": "f8ffcd7cb8fb3325c711d459152ef132b5b65aed",
         "type": "github"
       },
       "original": {
@@ -960,11 +902,11 @@
     "nvim-autopairs": {
       "flake": false,
       "locked": {
-        "lastModified": 1679861399,
+        "lastModified": 1681692125,
-        "narHash": "sha256-G5D07KozNj48CxzcMevf1+ZqJEMXQql7VfWUseg6Rzc=",
+        "narHash": "sha256-QBzyI0Jfo4nj6Nqkm8qzICgyDhg7CiT+2gMTsuZ8rIQ=",
         "owner": "windwp",
         "repo": "nvim-autopairs",
-        "rev": "0fd6519d44eac3a6736aafdb3fe9da916c3701d4",
+        "rev": "58985de5eeab159462bc262de5cc1b9c9b375595",
         "type": "github"
       },
       "original": {
@@ -993,15 +935,15 @@
     "nvim-cmp": {
       "flake": false,
       "locked": {
-        "lastModified": 1679026924,
+        "lastModified": 1681258533,
-        "narHash": "sha256-CoHGIiZrhRAHZ/Er0JSQMapI7jwllNF5OysLlx2QEik=",
+        "narHash": "sha256-vMQZzbvLGkBNtds8Ak6LgJBPCqXCxnJQ3m/eaTF2k+4=",
-        "owner": "hrsh7th",
+        "owner": "ShIRannx",
         "repo": "nvim-cmp",
-        "rev": "777450fd0ae289463a14481673e26246b5e38bf2",
+        "rev": "3dbd99fd3eab9974cda7751e43383f7869f70aa1",
         "type": "github"
       },
       "original": {
-        "owner": "hrsh7th",
+        "owner": "ShIRannx",
         "repo": "nvim-cmp",
         "type": "github"
       }
@@ -1057,11 +999,11 @@
     "nvim-lightbulb": {
       "flake": false,
       "locked": {
-        "lastModified": 1661474119,
+        "lastModified": 1681594259,
-        "narHash": "sha256-nw6H/dS4dHdrobnrfJVa8urWrMnbTWrA5bQJy9xbKXY=",
+        "narHash": "sha256-vMFl6Nzc0ZxTa4lQ5FEnE9GkxbPuu5/skufgsR34BSE=",
         "owner": "kosayoda",
         "repo": "nvim-lightbulb",
-        "rev": "56b9ce31ec9d09d560fe8787c0920f76bc208297",
+        "rev": "ca5b44a8efffb5fec1963ccd21f25ec04cc778b7",
         "type": "github"
       },
       "original": {
@@ -1073,11 +1015,11 @@
     "nvim-lspconfig": {
       "flake": false,
       "locked": {
-        "lastModified": 1680376121,
+        "lastModified": 1681647398,
-        "narHash": "sha256-iEBGdENh3qXKHpRCqApG2JfJwXOsInivO0dUGton+I4=",
+        "narHash": "sha256-jrVzwC9nO2gLmIKQ9gTRW/fsXc4ad7/rR917Krmv874=",
         "owner": "neovim",
         "repo": "nvim-lspconfig",
-        "rev": "8cbfc30c4b238cc2465ff256803f7747376f046a",
+        "rev": "eddaef928c1e1dd79a96f5db45f2fd7f2efe7ea0",
         "type": "github"
       },
       "original": {
@@ -1137,11 +1079,11 @@
     "nvim-tree-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1679961168,
+        "lastModified": 1681624690,
-        "narHash": "sha256-9e5kBw9cZX08uQAfFb/YP17a1biDR8PNg617PhkKJhk=",
+        "narHash": "sha256-kLvRB1w4wHGOOWj4fQ6pyhvKJ4+mqOkhYe04uicfHmA=",
         "owner": "nvim-tree",
         "repo": "nvim-tree.lua",
-        "rev": "45400cd7e02027937cd5e49845545e606ecf5a1f",
+        "rev": "8f392fa763b7ee80a48c714b630acaf6d1fe1854",
         "type": "github"
       },
       "original": {
@@ -1153,15 +1095,15 @@
     "nvim-treesitter-context": {
       "flake": false,
       "locked": {
-        "lastModified": 1652175020,
+        "lastModified": 1681297663,
-        "narHash": "sha256-dYw/Y6+Eni7gTSjvCCl7E6ho8xSTxDYAwH3xGEhf54Q=",
+        "narHash": "sha256-INYJBQDHgq+2V469JLIq54LolGb6T7nlgmmVDQcxwkk=",
-        "owner": "lewis6991",
+        "owner": "nvim-treesitter",
         "repo": "nvim-treesitter-context",
-        "rev": "c931a3136a696c1827eda78ac678aea542115bd0",
+        "rev": "0d730df898f3dc27fd88f03cfa6d26d2405554b4",
         "type": "github"
       },
       "original": {
-        "owner": "lewis6991",
+        "owner": "nvim-treesitter",
         "repo": "nvim-treesitter-context",
         "type": "github"
       }
@@ -1169,11 +1111,11 @@
     "nvim-ts-autotag": {
       "flake": false,
       "locked": {
-        "lastModified": 1679019585,
+        "lastModified": 1681387572,
-        "narHash": "sha256-XNR09azYMviWt8aU8XuhS7q+AT5xRBK+FkeejlAAshg=",
+        "narHash": "sha256-qi1PF75HeaAkHAvsinyXtfvggE12agUNnx7mrSsBiDo=",
         "owner": "windwp",
         "repo": "nvim-ts-autotag",
-        "rev": "25698e4033cd6cd3745454bfc837dd670eba0480",
+        "rev": "cac97f3b47bcb927db6d1d784c0c323056506ef3",
         "type": "github"
       },
       "original": {
@@ -1185,11 +1127,11 @@
     "nvim-web-devicons": {
       "flake": false,
       "locked": {
-        "lastModified": 1680259444,
+        "lastModified": 1681235235,
-        "narHash": "sha256-KY0L9j7zKSXgVLUqoda3btiQ6r1h/gckJGpma4CXqUM=",
+        "narHash": "sha256-lAjk2Kpyxabe21ut7xCvhE2+we8hsEZWpcJrYLbhWqM=",
         "owner": "kyazdani42",
         "repo": "nvim-web-devicons",
-        "rev": "d92b3f4275f4774c0cb23b8b094a41d1dbb3e78c",
+        "rev": "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e",
         "type": "github"
       },
       "original": {
@@ -1201,11 +1143,11 @@
     "obsidian-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1680287173,
+        "lastModified": 1681757981,
-        "narHash": "sha256-OV3s/0qZi29GH1tWqjQjbBWMHkOJfmTujjMO18/rKg8=",
+        "narHash": "sha256-7L/C/BKDCaYFJspEnOesrsCfOFe4XxxEiTlVh4ntT+Q=",
         "owner": "epwalsh",
         "repo": "obsidian.nvim",
-        "rev": "e1c4658cc6530a8d2f393451f68bd9e6366173b9",
+        "rev": "9dd19303aea80ff10b53de6879d973256125e395",
         "type": "github"
       },
       "original": {
@@ -1233,11 +1175,11 @@
     "orgmode-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1680214315,
+        "lastModified": 1681591080,
-        "narHash": "sha256-jveJ1ffvv4pkfog1t98yPvTiltTv8Li89gEDbBnz8K0=",
+        "narHash": "sha256-1JzE296ARUhsy55qjA3n5XAQLnySf+FM+mwJWa07+CM=",
         "owner": "nvim-orgmode",
         "repo": "orgmode",
-        "rev": "070f7588629b956bba17d9892e6fa15bf19a2260",
+        "rev": "d8020e95f531369962d74d037f603d038d70de1e",
         "type": "github"
       },
       "original": {
@@ -1249,11 +1191,11 @@
     "plenary-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1676797549,
+        "lastModified": 1681122243,
-        "narHash": "sha256-z5JHuQcF1EvySnRBywl6EOrp8aRO0nd2dnkXJg2ge58=",
+        "narHash": "sha256-tG+BrCgE1L7QMbchSzjLfQfpI09uTQXbx7OeFuVEcDQ=",
         "owner": "nvim-lua",
         "repo": "plenary.nvim",
-        "rev": "253d34830709d690f013daf2853a9d21ad7accab",
+        "rev": "9ac3e9541bbabd9d73663d757e4fe48a675bb054",
         "type": "github"
       },
       "original": {
@@ -1297,11 +1239,11 @@
     "registers": {
       "flake": false,
       "locked": {
-        "lastModified": 1678110851,
+        "lastModified": 1680595111,
-        "narHash": "sha256-JxOtdChh4V/SfBQNVDoHdWvH49nfDhlokS/7vWQWryI=",
+        "narHash": "sha256-MeBlcF5LLk6bhIofYuG+0Z2xwc0BVqP85yNCvjH66fw=",
         "owner": "tversteeg",
         "repo": "registers.nvim",
-        "rev": "0a461e635403065b3f9a525bd77eff30759cfba0",
+        "rev": "2ab8372bb837f05fae6b43091f10a0b725d113ca",
         "type": "github"
       },
       "original": {
@@ -1350,6 +1292,7 @@
         "crates-nvim": "crates-nvim",
         "dashboard-nvim": "dashboard-nvim",
         "diffview-nvim": "diffview-nvim",
+        "dracula": "dracula",
         "dressing-nvim": "dressing-nvim",
         "elixir-ls": "elixir-ls",
         "elixir-tools": "elixir-tools",
@@ -1372,7 +1315,6 @@
         "mind-nvim": "mind-nvim",
         "minimap-vim": "minimap-vim",
         "modes-nvim": "modes-nvim",
-        "neovim-nightly-overlay": "neovim-nightly-overlay",
         "nil": "nil",
         "nixpkgs": "nixpkgs",
         "nmd": "nmd",
@@ -1434,11 +1376,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1678415622,
+        "lastModified": 1680488274,
-        "narHash": "sha256-tems1jHETCYEen8QrW61yVVX0F4zOGy4ImB43iDc7bY=",
+        "narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "9f687941160108f89dd8bd2c650d32c15a35c7c7",
+        "rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8",
         "type": "github"
       },
       "original": {
@@ -1528,6 +1470,21 @@
         "type": "github"
       }
     },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "tabular": {
       "flake": false,
       "locked": {
@@ -1547,11 +1504,11 @@
     "telescope": {
       "flake": false,
       "locked": {
-        "lastModified": 1679492995,
+        "lastModified": 1681122231,
-        "narHash": "sha256-Kyw9ryb8YgAKFWLac9yl/fD3nNcu7mv7xzuNU6pDMkU=",
+        "narHash": "sha256-UMidzUf2nhG577Minzm3QYu0ZNPoK/rXEyUdvZ/5nFw=",
         "owner": "nvim-telescope",
         "repo": "telescope.nvim",
-        "rev": "942fe5faef47b21241e970551eba407bc10d9547",
+        "rev": "6258d50b09f9ae087317e392efe7c05a7323492d",
         "type": "github"
       },
       "original": {
@@ -1620,11 +1577,11 @@
     "toggleterm-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1680290314,
+        "lastModified": 1681296186,
-        "narHash": "sha256-862KtB9oqktx/mPI0wSauF7eJIJogqgG6wTTYlCSo9U=",
+        "narHash": "sha256-y8CvzzW4ezqdnSzeon39KVN1JEU+9SSJ78n51A5XHVQ=",
         "owner": "akinsho",
         "repo": "toggleterm.nvim",
-        "rev": "b86982429325112d2b20c6d0cc7a5c4b182ab705",
+        "rev": "1c5996ee3c30b54751093fe68d40676859e7778f",
         "type": "github"
       },
       "original": {
@@ -1636,11 +1593,11 @@
     "tokyonight": {
       "flake": false,
       "locked": {
-        "lastModified": 1679554571,
+        "lastModified": 1681713069,
-        "narHash": "sha256-M1fX5o8w6MbDX46HiN1Nw9xjG4Z79zraPKi0VUpyyVU=",
+        "narHash": "sha256-2+lDMcKZZqt8gf4bzi/I5FitO+DSlxrmtTgrO+tXkvU=",
         "owner": "folke",
         "repo": "tokyonight.nvim",
-        "rev": "1b0c88094548a62641ece1e668fa9a234e1c539e",
+        "rev": "ef8f5917f1a3972e6dd083c1ea74dafcb54f9917",
         "type": "github"
       },
       "original": {
@@ -1652,11 +1609,11 @@
     "trouble": {
       "flake": false,
       "locked": {
-        "lastModified": 1679827111,
+        "lastModified": 1681764706,
-        "narHash": "sha256-uw/wfMKoFN2sHw/99ZcqGKJ3jQVP9pkDHqDaXaYn3CA=",
+        "narHash": "sha256-znQA0i8gVzThGBBgkvBISFgSE47C5VZcMZ45dnJmewM=",
         "owner": "folke",
         "repo": "trouble.nvim",
-        "rev": "2ae7237c2917d661f458443c9a88680f8ca2d7b2",
+        "rev": "c25fab9a76e5559b0da4ee012c734f16e72bdf85",
         "type": "github"
       },
       "original": {
@@ -1714,11 +1671,11 @@
     "vim-markdown": {
       "flake": false,
       "locked": {
-        "lastModified": 1677235033,
+        "lastModified": 1680951012,
-        "narHash": "sha256-q4OE2tUoA0i6m3CbyzCYfjGsPNaTbU9/deM4DBu36GY=",
+        "narHash": "sha256-B00rad/Bbp+kJBN/fYliOaGiUe0AfBng6gs/fVBve9A=",
         "owner": "preservim",
         "repo": "vim-markdown",
-        "rev": "5d3d1b6cbdc4be0b4c6105c1ab1f769d76d3c68f",
+        "rev": "cc82d88e2a791f54d2b6e2b26e41f743351ac947",
         "type": "github"
       },
       "original": {
@@ -1812,11 +1769,11 @@
     "which-key": {
       "flake": false,
       "locked": {
-        "lastModified": 1679827118,
+        "lastModified": 1681746771,
-        "narHash": "sha256-R52U1Aa30KgNyyTxN3ZiWaoh86/Vsj5kmUmCCos5DjE=",
+        "narHash": "sha256-YRkwLCcJJE9QXOPhCdWIWfMBEgse0Me66JLGzm8Jz9c=",
         "owner": "folke",
         "repo": "which-key.nvim",
-        "rev": "4b73390eec680b4c061ea175eb32c0ff3412271d",
+        "rev": "f82ca7fbaf4718303dbaf83dc28303fee16cf4d2",
         "type": "github"
       },
       "original": {
@@ -1827,16 +1784,16 @@
     },
     "zig": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1680308637,
+        "lastModified": 1681690952,
-        "narHash": "sha256-gas/Oo1hYbYOHzr1TBoHGH1mEzMMlPIdosb3yt573c0=",
+        "narHash": "sha256-x8KEUCSorKtsWWlJWXi6atcWkcREAV1o081knXZCQfc=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "0d01cdde8c66b2b49cb30f8b52f11237b1ae5f6f",
+        "rev": "0cd7fee7dae8eaaf77ed0d420f69be0a481acc9d",
         "type": "github"
       },
       "original": {

flake.nix

@@ -32,18 +32,6 @@
           inherit (import ./extra.nix inputs) neovimConfiguration;
         };
 
-        /*
-        nixosModules.default = {
-          home-manager.sharedModules = [
-            ./lib/module
-          ];
-          nixpkgs.overlays = [
-            inputs.tidalcycles.overlays.default
-            inputs.self.overlays.default
-          ];
-        };
-        */
-
         homeManagerModules = {
           neovim-flake = {
             imports = [
@@ -70,12 +58,6 @@
     flake-parts.url = "github:hercules-ci/flake-parts";
     flake-utils.url = "github:numtide/flake-utils";
 
-    # TODO: neovim nightly
-    neovim-nightly-overlay = {
-      url = "github:nix-community/neovim-nightly-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     # For generating documentation website
     nmd = {
       url = "gitlab:rycee/nmd";
@@ -109,7 +91,7 @@
     };
 
     nvim-treesitter-context = {
-      url = "github:lewis6991/nvim-treesitter-context";
+      url = "github:nvim-treesitter/nvim-treesitter-context";
       flake = false;
     };
 
@@ -206,7 +188,7 @@
       flake = false;
     };
     nvim-cmp = {
-      url = "github:hrsh7th/nvim-cmp";
+      url = "github:ShIRannx/nvim-cmp";
       flake = false;
     };
     cmp-buffer = {
@@ -305,6 +287,11 @@
       flake = false;
     };
 
+    dracula = {
+      url = "github:Mofiqul/dracula.nvim";
+      flake = false;
+    };
+
     # Rust crates
     crates-nvim = {
       url = "github:Saecki/crates.nvim";

flake/legacyPackages.nix

@@ -9,7 +9,6 @@
       overlays = [
         inputs.tidalcycles.overlays.default
         inputs.self.overlays.default
-        inputs.neovim-nightly-overlay.overlay
         inputs.zig.overlays.default
         (_: _: {
           rnix-lsp = inputs'.rnix-lsp.defaultPackage;

flake/overlays.nix

@@ -1,4 +1,8 @@
-{inputs, ...}: let
+{
+  inputs,
+  pkgs,
+  ...
+}: let
   inherit (import ../extra.nix inputs) neovimConfiguration mainConfig;
 
   buildPkg = pkgs: modules:
@@ -14,5 +18,6 @@ in {
     neovim-nix = buildPkg prev [nixConfig];
     neovim-maximal = buildPkg prev [maximalConfig];
     neovim-tidal = buildPkg prev [tidalConfig];
+    devPkg = buildPkg pkgs [nixConfig {config.vim.languages.html.enable = pkgs.lib.mkForce true;}];
   };
 }

lib/booleans.nix

@@ -1,9 +0,0 @@
-# From home-manager: https://github.com/nix-community/home-manager/blob/master/modules/lib/booleans.nix
-{lib}: {
-  # Converts a boolean to a yes/no string. This is used in lots of
-  # configuration formats.
-  yesNo = value:
-    if value
-    then "yes"
-    else "no";
-}

lib/default.nix

@@ -2,4 +2,7 @@
   dag = import ./dag.nix {inherit lib;};
   booleans = import ./booleans.nix {inherit lib;};
   types = import ./types {inherit lib;};
+  languages = import ./languages.nix {inherit lib;};
+  nmd = import ./nmd.nix;
+  lua = import ./lua.nix {inherit lib;};
 }

lib/languages.nix

@@ -0,0 +1,25 @@
+# From home-manager: https://github.com/nix-community/home-manager/blob/master/modules/lib/booleans.nix
+{lib}: {
+  # Converts a boolean to a yes/no string. This is used in lots of
+  # configuration formats.
+  diagnosticsToLua = {
+    lang,
+    config,
+    diagnostics,
+  }:
+    lib.listToAttrs
+    (map (v: let
+        type =
+          if builtins.isString v
+          then v
+          else builtins.getAttr v.type;
+        package =
+          if builtins.isString v
+          then diagnostics.${type}.package
+          else v.package;
+      in {
+        name = "${lang}-diagnostics-${type}";
+        value = diagnostics.${type}.nullConfig package;
+      })
+      config);
+}

lib/lua.nix

@@ -0,0 +1,12 @@
+# Helpers for converting values to lua
+{lib}: {
+  yesNo = value:
+    if value
+    then "yes"
+    else "no";
+
+  nullString = value:
+    if value == null
+    then "nil"
+    else "'${value}'";
+}

lib/nmd.nix

@@ -0,0 +1,17 @@
+# Copied from nmd master: https://gitlab.com/rycee/nmd/-/blob/master/default.nix?ref_type=heads
+# Allows asciiDoc in options. It is easier to copy & keep updated then figure out how to pass the nmd input
+# along to user modules
+{
+  # Indicates that the given text should be interpreted as AsciiDoc markup.
+  asciiDoc = text: {
+    _type = "asciiDoc";
+    inherit text;
+  };
+
+  # Indicates that the given text should be interpreted as AsciiDoc markup and
+  # used in a literal context.
+  literalAsciiDoc = text: {
+    _type = "literalAsciiDoc";
+    inherit text;
+  };
+}

lib/types/default.nix

@@ -1,7 +1,9 @@
 {lib}: let
   typesDag = import ./dag.nix {inherit lib;};
   typesPlugin = import ./plugins.nix {inherit lib;};
+  typesLanguage = import ./languages.nix {inherit lib;};
 in {
   inherit (typesDag) dagOf;
   inherit (typesPlugin) pluginsOpt;
+  inherit (typesLanguage) diagnostics mkGrammarOption;
 }

lib/types/languages.nix

@@ -0,0 +1,31 @@
+{lib}:
+with lib; let
+  diagnosticSubmodule = {...}: {
+    options = {
+      type = mkOption {
+        description = "Type of diagnostic to enable";
+        type = attrNames diagnostics;
+      };
+      package = mkOption {
+        description = "Diagnostics package";
+        type = types.package;
+      };
+    };
+  };
+in {
+  diagnostics = {
+    langDesc,
+    diagnostics,
+    defaultDiagnostics,
+  }:
+    mkOption {
+      description = "List of ${langDesc} diagnostics to enable";
+      type = with types; listOf (either (enum (attrNames diagnostics)) (submodule diagnosticSubmodule));
+      default = defaultDiagnostics;
+    };
+
+  mkGrammarOption = pkgs: grammar:
+    mkPackageOption pkgs ["${grammar} treesitter"] {
+      default = ["vimPlugins" "nvim-treesitter" "builtGrammars" grammar];
+    };
+}

lib/types/plugins.nix

@@ -41,6 +41,7 @@ with lib; let
     "rust-tools"
     "onedark"
     "catppuccin"
+    "dracula"
     "minimap-vim"
     "dashboard-nvim"
     "alpha-nvim"

modules/autopairs/nvim-autopairs/nvim-autopairs.nix

@@ -23,7 +23,7 @@ with builtins; {
         map_cr = mkOption {
           type = types.bool;
           default = true;
-          description = "map `CR` on insert mode";
+          description = nvim.nmd.asciiDoc ''map <CR> on insert mode'';
         };
 
         map_complete = mkOption {

modules/basic/config.nix

@@ -103,6 +103,9 @@ in {
         set termguicolors
         set t_Co=256
       ''}
+      ${optionalString cfg.enableEditorconfig ''
+        vim.g.editorconfig = false
+      ''}
     '';
   };
 }

modules/basic/module.nix

@@ -139,5 +139,10 @@ with builtins; {
       default = true;
       description = "New splits will open to the right";
     };
+    enableEditorconfig = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Follow editorconfig rules in current directory";
+    };
   };
 }

modules/completion/nvim-cmp/config.nix

@@ -1,4 +1,5 @@
 {
+  pkgs,
   lib,
   config,
   ...
@@ -6,18 +7,58 @@
 with lib;
 with builtins; let
   cfg = config.vim.autocomplete;
+  lspkindEnabled = config.vim.lsp.enable && config.vim.lsp.lspkind.enable;
+  builtSources =
+    concatMapStringsSep
+    "\n"
+    (n: "{ name = '${n}'},")
+    (attrNames cfg.sources);
+
+  builtMaps =
+    concatStringsSep
+    "\n"
+    (mapAttrsToList
+      (n: v:
+        if v == null
+        then ""
+        else "${n} = '${v}',")
+      cfg.sources);
+
+  dagPlacement =
+    if lspkindEnabled
+    then nvim.dag.entryAfter ["lspkind"]
+    else nvim.dag.entryAnywhere;
 in {
   config = mkIf cfg.enable {
     vim.startPlugins = [
-      "vim-vsnip"
       "nvim-cmp"
       "cmp-buffer"
       "cmp-vsnip"
       "cmp-path"
-      "cmp-treesitter"
     ];
 
-    vim.luaConfigRC.completion = mkIf (cfg.type == "nvim-cmp") (nvim.dag.entryAnywhere ''
+    vim.autocomplete.sources = {
+      "nvim-cmp" = null;
+      "vsnip" = "[VSnip]";
+      "buffer" = "[Buffer]";
+      "crates" = "[Crates]";
+      "path" = "[Path]";
+    };
+
+    vim.luaConfigRC.completion = mkIf (cfg.type == "nvim-cmp") (dagPlacement ''
+      local nvim_cmp_menu_map = function(entry, vim_item)
+        -- name for each source
+        vim_item.menu = ({
+          ${builtMaps}
+        })[entry.source.name]
+        print(vim_item.menu)
+        return vim_item
+      end
+
+      ${optionalString lspkindEnabled ''
+        lspkind_opts.before = ${cfg.formatting.format}
+      ''}
+
       local has_words_before = function()
         local line, col = unpack(vim.api.nvim_win_get_cursor(0))
         return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
@@ -35,12 +76,7 @@ in {
           end,
         },
         sources = {
-          ${optionalString (config.vim.lsp.enable) "{ name = 'nvim_lsp' },"}
+          ${builtSources}
-          ${optionalString (config.vim.lsp.rust.enable) "{ name = 'crates' },"}
-          { name = 'vsnip' },
-          { name = 'treesitter' },
-          { name = 'path' },
-          { name = 'buffer' },
         },
         mapping = {
           ['<C-d>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
@@ -77,23 +113,12 @@ in {
           completeopt = 'menu,menuone,noinsert',
         },
         formatting = {
-          format = function(entry, vim_item)
+          format =
-            -- type of kind
+      ${
-            vim_item.kind = ${
+        if lspkindEnabled
-        optionalString (config.vim.visuals.lspkind.enable)
+        then "lspkind.cmp_format(lspkind_opts)"
-        "require('lspkind').presets.default[vim_item.kind] .. ' ' .."
+        else cfg.formatting.format
-      } vim_item.kind
+      },
-
-            -- name for each source
-            vim_item.menu = ({
-              buffer = "[Buffer]",
-              nvim_lsp = "[LSP]",
-              vsnip = "[VSnip]",
-              crates = "[Crates]",
-              path = "[Path]",
-            })[entry.source.name]
-            return vim_item
-          end,
         }
       })
       ${optionalString (config.vim.autopairs.enable && config.vim.autopairs.type == "nvim-autopairs") ''

modules/completion/nvim-cmp/nvim-cmp.nix

@@ -1,4 +1,5 @@
 {
+  pkgs,
   lib,
   config,
   ...
@@ -10,7 +11,7 @@ with builtins; {
       enable = mkOption {
         type = types.bool;
         default = false;
-        description = "Enable autocomplete via nvim-cmp";
+        description = "enable autocomplete";
       };
 
       type = mkOption {
@@ -18,6 +19,46 @@ with builtins; {
         default = "nvim-cmp";
         description = "Set the autocomplete plugin. Options: [nvim-cmp]";
       };
+
+      sources = mkOption {
+        description = nvim.nmd.asciiDoc ''
+          Attribute set of source names for nvim-cmp.
+
+          If an attribute set is provided, then the menu value of
+          `vim_item` in the format will be set to the value (if
+          utilizing the `nvim_cmp_menu_map` function).
+
+          Note: only use a single attribute name per attribute set
+        '';
+        type = with types; attrsOf (nullOr str);
+        default = {};
+        example = ''
+          {nvim-cmp = null; buffer = "[Buffer]";}
+        '';
+      };
+
+      formatting = {
+        format = mkOption {
+          description = nvim.nmd.asciiDoc ''
+            The function used to customize the appearance of the completion menu.
+
+            If <<opt-vim.lsp.lspkind.enable>> is true, then the function
+            will be called before modifications from lspkind.
+
+            Default is to call the menu mapping function.
+          '';
+          type = types.str;
+          default = "nvim_cmp_menu_map";
+          example = nvim.nmd.literalAsciiDoc ''
+            [source,lua]
+            ---
+            function(entry, vim_item)
+              return vim_item
+            end
+            ---
+          '';
+        };
+      };
     };
   };
 }

modules/default.nix

@@ -6,7 +6,7 @@ inputs: {
   extraSpecialArgs ? {},
 }: let
   inherit (pkgs) neovim-unwrapped wrapNeovim vimPlugins;
-  inherit (builtins) map filter isString toString getAttr;
+  inherit (builtins) map filter isString toString getAttr hasAttr attrNames;
   inherit (pkgs.vimUtils) buildVimPluginFrom2Nix;
 
   extendedLib = import ../lib/stdlib-extended.nix lib;

modules/filetree/nvimtree-lua/config.nix

@@ -80,7 +80,6 @@ in {
           width = ${toString cfg.view.width},
           side = ${"'" + cfg.view.side + "'"},
           adaptive_size = ${boolToString cfg.view.adaptiveSize},
-          hide_root_folder = ${boolToString cfg.view.hideRootFolder},
         },
         git = {
           enable = ${boolToString cfg.git.enable},
@@ -119,6 +118,12 @@ in {
           -- TODO: those two
           add_trailing = ${boolToString cfg.renderer.trailingSlash},
           group_empty = ${boolToString cfg.renderer.groupEmptyFolders},
+
+          root_folder_label = ${
+        if cfg.renderer.rootFolderLabel == null
+        then "false"
+        else "''${toString cfg.rootFolderLabel}''"
+      },
         },
 
         system_open = {

modules/filetree/nvimtree-lua/nvimtree-lua.nix

@@ -160,12 +160,6 @@ with builtins; {
         description = "Width of the tree in charecters";
         type = types.int;
       };
-
-      hideRootFolder = mkOption {
-        default = true;
-        description = "Hide the root folder";
-        type = types.bool;
-      };
     };
 
     git = {
@@ -282,6 +276,12 @@ with builtins; {
         type = types.bool;
       };
 
+      rootFolderLabel = mkOption {
+        default = null;
+        description = "Root folder label. Set null to disable";
+        type = with types; nullOr str;
+      };
+
       icons = {
         show = {
           file = mkOption {

modules/git/config.nix

@@ -1,13 +1,58 @@
 {
+  pkgs,
   config,
   lib,
   ...
 }:
-with lib; {
+with lib;
-  config = {
+with builtins; let
-    vim.git = {
+  cfg = config.vim.git;
-      enable = mkDefault false;
+in {
-      gitsigns.enable = mkDefault false;
+  config = mkIf cfg.enable (mkMerge [
-    };
+    (mkIf cfg.gitsigns.enable (mkMerge [
-  };
+      {
+        vim.startPlugins = ["gitsigns-nvim"];
+
+        vim.luaConfigRC.gitsigns = nvim.dag.entryAnywhere ''
+          require('gitsigns').setup {
+            keymaps = {
+              noremap = true,
+
+              ['n <leader>gn'] = { expr = true, "&diff ? \'\' : '<cmd>Gitsigns next_hunk<CR>'"},
+              ['n <leader>gp'] = { expr = true, "&diff ? \'\' : '<cmd>Gitsigns prev_hunk<CR>'"},
+
+              ['n <leader>gs'] = '<cmd>Gitsigns stage_hunk<CR>',
+              ['v <leader>gs'] = ':Gitsigns stage_hunk<CR>',
+              ['n <leader>gu'] = '<cmd>Gitsigns undo_stage_hunk<CR>',
+              ['n <leader>gr'] = '<cmd>Gitsigns reset_hunk<CR>',
+              ['v <leader>gr'] = ':Gitsigns reset_hunk<CR>',
+              ['n <leader>gR'] = '<cmd>Gitsigns reset_buffer<CR>',
+              ['n <leader>gp'] = '<cmd>Gitsigns preview_hunk<CR>',
+              ['n <leader>gb'] = '<cmd>lua require"gitsigns".blame_line{full=true}<CR>',
+              ['n <leader>gS'] = '<cmd>Gitsigns stage_buffer<CR>',
+              ['n <leader>gU'] = '<cmd>Gitsigns reset_buffer_index<CR>',
+              ['n <leader>gts'] = ':Gitsigns toggle_signs<CR>',
+              ['n <leader>gtn'] = ':Gitsigns toggle_numhl<CR>',
+              ['n <leader>gtl'] = ':Gitsigns toggle_linehl<CR>',
+              ['n <leader>gtw'] = ':Gitsigns toggle_word_diff<CR>',
+
+              -- Text objects
+              ['o ih'] = ':<C-U>Gitsigns select_hunk<CR>',
+              ['x ih'] = ':<C-U>Gitsigns select_hunk<CR>'
+            },
+          }
+        '';
+      }
+
+      (mkIf cfg.gitsigns.codeActions {
+        vim.lsp.null-ls.enable = true;
+        vim.lsp.null-ls.sources.gitsigns-ca = ''
+          table.insert(
+            ls_sources,
+            null_ls.builtins.code_actions.gitsigns
+          )
+        '';
+      })
+    ]))
+  ]);
 }

modules/git/git.nix

@@ -1,4 +1,5 @@
 {
+  pkgs,
   config,
   lib,
   ...
@@ -8,54 +9,12 @@ with builtins; let
   cfg = config.vim.git;
 in {
   options.vim.git = {
-    enable = mkOption {
+    enable = mkEnableOption "Git support";
-      type = types.bool;
-      description = "Enable git plugins";
-    };
 
-    gitsigns.enable = mkOption {
+    gitsigns = {
-      type = types.bool;
+      enable = mkEnableOption "gitsigns";
-      description = "Enable git options";
+
+      codeActions = mkEnableOption "gitsigns codeactions through null-ls";
     };
   };
-
-  config =
-    mkIf cfg.enable
-    {
-      vim.startPlugins =
-        if (cfg.gitsigns.enable)
-        then ["gitsigns-nvim"]
-        else [];
-
-      vim.luaConfigRC.gitsigns = mkIf (cfg.gitsigns.enable) (nvim.dag.entryAnywhere ''
-        -- GitSigns setup
-        require('gitsigns').setup {
-          keymaps = {
-            noremap = true,
-
-            ['n <leader>gn'] = { expr = true, "&diff ? \'\' : '<cmd>Gitsigns next_hunk<CR>'"},
-            ['n <leader>gp'] = { expr = true, "&diff ? \'\' : '<cmd>Gitsigns prev_hunk<CR>'"},
-
-            ['n <leader>gs'] = '<cmd>Gitsigns stage_hunk<CR>',
-            ['v <leader>gs'] = ':Gitsigns stage_hunk<CR>',
-            ['n <leader>gu'] = '<cmd>Gitsigns undo_stage_hunk<CR>',
-            ['n <leader>gr'] = '<cmd>Gitsigns reset_hunk<CR>',
-            ['v <leader>gr'] = ':Gitsigns reset_hunk<CR>',
-            ['n <leader>gR'] = '<cmd>Gitsigns reset_buffer<CR>',
-            ['n <leader>gp'] = '<cmd>Gitsigns preview_hunk<CR>',
-            ['n <leader>gb'] = '<cmd>lua require"gitsigns".blame_line{full=true}<CR>',
-            ['n <leader>gS'] = '<cmd>Gitsigns stage_buffer<CR>',
-            ['n <leader>gU'] = '<cmd>Gitsigns reset_buffer_index<CR>',
-            ['n <leader>gts'] = ':Gitsigns toggle_signs<CR>',
-            ['n <leader>gtn'] = ':Gitsigns toggle_numhl<CR>',
-            ['n <leader>gtl'] = ':Gitsigns toggle_linehl<CR>',
-            ['n <leader>gtw'] = ':Gitsigns toggle_word_diff<CR>',
-
-            -- Text objects
-            ['o ih'] = ':<C-U>Gitsigns select_hunk<CR>',
-            ['x ih'] = ':<C-U>Gitsigns select_hunk<CR>'
-          },
-        }
-      '');
-    };
 }

modules/languages/clang.nix

@@ -0,0 +1,88 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.languages.clang;
+
+  defaultServer = "ccls";
+  servers = {
+    ccls = {
+      package = pkgs.ccls;
+      lspConfig = ''
+        lspconfig.ccls.setup{
+          capabilities = capabilities;
+          on_attach=default_on_attach;
+          cmd = {"${pkgs.ccls}/bin/ccls"};
+          ${optionalString (cfg.lsp.opts != null) "init_options = ${cfg.lsp.cclsOpts}"}
+        }
+      '';
+    };
+  };
+in {
+  options.vim.languages.clang = {
+    enable = mkEnableOption "C/C++ language support";
+
+    cHeader = mkOption {
+      description = ''
+        C syntax for headers. Can fix treesitter errors, see:
+        https://www.reddit.com/r/neovim/comments/orfpcd/question_does_the_c_parser_from_nvimtreesitter/
+      '';
+      type = types.bool;
+      default = false;
+    };
+
+    treesitter = {
+      enable = mkOption {
+        description = "Enable C/C++ treesitter";
+        type = types.bool;
+        default = config.vim.languages.enableTreesitter;
+      };
+      cPackage = nvim.types.mkGrammarOption pkgs "c";
+      cppPackage = nvim.types.mkGrammarOption pkgs "cpp";
+    };
+
+    lsp = {
+      enable = mkOption {
+        description = "Enable clang LSP support";
+        type = types.bool;
+        default = config.vim.languages.enableLSP;
+      };
+      server = mkOption {
+        description = "The clang LSP server to use";
+        type = with types; enum (attrNames servers);
+        default = defaultServer;
+      };
+      package = mkOption {
+        description = "clang LSP server package";
+        type = types.package;
+        default = servers.${cfg.lsp.server}.package;
+      };
+      opts = mkOption {
+        description = "Options to pass to clang LSP server";
+        type = with types; nullOr str;
+        default = null;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.cHeader {
+      vim.configRC.c-header = nvim.dag.entryAnywhere "let g:c_syntax_for_h = 1";
+    })
+
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.cPackage cfg.treesitter.cppPackage];
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp.lspconfig.enable = true;
+
+      vim.lsp.lspconfig.sources.clang-lsp = servers.${cfg.lsp.server}.lspConfig;
+    })
+  ]);
+}

modules/languages/dart/config.nix

@@ -0,0 +1,60 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.languages.dart;
+  ftcfg = cfg.flutter-tools;
+  servers = {
+    dart = {
+      package = pkgs.dart;
+      lspConfig = ''
+        lspconfig.dart.setup{
+          capabilities = capabilities;
+          on_attach=default_on_attach;
+          cmd = {"${pkgs.dart}/bin/dart"};
+          ${optionalString (cfg.lsp.opts != null) "init_options = ${cfg.lsp.dartOpts}"}
+        }
+      '';
+    };
+  };
+in {
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.package];
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp.lspconfig.enable = true;
+
+      vim.lsp.lspconfig.sources.dart-lsp = servers.${cfg.lsp.server}.lspConfig;
+    })
+
+    (mkIf (ftcfg.enable) {
+      vim.startPlugins = ["flutter-tools"];
+
+      vim.luaConfigRC.flutter-tools = nvim.dag.entryAnywhere ''
+        require('flutter-tools').setup {
+          lsp = {
+            color = { -- show the derived colours for dart variables
+              enabled = ${boolToString ftcfg.color.enable}, -- whether or not to highlight color variables at all, only supported on flutter >= 2.10
+              background = ${boolToString ftcfg.color.highlightBackground}, -- highlight the background
+              foreground = ${boolToString ftcfg.color.highlightForeground}, -- highlight the foreground
+              virtual_text = ${boolToString ftcfg.color.virtualText.enable}, -- show the highlight using virtual text
+              virtual_text_str = ${ftcfg.color.virtualText.character} -- the virtual text character to highlight
+            },
+
+            capabilities = capabilities,
+            on_attach = default_on_attach;
+            flags = lsp_flags,
+          },
+        }
+
+      '';
+    })
+  ]);
+}

modules/languages/dart/dart.nix

@@ -0,0 +1,90 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.languages.dart;
+  defaultServer = "dart";
+  servers = {
+    dart = {
+      package = pkgs.dart;
+      lspConfig = ''
+        lspconfig.dart.setup{
+          capabilities = capabilities;
+          on_attach=default_on_attach;
+          cmd = {"${pkgs.dart}/bin/dart"};
+          ${optionalString (cfg.lsp.opts != null) "init_options = ${cfg.lsp.dartOpts}"}
+        }
+      '';
+    };
+  };
+in {
+  options.vim.languages.dart = {
+    enable = mkEnableOption "Dart language support";
+
+    treesitter = {
+      enable = mkOption {
+        description = "Enable Dart treesitter";
+        type = types.bool;
+        default = config.vim.languages.enableTreesitter;
+      };
+      package = nvim.types.mkGrammarOption pkgs "dart";
+    };
+
+    lsp = {
+      enable = mkOption {
+        description = "Enable Dart LSP support";
+        type = types.bool;
+        default = config.vim.languages.enableLSP;
+      };
+      server = mkOption {
+        description = "The Dart LSP server to use";
+        type = with types; enum (attrNames servers);
+        default = defaultServer;
+      };
+      package = mkOption {
+        description = "Dart LSP server package";
+        type = types.package;
+        default = servers.${cfg.lsp.server}.package;
+      };
+      opts = mkOption {
+        description = "Options to pass to Dart LSP server";
+        type = with types; nullOr str;
+        default = null;
+      };
+    };
+
+    flutter-tools = {
+      enable = mkEnableOption "Enable flutter-tools for flutter support";
+
+      color = {
+        enable = mkEnableOption "Whether or mot to highlight color variables at all";
+
+        highlightBackground = mkOption {
+          type = types.bool;
+          default = false;
+          description = "Highlight the background";
+        };
+
+        highlightForeground = mkOption {
+          type = types.bool;
+          default = false;
+          description = "Highlight the foreground";
+        };
+
+        virtualText = {
+          enable = mkEnableOption "Show the highlight using virtual text";
+
+          character = mkOption {
+            type = types.str;
+            default = "■";
+            description = "Virtual text character to highlight";
+          };
+        };
+      };
+    };
+  };
+}

modules/languages/dart/default.nix

@@ -1,6 +1,6 @@
 _: {
   imports = [
-    ./glow.nix
+    ./dart.nix
     ./config.nix
   ];
 }

modules/languages/default.nix

@@ -0,0 +1,33 @@
+{lib, ...}:
+with lib; let
+  mkEnable = desc:
+    mkOption {
+      description = "Turn on ${desc} for enabled languages by default";
+      type = types.bool;
+      default = false;
+    };
+in {
+  imports = [
+    ./markdown
+    ./tidal
+    ./dart
+    ./elixir
+
+    ./clang.nix
+    ./go.nix
+    ./nix.nix
+    ./python.nix
+    ./rust.nix
+    ./sql.nix
+    ./ts.nix
+    ./zig.nix
+    ./html.nix
+  ];
+
+  options.vim.languages = {
+    enableLSP = mkEnable "LSP";
+    enableTreesitter = mkEnable "treesitter";
+    enableFormat = mkEnable "formatting";
+    enableExtraDiagnostics = mkEnable "extra diagnostics";
+  };
+}

modules/languages/elixir/config.nix

@@ -6,12 +6,11 @@
 }:
 with lib;
 with builtins; let
-  cfg = config.vim.lsp.elixir;
+  cfg = config.vim.languages.elixir;
 in {
   config = mkIf (cfg.enable) {
     vim.startPlugins = [
       "elixir-tools"
-      "plenary-nvim"
     ];
 
     vim.luaConfigRC.elixir-tools = nvim.dag.entryAnywhere ''

modules/languages/elixir/elixir-tools.nix

@@ -0,0 +1,11 @@
+{
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; {
+  options.vim.languages.elixir = {
+    enable = mkEnableOption "elixir support";
+  };
+}

modules/languages/go.nix

@@ -0,0 +1,67 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.languages.go;
+
+  defaultServer = "gopls";
+  servers = {
+    gopls = {
+      package = pkgs.gopls;
+      lspConfig = ''
+        lspconfig.gopls.setup {
+          capabilities = capabilities;
+          on_attach = default_on_attach;
+          cmd = {"${cfg.lsp.package}/bin/gopls", "serve"},
+        }
+      '';
+    };
+  };
+in {
+  options.vim.languages.go = {
+    enable = mkEnableOption "Go language support";
+
+    treesitter = {
+      enable = mkOption {
+        description = "Enable Go treesitter";
+        type = types.bool;
+        default = config.vim.languages.enableTreesitter;
+      };
+      package = nvim.types.mkGrammarOption pkgs "go";
+    };
+
+    lsp = {
+      enable = mkOption {
+        description = "Enable Go LSP support";
+        type = types.bool;
+        default = config.vim.languages.enableLSP;
+      };
+      server = mkOption {
+        description = "Go LSP server to use";
+        type = with types; enum (attrNames servers);
+        default = defaultServer;
+      };
+      package = mkOption {
+        description = "Go LSP server package";
+        type = types.package;
+        default = servers.${cfg.lsp.server}.package;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.package];
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.go-lsp = servers.${cfg.lsp.server}.lspConfig;
+    })
+  ]);
+}

modules/languages/html.nix

@@ -0,0 +1,42 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.languages.html;
+in {
+  options.vim.languages.html = {
+    enable = mkEnableOption "HTML language support";
+
+    treesitter = {
+      enable = mkOption {
+        description = "Enable HTML treesitter";
+        type = types.bool;
+        default = config.vim.languages.enableTreesitter;
+      };
+      package = nvim.types.mkGrammarOption pkgs "html";
+
+      autotagHtml = mkOption {
+        description = "Enable autoclose/autorename of html tags (nvim-ts-autotag)";
+        type = types.bool;
+        default = true;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.package];
+
+      vim.startPlugins = optional cfg.treesitter.autotagHtml "nvim-ts-autotag";
+
+      vim.luaConfigRC.html-autotag = mkIf cfg.treesitter.autotagHtml (nvim.dag.entryAnywhere ''
+        require('nvim-ts-autotag').setup()
+      '');
+    })
+  ]);
+}

modules/languages/markdown/config.nix

@@ -0,0 +1,30 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.languages.markdown;
+in {
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+
+      vim.treesitter.grammars = [cfg.treesitter.mdPackage cfg.treesitter.mdInlinePackage];
+    })
+
+    (mkIf cfg.glow.enable {
+      vim.startPlugins = ["glow-nvim"];
+
+      vim.globals = {
+        "glow_binary_path" = "${pkgs.glow}/bin";
+      };
+
+      vim.configRC.glow = nvim.dag.entryAnywhere ''
+        autocmd FileType markdown noremap <leader>p :Glow<CR>
+      '';
+    })
+  ]);
+}

modules/languages/markdown/default.nix

@@ -1,7 +1,6 @@
 {...}: {
   imports = [
-    ./glow
     ./config.nix
-    ./module.nix
+    ./markdown.nix
   ];
 }

modules/languages/markdown/markdown.nix

@@ -0,0 +1,30 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.languages.markdown;
+in {
+  options.vim.languages.markdown = {
+    enable = mkEnableOption "Markdown language support";
+
+    glow.enable = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Enable markdown preview in neovim with glow";
+    };
+
+    treesitter = {
+      enable = mkOption {
+        description = "Enable Markdown treesitter";
+        type = types.bool;
+        default = config.vim.languages.enableTreesitter;
+      };
+      mdPackage = nvim.types.mkGrammarOption pkgs "markdown";
+      mdInlinePackage = nvim.types.mkGrammarOption pkgs "markdown-inline";
+    };
+  };
+}

modules/languages/nix.nix

@@ -0,0 +1,157 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.languages.nix;
+
+  useFormat = "on_attach = default_on_attach";
+  noFormat = "on_attach = attach_keymaps";
+
+  defaultServer = "nil";
+  servers = {
+    rnix = {
+      package = pkgs.rnix-lsp;
+      internalFormatter = cfg.format.type == "nixpkgs-fmt";
+      lspConfig = ''
+        lspconfig.rnix.setup{
+          capabilities = capabilities,
+        ${
+          if (cfg.format.enable && cfg.format.type == "nixpkgs-fmt")
+          then useFormat
+          else noFormat
+        },
+          cmd = {"${cfg.lsp.package}/bin/rnix-lsp"},
+        }
+      '';
+    };
+
+    nil = {
+      package = pkgs.nil;
+      internalFormatter = true;
+      lspConfig = ''
+        lspconfig.nil_ls.setup{
+          capabilities = capabilities,
+        ${
+          if cfg.format.enable
+          then useFormat
+          else noFormat
+        },
+          cmd = {"${cfg.lsp.package}/bin/nil"},
+        ${optionalString cfg.format.enable ''
+          settings = {
+            ["nil"] = {
+          ${optionalString (cfg.format.type == "alejandra")
+            ''
+              formatting = {
+                command = {"${cfg.format.package}/bin/alejandra", "--quiet"},
+              },
+            ''}
+          ${optionalString (cfg.format.type == "nixpkgs-fmt")
+            ''
+              formatting = {
+                command = {"${cfg.format.package}/bin/nixpkgs-fmt"},
+              },
+            ''}
+        ''}
+            },
+          };
+        }
+      '';
+    };
+  };
+
+  defaultFormat = "alejandra";
+  formats = {
+    alejandra = {
+      package = pkgs.alejandra;
+      nullConfig = ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.formatting.alejandra.with({
+            command = "${cfg.format.package}/bin/alejandra"
+          })
+        )
+      '';
+    };
+    nixpkgs-fmt = {
+      package = pkgs.nixpkgs-fmt;
+      # Never need to use null-ls for nixpkgs-fmt
+    };
+  };
+in {
+  options.vim.languages.nix = {
+    enable = mkEnableOption "Nix language support";
+
+    treesitter = {
+      enable = mkOption {
+        description = "Enable Nix treesitter";
+        type = types.bool;
+        default = config.vim.languages.enableTreesitter;
+      };
+      package = nvim.types.mkGrammarOption pkgs "nix";
+    };
+
+    lsp = {
+      enable = mkOption {
+        description = "Enable Nix LSP support";
+        type = types.bool;
+        default = config.vim.languages.enableLSP;
+      };
+      server = mkOption {
+        description = "Nix LSP server to use";
+        type = types.str;
+        default = defaultServer;
+      };
+      package = mkOption {
+        description = "Nix LSP server package";
+        type = types.package;
+        default = servers.${cfg.lsp.server}.package;
+      };
+    };
+
+    format = {
+      enable = mkOption {
+        description = "Enable Nix formatting";
+        type = types.bool;
+        default = config.vim.languages.enableFormat;
+      };
+      type = mkOption {
+        description = "Nix formatter to use";
+        type = with types; enum (attrNames formats);
+        default = defaultFormat;
+      };
+      package = mkOption {
+        description = "Nix formatter package";
+        type = types.package;
+        default = formats.${cfg.format.type}.package;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    {
+      vim.configRC.nix = nvim.dag.entryAnywhere ''
+        autocmd filetype nix setlocal tabstop=2 shiftwidth=2 softtabstop=2
+      '';
+    }
+
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.package];
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.nix-lsp = servers.${cfg.lsp.server}.lspConfig;
+    })
+
+    (mkIf (cfg.format.enable && !servers.${cfg.lsp.server}.internalFormatter) {
+      vim.lsp.null-ls.enable = true;
+      vim.lsp.null-ls.sources.nix-format = formats.${cfg.format.type}.nullConfig;
+    })
+  ]);
+}

modules/languages/python.nix

@@ -0,0 +1,104 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.languages.python;
+
+  defaultServer = "pyright";
+  servers = {
+    pyright = {
+      package = pkgs.nodePackages.pyright;
+      lspConfig = ''
+        lspconfig.pyright.setup{
+          capabilities = capabilities;
+          on_attach = default_on_attach;
+          cmd = {"${cfg.lsp.package}/bin/pyright-langserver", "--stdio"}
+        }
+      '';
+    };
+  };
+
+  defaultFormat = "black";
+  formats = {
+    black = {
+      package = pkgs.black;
+      nullConfig = ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.formatting.black.with({
+            command = "${cfg.format.package}/bin/black",
+          })
+        )
+      '';
+    };
+  };
+in {
+  options.vim.languages.python = {
+    enable = mkEnableOption "Python language support";
+
+    treesitter = {
+      enable = mkOption {
+        description = "Enable Python treesitter";
+        type = types.bool;
+        default = config.vim.languages.enableTreesitter;
+      };
+      package = mkOption {
+        description = "Python treesitter grammar to use";
+        type = types.package;
+        default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.python;
+      };
+    };
+
+    lsp = {
+      enable = mkOption {
+        description = "Enable Python LSP support";
+        type = types.bool;
+        default = config.vim.languages.enableLSP;
+      };
+      server = mkOption {
+        description = "Python LSP server to use";
+        type = with types; enum (attrNames servers);
+        default = defaultServer;
+      };
+      package = nvim.types.mkGrammarOption pkgs "python";
+    };
+
+    format = {
+      enable = mkOption {
+        description = "Enable Python formatting";
+        type = types.bool;
+        default = config.vim.languages.enableFormat;
+      };
+      type = mkOption {
+        description = "Python formatter to use";
+        type = with types; enum (attrNames formats);
+        default = defaultFormat;
+      };
+      package = mkOption {
+        description = "Python formatter package";
+        type = types.package;
+        default = formats.${cfg.format.type}.package;
+      };
+    };
+  };
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.package];
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.python-lsp = servers.${cfg.lsp.server}.lspConfig;
+    })
+
+    (mkIf cfg.format.enable {
+      vim.lsp.null-ls.enable = true;
+      vim.lsp.null-ls.sources.python-format = formats.${cfg.format.type}.nullConfig;
+    })
+  ]);
+}

modules/languages/rust.nix

@@ -0,0 +1,109 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.languages.rust;
+in {
+  options.vim.languages.rust = {
+    enable = mkEnableOption "Rust language support";
+
+    treesitter = {
+      enable = mkOption {
+        description = "Enable Rust treesitter";
+        type = types.bool;
+        default = config.vim.languages.enableTreesitter;
+      };
+      package = nvim.types.mkGrammarOption pkgs "rust";
+    };
+
+    crates = {
+      enable = mkEnableOption "crates-nvim, tools for managing dependencies";
+      codeActions = mkOption {
+        description = "Enable code actions through null-ls";
+        type = types.bool;
+        default = true;
+      };
+    };
+
+    lsp = {
+      enable = mkOption {
+        description = "Rust LSP support (rust-analyzer with extra tools)";
+        type = types.bool;
+        default = config.vim.languages.enableLSP;
+      };
+      package = mkOption {
+        description = "rust-analyzer package";
+        type = types.package;
+        default = pkgs.rust-analyzer;
+      };
+      opts = mkOption {
+        description = "Options to pass to rust analyzer";
+        type = types.str;
+        default = "";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.crates.enable {
+      vim.lsp.null-ls.enable = mkIf cfg.crates.codeActions true;
+
+      vim.startPlugins = ["crates-nvim"];
+
+      vim.autocomplete.sources = {"crates" = "[Crates]";};
+      vim.luaConfigRC.rust-crates = nvim.dag.entryAnywhere ''
+        require('crates').setup {
+          null_ls = {
+            enabled = ${boolToString cfg.crates.codeActions},
+            name = "crates.nvim",
+          }
+        }
+      '';
+    })
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.package];
+    })
+    (mkIf cfg.lsp.enable {
+      vim.startPlugins = ["rust-tools"];
+
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.rust-lsp = ''
+        local rt = require('rust-tools')
+        rust_on_attach = function(client, bufnr)
+          default_on_attach(client, bufnr)
+          local opts = { noremap=true, silent=true, buffer = bufnr }
+          vim.keymap.set("n", "<leader>ris", rt.inlay_hints.set, opts)
+          vim.keymap.set("n", "<leader>riu", rt.inlay_hints.unset, opts)
+          vim.keymap.set("n", "<leader>rr", rt.runnables.runnables, opts)
+          vim.keymap.set("n", "<leader>rp", rt.parent_module.parent_module, opts)
+          vim.keymap.set("n", "<leader>rm", rt.expand_macro.expand_macro, opts)
+          vim.keymap.set("n", "<leader>rc", rt.open_cargo_toml.open_cargo_toml, opts)
+          vim.keymap.set("n", "<leader>rg", function() rt.crate_graph.view_crate_graph("x11", nil) end, opts)
+        end
+        local rustopts = {
+          tools = {
+            autoSetHints = true,
+            hover_with_actions = false,
+            inlay_hints = {
+              only_current_line = false,
+            }
+          },
+          server = {
+            capabilities = capabilities,
+            on_attach = rust_on_attach,
+            cmd = {"${cfg.lsp.package}/bin/rust-analyzer"},
+            settings = {
+              ${cfg.lsp.opts}
+            }
+          }
+        }
+        rt.setup(rustopts)
+      '';
+    })
+  ]);
+}

modules/languages/sql.nix

@@ -0,0 +1,160 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.languages.sql;
+  sqlfluffDefault = pkgs.sqlfluff;
+
+  defaultServer = "sqls";
+  servers = {
+    sqls = {
+      package = pkgs.sqls;
+      lspConfig = ''
+        lspconfig.sqls.setup {
+          on_attach = function(client)
+            client.server_capabilities.execute_command = true
+            on_attach_keymaps(client, bufnr)
+            require'sqls'.setup{}
+          end,
+          cmd = { "${cfg.lsp.package}/bin/sqls", "-config", string.format("%s/config.yml", vim.fn.getcwd()) }
+        }
+      '';
+    };
+  };
+
+  defaultFormat = "sqlfluff";
+  formats = {
+    sqlfluff = {
+      package = sqlfluffDefault;
+      nullConfig = ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.formatting.sqlfluff.with({
+            command = "${cfg.format.package}/bin/sqlfluff",
+            extra_args = {"--dialect", "${cfg.dialect}"}
+          })
+        )
+      '';
+    };
+  };
+
+  defaultDiagnostics = ["sqlfluff"];
+  diagnostics = {
+    sqlfluff = {
+      package = sqlfluffDefault;
+      nullConfig = pkg: ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.diagnostics.sqlfluff.with({
+            command = "${pkg}/bin/sqlfluff",
+            extra_args = {"--dialect", "${cfg.dialect}"}
+          })
+        )
+      '';
+    };
+  };
+in {
+  options.vim.languages.sql = {
+    enable = mkEnableOption "SQL language support";
+
+    dialect = mkOption {
+      description = "SQL dialect for sqlfluff (if used)";
+      type = types.str;
+      default = "ansi";
+    };
+
+    treesitter = {
+      enable = mkOption {
+        description = "Enable SQL treesitter";
+        type = types.bool;
+        default = config.vim.languages.enableTreesitter;
+      };
+      package = mkOption {
+        description = "SQL treesitter grammar to use";
+        type = types.package;
+        default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.sql;
+      };
+    };
+
+    lsp = {
+      enable = mkOption {
+        description = "Enable SQL LSP support";
+        type = types.bool;
+        default = config.vim.languages.enableLSP;
+      };
+      server = mkOption {
+        description = "SQL LSP server to use";
+        type = with types; enum (attrNames servers);
+        default = defaultServer;
+      };
+      package = mkOption {
+        description = "SQL LSP server package";
+        type = types.package;
+        default = servers.${cfg.lsp.server}.package;
+      };
+    };
+
+    format = {
+      enable = mkOption {
+        description = "Enable SQL formatting";
+        type = types.bool;
+        default = config.vim.languages.enableFormat;
+      };
+      type = mkOption {
+        description = "SQL formatter to use";
+        type = with types; enum (attrNames formats);
+        default = defaultFormat;
+      };
+      package = mkOption {
+        description = "SQL formatter package";
+        type = types.package;
+        default = formats.${cfg.format.type}.package;
+      };
+    };
+
+    extraDiagnostics = {
+      enable = mkOption {
+        description = "Enable extra SQL diagnostics";
+        type = types.bool;
+        default = config.vim.languages.enableExtraDiagnostics;
+      };
+      types = lib.nvim.types.diagnostics {
+        langDesc = "SQL";
+        inherit diagnostics;
+        inherit defaultDiagnostics;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.package];
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.startPlugins = ["sqls-nvim"];
+
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.sql-lsp = servers.${cfg.lsp.server}.lspConfig;
+    })
+
+    (mkIf cfg.format.enable {
+      vim.lsp.null-ls.enable = true;
+      vim.lsp.null-ls.sources."sql-format" = formats.${cfg.format.type}.nullConfig;
+    })
+
+    (mkIf cfg.extraDiagnostics.enable {
+      vim.lsp.null-ls.enable = true;
+      vim.lsp.null-ls.sources = lib.nvim.languages.diagnosticsToLua {
+        lang = "sql";
+        config = cfg.extraDiagnostics.types;
+        inherit diagnostics;
+      };
+    })
+  ]);
+}

modules/languages/ts.nix

@@ -0,0 +1,145 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.languages.ts;
+
+  defaultServer = "tsserver";
+  servers = {
+    tsserver = {
+      package = pkgs.nodePackages.typescript-language-server;
+      lspConfig = ''
+        lspconfig.tsserver.setup {
+          capabilities = capabilities;
+          on_attach = attach_keymaps,
+          cmd = { "${cfg.lsp.package}/bin/typescript-language-server", "--stdio" }
+        }
+      '';
+    };
+  };
+
+  # TODO: specify packages
+  defaultFormat = "prettier";
+  formats = {
+    prettier = {
+      package = pkgs.nodePackages.prettier;
+      nullConfig = ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.formatting.prettier.with({
+            command = "${cfg.format.package}/bin/prettier",
+          })
+        )
+      '';
+    };
+  };
+
+  # TODO: specify packages
+  defaultDiagnostics = ["eslint"];
+  diagnostics = {
+    eslint = {
+      package = pkgs.nodePackages.eslint;
+      nullConfig = pkg: ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.diagnostics.eslint.with({
+            command = "${pkg}/bin/eslint",
+          })
+        )
+      '';
+    };
+  };
+in {
+  options.vim.languages.ts = {
+    enable = mkEnableOption "SQL language support";
+
+    treesitter = {
+      enable = mkOption {
+        description = "Enable Typescript/Javascript treesitter";
+        type = types.bool;
+        default = config.vim.languages.enableTreesitter;
+      };
+      tsPackage = nvim.types.mkGrammarOption pkgs "tsx";
+      jsPackage = nvim.types.mkGrammarOption pkgs "javascript";
+    };
+
+    lsp = {
+      enable = mkOption {
+        description = "Enable Typescript/Javascript LSP support";
+        type = types.bool;
+        default = config.vim.languages.enableLSP;
+      };
+      server = mkOption {
+        description = "Typescript/Javascript LSP server to use";
+        type = with types; enum (attrNames servers);
+        default = defaultServer;
+      };
+      package = mkOption {
+        description = "Typescript/Javascript LSP server package";
+        type = types.package;
+        default = servers.${cfg.lsp.server}.package;
+      };
+    };
+
+    format = {
+      enable = mkOption {
+        description = "Enable Typescript/Javascript formatting";
+        type = types.bool;
+        default = config.vim.languages.enableFormat;
+      };
+      type = mkOption {
+        description = "Typescript/Javascript formatter to use";
+        type = with types; enum (attrNames formats);
+        default = defaultFormat;
+      };
+      package = mkOption {
+        description = "Typescript/Javascript formatter package";
+        type = types.package;
+        default = formats.${cfg.format.type}.package;
+      };
+    };
+
+    extraDiagnostics = {
+      enable = mkOption {
+        description = "Enable extra Typescript/Javascript diagnostics";
+        type = types.bool;
+        default = config.vim.languages.enableExtraDiagnostics;
+      };
+      types = lib.nvim.types.diagnostics {
+        langDesc = "Typescript/Javascript";
+        inherit diagnostics;
+        inherit defaultDiagnostics;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.tsPackage cfg.treesitter.jsPackage];
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.ts-lsp = servers.${cfg.lsp.server}.lspConfig;
+    })
+
+    (mkIf cfg.format.enable {
+      vim.lsp.null-ls.enable = true;
+      vim.lsp.null-ls.sources.ts-format = formats.${cfg.format.type}.nullConfig;
+    })
+
+    (mkIf cfg.extraDiagnostics.enable {
+      vim.lsp.null-ls.enable = true;
+      vim.lsp.null-ls.sources = lib.nvim.languages.diagnosticsToLua {
+        lang = "ts";
+        config = cfg.extraDiagnostics.types;
+        inherit diagnostics;
+      };
+    })
+  ]);
+}

modules/languages/zig.nix

@@ -0,0 +1,64 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.languages.zig;
+in {
+  options.vim.languages.zig = {
+    enable = mkEnableOption "SQL language support";
+
+    treesitter = {
+      enable = mkOption {
+        description = "Enable Zig treesitter";
+        type = types.bool;
+        default = config.vim.languages.enableTreesitter;
+      };
+      package = nvim.types.mkGrammarOption pkgs "zig";
+    };
+    lsp = {
+      enable = mkOption {
+        description = "Zig LSP support (zls)";
+        type = types.bool;
+        default = config.vim.languages.enableLSP;
+      };
+      package = mkOption {
+        description = "ZLS package";
+        type = types.package;
+        default = pkgs.nodePackages.pyright;
+      };
+      zigPackage = mkOption {
+        description = "Zig package used by ZLS";
+        type = types.package;
+        default = pkgs.zig;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.package];
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.zig-lsp = ''
+        lspconfig.zls.setup {
+          capabilities = capabilities,
+          on_attach=default_on_attach,
+          cmd = {"${cfg.lsp.package}/bin/zls"},
+          settings = {
+            ["zls"] = {
+              zig_exe_path = "${cfg.lsp.zigPackage}/bin/zig",
+              zig_lib_path = "${cfg.lsp.zigPackage}/lib/zig",
+            }
+          }
+        }
+      '';
+    })
+  ]);
+}

modules/lsp/config.nix

@@ -1,354 +1,64 @@
 {
-  pkgs,
   config,
   lib,
+  pkgs,
   ...
 }:
 with lib;
 with builtins; let
   cfg = config.vim.lsp;
+  usingNvimCmp = config.vim.autocomplete.enable && config.vim.autocomplete.type == "nvim-cmp";
 in {
-  config = mkIf cfg.enable (
+  config = mkIf cfg.enable {
-    let
+    vim.startPlugins = optional usingNvimCmp "cmp-nvim-lsp";
-      writeIf = cond: msg:
-        if cond
-        then msg
-        else "";
-    in {
-      vim.startPlugins =
-        [
-          "nvim-lspconfig"
-          "null-ls"
-        ]
-        ++ optionals (cfg.rust.enable) [
-          "crates-nvim"
-          "rust-tools"
-        ]
-        ++ optionals (cfg.elixir.enable) [
-          "elixir-ls"
-        ]
-        ++ optionals ((config.vim.autocomplete.enable) && (config.vim.autocomplete.type == "nvim-cmp")) [
-          "cmp-nvim-lsp"
-        ]
-        ++ optionals (cfg.sql) [
-          "sqls-nvim"
-        ];
 
-      vim.configRC.lsp = nvim.dag.entryAnywhere ''
+    vim.autocomplete.sources = {"nvim_lsp" = "[LSP]";};
-        ${
-          if cfg.nix.enable
-          then ''
-            autocmd filetype nix setlocal tabstop=2 shiftwidth=2 softtabstop=2
-          ''
-          else ""
-        }
 
-        ${
+    vim.luaConfigRC.lsp-setup = ''
-          if cfg.clang.c_header
+      vim.g.formatsave = ${boolToString cfg.formatOnSave};
-          then ''
-            " c syntax for header (otherwise breaks treesitter highlighting)
-            " https://www.reddit.com/r/neovim/comments/orfpcd/question_does_the_c_parser_from_nvimtreesitter/
-            let g:c_syntax_for_h = 1
-          ''
-          else ""
-        }
-      '';
-      vim.luaConfigRC.lsp = nvim.dag.entryAnywhere ''
 
-        local attach_keymaps = function(client, bufnr)
+      local attach_keymaps = function(client, bufnr)
-          local opts = { noremap=true, silent=true }
+        local opts = { noremap=true, silent=true }
 
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>lgD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>lgD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>lgd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>lgd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>lgt', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>lgt', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>lgn', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>lgn', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>lgp', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>lgp', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
 
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>lwa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>lwa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>lwr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>lwr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>lwl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>lwl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
 
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>lh', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>lh', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>ls', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>ls', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
-          vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>ln', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>ln', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
-        end
+      end
 
-        local null_ls = require("null-ls")
+      -- Enable formatting
-        local null_helpers = require("null-ls.helpers")
+      format_callback = function(client, bufnr)
-        local null_methods = require("null-ls.methods")
+        vim.api.nvim_create_autocmd("BufWritePre", {
+          group = augroup,
+          buffer = bufnr,
+          callback = function()
+            if vim.g.formatsave then
+              if client.supports_method("textDocument/formatting") then
+                local params = require'vim.lsp.util'.make_formatting_params({})
+                client.request('textDocument/formatting', params, nil, bufnr)
 
-        local ls_sources = {
-          ${writeIf cfg.python
-          ''
-            null_ls.builtins.formatting.black.with({
-              command = "${pkgs.black}/bin/black",
-            }),
-          ''}
-
-          -- Commented out for now
-          --${writeIf (config.vim.git.enable && config.vim.git.gitsigns.enable) ''
-          --  null_ls.builtins.code_actions.gitsigns,
-          --''}
-
-          ${writeIf cfg.sql
-          ''
-            null_helpers.make_builtin({
-              method = null_methods.internal.FORMATTING,
-              filetypes = { "sql" },
-              generator_opts = {
-                to_stdin = true,
-                ignore_stderr = true,
-                suppress_errors = true,
-                command = "${pkgs.sqlfluff}/bin/sqlfluff",
-                args = {
-                  "fix",
-                  "-",
-                },
-              },
-              factory = null_helpers.formatter_factory,
-            }),
-
-            null_ls.builtins.diagnostics.sqlfluff.with({
-              command = "${pkgs.sqlfluff}/bin/sqlfluff",
-              extra_args = {"--dialect", "postgres"}
-            }),
-          ''}
-
-          ${writeIf
-          (cfg.nix.enable
-            && cfg.nix.server == "rnix"
-            && cfg.nix.formatter == "alejandra")
-          ''
-            null_ls.builtins.formatting.alejandra.with({
-              command = "${pkgs.alejandra}/bin/alejandra"
-            }),
-          ''}
-
-          ${writeIf cfg.ts
-          ''
-            null_ls.builtins.diagnostics.eslint,
-            null_ls.builtins.formatting.prettier,
-          ''}
-        }
-
-        vim.g.formatsave = ${
-          if cfg.formatOnSave
-          then "true"
-          else "false"
-        };
-
-        -- Enable formatting
-        format_callback = function(client, bufnr)
-          vim.api.nvim_create_autocmd("BufWritePre", {
-            group = augroup,
-            buffer = bufnr,
-            callback = function()
-              if vim.g.formatsave then
-                if client.supports_method("textDocument/formatting") then
-                  local params = require'vim.lsp.util'.make_formatting_params({})
-                  client.request('textDocument/formatting', params, nil, bufnr)
-                end
               end
             end
-          })
-        end
-
-        default_on_attach = function(client, bufnr)
-          attach_keymaps(client, bufnr)
-          format_callback(client, bufnr)
-        end
-
-        -- Enable null-ls
-        require('null-ls').setup({
-          diagnostics_format = "[#{m}] #{s} (#{c})",
-          debounce = 250,
-          default_timeout = 5000,
-          sources = ls_sources,
-          on_attach=default_on_attach
-        })
-
-        -- Enable lspconfig
-        local lspconfig = require('lspconfig')
-
-        local capabilities = vim.lsp.protocol.make_client_capabilities()
-        ${
-          let
-            cfg = config.vim.autocomplete;
-          in
-            writeIf cfg.enable (
-              if cfg.type == "nvim-cmp"
-              then ''
-                capabilities = require('cmp_nvim_lsp').default_capabilities()
-              ''
-              else ""
-            )
-        }
-
-        ${writeIf cfg.rust.enable ''
-          -- Rust config
-          local rt = require('rust-tools')
-
-          rust_on_attach = function(client, bufnr)
-            default_on_attach(client, bufnr)
-            local opts = { noremap=true, silent=true, buffer = bufnr }
-            vim.keymap.set("n", "<leader>ris", rt.inlay_hints.set, opts)
-            vim.keymap.set("n", "<leader>riu", rt.inlay_hints.unset, opts)
-            vim.keymap.set("n", "<leader>rr", rt.runnables.runnables, opts)
-            vim.keymap.set("n", "<leader>rp", rt.parent_module.parent_module, opts)
-            vim.keymap.set("n", "<leader>rm", rt.expand_macro.expand_macro, opts)
-            vim.keymap.set("n", "<leader>rc", rt.open_cargo_toml.open_cargo_toml, opts)
-            vim.keymap.set("n", "<leader>rg", function() rt.crate_graph.view_crate_graph("x11", nil) end, opts)
           end
+        })
+      end
 
-          local rustopts = {
+      default_on_attach = function(client, bufnr)
-            tools = {
+        attach_keymaps(client, bufnr)
-              autoSetHints = true,
+        format_callback(client, bufnr)
-              hover_with_actions = false,
+      end
-              inlay_hints = {
-                only_current_line = false,
-              }
-            },
-            server = {
-              capabilities = capabilities,
-              on_attach = rust_on_attach,
-              cmd = {"${pkgs.rust-analyzer}/bin/rust-analyzer"},
-              settings = {
-                ${cfg.rust.rustAnalyzerOpts}
-              }
-            }
-          }
 
-          require('crates').setup {
+      local capabilities = vim.lsp.protocol.make_client_capabilities()
-            null_ls = {
+      ${optionalString usingNvimCmp "capabilities = require('cmp_nvim_lsp').default_capabilities()"}
-              enabled = true,
+    '';
-              name = "crates.nvim",
+  };
-            }
-          }
-          rt.setup(rustopts)
-        ''}
-
-        ${optionalString cfg.zig.enable ''
-          -- Zig config
-          lspconfig.zls.setup {
-            capabilities = capabilities,
-            on_attach=default_on_attach,
-            cmd = {"${pkgs.zls}/bin/zls"},
-            settings = {
-              ["zls"] = {
-                zig_exe_path = "${pkgs.zig}/bin/zig",
-                zig_lib_path = "${pkgs.zig}/lib/zig",
-              }
-            }
-          }
-        ''}
-
-        ${writeIf cfg.python ''
-          -- Python config
-          lspconfig.pyright.setup{
-            capabilities = capabilities;
-            on_attach=default_on_attach;
-            cmd = {"${pkgs.nodePackages.pyright}/bin/pyright-langserver", "--stdio"}
-          }
-        ''}
-
-        ${writeIf cfg.nix.enable (
-          (writeIf (cfg.nix.server == "rnix") ''
-            -- Nix (rnix) config
-            lspconfig.rnix.setup{
-              capabilities = capabilities,
-              ${writeIf (cfg.nix.formatter == "alejandra")
-              ''
-                on_attach = function(client, bufnr)
-                  attach_keymaps(client, bufnr)
-                end,
-              ''}
-              ${writeIf (cfg.nix.formatter == "nixpkgs-fmt")
-              ''
-                on_attach = default_on_attach,
-              ''}
-              cmd = {"${cfg.nix.pkg}/bin/rnix-lsp"},
-            }
-          '')
-          + (writeIf (cfg.nix.server == "nil") ''
-            -- Nix (nil) config
-            lspconfig.nil_ls.setup{
-              capabilities = capabilities,
-              on_attach=default_on_attach,
-              cmd = {"${cfg.nix.pkg}/bin/nil"},
-              settings = {
-                ["nil"] = {
-              ${writeIf (cfg.nix.formatter == "alejandra")
-              ''
-                formatting = {
-                  command = {"${pkgs.alejandra}/bin/alejandra", "--quiet"},
-                },
-              ''}
-              ${writeIf (cfg.nix.formatter == "nixpkgs-fmt")
-              ''
-                formatting = {
-                  command = {"${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt"},
-                },
-              ''}
-                },
-              };
-            }
-          '')
-        )}
-
-
-        ${writeIf cfg.clang.enable ''
-          -- CCLS (clang) config
-          lspconfig.ccls.setup{
-            capabilities = capabilities;
-            on_attach=default_on_attach;
-            cmd = {"${pkgs.ccls}/bin/ccls"};
-            ${
-            if cfg.clang.cclsOpts == ""
-            then ""
-            else "init_options = ${cfg.clang.cclsOpts}"
-          }
-          }
-        ''}
-
-        ${writeIf cfg.sql ''
-          -- SQLS config
-          lspconfig.sqls.setup {
-            on_attach = function(client)
-              client.server_capabilities.execute_command = true
-              on_attach_keymaps(client, bufnr)
-              require'sqls'.setup{}
-            end,
-            cmd = {"${pkgs.sqls}/bin/sqls", "-config", string.format("%s/config.yml", vim.fn.getcwd()) }
-          }
-        ''}
-
-        ${writeIf cfg.go ''
-          -- Go config
-          lspconfig.gopls.setup {
-            capabilities = capabilities;
-            on_attach = default_on_attach;
-            cmd = {"${pkgs.gopls}/bin/gopls", "serve"},
-          }
-        ''}
-
-        ${writeIf cfg.ts ''
-          -- TS config
-          lspconfig.tsserver.setup {
-            capabilities = capabilities;
-            on_attach = function(client, bufnr)
-              attach_keymaps(client, bufnr)
-            end,
-            cmd = { "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server", "--stdio" }
-          }
-        ''}
-
-        ${writeIf cfg.elixir.enable ''
-          lspconfig.elixirls.setup {
-            cmd = { "${lib.getExe pkgs.elixir-ls}" },
-            on_attach = on_attach
-          }
-        ''}
-      '';
-    }
-  );
 }

modules/lsp/default.nix

@@ -1,18 +1,19 @@
-{...}: {
+_: {
   imports = [
     # nvim lsp support
     ./config.nix
     ./module.nix
 
+    ./lspconfig
+    ./lspsaga
+    ./null-ls
+
     # lsp plugins
     ./lspsaga
     ./nvim-code-action-menu
     ./trouble
     ./lsp-signature
     ./lightbulb
-
+    ./lspkind
-    # language specific modules
-    ./flutter-tools-nvim # dart & flutter
-    ./elixir # elixir
   ];
 }

modules/lsp/elixir/elixir-tools.nix

@@ -1,10 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib;
-with builtins; {
-  options.vim.lsp.elixir = {
-  };
-}

modules/lsp/flutter-tools-nvim/config.nix

@@ -1,33 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib;
-with builtins; let
-  cfg = config.vim.lsp;
-  ftcfg = cfg.dart.flutter-tools;
-in {
-  config = mkIf (cfg.enable && ftcfg.enable) {
-    vim.startPlugins = ["flutter-tools"];
-
-    vim.luaConfigRC.flutter-tools = nvim.dag.entryAnywhere ''
-      require('flutter-tools').setup {
-        lsp = {
-          color = { -- show the derived colours for dart variables
-            enabled = ${boolToString ftcfg.color.enable}, -- whether or not to highlight color variables at all, only supported on flutter >= 2.10
-            background = ${boolToString ftcfg.color.highlightBackground}, -- highlight the background
-            foreground = ${boolToString ftcfg.color.highlightForeground}, -- highlight the foreground
-            virtual_text = ${boolToString ftcfg.color.virtualText.enable}, -- show the highlight using virtual text
-            virtual_text_str = ${ftcfg.color.virtualText.character} -- the virtual text character to highlight
-          },
-
-          capabilities = capabilities,
-          on_attach = default_on_attach;
-          flags = lsp_flags,
-        },
-      }
-
-    '';
-  };
-}

modules/lsp/flutter-tools-nvim/flutter-tools.nix

@@ -1,35 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib;
-with builtins; {
-  options.vim.lsp.dart.flutter-tools = {
-    color = {
-      enable = mkEnableOption "Whether or mot to highlight color variables at all";
-
-      highlightBackground = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Highlight the background";
-      };
-
-      highlightForeground = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Highlight the foreground";
-      };
-
-      virtualText = {
-        enable = mkEnableOption "Show the highlight using virtual text";
-
-        character = mkOption {
-          type = types.str;
-          default = "■";
-          description = "Virtual text character to highlight";
-        };
-      };
-    };
-  };
-}

modules/lsp/lspconfig/config.nix

@@ -0,0 +1,25 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.lsp;
+in {
+  config = mkIf cfg.lspconfig.enable (mkMerge [
+    {
+      vim.lsp.enable = true;
+
+      vim.startPlugins = ["nvim-lspconfig"];
+
+      vim.luaConfigRC.lspconfig = nvim.dag.entryAfter ["lsp-setup"] ''
+        local lspconfig = require('lspconfig')
+      '';
+    }
+    {
+      vim.luaConfigRC = mapAttrs (_: v: (nvim.dag.entryAfter ["lspconfig"] v)) cfg.lspconfig.sources;
+    }
+  ]);
+}

modules/lsp/lspconfig/default.nix

@@ -1,6 +1,6 @@
 _: {
   imports = [
-    ./flutter-tools.nix
     ./config.nix
+    ./lspconfig.nix
   ];
 }

modules/lsp/lspconfig/lspconfig.nix

@@ -0,0 +1,18 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; {
+  options.vim.lsp.lspconfig = {
+    enable = mkEnableOption "nvim-lspconfig, also enabled automatically";
+
+    sources = mkOption {
+      description = "nvim-lspconfig sources";
+      type = with types; attrsOf str;
+      default = {};
+    };
+  };
+}

modules/lsp/lspkind/config.nix

@@ -0,0 +1,20 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.lsp;
+in {
+  config = mkIf (cfg.enable && cfg.lspkind.enable) {
+    vim.startPlugins = ["lspkind"];
+    vim.luaConfigRC.lspkind = nvim.dag.entryAnywhere ''
+      local lspkind = require'lspkind'
+      local lspkind_opts = {
+        mode = '${cfg.lspkind.mode}'
+      }
+    '';
+  };
+}

modules/lsp/lspkind/default.nix

@@ -0,0 +1,6 @@
+_: {
+  imports = [
+    ./config.nix
+    ./lspkind.nix
+  ];
+}

modules/lsp/lspkind/lspkind.nix

@@ -0,0 +1,22 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.lsp;
+in {
+  options.vim.lsp = {
+    lspkind = {
+      enable = mkEnableOption "vscode-like pictograms for lsp [lspkind]";
+
+      mode = mkOption {
+        description = "Defines how annotations are shown";
+        type = with types; enum ["text" "text_symbol" "symbol_text" "symbol"];
+        default = "symbol_text";
+      };
+    };
+  };
+}

modules/lsp/module.nix

@@ -1,77 +1,13 @@
 {
-  pkgs,
   config,
   lib,
+  pkgs,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.lsp;
-in {
   options.vim.lsp = {
-    enable = mkEnableOption "Enable neovim LSP support. Requires language specific LSPs to be anabled to take effect";
+    enable = mkEnableOption "LSP, also enabled automatically through null-ls and lspconfig options";
-    formatOnSave = mkEnableOption "Format on save";
+    formatOnSave = mkEnableOption "format on save";
-    nix = {
-      enable = mkEnableOption "Nix LSP";
-      server = mkOption {
-        type = with types; enum ["rnix" "nil"];
-        default = "nil";
-        description = "Which LSP to use";
-      };
-
-      pkg = mkOption {
-        type = types.package;
-        default =
-          if (cfg.nix.server == "rnix")
-          then pkgs.rnix-lsp
-          else pkgs.nil;
-        description = "The LSP package to use";
-      };
-
-      formatter = mkOption {
-        type = with types; enum ["nixpkgs-fmt" "alejandra"];
-        default = "alejandra";
-        description = "Which nix formatter to use";
-      };
-    };
-    rust = {
-      enable = mkEnableOption "Rust LSP";
-      rustAnalyzerOpts = mkOption {
-        type = types.str;
-        default = ''
-          ["rust-analyzer"] = {
-            experimental = {
-              procAttrMacros = true,
-            },
-          },
-        '';
-        description = "Options to pass to rust analyzer";
-      };
-    };
-    python = mkEnableOption "Python LSP";
-    clang = {
-      enable = mkEnableOption "C language LSP";
-      c_header = mkEnableOption "C syntax header files";
-      cclsOpts = mkOption {
-        type = types.str;
-        default = "";
-      };
-    };
-
-    dart = {
-      enable = mkEnableOption "Dart Language LSP";
-      flutter-tools = {
-        enable = mkEnableOption "";
-      };
-    };
-
-    elixir = {
-      enable = mkEnableOption "Elixir LSP";
-    };
-
-    sql = mkEnableOption "SQL Language LSP";
-    go = mkEnableOption "Go language LSP";
-    ts = mkEnableOption "TS language LSP";
-    zig.enable = mkEnableOption "Zig language LSP";
   };
 }

modules/lsp/null-ls/config.nix

@@ -0,0 +1,36 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.lsp;
+in {
+  config = mkIf cfg.null-ls.enable (mkMerge [
+    {
+      vim.lsp.enable = true;
+      vim.startPlugins = ["null-ls"];
+
+      vim.luaConfigRC.null_ls-setup = nvim.dag.entryAnywhere ''
+        local null_ls = require("null-ls")
+        local null_helpers = require("null-ls.helpers")
+        local null_methods = require("null-ls.methods")
+        local ls_sources = {}
+      '';
+      vim.luaConfigRC.null_ls = nvim.dag.entryAfter ["null_ls-setup" "lsp-setup"] ''
+        require('null-ls').setup({
+          diagnostics_format = "[#{m}] #{s} (#{c})",
+          debounce = 250,
+          default_timeout = 5000,
+          sources = ls_sources,
+          on_attach=default_on_attach
+        })
+      '';
+    }
+    {
+      vim.luaConfigRC = mapAttrs (_: v: (nvim.dag.entryBetween ["null_ls"] ["null_ls-setup"] v)) cfg.null-ls.sources;
+    }
+  ]);
+}

modules/lsp/null-ls/default.nix

@@ -0,0 +1,6 @@
+_: {
+  imports = [
+    ./config.nix
+    ./null-ls.nix
+  ];
+}

modules/lsp/null-ls/null-ls.nix

@@ -0,0 +1,20 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.lsp;
+in {
+  options.vim.lsp.null-ls = {
+    enable = mkEnableOption "null-ls, also enabled automatically";
+
+    sources = mkOption {
+      description = "null-ls sources";
+      type = with types; attrsOf str;
+      default = {};
+    };
+  };
+}

modules/markdown/config.nix

@@ -1,12 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib; {
-  config = {
-    vim.markdown = {
-      enable = mkDefault false;
-    };
-  };
-}

modules/markdown/glow/config.nix

@@ -1,33 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}:
-with lib; let
-  cfg = config.vim.markdown.glow;
-in {
-  config = (mkIf cfg.enable) {
-    vim.startPlugins = [
-      "glow-nvim"
-    ];
-
-    vim.globals = {
-      "glow_binary_path" = "${pkgs.glow}/bin";
-    };
-
-    vim.configRC.glow-nvim = nvim.dag.entryAnywhere ''
-      autocmd FileType markdown noremap <leader>pm :Glow<CR>
-    '';
-
-    vim.luaConfigRC.glow-nvim = nvim.dag.entryAnywhere ''
-      require('glow').setup({
-        -- use glow path from vim.globals
-        path = vim.g.glow_binary_path,
-        border = "${toString cfg.border}",
-        pager = ${boolToString cfg.pager},
-        width = 120,
-      })
-    '';
-  };
-}

modules/markdown/glow/glow.nix

@@ -1,33 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib;
-with builtins; {
-  options.vim.markdown.glow = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Enable markdown preview in neovim with glow";
-    };
-    border = mkOption {
-      type = types.enum ["shadow" "rounded" "single" "double" "none"];
-      default = "double";
-      description = "Border style for glow preview";
-    };
-
-    # style should be either light or dark
-    style = mkOption {
-      type = types.enum ["light" "dark"];
-      default = "dark";
-      description = "Style for glow preview";
-    };
-
-    pager = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Enable pager for glow preview";
-    };
-  };
-}

modules/markdown/module.nix

@@ -1,19 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib;
-with builtins; let
-  cfg = config.vim.markdown;
-in {
-  options.vim.markdown = {
-    enable = mkEnableOption "Enable markdown tools and plugins";
-  };
-
-  config = mkIf (cfg.enable) {
-    /*
-    ...
-    */
-  };
-}

modules/modules.nix

@@ -14,10 +14,8 @@
     ./visuals
     ./lsp
     ./treesitter
-    ./tidal
     ./autopairs
     ./snippets
-    ./markdown
     ./git
     ./minimap
     ./dashboard
@@ -30,6 +28,7 @@
     ./session
     ./comments
     ./projects
+    ./languages
   ];
 
   pkgsModule = {config, ...}: {

modules/statusline/lualine/config.nix

@@ -22,6 +22,7 @@ in {
           always_divide_middle = true,
           globalstatus = ${boolToString cfg.globalStatus},
           ignore_focus = {'NvimTree'},
+          extensions = {${optionalString config.vim.filetree.nvimTreeLua.enable "'nvim-tree'"}},
           refresh = {
             statusline = ${toString cfg.refresh.statusline},
             tabline = ${toString cfg.refresh.tabline},

modules/statusline/lualine/lualine.nix

@@ -8,11 +8,7 @@ with builtins; let
   supported_themes = import ./supported_themes.nix;
 in {
   options.vim.statusline.lualine = {
-    enable = mkOption {
+    enable = mkEnableOption "lualine";
-      type = types.bool;
-      description = "Enable lualine statusline";
-      default = true;
-    };
 
     icons = {
       enable = mkOption {
@@ -46,50 +42,50 @@ in {
       default = true;
     };
 
-    theme = mkOption {
+    theme = let
-      default = "auto";
+      themeSupported = elem config.vim.theme.name supported_themes;
-      type = types.enum (
+    in
-        [
+      mkOption {
-          "auto"
+        description = "Theme for lualine";
-          "16color"
+        type = types.enum ([
-          "gruvbox"
+            "auto"
-          "ayu_dark"
+            "16color"
-          "ayu_light"
+            "gruvbox"
-          "ayu_mirage"
+            "ayu_dark"
-          "codedark"
+            "ayu_light"
-          "dracula"
+            "ayu_mirage"
-          "everforest"
+            "codedark"
-          "gruvbox"
+            "dracula"
-          "gruvbox_light"
+            "everforest"
-          "gruvbox_material"
+            "gruvbox"
-          "horizon"
+            "gruvbox_light"
-          "iceberg_dark"
+            "gruvbox_material"
-          "iceberg_light"
+            "horizon"
-          "jellybeans"
+            "iceberg_dark"
-          "material"
+            "iceberg_light"
-          "modus_vivendi"
+            "jellybeans"
-          "molokai"
+            "material"
-          "nightfly"
+            "modus_vivendi"
-          "nord"
+            "molokai"
-          "oceanicnext"
+            "nightfly"
-          "onelight"
+            "nord"
-          "palenight"
+            "oceanicnext"
-          "papercolor_dark"
+            "onelight"
-          "papercolor_light"
+            "palenight"
-          "powerline"
+            "papercolor_dark"
-          "seoul256"
+            "papercolor_light"
-          "solarized_dark"
+            "powerline"
-          "tomorrow"
+            "seoul256"
-          "wombat"
+            "solarized_dark"
-        ]
+            "tomorrow"
-        ++ (
+            "wombat"
-          if elem config.vim.theme.name supported_themes
+          ]
-          then [config.vim.theme.name]
+          ++ optional themeSupported config.vim.theme.name);
-          else []
+        default = "auto";
-        )
+        # TODO: xml generation error if the closing '' is on a new line.
-      );
+        # issue: https://gitlab.com/rycee/nmd/-/issues/10
-      description = "Theme for lualine";
+        defaultText = nvim.nmd.literalAsciiDoc ''`config.vim.theme.name` if theme supports lualine else "auto"'';
-    };
+      };
 
     sectionSeparator = {
       left = mkOption {

modules/theme/supported_themes.nix

@@ -19,6 +19,13 @@
     styles = ["day" "night" "storm"];
   };
 
+  dracula = {
+    setup = ''
+      require('dracula').setup({});
+      require('dracula').load();
+    '';
+  };
+
   catppuccin = {
     setup = {
       style ? "mocha",

modules/treesitter/config.nix

@@ -1,4 +1,5 @@
 {
+  pkgs,
   config,
   lib,
   ...
@@ -6,59 +7,42 @@
 with lib;
 with builtins; let
   cfg = config.vim.treesitter;
+  usingNvimCmp = config.vim.autocomplete.enable && config.vim.autocomplete.type == "nvim-cmp";
 in {
-  config = mkIf cfg.enable (
+  config = mkIf cfg.enable {
-    let
+    vim.startPlugins =
-      writeIf = cond: msg:
+      ["nvim-treesitter"]
-        if cond
+      ++ optional usingNvimCmp "cmp-treesitter";
-        then msg
-        else "";
-    in {
-      vim.startPlugins = [
-        "nvim-treesitter"
-        (
-          if cfg.autotagHtml
-          then "nvim-ts-autotag"
-          else null
-        )
-      ];
 
-      # For some reason treesitter highlighting does not work on start if this is set before syntax on
+    vim.autocomplete.sources = {"treesitter" = "[Treesitter]";};
-      vim.configRC.treesitter = writeIf cfg.fold (nvim.dag.entryBefore ["basic"] ''
-        " Tree-sitter based folding
-        set foldmethod=expr
-        set foldexpr=nvim_treesitter#foldexpr()
-        set nofoldenable
-      '');
 
-      vim.luaConfigRC.treesitter = nvim.dag.entryAnywhere ''
+    # For some reason treesitter highlighting does not work on start if this is set before syntax on
-        -- Treesitter config
+    vim.configRC.treesitter-fold = mkIf cfg.fold (nvim.dag.entryBefore ["basic"] ''
-        require'nvim-treesitter.configs'.setup {
+      set foldmethod=expr
-          highlight = {
+      set foldexpr=nvim_treesitter#foldexpr()
-            enable = true,
+      set nofoldenable
-            disable = {},
+    '');
+
+    vim.luaConfigRC.treesitter = nvim.dag.entryAnywhere ''
+      require'nvim-treesitter.configs'.setup {
+        highlight = {
+          enable = true,
+          disable = {},
+        },
+
+        auto_install = false,
+        ensure_installed = {},
+
+        incremental_selection = {
+          enable = true,
+          keymaps = {
+            init_selection = "gnn",
+            node_incremental = "grn",
+            scope_incremental = "grc",
+            node_decremental = "grm",
           },
-
+        },
-          auto_install = false,
+      }
-          ensure_installed = {},
+    '';
-
+  };
-          incremental_selection = {
-            enable = true,
-            keymaps = {
-              init_selection = "gnn",
-              node_incremental = "grn",
-              scope_incremental = "grc",
-              node_decremental = "grm",
-            },
-          },
-
-          ${writeIf cfg.autotagHtml ''
-          autotag = {
-            enable = true,
-          },
-        ''}
-        }
-      '';
-    }
-  );
 }

modules/treesitter/context.nix

@@ -1,29 +1,84 @@
 {
+  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
 with builtins; let
-  cfg = config.vim.treesitter;
+  treesitter = config.vim.treesitter;
+  cfg = treesitter.context;
 in {
-  options.vim.treesitter.context.enable = mkOption {
+  options.vim.treesitter.context = {
-    type = types.bool;
+    enable = mkEnableOption "context of current buffer contents [nvim-treesitter-context] ";
-    default = false;
+
-    description = "enable function context [nvim-treesitter-context]";
+    maxLines = mkOption {
+      description = "How many lines the window should span. Values <=0 mean no limit.";
+      type = types.int;
+      default = 0;
+    };
+
+    minWindowHeight = mkOption {
+      description = "Minimum editor window height to enable context. Values <= 0 mean no limit.";
+      type = types.int;
+      default = 0;
+    };
+
+    lineNumbers = mkOption {
+      description = "";
+      type = types.bool;
+      default = true;
+    };
+
+    multilineThreshold = mkOption {
+      description = "Maximum number of lines to collapse for a single context line.";
+      type = types.int;
+      default = 20;
+    };
+
+    trimScope = mkOption {
+      description = nvim.nmd.asciiDoc "Which context lines to discard if <<opt-vim.treesitter.context.maxLines>> is exceeded.";
+      type = types.enum ["inner" "outer"];
+      default = "outer";
+    };
+
+    mode = mkOption {
+      description = "Line used to calculate context.";
+      type = types.enum ["cursor" "topline"];
+      default = "cursor";
+    };
+
+    separator = mkOption {
+      description = nvim.nmd.asciiDoc ''
+        Separator between context and content. Should be a single character string, like '-'.
+
+        When separator is set, the context will only show up when there are at least 2 lines above cursorline.
+      '';
+      type = with types; nullOr str;
+      default = null;
+    };
+
+    zindex = mkOption {
+      description = "The Z-index of the context window.";
+      type = types.int;
+      default = 20;
+    };
   };
 
-  config = mkIf (cfg.enable && cfg.context.enable) {
+  config = mkIf (treesitter.enable && cfg.enable) {
-    vim.startPlugins = [
+    vim.startPlugins = ["nvim-treesitter-context"];
-      "nvim-treesitter-context"
-    ];
 
     vim.luaConfigRC.treesitter-context = nvim.dag.entryAnywhere ''
-      -- Treesitter Context config
       require'treesitter-context'.setup {
         enable = true,
-        throttle = true,
+        max_lines = ${toString cfg.maxLines},
-        max_lines = 0
+        min_window_height = ${toString cfg.minWindowHeight},
+        line_numbers = ${boolToString cfg.lineNumbers},
+        multiline_threshold = ${toString cfg.multilineThreshold},
+        trim_scope = '${cfg.trimScope}',
+        mode = '${cfg.mode}',
+        separator = ${nvim.lua.nullString cfg.separator},
+        max_lines = ${toString cfg.zindex},
       }
     '';
   };

modules/treesitter/treesitter.nix

@@ -5,53 +5,24 @@
   ...
 }:
 with lib;
-with builtins; {
+with builtins; let
+  cfg = config.vim.treesitter;
+  usingNvimCmp = config.vim.autocomplete.enable && config.vim.autocomplete.type == "nvim-cmp";
+in {
   options.vim.treesitter = {
-    enable = mkOption {
+    enable = mkEnableOption "treesitter, also enabled automatically through language options";
-      default = false;
-      type = types.bool;
-      description = "Enable tree-sitter [nvim-treesitter]";
-    };
 
-    fold = mkOption {
+    fold = mkEnableOption "fold with treesitter";
-      default = false;
-      type = types.bool;
-      description = "Enable fold with tree-sitter";
-    };
 
-    autotagHtml = mkOption {
+    autotagHtml = mkEnableOption "autoclose and rename html tag";
-      default = false;
-      type = types.bool;
-      description = "Enable autoclose and rename html tag [nvim-ts-autotag]";
-    };
 
     grammars = mkOption {
       type = with types; listOf package;
-      default = with (pkgs.vimPlugins.nvim-treesitter.builtGrammars);
+      default = [];
-        [
+      description = nvim.nmd.asciiDoc ''
-          c
+        List of treesitter grammars to install. For supported languages
-          cpp
+        use the `vim.language.<lang>.treesitter` option
-          nix
+
-          python
-          rust
-          markdown
-          comment
-          toml
-          make
-          tsx
-          html
-          javascript
-          css
-          graphql
-          json
-          zig
-          elixir
-          heex
-        ]
-        ++ (optional config.vim.notes.orgmode.enable org); # add orgmode grammar if enabled
-      description = ''
-        List of treesitter grammars to install.
-        When enabling a language, its treesitter grammar is added for you.
       '';
     };
   };

modules/utility/binds/which-key/config.nix

@@ -106,7 +106,7 @@ in {
       }
 
         ${
-        if config.vim.markdown.glow.enable
+        if config.vim.languages.markdown.glow.enable
         then ''
           -- Markdown
           ["<leader>pm"] = { name = "+Preview Markdown" },

modules/visuals/config.nix

@@ -6,151 +6,105 @@
 with lib; let
   cfg = config.vim.visuals;
 in {
-  config = mkIf cfg.enable {
+  config = mkIf cfg.enable (mkMerge [
-    vim.startPlugins = [
+    (mkIf cfg.indentBlankline.enable {
-      (
+      vim.startPlugins = ["indent-blankline"];
-        if cfg.nvimWebDevicons.enable
+      vim.luaConfigRC.indent-blankline = nvim.dag.entryAnywhere ''
-        then "nvim-web-devicons"
+        -- highlight error: https://github.com/lukas-reineke/indent-blankline.nvim/issues/59
-        else null
+        vim.wo.colorcolumn = "99999"
-      )
+        vim.opt.list = true
-      (
-        if cfg.lspkind.enable
-        then "lspkind"
-        else null
-      )
-      (
-        if cfg.cursorWordline.enable
-        then "nvim-cursorline"
-        else null
-      )
-      (
-        if cfg.indentBlankline.enable
-        then "indent-blankline"
-        else null
-      )
-      (
-        if cfg.scrollBar.enable
-        then "scrollbar-nvim"
-        else null
-      )
-      (
-        if cfg.smoothScroll.enable
-        then "cinnamon-nvim"
-        else null
-      )
-      (
-        if cfg.cellularAutomaton.enable
-        then "cellular-automaton"
-        else null
-      )
-      (
-        if cfg.fidget-nvim.enable
-        then "fidget-nvim"
-        else null
-      )
-    ];
 
-    vim.luaConfigRC.visuals = nvim.dag.entryAnywhere ''
+        ${optionalString (cfg.indentBlankline.eolChar != null) ''
-      ${
+          vim.opt.listchars:append({ eol = "${cfg.indentBlankline.eolChar}" })
-        if cfg.lspkind.enable
+        ''}
-        then "require'lspkind'.init()"
+        ${optionalString (cfg.indentBlankline.fillChar != null) ''
-        else ""
+          vim.opt.listchars:append({ space = "${cfg.indentBlankline.fillChar}" })
-      }
+        ''}
-      ${
-        if cfg.indentBlankline.enable
-        then ''
-          -- highlight error: https://github.com/lukas-reineke/indent-blankline.nvim/issues/59
-          vim.wo.colorcolumn = "99999"
-          vim.opt.list = true
 
+        require("indent_blankline").setup {
+          enabled = true,
+          char = "${cfg.indentBlankline.listChar}",
+          show_current_context = ${boolToString cfg.indentBlankline.showCurrContext},
+          show_end_of_line = ${boolToString cfg.indentBlankline.showEndOfLine},
+          use_treesitter = ${boolToString cfg.indentBlankline.useTreesitter},
+        }
+      '';
+    })
 
-          ${
+    (mkIf cfg.cursorWordline.enable {
-            if cfg.indentBlankline.eolChar == ""
+      vim.startPlugins = ["nvim-cursorline"];
-            then ""
+      vim.luaConfigRC.cursorline = nvim.dag.entryAnywhere ''
-            else ''vim.opt.listchars:append({ eol = "${cfg.indentBlankline.eolChar}" })''
+        vim.g.cursorline_timeout = ${toString cfg.cursorWordline.lineTimeout}
-          }
+      '';
+    })
 
-          ${
+    (mkIf cfg.nvimWebDevicons.enable {
-            if cfg.indentBlankline.fillChar == ""
+      vim.startPlugins = ["nvim-web-devicons"];
-            then ""
+    })
-            else ''vim.opt.listchars:append({ space = "${cfg.indentBlankline.fillChar}"})''
-          }
 
-          require("indent_blankline").setup {
+    (mkIf cfg.scrollBar.enable {
-            char = "${cfg.indentBlankline.listChar}",
+      vim.startPlugins = ["scrollbar-nvim"];
-            show_current_context = ${boolToString cfg.indentBlankline.showCurrContext},
+      vim.luaConfigRC.scrollBar = nvim.dag.entryAnywhere ''
-            show_end_of_line = true,
+        require('scrollbar').setup{
-          }
-        ''
-        else ""
-      }
-
-      ${
-        if cfg.cursorWordline.enable
-        then "vim.g.cursorline_timeout = ${toString cfg.cursorWordline.lineTimeout}"
-        else ""
-      }
-
-      ${
-        if cfg.scrollBar.enable
-        then "require('scrollbar').setup{
             excluded_filetypes = {
               'prompt',
               'TelescopePrompt',
               'noice',
               'NvimTree',
-              'alpha'
+              'alpha',
+              'code-action-menu-menu'
             },
-          }"
-        else ""
-      }
-      ${
-        if cfg.smoothScroll.enable
-        then "require('cinnamon').setup()"
-        else ""
-      }
-      ${
-        if cfg.cellularAutomaton.enable
-        then ''
-          local config = {
-            fps = 50,
-            name = 'slide',
           }
+      '';
+    })
 
-          -- init function is invoked only once at the start
+    (mkIf cfg.smoothScroll.enable {
-          -- config.init = function (grid)
+      vim.startPlugins = ["cinnamon-nvim"];
-          --
+      vim.luaConfigRC.smoothScroll = nvim.dag.entryAnywhere ''
-          -- end
+        require('cinnamon').setup()
+      '';
+    })
 
-          -- update function
+    (mkIf cfg.cellularAutomaton.enable {
-          config.update = function (grid)
+      vim.startPlugins = ["cellular-automaton"];
-          for i = 1, #grid do
+      vim.luaConfigRC.cellularAUtomaton = nvim.dag.entryAnywhere ''
-            local prev = grid[i][#(grid[i])]
+        local config = {
-              for j = 1, #(grid[i]) do
+              fps = 50,
-                grid[i][j], prev = prev, grid[i][j]
+              name = 'slide',
-              end
-            end
-            return true
-          end
-
-          require("cellular-automaton").register_animation(config)
-
-          vim.keymap.set("n", "<leader>fml", "<cmd>CellularAutomaton make_it_rain<CR>")
-        ''
-        else ""
-      }
-      ${
-        if cfg.fidget-nvim.enable
-        then ''
-          require"fidget".setup{
-            align = {
-              bottom = ${boolToString cfg.fidget-nvim.align.bottom},
-              right = ${boolToString cfg.fidget-nvim.align.right},
             }
+
+            -- init function is invoked only once at the start
+            -- config.init = function (grid)
+            --
+            -- end
+
+            -- update function
+            config.update = function (grid)
+            for i = 1, #grid do
+              local prev = grid[i][#(grid[i])]
+                for j = 1, #(grid[i]) do
+                  grid[i][j], prev = prev, grid[i][j]
+                end
+              end
+              return true
+            end
+
+            require("cellular-automaton").register_animation(config)
+
+            vim.keymap.set("n", "<leader>fml", "<cmd>CellularAutomaton make_it_rain<CR>")
+      '';
+    })
+
+    (mkIf cfg.fidget-nvim.enable {
+      vim.startPlugins = ["fidget-nvim"];
+      vim.luaConfigRC.fidget-nvim = nvim.dag.entryAnywhere ''
+        require"fidget".setup{
+          align = {
+            bottom = ${boolToString cfg.fidget-nvim.align.bottom},
+            right = ${boolToString cfg.fidget-nvim.align.right},
           }
-        ''
+        }
-        else ""
+      '';
-      }
+    })
-    '';
+  ]);
-  };
 }

modules/visuals/visuals.nix

@@ -4,25 +4,13 @@
   ...
 }:
 with lib;
-with builtins; {
+with builtins; let
+  cfg = config.vim.visuals;
+in {
   options.vim.visuals = {
-    enable = mkOption {
+    enable = mkEnableOption "Visual enhancements.";
-      type = types.bool;
-      description = "Enable visual enhancements";
-      default = false;
-    };
 
-    nvimWebDevicons.enable = mkOption {
+    nvimWebDevicons.enable = mkEnableOption "dev icons. Required for certain plugins [nvim-web-devicons].";
-      type = types.bool;
-      description = "Enable dev icons. required for certain plugins [nvim-web-devicons]";
-      default = false;
-    };
-
-    lspkind.enable = mkOption {
-      type = types.bool;
-      description = "Enable vscode-like pictograms for lsp [lspkind]";
-      default = false;
-    };
 
     scrollBar.enable = mkOption {
       type = types.bool;
@@ -64,15 +52,12 @@ with builtins; {
     };
 
     cursorWordline = {
-      enable = mkOption {
+      enable = mkEnableOption "word and delayed line highlight [nvim-cursorline].";
-        type = types.bool;
-        description = "Enable word and delayed line highlight [nvim-cursorline]";
-        default = false;
-      };
 
       lineTimeout = mkOption {
         type = types.int;
         description = "Time in milliseconds for cursorline to appear";
+        default = 500;
       };
     };
 
@@ -90,21 +75,39 @@ with builtins; {
       };
 
       fillChar = mkOption {
-        type = types.str;
         description = "Character to fill indents";
+        type = with types; nullOr types.str;
         default = "⋅";
       };
 
       eolChar = mkOption {
-        type = types.str;
         description = "Character at end of line";
+        type = with types; nullOr types.str;
         default = "↴";
       };
 
-      showCurrContext = mkOption {
+      showEndOfLine = mkOption {
+        description = nvim.nmd.asciiDoc ''
+          Displays the end of line character set by <<opt-vim.visuals.indentBlankline.eolChar>> instead of the
+          indent guide on line returns.
+        '';
         type = types.bool;
+        default = cfg.indentBlankline.eolChar != null;
+        defaultText = literalExpression "config.vim.visuals.indentBlankline.eolChar != null";
+      };
+
+      showCurrContext = mkOption {
         description = "Highlight current context from treesitter";
-        default = true;
+        type = types.bool;
+        default = config.vim.treesitter.enable;
+        defaultText = literalExpression "config.vim.treesitter.enable";
+      };
+
+      useTreesitter = mkOption {
+        description = "Use treesitter to calculate indentation when possible.";
+        type = types.bool;
+        default = config.vim.treesitter.enable;
+        defaultText = literalExpression "config.vim.treesitter.enable";
       };
     };
   };