michael/dotfiles
1
0
Fork 0
mirror of https://github.com/m-housh/dotfiles.git synced 2026-02-14 06:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fix merge conflicts

Browse Source
This commit is contained in:
Michael Housh
2024-11-20 22:07:02 -05:00
parent eed9c143ea
commit d9ea8d80c6
5 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
nvim/m-housh/lua/user/plugin/swift.lua
View File

@@ -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,
}

4
nvim/m-housh/lua/user/plugin/trouble.lua
View File

@@ -3,7 +3,9 @@ return {
dependencies = { "nvim-tree/nvim-web-devicons" },
event = { "BufReadPre", "BufNewFile" },
keys = {
{ "<leader>tt", "<cmd>Trouble quickfix toggle<cr>", { desc = "Open a quickfix" } },
{ "<leader>t", "<cmd>Trouble diagnostics toggle<cr>", { desc = "[T]rouble diagnostics" } },
{ "<leader>tq", "<cmd>Trouble quickfix toggle<cr>", { desc = "Open a quickfix" } },
{ "<leader>tl", "<cmd>Trouble loclist toggle<cr>", { desc = "[T]rouble [L]ocation list" } },
},
opts = {},

6
nvim/m-housh/lua/user/settings.lua
View File

@@ -2,7 +2,7 @@ local o = vim.opt
local wo = vim.wo
local fn = vim.fn
vim.cmd.set('inccommand=split')
vim.cmd.set("inccommand=split")
o.updatetime = 500 -- faster completion
o.timeoutlen = 800 -- time to wait for a mapped sequence to complete (in milliseconds)
o.ttimeoutlen = 300 -- Time in milliseconds to wait for a key code sequence to complete
@@ -47,7 +47,7 @@ wo.colorcolumn = "99999"
o.wildmode = "full"
o.lazyredraw = false -- do not redraw screen while running macros
o.grepprg = "rg --hidden --vimgrep --smart-case --"
o.completeopt = {"menu", "menuone", "noselect", "noinsert"} -- A comma separated list of options for Insert mode completion
o.completeopt = { "menu", "menuone", "noselect", "noinsert" } -- A comma separated list of options for Insert mode completion
o.wildignorecase = true -- When set case is ignored when completing file names and directories
o.wildignore = [[
.git,.hg,.svn
@@ -62,4 +62,4 @@ o.wildignore = [[
*.swp,.lock,.DS_Store,._*
*/tmp/*,*.so,*.swp,*.zip,**/node_modules/**,**/target/**,**.terraform/**"
]]
o.viminfo="" -- disable viminfo from copying information from current session, for security.
o.viminfo = "" -- disable viminfo from copying information from current session, for security.