diff --git a/lua/zak/plugins.lua b/lua/zak/plugins.lua index 2f94531..e267cae 100644 --- a/lua/zak/plugins.lua +++ b/lua/zak/plugins.lua @@ -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 local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim' if not vim.loop.fs_stat(lazypath) then @@ -63,7 +61,6 @@ return require('lazy').setup({ 'theprimeagen/harpoon', 'mbbill/undotree', 'tpope/vim-fugitive', - { 'VonHeikemen/lsp-zero.nvim', branch = 'v3.x', @@ -81,27 +78,4 @@ return require('lazy').setup({ '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 -} }) diff --git a/lua/zak/remap.lua b/lua/zak/remap.lua index 80f0478..68c207f 100644 --- a/lua/zak/remap.lua +++ b/lua/zak/remap.lua @@ -21,7 +21,6 @@ vim.keymap.set("t", "", "", { noremap = true, silent = true }) local term_buf = nil - function toggleTerminal() -- 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 @@ -175,4 +174,4 @@ end vim.keymap.set('n', '', ToggleZen, { desc = 'Zen Mode' }) vim.keymap.set('v', '', ToggleZen, { desc = 'Zen Mode' }) vim.keymap.set('i', '', ToggleZen, { desc = 'Zen Mode' }) -vim.keymap.set('t', '', ToggleZen, { desc = 'Zen Mode', silent = true }) +vim.keymap.set('t', '', ToggleZen, { desc = 'Zen Mode' }) diff --git a/lua/zak/set.lua b/lua/zak/set.lua index 09fd450..cc5987b 100644 --- a/lua/zak/set.lua +++ b/lua/zak/set.lua @@ -16,27 +16,19 @@ vim.opt.swapfile = false vim.opt.backup = false vim.opt.undodir = "C:/Users/zakla/.undodir" vim.opt.undofile = true -vim.opt.shellcmdflag = "-ic" -vim.opt.clipboard = 'unnamedplus' +-- vim.opt.shellcmdflag = "" +-- vim.opt.clipboard = 'unnamedplus' vim.opt.hlsearch = false vim.opt.incsearch = true - vim.opt.termguicolors = true - -vim.opt.scrolloff = 8 +vim.opt.scrolloff = 16 vim.opt.signcolumn = "yes" vim.opt.isfname:append("@-@") - vim.opt.updatetime = 50 - vim.opt.colorcolumn = "120" vim.cmd [[ - augroup ShadersType - autocmd! - autocmd BufRead,BufNewFile *.gl set filetype=glsl - augroup END augroup TerminalStuff autocmd BufWinEnter,WinEnter term://* startinsert autocmd BufLeave term://* stopinsert