Skip to content

Commit 10c3dd9

Browse files
committed
misc
1 parent 1371fb7 commit 10c3dd9

File tree

3 files changed

+44
-635
lines changed

3 files changed

+44
-635
lines changed

home/.config/nvim/init.lua

Lines changed: 44 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ o.updatetime = 100
2020

2121
cmd 'filetype plugin on'
2222
cmd 'filetype plugin indent on'
23-
pcall(cmd, 'colorscheme tokyonight')
2423

2524
local stl = {
2625
'%#ColorColumn#%2f', -- buffer number
@@ -44,6 +43,50 @@ local stl = {
4443
}
4544
o.statusline = table.concat(stl)
4645

46+
function prequire(...)
47+
local status, lib = pcall(require, ...)
48+
if status then return lib end
49+
return nil
50+
end
51+
52+
local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim'
53+
if not vim.loop.fs_stat(lazypath) then
54+
vim.fn.system({'git', 'clone', '--filter=blob:none', 'https://github.com/folke/lazy.nvim.git', '--branch=stable', lazypath})
55+
end
56+
vim.opt.rtp:prepend(lazypath)
57+
58+
require('lazy').setup({
59+
spec = {
60+
'folke/tokyonight.nvim',
61+
62+
'neoclide/coc.nvim',
63+
'junegunn/fzf',
64+
'junegunn/fzf.vim',
65+
'lewis6991/gitsigns.nvim',
66+
'phaazon/hop.nvim',
67+
'rluba/jai.vim',
68+
'kdheepak/lazygit.nvim',
69+
'ggandor/lightspeed.nvim',
70+
'alaviss/nim.nvim',
71+
{'hrsh7th/nvim-cmp', dependencies = {'hrsh7th/cmp-buffer', 'hrsh7th/cmp-nvim-lsp'}},
72+
'terrortylor/nvim-comment',
73+
'mfussenegger/nvim-dap',
74+
'neovim/nvim-lspconfig',
75+
{'nvim-treesitter/nvim-treesitter', build = ':TSUpdate'},
76+
{'romgrk/nvim-treesitter-context', config = function() require('treesitter-context').setup() end},
77+
'nvim-treesitter/nvim-treesitter-textobjects',
78+
'nvim-treesitter/playground',
79+
{'nvim-telescope/telescope.nvim', dependencies = {'nvim-lua/plenary.nvim'}},
80+
'justinmk/vim-dirvish',
81+
'tpope/vim-fugitive',
82+
'mhinz/vim-grepper',
83+
'preservim/vimux',
84+
'folke/which-key.nvim',
85+
}
86+
})
87+
88+
pcall(cmd, 'colorscheme tokyonight')
89+
4790
-- Mappings {{{1
4891
local function map(mode, lhs, rhs, opts)
4992
local options = {noremap = true}
@@ -234,52 +277,4 @@ aug Nim
234277
aug END
235278
]], true)
236279

237-
function prequire(...)
238-
local status, lib = pcall(require, ...)
239-
if status then return lib end
240-
return nil
241-
end
242-
243-
local ensure_packer = function()
244-
local fn = vim.fn
245-
local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
246-
if fn.empty(fn.glob(install_path)) > 0 then
247-
fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
248-
vim.cmd [[packadd packer.nvim]]
249-
return true
250-
end
251-
return false
252-
end
253-
local packer_bootstrap = ensure_packer()
254-
255-
require('packer').startup(function(use)
256-
use 'wbthomason/packer.nvim'
257-
258-
use 'folke/tokyonight.nvim'
259-
260-
use 'neoclide/coc.nvim'
261-
use 'junegunn/fzf'
262-
use 'junegunn/fzf.vim'
263-
use 'lewis6991/gitsigns.nvim'
264-
use 'phaazon/hop.nvim'
265-
use 'rluba/jai.vim'
266-
use 'kdheepak/lazygit.nvim'
267-
use 'ggandor/lightspeed.nvim'
268-
use 'alaviss/nim.nvim'
269-
use {'hrsh7th/nvim-cmp', requires = {"hrsh7th/cmp-buffer", "hrsh7th/cmp-nvim-lsp"}}
270-
use 'terrortylor/nvim-comment'
271-
use 'mfussenegger/nvim-dap'
272-
use 'neovim/nvim-lspconfig'
273-
use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'}
274-
use {'romgrk/nvim-treesitter-context', config = function() require('treesitter-context').setup() end}
275-
use 'nvim-treesitter/nvim-treesitter-textobjects'
276-
use 'nvim-treesitter/playground'
277-
use {'nvim-telescope/telescope.nvim', requires = {{'nvim-lua/plenary.nvim'}}}
278-
use 'justinmk/vim-dirvish'
279-
use 'tpope/vim-fugitive'
280-
use 'mhinz/vim-grepper'
281-
use 'preservim/vimux'
282-
use 'folke/which-key.nvim'
283-
end)
284-
285280
require 'plugins'

home/.spacemacs.d/custom.el

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)