init.lua @ 300ceda

M lua/plugin.lua

@@ -9,6 +9,7 @@ use "lewis6991/impatient.nvim"
 
   use { "tpope/vim-surround", keys = { "c", "d", "y" } }
   use { "numToStr/Comment.nvim", keys = { "gc" }, config = get_config "Comment" }
+  use { "windwp/nvim-autopairs", config = get_config "plugin.autopairs" }
   use { "ahmedkhalf/project.nvim", config = get_config "plugin.project" }
 
   -- languages
@@ -29,13 +30,6 @@ use { "folke/which-key.nvim", config = get_config "plugin.whichkey" }
   use { "nvim-lualine/lualine.nvim", config = get_config "plugin.statusline" }
   use { "folke/todo-comments.nvim", config = get_config "todo-comments" }
   use { "goolord/alpha-nvim", config = get_config "plugin.alpha" }
-
-  use {
-    "windwp/nvim-autopairs",
-    event = "InsertEnter",
-    module = "nvim-autopairs",
-    config = get_config "plugin.autopairs",
-  }
 
   use {
     "kyazdani42/nvim-tree.lua",
@@ -97,12 +91,5 @@ requires = {
       { "nvim-treesitter/nvim-treesitter-refactor", after = "nvim-treesitter" },
       { "nvim-treesitter/playground", after = "nvim-treesitter" },
     },
-  }
-
-  use {
-    "rcarriga/vim-ultest",
-    requires = { { "vim-test/vim-test", after = "vim-ultest" } },
-    cmd = { "Ultest", "UltestStop", "UltestClear", "UltestNearest", "UltestOutput" },
-    run = "<cmd>UpdateRemotePlugins<cr>",
   }
 end)

M lua/plugin/autopairs.lua

@@ -2,11 +2,11 @@ local M = {}
 
 function M.setup()
   local npairs = require "nvim-autopairs"
-  npairs.setup()
+  npairs.setup {
+    check_ts = true,
+  }
 
-  npairs.add_rules(require "nvim-autopairs.rules.endwise-elixir")
   npairs.add_rules(require "nvim-autopairs.rules.endwise-lua")
-  npairs.add_rules(require "nvim-autopairs.rules.endwise-ruby")
 end
 
 return M

M lua/plugin/whichkey.lua

@@ -99,16 +99,6 @@ i = { "<cmd>PackerInstall<cr>", "Install" },
       c = { "<cmd>PackerCompile<cr>", "Compile" },
       C = { "<cmd>PackerClean<cr>", "Clean" },
     },
-    t = {
-      name = "Tests",
-      t = { "<cmd>Ultest<cr>", "Run all" },
-      s = { "<cmd>UltestStop<cr>", "Stop all" },
-      c = { "<cmd>UltestClear<cr>", "Clean results" },
-      n = { "<cmd>UltestNearest<cr>", "Run nearest" },
-      N = { "<cmd>UltestStopNearest<cr>", "Stop nearest" },
-      o = { "<cmd>UltestOutput<cr>", "Show output" },
-      S = { "<cmd>UltestSummary<cr>", "Summary win" },
-    },
   }
 
   wk.register(mappings, opts)