diff --git a/configuration.nix b/configuration.nix index 832bf95c..df0b2b1c 100644 --- a/configuration.nix +++ b/configuration.nix @@ -174,7 +174,6 @@ isMaximal: { notes = { obsidian.enable = false; # FIXME: neovim fails to build if obsidian is enabled - neorg.enable = false; orgmode.enable = false; mind-nvim.enable = isMaximal; todo-comments.enable = true; diff --git a/docs/release-notes/rl-0.7.md b/docs/release-notes/rl-0.7.md index 7cbdbaae..87861e2d 100644 --- a/docs/release-notes/rl-0.7.md +++ b/docs/release-notes/rl-0.7.md @@ -262,7 +262,6 @@ everyone. - 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 -- Add Neorg support under `vim.notes.neorg` - Add LSP, diagnostics, formatter and Treesitter support for Kotlin under `vim.languages.kotlin` - changed default keybinds for leap.nvim to avoid altering expected behavior @@ -277,4 +276,3 @@ everyone. - Add LSP support for Scala via [nvim-metals](https://github.com/scalameta/nvim-metals) - diff --git a/flake.lock b/flake.lock index 34a22430..843acb2a 100644 --- a/flake.lock +++ b/flake.lock @@ -828,22 +828,6 @@ "type": "github" } }, - "plugin-lua-utils-nvim": { - "flake": false, - "locked": { - "lastModified": 1708177208, - "narHash": "sha256-9ildzQEMkXKZ3LHq+khGFgRQFxlIXQclQ7QU3fcU1C4=", - "owner": "nvim-neorg", - "repo": "lua-utils.nvim", - "rev": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd", - "type": "github" - }, - "original": { - "owner": "nvim-neorg", - "repo": "lua-utils.nvim", - "type": "github" - } - }, "plugin-lualine": { "flake": false, "locked": { @@ -972,38 +956,6 @@ "type": "github" } }, - "plugin-neorg": { - "flake": false, - "locked": { - "lastModified": 1727821831, - "narHash": "sha256-yfWQ6yKytu1jkWUtRZTVICslUWej6jVYv7frmSB7/6Q=", - "owner": "nvim-neorg", - "repo": "neorg", - "rev": "afc9a37bf021acb0853e95714c4c6436e1588286", - "type": "github" - }, - "original": { - "owner": "nvim-neorg", - "repo": "neorg", - "type": "github" - } - }, - "plugin-neorg-telescope": { - "flake": false, - "locked": { - "lastModified": 1722358034, - "narHash": "sha256-ei4uUqpIQjGKzu5ryu0Hlmis9TS9FJsYnjt4J4QdWlw=", - "owner": "nvim-neorg", - "repo": "neorg-telescope", - "rev": "ddb2556644cae922699a239bbb0fe16e25b084b7", - "type": "github" - }, - "original": { - "owner": "nvim-neorg", - "repo": "neorg-telescope", - "type": "github" - } - }, "plugin-new-file-template-nvim": { "flake": false, "locked": { @@ -1517,22 +1469,6 @@ "type": "github" } }, - "plugin-pathlib-nvim": { - "flake": false, - "locked": { - "lastModified": 1724943804, - "narHash": "sha256-YhCJeNKlcjgg3q51UWFhuIEPzNueC8YTpeuPPJDndvw=", - "owner": "pysan3", - "repo": "pathlib.nvim", - "rev": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1", - "type": "github" - }, - "original": { - "owner": "pysan3", - "repo": "pathlib.nvim", - "type": "github" - } - }, "plugin-plenary-nvim": { "flake": false, "locked": { @@ -1955,7 +1891,6 @@ "plugin-lsp-signature": "plugin-lsp-signature", "plugin-lspkind": "plugin-lspkind", "plugin-lspsaga": "plugin-lspsaga", - "plugin-lua-utils-nvim": "plugin-lua-utils-nvim", "plugin-lualine": "plugin-lualine", "plugin-luasnip": "plugin-luasnip", "plugin-mind-nvim": "plugin-mind-nvim", @@ -1964,8 +1899,6 @@ "plugin-neo-tree-nvim": "plugin-neo-tree-nvim", "plugin-neocord": "plugin-neocord", "plugin-neodev-nvim": "plugin-neodev-nvim", - "plugin-neorg": "plugin-neorg", - "plugin-neorg-telescope": "plugin-neorg-telescope", "plugin-new-file-template-nvim": "plugin-new-file-template-nvim", "plugin-noice-nvim": "plugin-noice-nvim", "plugin-none-ls": "plugin-none-ls", @@ -1998,7 +1931,6 @@ "plugin-orgmode-nvim": "plugin-orgmode-nvim", "plugin-otter-nvim": "plugin-otter-nvim", "plugin-oxocarbon": "plugin-oxocarbon", - "plugin-pathlib-nvim": "plugin-pathlib-nvim", "plugin-plenary-nvim": "plugin-plenary-nvim", "plugin-project-nvim": "plugin-project-nvim", "plugin-registers": "plugin-registers", diff --git a/flake.nix b/flake.nix index d12bdc57..8a9f93cc 100644 --- a/flake.nix +++ b/flake.nix @@ -646,26 +646,6 @@ flake = false; }; - plugin-lua-utils-nvim = { - url = "github:nvim-neorg/lua-utils.nvim"; - flake = false; - }; - - plugin-pathlib-nvim = { - url = "github:pysan3/pathlib.nvim"; - flake = false; - }; - - plugin-neorg = { - url = "github:nvim-neorg/neorg"; - flake = false; - }; - - plugin-neorg-telescope = { - url = "github:nvim-neorg/neorg-telescope"; - flake = false; - }; - plugin-nui-nvim = { # (required by noice.nvim) url = "github:MunifTanjim/nui.nvim"; diff --git a/modules/plugins/comments/comment-nvim/config.nix b/modules/plugins/comments/comment-nvim/config.nix index e228d92c..e70e918c 100644 --- a/modules/plugins/comments/comment-nvim/config.nix +++ b/modules/plugins/comments/comment-nvim/config.nix @@ -12,7 +12,9 @@ inherit (self.options.vim.comments.comment-nvim) mappings; in { config = mkIf cfg.enable { - vim.startPlugins = ["comment-nvim"]; + vim.startPlugins = [ + "comment-nvim" + ]; vim.maps.normal = mkMerge [ (mkBinding cfg.mappings.toggleOpLeaderLine "(comment_toggle_linewise)" mappings.toggleOpLeaderLine.description) @@ -34,7 +36,7 @@ in { mappings.toggleCurrentBlock.description) ]; - vim.maps.visual = mkMerge [ + vim.maps.visualOnly = mkMerge [ (mkBinding cfg.mappings.toggleSelectedLine "(comment_toggle_linewise_visual)" mappings.toggleSelectedLine.description) (mkBinding cfg.mappings.toggleSelectedBlock "(comment_toggle_blockwise_visual)" mappings.toggleSelectedBlock.description) ]; diff --git a/modules/plugins/notes/default.nix b/modules/plugins/notes/default.nix index 6c342728..88a70924 100644 --- a/modules/plugins/notes/default.nix +++ b/modules/plugins/notes/default.nix @@ -2,7 +2,6 @@ imports = [ ./obsidian ./orgmode - ./neorg ./mind-nvim ./todo-comments ]; diff --git a/modules/plugins/notes/neorg/config.nix b/modules/plugins/notes/neorg/config.nix deleted file mode 100644 index fab5079d..00000000 --- a/modules/plugins/notes/neorg/config.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - config, - lib, - ... -}: let - inherit (lib.modules) mkIf mkMerge; - inherit (lib.nvim.dag) entryAnywhere; - inherit (lib.nvim.binds) pushDownDefault; - inherit (lib.nvim.lua) toLuaObject; - - cfg = config.vim.notes.neorg; -in { - config = mkIf cfg.enable (mkMerge [ - { - vim = { - startPlugins = [ - "lua-utils-nvim" - "nui-nvim" - "nvim-nio" - "pathlib-nvim" - "plenary-nvim" - "neorg" - "neorg-telescope" - ]; - - binds.whichKey.register = pushDownDefault { - "o" = "+Notes"; - }; - - pluginRC.neorg = entryAnywhere '' - require('neorg').setup(${toLuaObject cfg.setupOpts}) - ''; - }; - } - - (mkIf cfg.treesitter.enable { - vim.treesitter.enable = true; - vim.treesitter.grammars = [cfg.treesitter.norgPackage]; - }) - ]); -} diff --git a/modules/plugins/notes/neorg/default.nix b/modules/plugins/notes/neorg/default.nix deleted file mode 100644 index 409cee31..00000000 --- a/modules/plugins/notes/neorg/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./neorg.nix - ./config.nix - ]; -} diff --git a/modules/plugins/notes/neorg/neorg.nix b/modules/plugins/notes/neorg/neorg.nix deleted file mode 100644 index 6b5cf18e..00000000 --- a/modules/plugins/notes/neorg/neorg.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - inherit (lib.options) mkEnableOption mkOption; - inherit (lib.types) submodule listOf str; - inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption; -in { - options.vim.notes.neorg = { - enable = mkEnableOption '' - Neorg: An intuitive note-taking and organization tool with a structured nested syntax. - ''; - - setupOpts = mkPluginSetupOption "Neorg" { - load = { - "core.defaults" = mkOption { - default = {}; - description = '' - all of the most important modules that any user would want to have a "just works" experience - ''; - - type = submodule { - options = { - enable = mkEnableOption '' - all of the most important modules that any user would want to have a "just works" experience - ''; - config = { - disable = mkOption { - description = '' - list of modules from to be disabled from core.defaults - ''; - type = listOf str; - default = []; - example = ["core.autocommands" "core.itero"]; - }; - }; - }; - }; - }; - }; - }; - - treesitter = { - enable = mkEnableOption "Neorg treesitter" // {default = config.vim.languages.enableTreesitter;}; - norgPackage = mkGrammarOption pkgs "norg"; - }; - }; -}