- commit
- 3a8f5e9
- parent
- 23ac98c
- author
- Eric Bower
- date
- 2024-09-03 21:47:29 -0400 EDT
chore: tmux and lazy.nvim updates
2 files changed,
+102,
-93
+1,
-1
1@@ -2,7 +2,7 @@ unbind C-b
2 set-option -g prefix C-Space
3 bind-key C-Space send-prefix
4
5-set -ag terminal-overrides ",*256col*:colors=256:Tc"
6+# set -ag terminal-overrides ",*256col*:colors=256:Tc"
7 set -g set-clipboard on
8 set-option -ga update-environment ' SWAYSOCK'
9 set-option -ga update-environment ' DISPLAY'
+101,
-92
1@@ -1,13 +1,16 @@
2 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
3-if not vim.loop.fs_stat(lazypath) then
4- vim.fn.system({
5- "git",
6- "clone",
7- "--filter=blob:none",
8- "https://github.com/folke/lazy.nvim.git",
9- "--branch=stable", -- latest stable release
10- lazypath,
11- })
12+if not (vim.uv or vim.loop).fs_stat(lazypath) then
13+ local lazyrepo = "https://github.com/folke/lazy.nvim.git"
14+ local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
15+ if vim.v.shell_error ~= 0 then
16+ vim.api.nvim_echo({
17+ { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
18+ { out, "WarningMsg" },
19+ { "\nPress any key to exit..." },
20+ }, true, {})
21+ vim.fn.getchar()
22+ os.exit(1)
23+ end
24 end
25 vim.opt.rtp:prepend(lazypath)
26
27@@ -15,91 +18,97 @@ vim.opt.rtp:prepend(lazypath)
28 require 'plugin_config'
29
30 require("lazy").setup({
31- {
32- 'neovim/nvim-lspconfig',
33- config = setup_lsp,
34+ rocks = {
35+ enabled = false,
36 },
37- {
38- 'nvim-treesitter/nvim-treesitter',
39- build = ':TSUpdate',
40- config = setup_treesitter
41- },
42- {
43- "hrsh7th/nvim-cmp",
44- dependencies = {
45- "hrsh7th/cmp-buffer",
46- "hrsh7th/cmp-vsnip",
47- "hrsh7th/vim-vsnip"
48+ spec = {
49+ {
50+ 'neovim/nvim-lspconfig',
51+ config = setup_lsp,
52 },
53- config = setup_comp,
54- },
55- "hrsh7th/cmp-nvim-lsp",
56- {
57- "akinsho/bufferline.nvim",
58- dependencies = 'nvim-tree/nvim-web-devicons',
59- config = setup_bufferline,
60- },
61- {
62- 'nvim-lualine/lualine.nvim',
63- dependencies = {
64- 'nvim-tree/nvim-web-devicons',
65- lazy = true,
66+ {
67+ 'nvim-treesitter/nvim-treesitter',
68+ build = ':TSUpdate',
69+ config = setup_treesitter
70+ },
71+ {
72+ "hrsh7th/nvim-cmp",
73+ dependencies = {
74+ "hrsh7th/cmp-buffer",
75+ "hrsh7th/cmp-vsnip",
76+ "hrsh7th/vim-vsnip"
77+ },
78+ config = setup_comp,
79+ },
80+ "hrsh7th/cmp-nvim-lsp",
81+ {
82+ "akinsho/bufferline.nvim",
83+ dependencies = 'nvim-tree/nvim-web-devicons',
84+ config = setup_bufferline,
85+ },
86+ {
87+ 'nvim-lualine/lualine.nvim',
88+ dependencies = {
89+ 'nvim-tree/nvim-web-devicons',
90+ lazy = true,
91+ },
92+ config = setup_statusline
93+ },
94+ {
95+ 'nvim-tree/nvim-tree.lua',
96+ config = setup_tree,
97+ dependencies = {
98+ 'nvim-tree/nvim-web-devicons',
99+ lazy = true,
100+ }
101+ },
102+ {
103+ 'lewis6991/gitsigns.nvim',
104+ config = setup_gitsigns,
105+ },
106+ 'lukas-reineke/indent-blankline.nvim',
107+ {
108+ 'ruifm/gitlinker.nvim',
109+ dependencies = 'nvim-lua/plenary.nvim',
110+ config = setup_gitlinker,
111+ },
112+ {
113+ 'rhysd/git-messenger.vim'
114+ },
115+ {
116+ 'junegunn/fzf',
117+ build = function()
118+ vim.fn['fzf#install']()
119+ end
120+ },
121+ 'junegunn/fzf.vim',
122+ {
123+ 'alexghergh/nvim-tmux-navigation',
124+ config = setup_tmux_nav,
125+ },
126+ {
127+ 'mg979/vim-visual-multi',
128+ branch = 'master',
129+ },
130+ {
131+ 'Shougo/vimproc.vim',
132+ build = 'make',
133+ },
134+ {
135+ 'Mofiqul/dracula.nvim',
136+ lazy = false,
137+ priority = 1000,
138+ config = function()
139+ require('dracula').setup({})
140+ vim.cmd[[colorscheme dracula]]
141+ end
142+ },
143+ 'ntpeters/vim-better-whitespace',
144+ {
145+ "karb94/neoscroll.nvim",
146+ config = function ()
147+ require('neoscroll').setup({})
148+ end
149 },
150- config = setup_statusline
151- },
152- {
153- 'nvim-tree/nvim-tree.lua',
154- config = setup_tree,
155- dependencies = {
156- 'nvim-tree/nvim-web-devicons',
157- lazy = true,
158- }
159- },
160- {
161- 'lewis6991/gitsigns.nvim',
162- config = setup_gitsigns,
163- },
164- 'lukas-reineke/indent-blankline.nvim',
165- {
166- 'ruifm/gitlinker.nvim',
167- dependencies = 'nvim-lua/plenary.nvim',
168- config = setup_gitlinker,
169- },
170- {
171- 'rhysd/git-messenger.vim'
172- },
173- {
174- 'junegunn/fzf',
175- build = function()
176- vim.fn['fzf#install']()
177- end
178- },
179- 'junegunn/fzf.vim',
180- {
181- 'alexghergh/nvim-tmux-navigation',
182- config = setup_tmux_nav,
183- },
184- {
185- 'mg979/vim-visual-multi',
186- branch = 'master',
187- },
188- {
189- 'Shougo/vimproc.vim',
190- build = 'make',
191- },
192- --{
193- -- 'kevinhwang91/nvim-ufo',
194- -- dependencies = 'kevinhwang91/promise-async',
195- --},
196- {
197- 'Mofiqul/dracula.nvim',
198- lazy = false,
199- priority = 1000,
200- config = function()
201- require('dracula').setup({})
202- vim.cmd[[colorscheme dracula]]
203- end
204 },
205- 'ntpeters/vim-better-whitespace',
206- 'psliwka/vim-smoothie'
207 })