diff --git a/.github/README.md b/.github/README.md index 33304fdb..22c56198 100644 --- a/.github/README.md +++ b/.github/README.md @@ -43,7 +43,6 @@
-[Features]: #features
[Get Started]: #get-started
[Documentation]: #documentation
[Help]: #help
@@ -51,7 +50,6 @@
[FAQ]: #faq
[Credits]: #credits
-**[
Features
][Features]**
**[
Get Started
][Get Started]**
**[
Documentation
][Documentation]**
**[
Help
][Help]**
@@ -62,19 +60,6 @@
---
-## Features
-
-- **Reproducible**: Your configuration will behave the same anywhere. No
- surprises, promise!
-- **Portable**: nvf depends _solely_ on your Nix store, and nothing else. No
- more global binaries! Works on all platforms, without hassle.
-- **Customizable**: There are _almost no defaults_ to annoy you. nvf is fully
- customizable through the Nix module system.
-- **Well-documented**: Documentation is priority. You will never face
- undocumented, obscure behaviour.
-- **Idiomatic**: nvf does things _the right way_. The codebase is, and will,
- remain maintainable.
-
## Get Started
If you are not sold on the concepts of **nvf**, and would like to try out the
@@ -121,7 +106,7 @@ The _recommended_ way of installing **nvf** is using either the NixOS or the
Home-Manager module, though it is completely possible and no less supported to
install **nvf** as a standalone package, or a flake output.
-See the [**nvf** manual] for detailed and up-to-date installation guides,
+See the [**nvf** Manual] for detailed and up-to-date installation guides,
configurations, available options, release notes and more. Tips for installing
userspace plugins is also contained in the documentation.
diff --git a/configuration.nix b/configuration.nix
index b21b26aa..08b0f9b6 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -19,7 +19,6 @@ isMaximal: {
lspsaga.enable = false;
trouble.enable = true;
lspSignature.enable = true;
- otter-nvim.enable = isMaximal;
lsplines.enable = isMaximal;
nvim-docs-view.enable = isMaximal;
};
@@ -156,7 +155,7 @@ isMaximal: {
};
utility = {
- ccc.enable = false;
+ ccc.enable = isMaximal;
vim-wakatime.enable = false;
icon-picker.enable = isMaximal;
surround.enable = isMaximal;
diff --git a/docs/release-notes/rl-0.7.md b/docs/release-notes/rl-0.7.md
index 55746f2b..d93bb2c6 100644
--- a/docs/release-notes/rl-0.7.md
+++ b/docs/release-notes/rl-0.7.md
@@ -202,5 +202,3 @@ everyone.
[Soliprem](https://github.com/Soliprem)
- Add LSP and Treesitter support for R under `vim.languages.R`.
-- Add Otter support under `vim.lsp.otter` and an assert to prevent conflict with
- ccc
diff --git a/flake.lock b/flake.lock
index ecc02f27..91fc5060 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1373,22 +1373,6 @@
"type": "github"
}
},
- "plugin-otter-nvim": {
- "flake": false,
- "locked": {
- "lastModified": 1724585935,
- "narHash": "sha256-euHwoK2WHLF/hrjLY2P4yGrIbYyBN38FL3q4CKNZmLY=",
- "owner": "jmbuhr",
- "repo": "otter.nvim",
- "rev": "ca9ce67d0399380b659923381b58d174344c9ee7",
- "type": "github"
- },
- "original": {
- "owner": "jmbuhr",
- "repo": "otter.nvim",
- "type": "github"
- }
- },
"plugin-oxocarbon": {
"flake": false,
"locked": {
@@ -1877,7 +1861,6 @@
"plugin-obsidian-nvim": "plugin-obsidian-nvim",
"plugin-onedark": "plugin-onedark",
"plugin-orgmode-nvim": "plugin-orgmode-nvim",
- "plugin-otter-nvim": "plugin-otter-nvim",
"plugin-oxocarbon": "plugin-oxocarbon",
"plugin-plenary-nvim": "plugin-plenary-nvim",
"plugin-project-nvim": "plugin-project-nvim",
diff --git a/flake.nix b/flake.nix
index 987e3e59..c4996fcf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,8 +13,8 @@
inherit inputs;
specialArgs = {inherit lib;};
} {
- # Allow users to bring their own systems.
- # «https://github.com/nix-systems/nix-systems»
+ # provide overridable systems
+ # https://github.com/nix-systems/nix-systems
systems = import inputs.systems;
imports = [
./flake/apps.nix
@@ -62,6 +62,7 @@
pkgs,
...
}: {
+ formatter = pkgs.alejandra;
devShells = {
default = self'.devShells.lsp;
nvim-nix = pkgs.mkShell {packages = [config.packages.nix];};
@@ -69,21 +70,6 @@
packages = with pkgs; [nil statix deadnix alejandra];
};
};
-
- # Provide the default formatter. `nix fmt` in project root
- # will format available files with the correct formatter.
- # P.S: Please do not format with nixfmt! It messes with many
- # syntax elements and results in unreadable code.
- formatter = pkgs.alejandra;
-
- # Check if codebase is properly formatted.
- # This can be initiated with `nix build .#checks.