Merge 2bfedb14dc into 2615c568f8

Merge pull request #288 from NotAShelf/additional-luafile
wrapper/rc: add vim.extraLuaFiles
2024-05-10 12:37:56 +00:00 · 2024-05-10 12:37:47 +00:00 · 2024-05-09 00:44:58 +03:00 · 2024-05-08 23:05:58 +03:00 · 2024-05-08 00:31:23 +03:00 · 2024-05-08 00:22:12 +03:00
33 changed files with 574 additions and 836 deletions
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@ -19,7 +19,6 @@ jobs:
        package:
          - default
          - nix
-          - tidal
          - maximal
    steps:
      - uses: easimon/maximize-build-space@v10
--- a/configuration.nix
+++ b/configuration.nix
@ -15,10 +15,6 @@ inputs: let
      configuration.imports = modules;
    };

-  tidalConfig = {
-    config.vim.languages.tidal.enable = true;
-  };
-
  mainConfig = isMaximal: {
    config.vim = {
      viAlias = true;
@ -58,7 +54,16 @@ inputs: let
        enableTreesitter = true;
        enableExtraDiagnostics = true;

+        # Nim LSP is broken on Darwin and therefore
+        # should be disabled by default. Users may still enable
+        # `vim.languages.vim` to enable it, this does not restrict
+        # that.
+        # See: <https://github.com/PMunch/nimlsp/issues/178#issue-2128106096>
+        nim.enable = false;
+
        nix.enable = true;
+
+        markdown.enable = isMaximal;
        html.enable = isMaximal;
        css.enable = isMaximal;
        sql.enable = isMaximal;
@ -66,13 +71,11 @@ inputs: let
        ts.enable = isMaximal;
        svelte.enable = isMaximal;
        go.enable = isMaximal;
+        elixir.enable = isMaximal;
        zig.enable = isMaximal;
        python.enable = isMaximal;
        dart.enable = isMaximal;
-        elixir.enable = isMaximal;
        bash.enable = isMaximal;
-        terraform.enable = isMaximal;
-        nim.enable = false;
        tailwind.enable = isMaximal;
        typst.enable = isMaximal;
        clang = {
@ -82,14 +85,14 @@ inputs: let

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

      visuals = {
        enable = true;
        nvimWebDevicons.enable = true;
-        scrollBar.enable = true;
+        scrollBar.enable = isMaximal;
        smoothScroll.enable = true;
        cellularAutomaton.enable = false;
        fidget-nvim.enable = true;
@ -252,5 +255,5 @@ inputs: let
    };
  };
 in {
-  inherit neovimConfiguration mainConfig tidalConfig;
+  inherit neovimConfiguration mainConfig;
 }
--- a/docs/manual/try-it-out.md
+++ b/docs/manual/try-it-out.md
@ -5,7 +5,6 @@ Below are the commands you may run to try out different configurations provided
 configurations are provided:

 - Nix
- Tidal
 - Maximal

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

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

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

-#### Tidal {#sec-configs-tidal}
-
-Tidal is an alternative config that adds vim-tidal on top of the plugins from the Nix configuration.
-
 #### Maximal {#sec-configs-maximal}

 `Maximal` is the ultimate configuration that will enable support for more commonly used language as well as additional
--- a/docs/release-notes/rl-0.7.md
+++ b/docs/release-notes/rl-0.7.md
@ -6,14 +6,32 @@ Release notes for release 0.7

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

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

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

- Modified type for [](#opt-vim.visuals.fidget-nvim.setupOpts.progress.display.overrides)
-  from `anything` to a `submodule` for better type checking.
+- Modified type for
+  [](#opt-vim.visuals.fidget-nvim.setupOpts.progress.display.overrides) from
+  `anything` to a `submodule` for better type checking.
+- Fix null `vim.lsp.mappings` generating an error and not being filtered out.

-[horriblename](https://github.com/horriblename)
+[horriblename](https://github.com/horriblename):

 - Fix broken treesitter-context keybinds in visual mode
+
+[NotAShelf](https://github.com/notashelf)
+
+- Add `deno fmt` as the default Markdown formatter. This will be enabled
+  automatically if you have autoformatting enabled, but can be disabled manually
+  if you choose to.
+
+- Add `vim.extraLuaFiles` for optionally sourcing additional lua files in your
+  configuration.
+
+- Refactor `programs.languages.elixir` to use lspconfig and none-ls for LSP and
+  formatter setups respectively. Diagnostics support is considered, and may be
+  added once the [credo](https://github.com/rrrene/credo) linter has been added
+  to nixpkgs. A pull request is currently open.
+
+- Remove vim-tidal and friends
--- a/flake.lock
+++ b/flake.lock
@ -1,22 +1,5 @@
 {
  "nodes": {
-    "dirt-samples-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1667426233,
-        "narHash": "sha256-Zl2bi9QofcrhU63eMtg+R6lhV9ExQS/0XNTJ+oq65Uo=",
-        "owner": "tidalcycles",
-        "repo": "dirt-samples",
-        "rev": "92f2145e661b397e62ca0ff3965819e7c7db0dad",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tidalcycles",
-        "ref": "master",
-        "repo": "dirt-samples",
-        "type": "github"
-      }
-    },
    "flake-compat": {
      "flake": false,
      "locked": {
@ -38,11 +21,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1712014858,
-        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
+        "lastModified": 1714641030,
+        "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
+        "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
        "type": "github"
      },
      "original": {
@ -136,11 +119,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1704611696,
-        "narHash": "sha256-4ZCgV5oHdEc3q+XaIzy//gh20uC/aSuAtMU9bsfgLZk=",
+        "lastModified": 1714571717,
+        "narHash": "sha256-o4tqlTzi9kcVub167kTGXgCac9jM3kW4+v9MH/ue4Hk=",
        "owner": "oxalica",
        "repo": "nil",
-        "rev": "059d33a24bb76d2048740bcce936362bf54b5bc9",
+        "rev": "2f3ed6348bbf1440fcd1ab0411271497a0fbbfa4",
        "type": "github"
      },
      "original": {
@ -151,11 +134,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1713895582,
-        "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=",
+        "lastModified": 1715087517,
+        "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "572af610f6151fd41c212f897c71f7056e3fb518",
+        "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
        "type": "github"
      },
      "original": {
@ -167,20 +150,14 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "dir": "lib",
-        "lastModified": 1711703276,
-        "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
-        "type": "github"
+        "lastModified": 1714640452,
+        "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
      },
      "original": {
-        "dir": "lib",
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
      }
    },
    "nixpkgs_2": {
@ -200,22 +177,6 @@
      }
    },
    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1693844670,
-        "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
      "locked": {
        "lastModified": 1702350026,
        "narHash": "sha256-A+GNZFZdfl4JdDphYKBJ5Ef1HOiFsP18vQe9mqjmUis=",
@ -282,11 +243,11 @@
    "plugin-catppuccin": {
      "flake": false,
      "locked": {
-        "lastModified": 1713105352,
-        "narHash": "sha256-yTVou/WArEWygBBs2NFPI9Dm9iSGfwVftKFbOAGl8tk=",
+        "lastModified": 1715167632,
+        "narHash": "sha256-aRrhVHQSCyo1Ti1j8ogWJ8e0eJWiTw5+abIpyUxky/M=",
        "owner": "catppuccin",
        "repo": "nvim",
-        "rev": "a1439ad7c584efb3d0ce14ccb835967f030450fe",
+        "rev": "d97387aea8264f484bb5d5e74f2182a06c83e0d8",
        "type": "github"
      },
      "original": {
@ -298,11 +259,11 @@
    "plugin-ccc": {
      "flake": false,
      "locked": {
-        "lastModified": 1712580766,
-        "narHash": "sha256-G96++Bmuklb3eDfmyKPKFUDHuopTMmIFa/ILdf11N/I=",
+        "lastModified": 1714299582,
+        "narHash": "sha256-QRq9hQF5vLnOTzQGbOWC2ykMdMsQDlDlb6XC17dJG7Q=",
        "owner": "uga-rosa",
        "repo": "ccc.nvim",
-        "rev": "1283eef5494c092a047baa34ed3e667f3cb2715e",
+        "rev": "f388f1981d222967c741fe9927edf9ba5fa3bcbe",
        "type": "github"
      },
      "original": {
@ -362,11 +323,11 @@
    "plugin-cinnamon-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1711005384,
-        "narHash": "sha256-LNikkGldBpUsfyH8ThtX7RS1p/z3JzSPonT9qUU84jw=",
+        "lastModified": 1714107684,
+        "narHash": "sha256-cMP9WRZzevxaWgpILyDh1JwNukm3Jl3JKJYPT2HnFns=",
        "owner": "declancm",
        "repo": "cinnamon.nvim",
-        "rev": "559fe02fae00ffd78377e9c242b2faa25a428592",
+        "rev": "a011e84b624cd7b609ea928237505d31b987748a",
        "type": "github"
      },
      "original": {
@ -522,11 +483,11 @@
    "plugin-crates-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1713995074,
-        "narHash": "sha256-09+mBhh5hAXENPzrvwNNQEyM7ZtuPYAWrtAG/pzBOV8=",
+        "lastModified": 1715069896,
+        "narHash": "sha256-AhjnPo3SM7o7foj5ppv0CW+jfJe6ACerq4YFgJfY3/8=",
        "owner": "Saecki",
        "repo": "crates.nvim",
-        "rev": "f00e11e8282b94f2a2e938d32712c99f0e0bdeb4",
+        "rev": "7d8541ec0e3b30ac2c43864d3ee13a632e1231ed",
        "type": "github"
      },
      "original": {
@ -538,11 +499,11 @@
    "plugin-dashboard-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1713420371,
-        "narHash": "sha256-zcWBgDM409n6rmb06FqVXbC+HU9HJN0+ADoTJDWHvbA=",
+        "lastModified": 1714906999,
+        "narHash": "sha256-euIAtegnJTH2hpFP0OAuvl7VpEV0Xu91h+w9p1uC3+0=",
        "owner": "glepnir",
        "repo": "dashboard-nvim",
-        "rev": "6d06924b562de6f0bb136edf1bf549afbf6b7d00",
+        "rev": "a0a78099658c7d4be3714f657b18ca8285d5d106",
        "type": "github"
      },
      "original": {
@ -599,30 +560,14 @@
        "type": "github"
      }
    },
-    "plugin-elixir-ls": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1713724318,
-        "narHash": "sha256-1kLMxznNRRJ7M10zkuWexA/sPFaN449M0SKUjLrnc8c=",
-        "owner": "elixir-lsp",
-        "repo": "elixir-ls",
-        "rev": "8486de473a219dcdb72408702f8d56d0227c7366",
-        "type": "github"
-      },
-      "original": {
-        "owner": "elixir-lsp",
-        "repo": "elixir-ls",
-        "type": "github"
-      }
-    },
    "plugin-elixir-tools": {
      "flake": false,
      "locked": {
-        "lastModified": 1713617654,
-        "narHash": "sha256-pJgtW51FLs+Yr+tlQckRmGkRnSUQNI3fEROn3D51mMs=",
+        "lastModified": 1714657398,
+        "narHash": "sha256-U6db1n/RIpT7Dd54e9iI/PjO1BhDpMyNPfaph+dUk7k=",
        "owner": "elixir-tools",
        "repo": "elixir-tools.nvim",
-        "rev": "3c4f8344a341818417b3d75c04eb96d894cb4640",
+        "rev": "51eddb03a7a8c9f00d6415b356a4d3b75d8e75b6",
        "type": "github"
      },
      "original": {
@ -666,11 +611,11 @@
    "plugin-gesture-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1713872849,
-        "narHash": "sha256-npryXJ92l65gOGltTd3jE3fdhiEgqbxCdK5w/C/BQV0=",
+        "lastModified": 1715081943,
+        "narHash": "sha256-h6alx5TjskXYQ3H9fFfC4QyxsGbpjQkoZFVvLi1sgFI=",
        "owner": "notomo",
        "repo": "gesture.nvim",
-        "rev": "47175ed2741ba46fe7f14d6ee37ebbc5b9614c5a",
+        "rev": "591b350bfc87932a748f4838ad724eea6fb073e0",
        "type": "github"
      },
      "original": {
@ -682,11 +627,11 @@
    "plugin-gitsigns-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1713620636,
-        "narHash": "sha256-UK3DyvrQ0kLm9wrMQ6tLDoDunoThbY/Yfjn+eCZpuMw=",
+        "lastModified": 1715007445,
+        "narHash": "sha256-v21qTJfiv57vSUDGCJ4wM+L0Ixwh2b3pkoESFAHBrDM=",
        "owner": "lewis6991",
        "repo": "gitsigns.nvim",
-        "rev": "035da036e68e509ed158414416c827d022d914bd",
+        "rev": "805610a9393fa231f2c2b49cb521bfa413fadb3d",
        "type": "github"
      },
      "original": {
@ -714,11 +659,11 @@
    "plugin-gruvbox": {
      "flake": false,
      "locked": {
-        "lastModified": 1706538659,
-        "narHash": "sha256-jWnrRy/PT7D0UcPGL+XTbKHWvS0ixvbyqPtTzG9HY84=",
+        "lastModified": 1715085640,
+        "narHash": "sha256-2Ad5I+peKCD2BCm4m/QIjqpW08qQvrY+o3bK5UEy1x8=",
        "owner": "ellisonleao",
        "repo": "gruvbox.nvim",
-        "rev": "6e4027ae957cddf7b193adfaec4a8f9e03b4555f",
+        "rev": "c442515506caa166118e157980f62a9ac24fa8c3",
        "type": "github"
      },
      "original": {
@ -730,11 +675,11 @@
    "plugin-highlight-undo": {
      "flake": false,
      "locked": {
-        "lastModified": 1713721901,
-        "narHash": "sha256-5zYUpfSR56gCufR+Y18qo8ZpMRg8N3ejkRZNJswJ4wQ=",
+        "lastModified": 1714982601,
+        "narHash": "sha256-yGw1SxcUmGQxqKhMb2SJAai07g+rOpEJy2CqIX2h9dM=",
        "owner": "tzachar",
        "repo": "highlight-undo.nvim",
-        "rev": "a0dbc6afa19b438ca5a6f54bc7f1a10399f21a15",
+        "rev": "1ea1c79372d7d93c88fd97543880927b7635e3d2",
        "type": "github"
      },
      "original": {
@ -778,11 +723,11 @@
    "plugin-image-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1713989303,
-        "narHash": "sha256-UBrusfIYWURI1Auo3XayswA8NXgZhqwazg6wmmgWygA=",
+        "lastModified": 1714464812,
+        "narHash": "sha256-UfJzROXnjaiF+kIaBYAt5GSL107vT5NrpXj+Gh535Yk=",
        "owner": "3rd",
        "repo": "image.nvim",
-        "rev": "2d4b479c59fd70cc26f63d48b5cd76a44dda8873",
+        "rev": "604692f493519128c58893c28273d4247bc71a4d",
        "type": "github"
      },
      "original": {
@ -810,11 +755,11 @@
    "plugin-leap-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1712927908,
-        "narHash": "sha256-sSnofCInXuqaDEawT4vN1WdYl1cjK++BjSFnR1wXjr4=",
+        "lastModified": 1714857300,
+        "narHash": "sha256-RodnRoiQTH/+XoPk30neLiYIptPJnCvL94keIQXjq2g=",
        "owner": "ggandor",
        "repo": "leap.nvim",
-        "rev": "626be4c4ec040aeaf6466c9aae17ee0ab09f1a5b",
+        "rev": "f1f19fc268b406b00b50091f51f16d9634fbe449",
        "type": "github"
      },
      "original": {
@ -986,11 +931,11 @@
    "plugin-noice-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1711471279,
-        "narHash": "sha256-y6gHNkWVsIuwBf7MblCTKTZSqjGDxqeFeQZWexzwk94=",
+        "lastModified": 1714737209,
+        "narHash": "sha256-jR9tX6AhY+DXPqGXqGqCkG/sL9+mLxpwOqfwjHHN0Ac=",
        "owner": "folke",
        "repo": "noice.nvim",
-        "rev": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12",
+        "rev": "f4decbc7a80229ccc9f86026b74bdcf0c39e38a7",
        "type": "github"
      },
      "original": {
@ -1019,11 +964,11 @@
    "plugin-nui-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1710740032,
-        "narHash": "sha256-Zr5CNx6BIM6naCXW8YBc/Oj1qOtWV/3tuMoaaZjoSZA=",
+        "lastModified": 1714991123,
+        "narHash": "sha256-W5w8mWjZhf8rhFYDJX4vPAszxKX6uLgT7+8xg3dY4Ok=",
        "owner": "MunifTanjim",
        "repo": "nui.nvim",
-        "rev": "cbd2668414331c10039278f558630ed19b93e69b",
+        "rev": "a3597dc88b53489d3fddbddbbd13787355253bb0",
        "type": "github"
      },
      "original": {
@ -1035,11 +980,11 @@
    "plugin-nvim-autopairs": {
      "flake": false,
      "locked": {
-        "lastModified": 1712441622,
-        "narHash": "sha256-ta+0jw7P0ESThP8q2c+CD+nCzPMyHH2Cy3kjjysH0TE=",
+        "lastModified": 1714895218,
+        "narHash": "sha256-LMRt1XEoeHB3blfjI0SsQr4goMUmwjoMGS2LcR3ye20=",
        "owner": "windwp",
        "repo": "nvim-autopairs",
-        "rev": "4f41e5940bc0443fdbe5f995e2a596847215cd2a",
+        "rev": "14e97371b2aab6ee70054c1070a123dfaa3e217e",
        "type": "github"
      },
      "original": {
@ -1067,11 +1012,11 @@
    "plugin-nvim-cmp": {
      "flake": false,
      "locked": {
-        "lastModified": 1713837627,
-        "narHash": "sha256-rz+JMd/hsUEDNVan2sCuEGtbsOVi6oRmPtps+7qSXQE=",
+        "lastModified": 1715160812,
+        "narHash": "sha256-/zTOFwCSBETBgkILpP8h82ZjN7LiMV0Uk5d2TEnQVU4=",
        "owner": "hrsh7th",
        "repo": "nvim-cmp",
-        "rev": "8f3c541407e691af6163e2447f3af1bd6e17f9a3",
+        "rev": "cd2cf0c124d3de577fb5449746568ee8e601afc8",
        "type": "github"
      },
      "original": {
@ -1147,11 +1092,11 @@
    "plugin-nvim-dap-ui": {
      "flake": false,
      "locked": {
-        "lastModified": 1710867604,
-        "narHash": "sha256-KAwCt8E3lC0fzXQ9GpPsdb9wdWC6G2P4C/YFQFY9AAM=",
+        "lastModified": 1714314733,
+        "narHash": "sha256-26g4dlxzTGaR5OrXpPo4A2erM/eSkgedb0Bl2pK362M=",
        "owner": "rcarriga",
        "repo": "nvim-dap-ui",
-        "rev": "edfa93f60b189e5952c016eee262d0685d838450",
+        "rev": "5934302d63d1ede12c0b22b6f23518bb183fc972",
        "type": "github"
      },
      "original": {
@ -1195,11 +1140,11 @@
    "plugin-nvim-lspconfig": {
      "flake": false,
      "locked": {
-        "lastModified": 1713908193,
-        "narHash": "sha256-VdIoInJj2u49WHN4+WX0kNHdbXgh0AqIPU+OAiUaBck=",
+        "lastModified": 1715152811,
+        "narHash": "sha256-LMzLDbkKVmRRhwaUaroCRGUsKe/fwzgwV1gbvr/t6WQ=",
        "owner": "neovim",
        "repo": "nvim-lspconfig",
-        "rev": "cfa386fc4027e847156ee16141ea1f4c0bc2f0a4",
+        "rev": "a3d9395455f2b2e3b50a0b0f37b8b4c23683f44a",
        "type": "github"
      },
      "original": {
@ -1259,11 +1204,11 @@
    "plugin-nvim-nio": {
      "flake": false,
      "locked": {
-        "lastModified": 1712221544,
-        "narHash": "sha256-ZRYclqsgAvlRBwb59XHlqVat7CxUJTH1rD6QLwh1ang=",
+        "lastModified": 1714664267,
+        "narHash": "sha256-VfoJOXXtMhalFcnfhVzweq7TVmB8WjRP+Z5Z5Z24Pzc=",
        "owner": "nvim-neotest",
        "repo": "nvim-nio",
-        "rev": "5800f585def265d52f1d8848133217c800bcb25d",
+        "rev": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90",
        "type": "github"
      },
      "original": {
@ -1291,11 +1236,11 @@
    "plugin-nvim-session-manager": {
      "flake": false,
      "locked": {
-        "lastModified": 1708284146,
-        "narHash": "sha256-+TDWY8mprJfUp9ZFKbz83to7XW8iiovja22jHms+N1A=",
+        "lastModified": 1714905094,
+        "narHash": "sha256-VduhmnnRPIdi6GZ+TZUnZfpY4Lt8z5JBTKgl7oobtdY=",
        "owner": "Shatur",
        "repo": "neovim-session-manager",
-        "rev": "d8e1ba3bbcf3fdc6a887bcfbd94c48ae4707b457",
+        "rev": "892c55f7256fe170301a1fdd21752982c75c3507",
        "type": "github"
      },
      "original": {
@ -1307,11 +1252,11 @@
    "plugin-nvim-surround": {
      "flake": false,
      "locked": {
-        "lastModified": 1712807644,
-        "narHash": "sha256-gXWSCAJhOJKzTFi6QiDqDWPNgBtG5KgyF2t4gposqSY=",
+        "lastModified": 1714506343,
+        "narHash": "sha256-PJdkmTzuRldPTdaoerdddOL0/+V/KyNSzFBBee6P4kU=",
        "owner": "kylechui",
        "repo": "nvim-surround",
-        "rev": "a4e30d33add8a9743b4f518b3a788b3c8e5def71",
+        "rev": "6d0dc3dbb557bcc6a024969da461df4ba803fc48",
        "type": "github"
      },
      "original": {
@ -1323,11 +1268,11 @@
    "plugin-nvim-tree-lua": {
      "flake": false,
      "locked": {
-        "lastModified": 1713946472,
-        "narHash": "sha256-iD8c/dXt/UcTYDK8/zkTkFW/1Ial8ulCUWojjyXpG8k=",
+        "lastModified": 1714794673,
+        "narHash": "sha256-rY4FbuqBM4zOUkaA3QBc+UrpfTha8uGtp+lIzrYK+cg=",
        "owner": "nvim-tree",
        "repo": "nvim-tree.lua",
-        "rev": "62008e5cf2e8745c9d23bb599ef642963131057e",
+        "rev": "64f61e4c913047a045ff90bd188dd3b54ee443cf",
        "type": "github"
      },
      "original": {
@ -1339,11 +1284,11 @@
    "plugin-nvim-treesitter-context": {
      "flake": false,
      "locked": {
-        "lastModified": 1713984790,
-        "narHash": "sha256-QAudKglQGDRJKrsEcMSjbrxTgQRXO60ZcfOvEnPLUoE=",
+        "lastModified": 1714689136,
+        "narHash": "sha256-gHbLt0ApyPPQU8Q+lde0Zv8XBR6pESKzvIzIXHkd5eI=",
        "owner": "nvim-treesitter",
        "repo": "nvim-treesitter-context",
-        "rev": "4fe0a54e86859744968e1a5c7867b49c86855774",
+        "rev": "2650e6431f7daba5d9c2c64134fa5eb2312eb3d7",
        "type": "github"
      },
      "original": {
@ -1371,11 +1316,11 @@
    "plugin-nvim-web-devicons": {
      "flake": false,
      "locked": {
-        "lastModified": 1713675782,
-        "narHash": "sha256-AW2W6H7OTv52hfZCcYQc5UjFArBWKLeVclrwMt13HOM=",
+        "lastModified": 1715028064,
+        "narHash": "sha256-DSUTxUFCesXuaJjrDNvurILUt1IrO5MI5ukbZ8D87zQ=",
        "owner": "nvim-tree",
        "repo": "nvim-web-devicons",
-        "rev": "beb6367ab8496c9e43f22e0252735fdadae1872d",
+        "rev": "5b9067899ee6a2538891573500e8fd6ff008440f",
        "type": "github"
      },
      "original": {
@ -1387,11 +1332,11 @@
    "plugin-obsidian-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1713538455,
-        "narHash": "sha256-nIAaQa0DBYBQyfTEJi3Lzqs7QJqyw0Cemq6Hm704K60=",
+        "lastModified": 1715192893,
+        "narHash": "sha256-lGnEEFp/MU5sciq6bH5YKAiFx7kf9tTYqE+eB8zvf7A=",
        "owner": "epwalsh",
        "repo": "obsidian.nvim",
-        "rev": "ec0f44e1921d2701bd99a542031d280f1e3930b5",
+        "rev": "2e1f03416583232899dc1b6e27673da5e705abef",
        "type": "github"
      },
      "original": {
@ -1419,11 +1364,11 @@
    "plugin-orgmode-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1713539113,
-        "narHash": "sha256-0Ayu2kVpnsxu/ER0nx+t7nyU9oNN8URLrGQtAKKb7Ls=",
+        "lastModified": 1715114055,
+        "narHash": "sha256-SmofuYt4fLhtl5qedYlmCRgOmZaw3nmlnMg0OMzyKnM=",
        "owner": "nvim-orgmode",
        "repo": "orgmode",
-        "rev": "389e91f6f935aa845bc0cd13dd80f75431c34751",
+        "rev": "cda615fa7c8607bfb7aaf7d2c9424dd5969f2625",
        "type": "github"
      },
      "original": {
@ -1451,11 +1396,11 @@
    "plugin-plenary-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1713788468,
-        "narHash": "sha256-orGs1npIGIk7MUYadatYrcEXygK7JTj6OqQwy2TLDn0=",
+        "lastModified": 1714083960,
+        "narHash": "sha256-vy0MXEoSM4rvYpfwbc2PnilvMOA30Urv0FAxjXuvqQ8=",
        "owner": "nvim-lua",
        "repo": "plenary.nvim",
-        "rev": "5129a3693c482fcbc5ab99a7706ffc4360b995a0",
+        "rev": "08e301982b9a057110ede7a735dd1b5285eb341f",
        "type": "github"
      },
      "original": {
@ -1595,11 +1540,11 @@
    "plugin-telescope": {
      "flake": false,
      "locked": {
-        "lastModified": 1713665692,
-        "narHash": "sha256-wlRiwT1TCtwPXnIwnzqa6ZABUzJYn+lSRyvkqe6Dbsw=",
+        "lastModified": 1714700089,
+        "narHash": "sha256-SoEetPE7f7Y0kUa4+7dH+EOs/0WBsMDxeOkbVNuoSjE=",
        "owner": "nvim-telescope",
        "repo": "telescope.nvim",
-        "rev": "7d1698f3d88b448e0639974248cc17f49b7b8acf",
+        "rev": "fac83a556e7b710dc31433dec727361ca062dbe9",
        "type": "github"
      },
      "original": {
@ -1691,11 +1636,11 @@
    "plugin-vim-fugitive": {
      "flake": false,
      "locked": {
-        "lastModified": 1712554826,
-        "narHash": "sha256-pmY1EQbupKvsqok9O5omkOWi0BEZ8df7HL0F7ubdY9Q=",
+        "lastModified": 1714601825,
+        "narHash": "sha256-0ujueJ226zEmjkFwodSukO1Zu5gMvTmx/dCtT5VBhek=",
        "owner": "tpope",
        "repo": "vim-fugitive",
-        "rev": "dac8e5c2d85926df92672bf2afb4fc48656d96c7",
+        "rev": "ce882460cf3db12e99f8bf579cbf99e331f6dd4f",
        "type": "github"
      },
      "original": {
@ -1850,7 +1795,6 @@
        "plugin-diffview-nvim": "plugin-diffview-nvim",
        "plugin-dracula": "plugin-dracula",
        "plugin-dressing-nvim": "plugin-dressing-nvim",
-        "plugin-elixir-ls": "plugin-elixir-ls",
        "plugin-elixir-tools": "plugin-elixir-tools",
        "plugin-fidget-nvim": "plugin-fidget-nvim",
        "plugin-flutter-tools": "plugin-flutter-tools",
@ -1927,7 +1871,6 @@
        "plugin-which-key": "plugin-which-key",
        "rnix-lsp": "rnix-lsp",
        "systems": "systems_2",
-        "tidalcycles": "tidalcycles",
        "zig": "zig"
      }
    },
@ -1943,11 +1886,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1704593904,
-        "narHash": "sha256-nDoXZDTRdgF3b4n3m011y99nYFewvOl9UpzFvP8Rb3c=",
+        "lastModified": 1714529851,
+        "narHash": "sha256-YMKJW880f7LHXVRzu93xa6Ek+QLECIu0IRQbXbzZe38=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "c36fd70a99decfa6e110c86f296a97613034a680",
+        "rev": "9ca720fdcf7865385ae3b93ecdf65f1a64cb475e",
        "type": "github"
      },
      "original": {
@ -1956,23 +1899,6 @@
        "type": "github"
      }
    },
-    "superdirt-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1611740180,
-        "narHash": "sha256-GtnqZeMFqFkVhgx2Exu0wY687cHa7mNnVCgjQd6fiIA=",
-        "owner": "musikinformatik",
-        "repo": "superdirt",
-        "rev": "7abb62e89649daa1232b9cbd6427241868abd30e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "musikinformatik",
-        "ref": "master",
-        "repo": "superdirt",
-        "type": "github"
-      }
-    },
    "systems": {
      "locked": {
        "lastModified": 1681028828,
@ -2003,62 +1929,6 @@
        "type": "github"
      }
    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "tidal-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1654350756,
-        "narHash": "sha256-tONM5SYYBca0orTLH1EUOilSC1FCluWrFt8AetUx+YQ=",
-        "owner": "tidalcycles",
-        "repo": "tidal",
-        "rev": "fda9c1ecb3722698935245e5409ef8ccdfca16c8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tidalcycles",
-        "ref": "main",
-        "repo": "tidal",
-        "type": "github"
-      }
-    },
-    "tidalcycles": {
-      "inputs": {
-        "dirt-samples-src": "dirt-samples-src",
-        "nixpkgs": "nixpkgs_3",
-        "superdirt-src": "superdirt-src",
-        "tidal-src": "tidal-src",
-        "utils": "utils_2",
-        "vim-tidal-src": "vim-tidal-src",
-        "vowel-src": "vowel-src"
-      },
-      "locked": {
-        "lastModified": 1694087816,
-        "narHash": "sha256-GMV5ONQhLwa6xRYhZkmwc2W2jbjAfHfB/OR9vR0+PFA=",
-        "owner": "mitchmindtree",
-        "repo": "tidalcycles.nix",
-        "rev": "1b1c4df5303e07930d23e8361ab8253ebec0c7bb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mitchmindtree",
-        "repo": "tidalcycles.nix",
-        "type": "github"
-      }
-    },
    "utils": {
      "locked": {
        "lastModified": 1656928814,
@ -2074,69 +1944,18 @@
        "type": "github"
      }
    },
-    "utils_2": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1692799911,
-        "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "vim-tidal-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1685703852,
-        "narHash": "sha256-8gyk17YLeKpLpz3LRtxiwbpsIbZka9bb63nK5/9IUoA=",
-        "owner": "tidalcycles",
-        "repo": "vim-tidal",
-        "rev": "e440fe5bdfe07f805e21e6872099685d38e8b761",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tidalcycles",
-        "repo": "vim-tidal",
-        "type": "github"
-      }
-    },
-    "vowel-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1641306144,
-        "narHash": "sha256-zfF6cvAGDNYWYsE8dOIo38b+dIymd17Pexg0HiPFbxM=",
-        "owner": "supercollider-quarks",
-        "repo": "vowel",
-        "rev": "ab59caa870201ecf2604b3efdd2196e21a8b5446",
-        "type": "github"
-      },
-      "original": {
-        "owner": "supercollider-quarks",
-        "ref": "master",
-        "repo": "vowel",
-        "type": "github"
-      }
-    },
    "zig": {
      "inputs": {
        "flake-compat": "flake-compat",
        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1713960597,
-        "narHash": "sha256-WAryNIrMfZ48iZSTh8hcHIX9vwh78LMFUtewgY7kp1Y=",
+        "lastModified": 1715170163,
+        "narHash": "sha256-EuRzY3HI9sMMqPX7Yb7xkZaBoznP0mtS2O/Kk/r6fYk=",
        "owner": "mitchellh",
        "repo": "zig-overlay",
-        "rev": "71894accd2dd096f5a84166a628b1f075311aafe",
+        "rev": "9c0a853edcab5d60d28784c10b13392d7fabb9d7",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -78,6 +78,7 @@

  # Flake inputs
  inputs = {
+    ## Basic Inputs
    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
    flake-parts.url = "github:hercules-ci/flake-parts";
    flake-utils.url = "github:numtide/flake-utils";
@ -106,13 +107,7 @@
      inputs.flake-utils.follows = "flake-utils";
    };

-    ### Plugins
-    # Tidal cycles
-    tidalcycles = {
-      url = "github:mitchmindtree/tidalcycles.nix";
-      inputs.vim-tidal-src.url = "github:tidalcycles/vim-tidal";
-    };
-
+    ## Plugins
    # LSP plugins
    plugin-nvim-lspconfig = {
      url = "github:neovim/nvim-lspconfig";
@ -191,26 +186,11 @@
      flake = false;
    };

-    plugin-elixir-ls = {
-      url = "github:elixir-lsp/elixir-ls";
-      flake = false;
-    };
-
    plugin-elixir-tools = {
      url = "github:elixir-tools/elixir-tools.nvim";
      flake = false;
    };

-    plugin-glow-nvim = {
-      url = "github:ellisonleao/glow.nvim";
-      flake = false;
-    };
-
-    plugin-image-nvim = {
-      url = "github:3rd/image.nvim";
-      flake = false;
-    };
-
    # Copying/Registers
    plugin-registers = {
      url = "github:tversteeg/registers.nvim";
@ -510,6 +490,16 @@
      flake = false;
    };

+    plugin-glow-nvim = {
+      url = "github:ellisonleao/glow.nvim";
+      flake = false;
+    };
+
+    plugin-image-nvim = {
+      url = "github:3rd/image.nvim";
+      flake = false;
+    };
+
    # Note-taking
    plugin-obsidian-nvim = {
      url = "github:epwalsh/obsidian.nvim";
--- a/flake/apps.nix
+++ b/flake/apps.nix
@ -1,21 +1,11 @@
-{lib, ...}: {
-  perSystem = {
-    system,
-    config,
-    ...
-  }: {
-    apps =
-      {
-        nix.program = lib.getExe config.packages.nix;
-        maximal.program = lib.getExe config.packages.maximal;
-        default = config.apps.nix;
-      }
-      // (
-        if !(builtins.elem system ["aarch64-darwin" "x86_64-darwin"])
-        then {
-          tidal.program = lib.getExe config.packages.tidal;
-        }
-        else {}
-      );
+{lib, ...}: let
+  inherit (lib.meta) getExe;
+in {
+  perSystem = {config, ...}: {
+    apps = {
+      nix.program = getExe config.packages.nix;
+      maximal.program = getExe config.packages.maximal;
+      default = config.apps.nix;
+    };
  };
 }
--- a/flake/legacyPackages.nix
+++ b/flake/legacyPackages.nix
@ -7,7 +7,6 @@
    legacyPackages = import inputs.nixpkgs {
      inherit system;
      overlays = [
-        inputs.tidalcycles.overlays.default
        inputs.self.overlays.default
        (_: _: {
          rnix-lsp = inputs'.rnix-lsp.defaultPackage;
--- a/flake/overlays.nix
+++ b/flake/overlays.nix
@ -9,13 +9,11 @@

  nixConfig = mainConfig false;
  maximalConfig = mainConfig true;
-  tidalConfig = {config.vim.tidal.enable = true;};
 in {
  flake.overlays.default = _final: prev: {
    inherit neovimConfiguration;
    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;}];
  };
 }
--- a/flake/packages.nix
+++ b/flake/packages.nix
@ -7,56 +7,50 @@
  }: let
    docs = import ../docs {inherit pkgs inputs;};
  in {
-    packages =
-      {
-        # Documentation
-        docs = docs.manual.html;
-        docs-html = docs.manual.html;
-        docs-manpages = docs.manPages;
-        docs-json = docs.options.json;
+    packages = {
+      # Documentation
+      docs = docs.manual.html;
+      docs-html = docs.manual.html;
+      docs-manpages = docs.manPages;
+      docs-json = docs.options.json;

-        # Build and open the built manual in your system browser
-        docs-html-wrapped = pkgs.writeScriptBin "docs-html-wrapped" ''
-          #!${pkgs.stdenv.shell}
-          # use xdg-open to open the docs in the browser
-          ${pkgs.xdg_utils}/bin/xdg-open ${docs.manual.html}
-        '';
+      # Build and open the built manual in your system browser
+      docs-html-wrapped = pkgs.writeScriptBin "docs-html-wrapped" ''
+        #!${pkgs.stdenv.shell}
+        # use xdg-open to open the docs in the browser
+        ${pkgs.xdg_utils}/bin/xdg-open ${docs.manual.html}
+      '';

-        # Exposed neovim configurations
-        nix = config.legacyPackages.neovim-nix;
-        maximal = config.legacyPackages.neovim-maximal;
-        default = config.legacyPackages.neovim-nix;
+      # Exposed neovim configurations
+      nix = config.legacyPackages.neovim-nix;
+      maximal = config.legacyPackages.neovim-maximal;
+      default = config.legacyPackages.neovim-nix;

-        # Published docker images
-        docker-nix = let
-          inherit (pkgs) bash gitFull buildEnv dockerTools;
-          inherit (config.legacyPackages) neovim-nix;
-        in
-          dockerTools.buildImage {
-            name = "nvf";
-            tag = "latest";
+      # Published docker images
+      docker-nix = let
+        inherit (pkgs) bash gitFull buildEnv dockerTools;
+        inherit (config.legacyPackages) neovim-nix;
+      in
+        dockerTools.buildImage {
+          name = "nvf";
+          tag = "latest";

-            copyToRoot = buildEnv {
-              name = "neovim-root";
-              pathsToLink = ["/bin"];
-              paths = [
-                neovim-nix
-                gitFull
-                bash
-              ];
-            };
-
-            config = {
-              Cmd = ["${neovim-nix}/bin/nvim"];
-              WorkingDir = "/home/neovim/demo";
-              Volumes = {"/home/neovim/demo" = {};};
-            };
+          copyToRoot = buildEnv {
+            name = "neovim-root";
+            pathsToLink = ["/bin"];
+            paths = [
+              neovim-nix
+              gitFull
+              bash
+            ];
          };
-      }
-      // (
-        if !(builtins.elem system ["aarch64-darwin" "x86_64-darwin"])
-        then {tidal = config.legacyPackages.neovim-tidal;}
-        else {}
-      );
+
+          config = {
+            Cmd = ["${neovim-nix}/bin/nvim"];
+            WorkingDir = "/home/neovim/demo";
+            Volumes = {"/home/neovim/demo" = {};};
+          };
+        };
+    };
  };
 }
--- a/modules/extra/deprecations.nix
+++ b/modules/extra/deprecations.nix
@ -0,0 +1,11 @@
+{lib, ...}: let
+  inherit (lib.modules) mkRemovedOptionModule;
+in {
+  imports = [
+    # 2024-06-06
+    (mkRemovedOptionModule ["vim" "tidal"] ''
+      Tidalcycles language support has been removed as of 2024-06-06 as it was long unmaintained. If
+      you depended on this functionality, please open an issue.
+    '')
+  ];
+}
--- a/modules/modules.nix
+++ b/modules/modules.nix
@ -53,7 +53,13 @@
    "warnings"
  ];

-  allModules = concatLists [neovim plugins wrapper];
+  # Extra modules, such as deprecation warnings
+  # or renames in one place.
+  extra = map (p: ./extra + "/${p}") [
+    "deprecations.nix"
+  ];
+
+  allModules = concatLists [neovim plugins wrapper extra];

  pkgsModule = {config, ...}: {
    config = {
--- a/modules/plugins/languages/bash/bash.nix
+++ b/modules/plugins/languages/bash/bash.nix
@ -1,15 +1,17 @@
 {
-  pkgs,
  config,
+  pkgs,
  lib,
  ...
 }: let
  inherit (builtins) attrNames;
  inherit (lib.options) mkOption mkEnableOption literalExpression;
+  inherit (lib.modules) mkIf mkMerge;
  inherit (lib.lists) isList;
  inherit (lib.types) enum either package listOf str bool;
-  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.languages) diagnosticsToLua;
  inherit (lib.nvim.types) diagnostics mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua;

  cfg = config.vim.languages.bash;

@ -55,6 +57,7 @@
          ls_sources,
          null_ls.builtins.diagnostics.shellcheck.with({
            command = "${pkg}/bin/shellcheck",
+            diagnostics_format = "#{m} [#{c}]"
          })
        )
      '';
@ -114,4 +117,30 @@ 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.bash-lsp = servers.${cfg.lsp.server}.lspConfig;
+    })
+
+    (mkIf cfg.format.enable {
+      vim.lsp.null-ls.enable = true;
+      vim.lsp.null-ls.sources.bash-format = formats.${cfg.format.type}.nullConfig;
+    })
+
+    (mkIf cfg.extraDiagnostics.enable {
+      vim.lsp.null-ls.enable = true;
+      vim.lsp.null-ls.sources = diagnosticsToLua {
+        lang = "bash";
+        config = cfg.extraDiagnostics.types;
+        inherit diagnosticsProviders;
+      };
+    })
+  ]);
 }
--- a/modules/plugins/languages/bash/config.nix
+++ b/modules/plugins/languages/bash/config.nix
@ -1,83 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib.lists) isList;
-  inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.nvim.lua) expToLua;
-  inherit (lib.nvim.languages) diagnosticsToLua;
-
-  cfg = config.vim.languages.bash;
-  diagnosticsProviders = {
-    shellcheck = {
-      package = pkgs.shellcheck;
-      nullConfig = pkg: ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.diagnostics.shellcheck.with({
-            command = "${pkg}/bin/shellcheck",
-          })
-        )
-      '';
-    };
-  };
-
-  formats = {
-    shfmt = {
-      package = pkgs.shfmt;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.shfmt.with({
-            command = "${pkgs.shfmt}/bin/shfmt",
-          })
-        )
-      '';
-    };
-  };
-
-  servers = {
-    bash-ls = {
-      package = pkgs.nodePackages.bash-language-server;
-      lspConfig = ''
-        lspconfig.bashls.setup{
-          capabilities = capabilities;
-          on_attach = default_on_attach;
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${cfg.lsp.package}/bin/bash-language-server",  "start"}''
-        };
-        }
-      '';
-    };
-  };
-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.bash-lsp = servers.${cfg.lsp.server}.lspConfig;
-    })
-
-    (mkIf cfg.format.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.bash-format = formats.${cfg.format.type}.nullConfig;
-    })
-
-    (mkIf cfg.extraDiagnostics.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources = diagnosticsToLua {
-        lang = "bash";
-        config = cfg.extraDiagnostics.types;
-        inherit diagnosticsProviders;
-      };
-    })
-  ]);
-}
--- a/modules/plugins/languages/bash/default.nix
+++ b/modules/plugins/languages/bash/default.nix
@ -1,6 +0,0 @@
-{
-  imports = [
-    ./bash.nix
-    ./config.nix
-  ];
-}
--- a/modules/plugins/languages/dart/dart.nix
+++ b/modules/plugins/languages/dart/dart.nix
@ -1,18 +1,23 @@
 {
  config,
-  lib,
  pkgs,
+  lib,
  ...
 }: let
  inherit (builtins) attrNames;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.trivial) boolToString;
  inherit (lib.lists) isList;
  inherit (lib.options) mkEnableOption mkOption;
  inherit (lib.types) enum either listOf package nullOr str bool;
  inherit (lib.strings) optionalString;
  inherit (lib.nvim.lua) expToLua;
  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.dag) entryAnywhere;

  cfg = config.vim.languages.dart;
+  ftcfg = cfg.flutter-tools;
+
  defaultServer = "dart";
  servers = {
    dart = {
@ -48,15 +53,16 @@ in {
        default = defaultServer;
      };
      package = mkOption {
-        description = "Dart LSP server package, or the command to run as a list of strings";
-        example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
        type = either package (listOf str);
        default = servers.${cfg.lsp.server}.package;
+        example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
+        description = "Dart LSP server package, or the command to run as a list of strings";
      };
+
      opts = mkOption {
-        description = "Options to pass to Dart LSP server";
        type = nullOr str;
        default = null;
+        description = "Options to pass to Dart LSP server";
      };
    };

@ -70,23 +76,26 @@ in {

    flutter-tools = {
      enable = mkOption {
-        description = "Enable flutter-tools for flutter support";
        type = bool;
        default = config.vim.languages.enableLSP;
+        description = "Enable flutter-tools for flutter support";
      };

      enableNoResolvePatch = mkOption {
-        description = ''
-          Patch flutter-tools so that it doesn't resolve symlinks when detecting flutter path.
-          This is required if you want to use a flutter package built with nix.
-          If you are using a flutter SDK installed from a different source and encounter the error "`dart` missing from PATH", disable this option.
-        '';
        type = bool;
        default = true;
+        description = ''
+          Whether to patch flutter-tools so that it doesn't resolve
+          symlinks when detecting flutter path.
+
+          This is required if you want to use a flutter package built with nix.
+          If you are using a flutter SDK installed from a different source
+          and encounter the error "`dart` missing from PATH", disable this option.
+        '';
      };

      color = {
-        enable = mkEnableOption "Whether or mot to highlight color variables at all";
+        enable = mkEnableOption "highlighting color variables";

        highlightBackground = mkOption {
          type = bool;
@ -112,4 +121,47 @@ 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 =
+        if ftcfg.enableNoResolvePatch
+        then ["flutter-tools-patched"]
+        else ["flutter-tools"];
+
+      vim.luaConfigRC.flutter-tools = 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,
+          },
+          ${optionalString cfg.dap.enable ''
+          debugger = {
+            enabled = true,
+          },
+        ''}
+        }
+      '';
+    })
+  ]);
 }
--- a/modules/plugins/languages/dart/config.nix
+++ b/modules/plugins/languages/dart/config.nix
@ -1,76 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (lib.lists) isList;
-  inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.strings) optionalString;
-  inherit (lib.trivial) boolToString;
-  inherit (lib.nvim.lua) expToLua;
-  inherit (lib.nvim.dag) entryAnywhere;
-
-  cfg = config.vim.languages.dart;
-  ftcfg = cfg.flutter-tools;
-  servers = {
-    dart = {
-      package = pkgs.dart;
-      lspConfig = ''
-        lspconfig.dartls.setup{
-          capabilities = capabilities;
-          on_attach=default_on_attach;
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${cfg.lsp.package}/bin/dart", "language-server", "--protocol=lsp"}''
-        };
-          ${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 =
-        if ftcfg.enableNoResolvePatch
-        then ["flutter-tools-patched"]
-        else ["flutter-tools"];
-
-      vim.luaConfigRC.flutter-tools = 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,
-          },
-          ${optionalString cfg.dap.enable ''
-          debugger = {
-            enabled = true,
-          },
-        ''}
-        }
-      '';
-    })
-  ]);
-}
--- a/modules/plugins/languages/dart/default.nix
+++ b/modules/plugins/languages/dart/default.nix
@ -1,6 +0,0 @@
-{
-  imports = [
-    ./dart.nix
-    ./config.nix
-  ];
-}
--- a/modules/plugins/languages/default.nix
+++ b/modules/plugins/languages/default.nix
@ -2,18 +2,16 @@
  inherit (lib.nvim.languages) mkEnable;
 in {
  imports = [
-    ./bash
-    ./dart
-    ./elixir
-    ./markdown
-    ./tidal
-
+    ./bash.nix
+    ./dart.nix
    ./clang.nix
    ./css.nix
+    ./elixir.nix
    ./go.nix
    ./html.nix
    ./java.nix
    ./lua.nix
+    ./markdown.nix
    ./nim.nix
    ./nix.nix
    ./php.nix
--- a/modules/plugins/languages/elixir.nix
+++ b/modules/plugins/languages/elixir.nix
@ -0,0 +1,138 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (builtins) attrNames;
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.lists) isList;
+  inherit (lib.types) enum either listOf package str;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.dag) entryAnywhere;
+
+  cfg = config.vim.languages.elixir;
+
+  defaultServer = "elixirls";
+  servers = {
+    elixirls = {
+      package = pkgs.elixir-ls;
+      lspConfig = ''
+        -- elixirls setup
+        lspconfig.elixirls.setup {
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/elixir-ls"}''
+        }
+        }
+      '';
+    };
+  };
+
+  defaultFormat = "mix";
+  formats = {
+    mix = {
+      package = pkgs.elixir;
+      nullConfig = ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.formatting.mix.with({
+            command = "${cfg.format.package}/bin/mix",
+          })
+        )
+      '';
+    };
+  };
+in {
+  options.vim.languages.elixir = {
+    enable = mkEnableOption "Elixir language support";
+
+    treesitter = {
+      enable = mkEnableOption "Elixir treesitter" // {default = config.vim.languages.enableTreesitter;};
+      package = mkGrammarOption pkgs "elixir";
+    };
+
+    lsp = {
+      enable = mkEnableOption "Elixir LSP support" // {default = config.vim.languages.enableLSP;};
+
+      server = mkOption {
+        description = "Elixir LSP server to use";
+        type = enum (attrNames servers);
+        default = defaultServer;
+      };
+
+      package = mkOption {
+        description = "Elixir LSP server package, or the command to run as a list of strings";
+        example = ''[lib.getExe pkgs.jdt-language-server " - data " " ~/.cache/jdtls/workspace "]'';
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
+      };
+    };
+
+    format = {
+      enable = mkEnableOption "Elixir formatting" // {default = config.vim.languages.enableFormat;};
+
+      type = mkOption {
+        description = "Elixir formatter to use";
+        type = enum (attrNames formats);
+        default = defaultFormat;
+      };
+
+      package = mkOption {
+        description = "Elixir formatter package";
+        type = package;
+        default = formats.${cfg.format.type}.package;
+      };
+    };
+
+    elixir-tools = {
+      enable = mkEnableOption "Elixir tools";
+    };
+  };
+
+  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.elixir-lsp = servers.${cfg.lsp.server}.lspConfig;
+    })
+
+    (mkIf cfg.format.enable {
+      vim.lsp.null-ls.enable = true;
+      vim.lsp.null-ls.sources.elixir-format = formats.${cfg.format.type}.nullConfig;
+    })
+
+    (mkIf cfg.elixir-tools.enable {
+      vim.startPlugins = ["elixir-tools"];
+      vim.luaConfigRC.elixir-tools = entryAnywhere ''
+        local elixir-tools = require("elixir")
+        local elixirls = require("elixir-tools.elixirls")
+
+        -- disable imperative insstallations of various
+        -- elixir related tools installed by elixir-tools
+        elixir-tools.setup {
+          nextls = {
+            enable = false -- defaults to false
+          },
+
+          credo = {
+            enable = false -- defaults to true
+          },
+
+          elixirls = {
+            enable = false, -- defaults to true
+          }
+        }
+      '';
+    })
+  ]);
+}
--- a/modules/plugins/languages/elixir/config.nix
+++ b/modules/plugins/languages/elixir/config.nix
@ -1,67 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (lib.modules) mkIf;
-  inherit (lib.meta) getExe;
-  inherit (lib.nvim.dag) entryAnywhere;
-
-  cfg = config.vim.languages.elixir;
-in {
-  config = mkIf (cfg.enable) {
-    vim.startPlugins = [
-      "elixir-tools"
-    ];
-
-    vim.luaConfigRC.elixir-tools = entryAnywhere ''
-        local elixir = require("elixir")
-        local elixirls = require("elixir.elixirls")
-
-        elixir.setup {
-          elixirls = {
-          -- alternatively, point to an existing elixir-ls installation (optional)
-          -- not currently supported by elixirls, but can be a table if you wish to pass other args `{"path/to/elixirls", "--foo"}`
-          cmd = "${getExe pkgs.elixir-ls}",
-
-          -- default settings, use the `settings` function to override settings
-          settings = elixirls.settings {
-            dialyzerEnabled = true,
-            fetchDeps = false,
-            enableTestLenses = false,
-            suggestSpecs = false,
-          },
-
-          on_attach = function(client, bufnr)
-            local map_opts = { buffer = true, noremap = true}
-
-            -- run the codelens under the cursor
-            vim.keymap.set("n", "<space>r",  vim.lsp.codelens.run, map_opts)
-            -- remove the pipe operator
-            vim.keymap.set("n", "<space>fp", ":ElixirFromPipe<cr>", map_opts)
-            -- add the pipe operator
-            vim.keymap.set("n", "<space>tp", ":ElixirToPipe<cr>", map_opts)
-            vim.keymap.set("v", "<space>em", ":ElixirExpandMacro<cr>", map_opts)
-
-            -- bindings for standard LSP functions.
-            vim.keymap.set("n", "<space>df", "<cmd>lua vim.lsp.buf.format()<cr>", map_opts)
-            vim.keymap.set("n", "<space>gd", "<cmd>lua vim.diagnostic.open_float()<cr>", map_opts)
-            vim.keymap.set("n", "<space>dt", "<cmd>lua vim.lsp.buf.definition()<cr>", map_opts)
-            vim.keymap.set("n", "<space>K", "<cmd>lua vim.lsp.buf.hover()<cr>", map_opts)
-            vim.keymap.set("n", "<space>gD","<cmd>lua vim.lsp.buf.implementation()<cr>", map_opts)
-            vim.keymap.set("n", "<space>1gD","<cmd>lua vim.lsp.buf.type_definition()<cr>", map_opts)
-
-            -- keybinds for fzf-lsp.nvim: https://github.com/gfanto/fzf-lsp.nvim
-            -- you could also use telescope.nvim: https://github.com/nvim-telescope/telescope.nvim
-            -- there are also core vim.lsp functions that put the same data in the loclist
-            vim.keymap.set("n", "<space>gr", ":References<cr>", map_opts)
-            vim.keymap.set("n", "<space>g0", ":DocumentSymbols<cr>", map_opts)
-            vim.keymap.set("n", "<space>gW", ":WorkspaceSymbols<cr>", map_opts)
-            vim.keymap.set("n", "<leader>d", ":Diagnostics<cr>", map_opts)
-          end
-        }
-      }
-    '';
-  };
-}
--- a/modules/plugins/languages/elixir/default.nix
+++ b/modules/plugins/languages/elixir/default.nix
@ -1,6 +0,0 @@
-{
-  imports = [
-    ./config.nix
-    ./elixir-tools.nix
-  ];
-}
--- a/modules/plugins/languages/elixir/elixir-tools.nix
+++ b/modules/plugins/languages/elixir/elixir-tools.nix
@ -1,7 +0,0 @@
-{lib, ...}: let
-  inherit (lib.options) mkEnableOption;
-in {
-  options.vim.languages.elixir = {
-    enable = mkEnableOption "Elixir language support";
-  };
-}
--- a/modules/plugins/languages/markdown/markdown.nix
+++ b/modules/plugins/languages/markdown/markdown.nix
@ -4,7 +4,8 @@
  lib,
  ...
 }: let
