Made a few changes
This commit is contained in:
parent
c7b01d9b6d
commit
7cbe73ad5b
19 changed files with 55 additions and 26 deletions
dotfiles/neovim/lua/my
|
@ -22,11 +22,11 @@ function M.mapSilent(mode, lhs, rhs, opts)
|
|||
end
|
||||
|
||||
function M.setup()
|
||||
M.map("n", "vv", "<C-w>v") -- Create vertical split
|
||||
M.map("n", "qq", ":wq<cr>") -- Create vertical split
|
||||
|
||||
-- Create chords
|
||||
if arpeggio ~= nil then
|
||||
-- Create chords
|
||||
arpeggio.chord("n", "vs", "<C-w>v") -- Create vertical split
|
||||
arpeggio.chord("n", "ji", ":w<cr>") -- Saving
|
||||
arpeggio.chord("i", "jk", "<Esc>") -- Remap Esc to jk
|
||||
arpeggio.chord("i", "<Leader>k", "<C-k><cr>") -- Rebind digraph insertion to leader+k
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
local au = require("my.helpers.augroup")
|
||||
local M = {}
|
||||
|
||||
local syntaxFiles = {bkf = "bkf"}
|
||||
local syntaxFiles = {hkf = "hkf"}
|
||||
|
||||
function M.setup()
|
||||
au.augroup("myfiledetection", function()
|
||||
|
|
|
@ -36,7 +36,9 @@ function M.setup()
|
|||
"hrsh7th/nvim-cmp", -- completion engine
|
||||
"L3MON4D3/LuaSnip", -- snippeting engine
|
||||
"saadparwaiz1/cmp_luasnip", -- snippet support for cmp
|
||||
"wakatime/vim-wakatime" -- track time usage
|
||||
"wakatime/vim-wakatime", -- track time usage
|
||||
"vmchale/dhall-vim", -- dhall syntax highlighting
|
||||
"folke/which-key.nvim"
|
||||
}
|
||||
|
||||
for _, v in ipairs(themePackages) do
|
||||
|
|
|
@ -14,7 +14,7 @@ function M.setup()
|
|||
local luasnip = require("luasnip")
|
||||
|
||||
local options = {
|
||||
formatting = {format = lspkind.cmp_format()},
|
||||
formatting = {format = lspkind.cmp_format({mode = "symbol"})},
|
||||
snippet = {
|
||||
-- REQUIRED - you must specify a snippet engine
|
||||
expand = function(args)
|
||||
|
|
|
@ -5,6 +5,7 @@ function M.setup()
|
|||
require('nvim-autopairs').setup()
|
||||
require("startup").setup()
|
||||
require("presence"):setup({}) -- wtf does the : do here?
|
||||
-- require("which-key").setup()
|
||||
|
||||
-- Plugins with their own configs:
|
||||
require("my.plugins.vim-tmux-navigator").setup()
|
||||
|
|
|
@ -71,6 +71,7 @@ end
|
|||
-- General server config
|
||||
local servers = {
|
||||
tsserver = {on_attach = on_attach_typescript},
|
||||
dhall_lsp_server = {},
|
||||
sumneko_lua = {
|
||||
settings = {
|
||||
Lua = {
|
||||
|
|
|
@ -12,7 +12,8 @@ function M.setup()
|
|||
lualine_b = {'branch', 'diff', 'diagnostics'},
|
||||
lualine_c = {'filename'},
|
||||
lualine_x = {},
|
||||
lualine_y = {'encoding', 'fileformat', 'filetype'},
|
||||
-- lualine_y = {'encoding', 'fileformat', 'filetype'},
|
||||
lualine_y = {'filetype'},
|
||||
lualine_z = {'location'}
|
||||
},
|
||||
-- Integration with other plugins
|
||||
|
|
|
@ -6,10 +6,10 @@ local M = {}
|
|||
function M.setup()
|
||||
vim.g.tmux_navigator_no_mappings = 1
|
||||
|
||||
map("n", "C-h", ":TmuxNavigateLeft<cr>")
|
||||
map("n", "C-j", ":TmuxNavigateDown<cr>")
|
||||
map("n", "C-k", ":TmuxNavigateUp<cr>")
|
||||
map("n", "C-l", ":TmuxNavigateRight<cr>")
|
||||
map("n", "<C-h>", ":TmuxNavigateLeft<cr>")
|
||||
map("n", "<C-j>", ":TmuxNavigateDown<cr>")
|
||||
map("n", "<C-k>", ":TmuxNavigateUp<cr>")
|
||||
map("n", "<C-l>", ":TmuxNavigateRight<cr>")
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
@ -4,6 +4,8 @@ local M = {}
|
|||
|
||||
function M.setup()
|
||||
arpeggio.chordSilent("n", "vp", ":VimuxPromptCommand<CR>")
|
||||
arpeggio.chordSilent("n", "vc", ":VimuxRunCommand \"clear\"<CR>")
|
||||
arpeggio.chordSilent("n", "vl", ":VimuxRunLastCommand<CR>")
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue