From 35456c3032fb42b44dc95ecea7ccd871485e7eca Mon Sep 17 00:00:00 2001 From: derped Date: Wed, 2 Jul 2025 15:55:26 +0200 Subject: [PATCH] nvim: remove org-mode --- machines/Lilim/options.nix | 1 - pkgsets/nvim/orgmode.nix | 40 ------------------------------------- pkgsets/nvim/treesitter.nix | 18 +---------------- 3 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 pkgsets/nvim/orgmode.nix diff --git a/machines/Lilim/options.nix b/machines/Lilim/options.nix index a0e4359..0df2386 100644 --- a/machines/Lilim/options.nix +++ b/machines/Lilim/options.nix @@ -52,7 +52,6 @@ "nvim::lualine" "nvim::nvim-highlight" "nvim::oil-nvim" - "nvim::orgmode" "nvim::sniprun" "nvim::telescope" "nvim::tmux-navigate" diff --git a/pkgsets/nvim/orgmode.nix b/pkgsets/nvim/orgmode.nix deleted file mode 100644 index dca52c6..0000000 --- a/pkgsets/nvim/orgmode.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - config, - ... -}: - -lib.mkIf (lib.elem "nvim::orgmode" config.machine.pkgs) { - programs.nvim-lazy.lazyPlugins = [ - { - lazy = true; - dir = vPlug: vPlug.orgmode; - event = [ "VeryLazy" ]; - ft = [ "org" ]; - dependencies = ( - vPlug: with vPlug; [ - vim-table-mode - "akinsho/org-bullets.nvim" - ] - ); - opts = { - org_hide_leading_stars = true; - org_log_done = true; - org_startup_folded = "showeverything"; - org_startup_indented = true; - org_adapt_indentation = false; - org_agenda_files = "~/org/**/*"; - org_default_notes_file = "~/org/refile.org"; - }; - } - { - lazy = true; - short = "akinsho/org-bullets.nvim"; - opts = { }; - } - { - lazy = true; - dir = vPlug: vPlug.vim-table-mode; - } - ]; -} diff --git a/pkgsets/nvim/treesitter.nix b/pkgsets/nvim/treesitter.nix index 102a630..d17e075 100644 --- a/pkgsets/nvim/treesitter.nix +++ b/pkgsets/nvim/treesitter.nix @@ -8,23 +8,7 @@ lib.mkIf (lib.elem "nvim::treesitter" config.machine.pkgs) { programs.nvim-lazy.lazyPlugins = let - org-grammar = pkgs.tree-sitter.buildGrammar { - language = "org"; - version = "1.0"; - src = pkgs.fetchFromGitHub { - owner = "nvim-orgmode"; - repo = "tree-sitter-org"; - rev = "436c2dec440e6ad40be98f3b712537bbb08bef0b"; - hash = "sha256-k/i+7/K6puXg554BWSLHIDlOXElUovOwOEe5i1Q95L8="; - }; - }; - # all grammars except replace org-mode - treesitter = pkgs.vimPlugins.nvim-treesitter.withPlugins ( - _: - (lib.filter (grammar: grammar.pname != "org-grammar") pkgs.vimPlugins.nvim-treesitter.allGrammars) - ++ [ org-grammar ] - ); - #treesitter = pkgs.vimPlugins.nvim-treesitter.withAllGrammars; + treesitter = pkgs.vimPlugins.nvim-treesitter.withAllGrammars; grammars = pkgs.symlinkJoin { name = "treesitter-parsers"; paths = treesitter.dependencies;