-  inherit (builtins) attrNames;
+  inherit (builtins) attrNames concatLists;
+  inherit (lib.modules) mkIf mkMerge;
  inherit (lib.options) mkEnableOption mkOption;
  inherit (lib.lists) isList;
  inherit (lib.types) bool enum either package listOf str;
@ -29,15 +30,31 @@
      '';
    };
  };
+
+  defaultFormat = "denofmt";
+  formats = {
+    denofmt = {
+      package = pkgs.deno;
+      nullConfig = ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.formatting.deno_fmt.with({
+            filetypes = ${expToLua (concatLists [cfg.format.extraFiletypes ["markdown"]])},
+            command = "${cfg.format.package}/bin/deno",
+          })
+        )
+      '';
+    };
+  };
 in {
  options.vim.languages.markdown = {
    enable = mkEnableOption "Markdown markup language support";

    treesitter = {
      enable = mkOption {
-        description = "Enable Markdown treesitter";
        type = bool;
        default = config.vim.languages.enableTreesitter;
+        description = "Enable Markdown treesitter";
      };
      mdPackage = mkGrammarOption pkgs "markdown";
      mdInlinePackage = mkGrammarOption pkgs "markdown-inline";
@ -47,17 +64,56 @@ in {
      enable = mkEnableOption "Enable Markdown LSP support" // {default = config.vim.languages.enableLSP;};

      server = mkOption {
-        description = "Markdown LSP server to use";
        type = enum (attrNames servers);
        default = defaultServer;
+        description = "Markdown LSP server to use";
      };

      package = mkOption {
-        description = "Markdown LSP server package, or the command to run as a list of strings";
-        example = ''[lib.getExe pkgs.jdt-language-server " - data " " ~/.cache/jdtls/workspace "]'';
        type = either package (listOf str);
        default = servers.${cfg.lsp.server}.package;
+        example = ''[lib.getExe pkgs.jdt-language-server " - data " " ~/.cache/jdtls/workspace "]'';
+        description = "Markdown LSP server package, or the command to run as a list of strings";
+      };
+    };
+
+    format = {
+      enable = mkEnableOption "Markdown formatting" // {default = config.vim.languages.enableFormat;};
+
+      type = mkOption {
+        type = enum (attrNames formats);
+        default = defaultFormat;
+        description = "Markdown formatter to use";
+      };
+
+      package = mkOption {
+        type = package;
+        default = formats.${cfg.format.type}.package;
+        description = "Markdown formatter package";
+      };
+
+      extraFiletypes = mkOption {
+        type = listOf str;
+        default = [];
+        description = "Extra filetypes to format with the Markdown formatter";
      };
    };
  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.mdPackage cfg.treesitter.mdInlinePackage];
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.markdown-lsp = servers.${cfg.lsp.server}.lspConfig;
+    })
+
+    (mkIf cfg.format.enable {
+      vim.lsp.null-ls.enable = true;
+      vim.lsp.null-ls.sources.markdown-format = formats.${cfg.format.type}.nullConfig;
+    })
+  ]);
 }
