Compare commits

..

7 Commits

8 changed files with 49 additions and 24 deletions

View File

@ -45,7 +45,7 @@ font:
style: Bold Italic
# Point size
size: 11.0
size: 12.0
offset:
x: 0
@ -82,6 +82,22 @@ selection:
live_config_reload: true
cursor:
# Cursor style
#
# Values for 'style':
# - ▇ Block
# - _ Underline
# - | Beam
style: Block
# If this is `true`, the cursor will be rendered as a hollow box when the
# window is not focused.
unfocused_hollow: true
mouse_bindings:
- { mouse: Middle, action: PasteSelection }
key_bindings:
- { key: V, mods: Control|Shift, action: Paste }
- { key: C, mods: Control|Shift, action: Copy }

View File

@ -1,6 +1,6 @@
auto-reload yes
reload-time 30
browser chromium
browser "chromium --incognito"
macro y set browser "tmux new-window mpv %u"; open-in-browser ; set browser chromium
macro Y set browser "mpv %u"; open-in-browser ; set browser chromium

View File

@ -65,26 +65,26 @@ cmp.setup{
},
mapping = {
-- ["<cr>"] = cmp.mapping.confirm({select = true, behavior = cmp.ConfirmBehavior.Replace}),
["<cr>"] = cmp.mapping.confirm({select = true, behavior = cmp.ConfirmBehavior.Insert}),
["<Tab>"] = cmp.mapping(function(fallback)
if vim.fn.pumvisible() == 1 then
feedkey("<C-n>", "n")
elseif vim.fn["vsnip#available"]() == 1 then
feedkey("<Plug>(vsnip-expand-or-jump)", "")
elseif has_words_before() then
cmp.complete()
else
fallback() -- The fallback function sends a already mapped key. In this case, it's probably `<Tab>`.
end
end, { "i", "s" }),
["<Tab>"] = cmp.mapping.confirm({select = true, behavior = cmp.ConfirmBehavior.Insert}),
-- ["<Tab>"] = cmp.mapping(function(fallback)
-- if vim.fn.pumvisible() == 1 then
-- feedkey("<C-n>", "n")
-- elseif vim.fn["vsnip#available"]() == 1 then
-- feedkey("<Plug>(vsnip-expand-or-jump)", "")
-- elseif has_words_before() then
-- cmp.complete()
-- else
-- fallback() -- The fallback function sends a already mapped key. In this case, it's probably `<Tab>`.
-- end
-- end, { "i", "s" }),
["<S-Tab>"] = cmp.mapping(function()
if vim.fn.pumvisible() == 1 then
feedkey("<C-p>", "n")
elseif vim.fn["vsnip#jumpable"](-1) == 1 then
feedkey("<Plug>(vsnip-jump-prev)", "")
end
end, { "i", "s" }),
-- ["<S-Tab>"] = cmp.mapping(function()
-- if vim.fn.pumvisible() == 1 then
-- feedkey("<C-p>", "n")
-- elseif vim.fn["vsnip#jumpable"](-1) == 1 then
-- feedkey("<Plug>(vsnip-jump-prev)", "")
-- end
-- end, { "i", "s" }),
},
sources = {
{ name = 'vsnip' },

View File

@ -168,6 +168,8 @@ ins_left {function() return '%=' end}
ins_left {
'filename',
file_status = true,
path = 1,
condition = conditions.buffer_not_empty,
color = {fg = colors.magenta, gui = 'bold'}
}

View File

@ -17,7 +17,7 @@ local on_attach = function(client, bufnr)
-- See references
buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
-- show documentation
buf_set_keymap('n', 'K', '<Cmd>lua vim.lsp.buf.hover()<CR>', opts)
buf_set_keymap('n', '<leader>K', '<Cmd>lua vim.lsp.buf.hover()<CR>', opts)
-- Rename
buf_set_keymap('n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
@ -45,7 +45,7 @@ end
-- Use a loop to conveniently call 'setup' on multiple servers and
-- map buffer local keybindings when the language server attaches
local servers = { "texlab", "pyright", "vuels", "tsserver" }
local servers = { "texlab", "pyright", "vuels", "tsserver", "html" }
for _, lsp in ipairs(servers) do
nvim_lsp[lsp].setup {
on_attach = on_attach,

View File

@ -49,3 +49,7 @@ exec([[
]], false)
cmd('colorscheme gruvbox')
-- Python 3
g.python3_host_prog="~/.venv/nvim/bin/python"

View File

@ -14,7 +14,7 @@ set $down j
set $up k
set $right l
# Your preferred terminal emulator
set $term urxvt
set $term alacritty
# Your preferred application launcher
# Note: pass the final command to swaymsg so that the resulting window can be opened
# on the original workspace that the command was run on.

View File

@ -68,6 +68,9 @@ bindkey -M vicmd 'j' history-substring-search-down
# Auto-ls
source ~/.config/zsh/auto-ls/auto-ls.zsh
# Pyenv
eval "$(pyenv init --path)"
source ~/.config/zsh/completion.zsh
source ~/.config/zsh/key-bindings.zsh