mirror of
https://github.com/m-housh/dotfiles.git
synced 2026-02-14 14:12:41 +00:00
fix: Fix merge conflicts
This commit is contained in:
@@ -1,15 +1,16 @@
|
||||
return {
|
||||
'm-housh/swift.nvim',
|
||||
dependencies = {
|
||||
'akinsho/toggleterm.nvim'
|
||||
},
|
||||
ft = { 'swift' },
|
||||
config = function()
|
||||
require('swift').setup()
|
||||
local default_options = { noremap = true, silent = true }
|
||||
local actions = require('swift.actions')
|
||||
|
||||
vim.keymap.set('n', '<C-b>', actions.build, default_options)
|
||||
vim.keymap.set('n', '<C-S-U>', actions.test, default_options)
|
||||
end
|
||||
}
|
||||
"m-housh/swift.nvim",
|
||||
dependencies = {
|
||||
"akinsho/toggleterm.nvim",
|
||||
},
|
||||
ft = { "swift" },
|
||||
config = function()
|
||||
require("swift").setup()
|
||||
local default_options = { noremap = true, silent = true }
|
||||
local actions = require("swift.actions")
|
||||
vim.opt.tabstop = 2
|
||||
vim.opt.shiftwidth = 2
|
||||
vim.keymap.set("n", "<C-b>", actions.build, default_options)
|
||||
vim.keymap.set("n", "<C-S-U>", actions.test, default_options)
|
||||
end,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user