--- a/modules/plugins/languages/markdown/config.nix
+++ b/modules/plugins/languages/markdown/config.nix
@ -1,40 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib.nvim.lua) expToLua;
-  inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.lists) isList;
-
-  cfg = config.vim.languages.markdown;
-  servers = {
-    marksman = {
-      package = pkgs.marksman;
-      lspConfig = ''
-        lspconfig.marksman.setup{
-          capabilities = capabilities;
-          on_attach = default_on_attach;
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${cfg.lsp.package}/bin/marksman", "server"}''
-        },
-        }
-      '';
-    };
-  };
-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.lsp.enable {
-      vim.lsp.lspconfig.enable = true;
-      vim.lsp.lspconfig.sources.markdown-lsp = servers.${cfg.lsp.server}.lspConfig;
-    })
-  ]);
-}
--- a/modules/plugins/languages/markdown/default.nix
+++ b/modules/plugins/languages/markdown/default.nix
@ -1,6 +0,0 @@
-{...}: {
-  imports = [
-    ./config.nix
-    ./markdown.nix
-  ];
-}
--- a/modules/plugins/languages/tidal/config.nix
+++ b/modules/plugins/languages/tidal/config.nix
@ -1,23 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib.modules) mkIf;
-
-  cfg = config.vim.tidal;
-in {
-  config = mkIf (cfg.enable) {
-    vim.startPlugins = [
-      # From tidalcycles flake
-      pkgs.vimPlugins.vim-tidal
-    ];
-
-    vim.globals = {
-      "tidal_target" = "terminal";
-      "tidal_flash_duration" = 150;
-      "tidal_sc_enable" = cfg.openSC;
-    };
-  };
-}
--- a/modules/plugins/languages/tidal/default.nix
+++ b/modules/plugins/languages/tidal/default.nix
@ -1,6 +0,0 @@
-{...}: {
-  imports = [
-    ./tidal.nix
-    ./config.nix
-  ];
-}
--- a/modules/plugins/languages/tidal/tidal.nix
+++ b/modules/plugins/languages/tidal/tidal.nix
@ -1,24 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib.options) mkEnableOption mkOption;
-  inherit (lib.types) int bool;
-in {
-  options.vim.tidal = {
-    enable = mkEnableOption "tidalcycles tools and plugins";
-
-    flash = mkOption {
-      description = ''When sending a paragraph or a single line, vim-tidal will "flash" the selection for some milliseconds'';
-      type = int;
-      default = 150;
-    };
-
-    openSC = mkOption {
-      description = "Automatically run the supercollider CLI, sclang, alongside the Tidal GHCI terminal.";
-      type = bool;
-      default = true;
-    };
-  };
-}
--- a/modules/plugins/lsp/config.nix
+++ b/modules/plugins/lsp/config.nix
@ -16,7 +16,10 @@

  mappingDefinitions = self.options.vim.lsp.mappings;
  mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
-  mkBinding = binding: action: "vim.api.nvim_buf_set_keymap(bufnr, 'n', '${binding.value}', '<cmd>lua ${action}<CR>', {noremap=true, silent=true, desc='${binding.description}'})";
+  mkBinding = binding: action:
+    if binding.value != null
+    then "vim.api.nvim_buf_set_keymap(bufnr, 'n', '${binding.value}', '<cmd>lua ${action}<CR>', {noremap=true, silent=true, desc='${binding.description}'})"
+    else "";
 in {
  config = mkIf cfg.enable {
    vim = {
--- a/modules/utility/telescope/telescope.nix
+++ b/modules/utility/telescope/telescope.nix
@ -1,53 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: let
-  inherit (lib) mkMappingOption mkEnableOption mkOption types;
-in {
-  options.vim.telescope = {
-    mappings = {
-      findProjects = mkMappingOption "Find files [Telescope]" "<leader>fp";
-
-      findFiles = mkMappingOption "Find files [Telescope]" "<leader>ff";
-      liveGrep = mkMappingOption "Live grep [Telescope]" "<leader>fg";
-      buffers = mkMappingOption "Buffers [Telescope]" "<leader>fb";
-      helpTags = mkMappingOption "Help tags [Telescope]" "<leader>fh";
-      open = mkMappingOption "Open [Telescope]" "<leader>ft";
-
-      gitCommits = mkMappingOption "Git commits [Telescope]" "<leader>fvcw";
-      gitBufferCommits = mkMappingOption "Git buffer commits [Telescope]" "<leader>fvcb";
-      gitBranches = mkMappingOption "Git branches [Telescope]" "<leader>fvb";
-      gitStatus = mkMappingOption "Git status [Telescope]" "<leader>fvs";
-      gitStash = mkMappingOption "Git stash [Telescope]" "<leader>fvx";
-
-      lspDocumentSymbols = mkMappingOption "LSP Document Symbols [Telescope]" "<leader>flsb";
-      lspWorkspaceSymbols = mkMappingOption "LSP Workspace Symbols [Telescope]" "<leader>flsw";
-      lspReferences = mkMappingOption "LSP References [Telescope]" "<leader>flr";
-      lspImplementations = mkMappingOption "LSP Implementations [Telescope]" "<leader>fli";
-      lspDefinitions = mkMappingOption "LSP Definitions [Telescope]" "<leader>flD";
-      lspTypeDefinitions = mkMappingOption "LSP Type Definitions [Telescope]" "<leader>flt";
-      diagnostics = mkMappingOption "Diagnostics [Telescope]" "<leader>fld";
-
-      treesitter = mkMappingOption "Treesitter [Telescope]" "<leader>fs";
-    };
-
-    enable = mkEnableOption "telescope.nvim: multi-purpose search and picker utility";
-
-    vimgrep_arguments = mkOption {
-      description = "Arguments to use for the grep command";
-      type = types.listOf types.str;
-      default = [
-        "${pkgs.ripgrep}/bin/rg"
-        "--color=never"
-        "--no-heading"
-        "--with-filename"
-        "--line-number"
-        "--column"
-        "--smart-case"
-        "--hidden"
-        "--no-ignore"
-      ];
-    };
-  };
-}
--- a/modules/wrapper/rc/config.nix
+++ b/modules/wrapper/rc/config.nix
@ -133,6 +133,14 @@ in {
      configRC = {
        globalsScript = entryAnywhere (concatStringsSep "\n" globalsScript);

+        # Call additional lua files with :luafile in Vimscript
+        # section of the configuration, only after
+        # the luaScript section  has been evaluated
+        extraLuaFiles = let
+          callLuaFiles = map (file: "luafile ${file}") cfg.extraLuaFiles;
+        in
+          entryAfter ["globalScript"] (concatStringsSep "\n" callLuaFiles);
+
        # wrap the lua config in a lua block
        # using the wrapLuaConfic function from the lib
        luaScript = let
@ -148,7 +156,7 @@ in {
            inherit mapResult;
          };
        in
-          entryAfter ["globalsScript"] luaConfig;
+          entryAnywhere luaConfig;

        extraPluginConfigs = let
          mapResult = result: (wrapLuaConfig {
--- a/modules/wrapper/rc/options.nix
+++ b/modules/wrapper/rc/options.nix
@ -37,8 +37,8 @@ in {
        To avoid leaking imperative user configuration into your
        configuration, this is enabled by default. If you wish
        to load configuration from user configuration directories
-        (e.g. `$HOME/.config/nvim`, `$HOME/.config/nvim/after`
-        and `$HOME/.local/share/nvim/site`) you may set this
+        (e.g. {file}`$HOME/.config/nvim`, {file}`$HOME/.config/nvim/after`
+        and {file}`$HOME/.local/share/nvim/site`) you may set this
        option to true.
        :::
      '';
@ -68,16 +68,52 @@ in {
        active runtimepath of the Neovim. This can be used to
        add additional lookup paths for configs, plugins, spell
        languages and other things you would generally place in
-        your `$HOME/.config/nvim`.
+        your {file}`$HOME/.config/nvim`.

        This is meant as a declarative alternative to throwing
-        files into `~/.config/nvim` and having the Neovim
+        files into {file}`~/.config/nvim` and having the Neovim
        wrapper pick them up. For more details on
        `vim.o.runtimepath`, and what paths to use; please see
        [the official documentation](https://neovim.io/doc/user/options.html#'runtimepath')
      '';
    };

+    extraLuaFiles = mkOption {
+      type = listOf (either path str);
+      default = [];
+      example = literalExpression ''
+        [
+          # absolute path, as a string - impure
+          "$HOME/.config/nvim/my-lua-file.lua"
+
+          # relative path, as a path - pure
+          ./nvim/my-lua-file.lua
+
+          # source type path - pure and reproducible
+          (builtins.source {
+            path = ./nvim/my-lua-file.lua;
+            name = "my-lua-file";
+          })
+        ]
+      '';
+
+      description = ''
+        Additional lua files that will be sourced by Neovim.
+        Takes both absolute and relative paths, all of which
+        will be called via the `luafile` command in Neovim.
+
+        See [lua-commands](https://neovim.io/doc/user/lua.html#lua-commands)
+        on the Neovim documentation for more details.
+
+        ::: {.warning}
+        All paths passed to this option must be valid. If Neovim cannot
+        resolve the path you are attempting to sourcee, then your configuration
+        will error, and Neovim will not start. Please ensure that all paths
+        are correct before using this option.
+        :::
+      '';
+    };
+
    globals = mkOption {
      type = attrs;
      default = {};
Author	SHA1	Message	Date
raf	18f759690b	Merge `2bfedb14dc` into `2615c568f8`	2024-05-10 12:37:56 +00:00
raf	2615c568f8	Merge pull request #288 from NotAShelf/additional-luafile wrapper/rc: add vim.extraLuaFiles	2024-05-10 12:37:47 +00:00
NotAShelf	407ecf00d5	wrapper/rc: add `vim.additionaLuafiles` Allows the user to specify a list of lua files that will be called via `luafile`. All paths that are passed to this option are checked by `builtins.isPath` so attempting to source paths that do not exist do not result in a broken Lua configuration.	2024-05-09 00:44:58 +03:00
NotAShelf	7c1a8e2c1e	flake: bump inputs	2024-05-08 23:05:58 +03:00
NotAShelf	ea5f229efd	languages/markdown: convert extra ft list to lua table	2024-05-08 00:31:23 +03:00
NotAShelf	41f7abcdc3	languagess/markdown: add missing `config` section	2024-05-08 00:22:12 +03:00
NotAShelf	a85bf963e6	CI: don't build tidal output	2024-05-07 23:57:09 +03:00
raf	26755a6b93	Merge pull request #286 from NotAShelf/minor-lang-refactor modules/languages: minor refactor; add bash formatter	2024-05-07 20:53:35 +00:00
NotAShelf	96b92b5652	configuration.nix: disable nim by default It is broken on Darwin, and pkgs is not in scope here to check	2024-05-07 15:40:08 +03:00
NotAShelf	544c98a03b	Merge branch 'main' of github.com:NotAShelf/nvf into minor-lang-refactor	2024-05-07 01:04:47 +03:00
NotAShelf	e96897f6b3	languages/elixir: readd; format module options	2024-05-07 00:52:33 +03:00
raf	12fd9d69dc	Merge pull request #287 from FrothyMarrow/mappings-fix plugins/lsp: filter out null mappings	2024-05-06 21:42:22 +00:00
Frothy	dc0fa76295	docs: entry for fixed null lsp mappings	2024-05-06 17:01:16 -04:00
NotAShelf	e0790f2bdb	docs: remove remaining references to elixir & vim-tidal related pkgs	2024-05-06 23:43:35 +03:00
NotAShelf	bf090172d2	modules/extra: init deprecations module; warn for elixir & vim-tidal	2024-05-06 23:43:34 +03:00
NotAShelf	7481423bed	docs: update 0.7 release notes	2024-05-06 23:43:33 +03:00
NotAShelf	6eba2a5585	languages: move bash & dart configurations to standalone files	2024-05-06 23:43:32 +03:00
NotAShelf	1847b9f1bf	languages/tidal: remove	2024-05-06 23:43:31 +03:00
NotAShelf	d06ff3d7db	languages/markdown: move to standalone file; add deno formatter	2024-05-06 23:43:30 +03:00
Frothy	83583e9b64	plugins/lsp: filter out null mappings	2024-05-06 16:05:43 -04:00
raf	efd8b44ce1	Merge pull request #284 from FrothyMarrow/del-dupl-telescope utility/telescope: remove duplicate telescope module	2024-05-06 12:53:12 +00:00
Frothy	9fe96ce010	utility/telescope: remove duplicate telescope module	2024-05-06 08:46:04 -04:00