tweaks
parent
3235f24078
commit
f4da84676a
|
@ -1,5 +1,3 @@
|
||||||
-- This file can be loaded by calling `lua require('plugins')` from your init.vim
|
|
||||||
|
|
||||||
-- Bootstrap lazy.nvim if not already installed
|
-- Bootstrap lazy.nvim if not already installed
|
||||||
local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim'
|
local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim'
|
||||||
if not vim.loop.fs_stat(lazypath) then
|
if not vim.loop.fs_stat(lazypath) then
|
||||||
|
@ -63,7 +61,6 @@ return require('lazy').setup({
|
||||||
'theprimeagen/harpoon',
|
'theprimeagen/harpoon',
|
||||||
'mbbill/undotree',
|
'mbbill/undotree',
|
||||||
'tpope/vim-fugitive',
|
'tpope/vim-fugitive',
|
||||||
|
|
||||||
{
|
{
|
||||||
'VonHeikemen/lsp-zero.nvim',
|
'VonHeikemen/lsp-zero.nvim',
|
||||||
branch = 'v3.x',
|
branch = 'v3.x',
|
||||||
|
@ -81,27 +78,4 @@ return require('lazy').setup({
|
||||||
'L3MON4D3/LuaSnip',
|
'L3MON4D3/LuaSnip',
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
-- Lua
|
|
||||||
{
|
|
||||||
"folke/zen-mode.nvim",
|
|
||||||
opts = {
|
|
||||||
-- your configuration comes here
|
|
||||||
-- or leave it empty to use the default settings
|
|
||||||
-- refer to the configuration section below
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"ray-x/go.nvim",
|
|
||||||
dependencies = { -- optional packages
|
|
||||||
"ray-x/guihua.lua",
|
|
||||||
"neovim/nvim-lspconfig",
|
|
||||||
"nvim-treesitter/nvim-treesitter",
|
|
||||||
},
|
|
||||||
config = function()
|
|
||||||
require("go").setup()
|
|
||||||
end,
|
|
||||||
event = {"CmdlineEnter"},
|
|
||||||
ft = {"go", 'gomod'},
|
|
||||||
build = ':lua require("go.install").update_all_sync()' -- if you need to install/update all binaries
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
|
|
|
@ -21,7 +21,6 @@ vim.keymap.set("t", "<Esc>", "<C-\\><C-n>", { noremap = true, silent = true })
|
||||||
|
|
||||||
local term_buf = nil
|
local term_buf = nil
|
||||||
|
|
||||||
|
|
||||||
function toggleTerminal()
|
function toggleTerminal()
|
||||||
-- If we already have a terminal buffer and it's hidden, reopen it
|
-- If we already have a terminal buffer and it's hidden, reopen it
|
||||||
if term_buf and vim.api.nvim_buf_is_valid(term_buf) then
|
if term_buf and vim.api.nvim_buf_is_valid(term_buf) then
|
||||||
|
@ -175,4 +174,4 @@ end
|
||||||
vim.keymap.set('n', '<A-z>', ToggleZen, { desc = 'Zen Mode' })
|
vim.keymap.set('n', '<A-z>', ToggleZen, { desc = 'Zen Mode' })
|
||||||
vim.keymap.set('v', '<A-z>', ToggleZen, { desc = 'Zen Mode' })
|
vim.keymap.set('v', '<A-z>', ToggleZen, { desc = 'Zen Mode' })
|
||||||
vim.keymap.set('i', '<A-z>', ToggleZen, { desc = 'Zen Mode' })
|
vim.keymap.set('i', '<A-z>', ToggleZen, { desc = 'Zen Mode' })
|
||||||
vim.keymap.set('t', '<A-z>', ToggleZen, { desc = 'Zen Mode', silent = true })
|
vim.keymap.set('t', '<A-z>', ToggleZen, { desc = 'Zen Mode' })
|
||||||
|
|
|
@ -16,27 +16,19 @@ vim.opt.swapfile = false
|
||||||
vim.opt.backup = false
|
vim.opt.backup = false
|
||||||
vim.opt.undodir = "C:/Users/zakla/.undodir"
|
vim.opt.undodir = "C:/Users/zakla/.undodir"
|
||||||
vim.opt.undofile = true
|
vim.opt.undofile = true
|
||||||
vim.opt.shellcmdflag = "-ic"
|
-- vim.opt.shellcmdflag = ""
|
||||||
vim.opt.clipboard = 'unnamedplus'
|
-- vim.opt.clipboard = 'unnamedplus'
|
||||||
|
|
||||||
vim.opt.hlsearch = false
|
vim.opt.hlsearch = false
|
||||||
vim.opt.incsearch = true
|
vim.opt.incsearch = true
|
||||||
|
|
||||||
vim.opt.termguicolors = true
|
vim.opt.termguicolors = true
|
||||||
|
vim.opt.scrolloff = 16
|
||||||
vim.opt.scrolloff = 8
|
|
||||||
vim.opt.signcolumn = "yes"
|
vim.opt.signcolumn = "yes"
|
||||||
vim.opt.isfname:append("@-@")
|
vim.opt.isfname:append("@-@")
|
||||||
|
|
||||||
vim.opt.updatetime = 50
|
vim.opt.updatetime = 50
|
||||||
|
|
||||||
vim.opt.colorcolumn = "120"
|
vim.opt.colorcolumn = "120"
|
||||||
|
|
||||||
vim.cmd [[
|
vim.cmd [[
|
||||||
augroup ShadersType
|
|
||||||
autocmd!
|
|
||||||
autocmd BufRead,BufNewFile *.gl set filetype=glsl
|
|
||||||
augroup END
|
|
||||||
augroup TerminalStuff
|
augroup TerminalStuff
|
||||||
autocmd BufWinEnter,WinEnter term://* startinsert
|
autocmd BufWinEnter,WinEnter term://* startinsert
|
||||||
autocmd BufLeave term://* stopinsert
|
autocmd BufLeave term://* stopinsert
|
||||||
|
|
Loading…
Reference in New Issue