Compare commits

...

2 Commits

Author SHA1 Message Date
396b23be3b Orgnanize lua config 2022-12-22 18:18:01 +00:00
32f51defaa Start moving config 2022-12-22 18:18:01 +00:00
18 changed files with 90 additions and 39 deletions

View File

View File

@ -97,3 +97,8 @@ map(
map("n", map("n",
"<leader>ps", "<leader>ps",
[[:Telescope find_files find_command=hg,pstatus,-ma,-n,--template=<CR>]]) [[:Telescope find_files find_command=hg,pstatus,-ma,-n,--template=<CR>]])
map( "n", "<space>tb", ":Telescope file_browser")
map( "n", "<space>fb", ":Telescope file_browser")
map("n", "<leader><leader>", "<Cmd>lua require('telescope').extensions.frecency.frecency({ workspace = 'CWD' })<CR>", {noremap = true, silent = true})

View File

@ -0,0 +1,5 @@
require("which-key").setup {
-- your configuration comes here
-- or leave it empty to use the default settings
-- refer to the configuration section below
}

View File

@ -1,4 +0,0 @@
require('orgmode').setup({
org_agenda_files = {'~/org/*'},
org_default_notes_file = '~/org/refile.org',
})

View File

@ -13,11 +13,19 @@ autocmd BufWritePost plugins.lua source <afile> | PackerCompile
augroup end augroup end
]]) ]])
require('lspconfig')
require('packer').startup(function(use) require('packer').startup(function(use)
-- Packer can manage itself -- Packer can manage itself
use 'wbthomason/packer.nvim' use 'wbthomason/packer.nvim'
use 'lewis6991/impatient.nvim'
use 'dstein64/vim-startuptime'
use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' } use {
'nvim-treesitter/nvim-treesitter',
run = ':TSUpdate',
config =[[ require("config.nvim-treesitter") ]]
}
-- Undo tree -- Undo tree
use { use {
@ -27,12 +35,9 @@ require('packer').startup(function(use)
} }
use 'nvim-lua/plenary.nvim' use 'nvim-lua/plenary.nvim'
-- use 'vimwiki/vimwiki'
-- use 'michal-h21/vim-zettel'
-- use 'Furkanzmc/zettelkasten.nvim'
use { use {
'renerocksai/telekasten.nvim', 'renerocksai/telekasten.nvim',
config = [[ require("zettel") ]] config = [[ require("config.telekasten") ]]
} }
use 'renerocksai/calendar-vim' use 'renerocksai/calendar-vim'
@ -64,7 +69,7 @@ require('packer').startup(function(use)
'ray-x/cmp-treesitter', 'ray-x/cmp-treesitter',
{ 'saadparwaiz1/cmp_luasnip', after = {'LuaSnip'} }, { 'saadparwaiz1/cmp_luasnip', after = {'LuaSnip'} },
}, },
-- config = [[require('lsp')]], config = [[ require("config.lsp") ]],
-- event = 'InsertEnter', -- event = 'InsertEnter',
} }
use { use {
@ -78,7 +83,7 @@ require('packer').startup(function(use)
} }
use { use {
'jose-elias-alvarez/null-ls.nvim', 'jose-elias-alvarez/null-ls.nvim',
config = [[ require("null_lsp") ]] config = [[ require("config.null-ls") ]]
} }
use { use {
'saecki/crates.nvim', 'saecki/crates.nvim',
@ -87,20 +92,33 @@ require('packer').startup(function(use)
config = [[ require('crates').setup() ]] config = [[ require('crates').setup() ]]
} }
use 'simrat39/rust-tools.nvim' use 'simrat39/rust-tools.nvim'
use 'folke/trouble.nvim' use {
'folke/trouble.nvim',
config = [[ require("config.trouble")]]
}
use 'hrsh7th/vim-vsnip' use 'hrsh7th/vim-vsnip'
use 'kosayoda/nvim-lightbulb' use 'kosayoda/nvim-lightbulb'
use {'andymass/vim-matchup', event = 'VimEnter'} use {'andymass/vim-matchup', event = 'VimEnter'}
use { 'ErichDonGubler/lsp_lines.nvim', config = [[require("lsp_lines").setup()]] } use { 'ErichDonGubler/lsp_lines.nvim', config = [[ require("lsp_lines").setup() ]] }
use 'jghauser/mkdir.nvim' use 'jghauser/mkdir.nvim'
use { 'simrat39/symbols-outline.nvim' } use { 'simrat39/symbols-outline.nvim', config = [[ require("config.symbols-outline") ]] }
use { 'petertriho/nvim-scrollbar', config = [[require("scrollbar").setup()]] } use { 'petertriho/nvim-scrollbar', config = [[ require("scrollbar").setup() ]] }
use { use {
'nvim-telescope/telescope.nvim' , branch = '0.1.x', 'nvim-telescope/telescope.nvim',
requires = { {'nvim-lua/plenary.nvim'} } branch = '0.1.x',
config = [[ require("config.telescope") ]]
}
use 'nvim-telescope/telescope-file-browser.nvim'
use {
"nvim-telescope/telescope-frecency.nvim",
config = function()
require"telescope".load_extension("frecency")
end,
requires = {"kkharji/sqlite.lua"}
} }
use { use {
@ -115,8 +133,6 @@ require('packer').startup(function(use)
use { use {
-- 'sso://googler@user/lerm/glint-ale',
-- 'dense-analysis/ale',
'sso://googler@user/vintharas/telescope-codesearch.nvim', 'sso://googler@user/vintharas/telescope-codesearch.nvim',
disable = not use_google(), disable = not use_google(),
} }
@ -133,12 +149,11 @@ require('packer').startup(function(use)
-- '/google/src/cloud/cnieves/google-comments/google3/experimental/users/chmnchiang/neovim/google-comments', -- '/google/src/cloud/cnieves/google-comments/google3/experimental/users/chmnchiang/neovim/google-comments',
disable = not use_google(), disable = not use_google(),
requires = {'rcarriga/nvim-notify', 'nvim-lua/plenary.nvim'}, requires = {'rcarriga/nvim-notify', 'nvim-lua/plenary.nvim'},
config = [[ require("google_comments") ]] config = [[ require("config.google-comments") ]]
} }
use { use {
'/google/src/cloud/cnieves/google-comments/google3/experimental/users/cnieves/neovim/critique', '/google/src/cloud/cnieves/google-comments/google3/experimental/users/cnieves/neovim/critique',
-- cond = file_exists(os.getenv("HOME").."/use_google"),
disable = not use_google(), disable = not use_google(),
config = [[ require("critique").setup() ]] config = [[ require("critique").setup() ]]
} }
@ -146,11 +161,11 @@ require('packer').startup(function(use)
use 'nvim-lua/lsp-status.nvim' use 'nvim-lua/lsp-status.nvim'
use { use {
'nvim-lualine/lualine.nvim', 'nvim-lualine/lualine.nvim',
config = [[ require("lualine_config") ]] config = [[ require("config.lualine") ]]
} }
use { use {
'rcarriga/nvim-notify', 'rcarriga/nvim-notify',
config = [[ require("notify_config") ]] config = [[ require("config.notify") ]]
} }
-- Git -- Git
@ -170,7 +185,7 @@ require('packer').startup(function(use)
} }
-- use { "catppuccin/nvim", as = "catppuccin" } -- use { "catppuccin/nvim", as = "catppuccin" }
use { "catppuccin/nvim", as = "catppuccin", config = [[require("catppuccin-config")]]} use { "catppuccin/nvim", as = "catppuccin", config = [[require("config.catppuccin")]]}
-- Tmux -- Tmux
use { use {
'preservim/vimux', 'preservim/vimux',
@ -183,8 +198,12 @@ require('packer').startup(function(use)
-- mine -- mine
use { use {
'squk/vim-quantum', 'squk/java-syntax.vim', ft='java'
'squk/java-syntax.vim' }
use {
"folke/which-key.nvim",
config = [[require("config.whichkey")]]
} }
use 'ntpeters/vim-better-whitespace' use 'ntpeters/vim-better-whitespace'
@ -194,9 +213,6 @@ require('packer').startup(function(use)
use 'nathanaelkane/vim-indent-guides' use 'nathanaelkane/vim-indent-guides'
use 'tversteeg/registers.nvim' use 'tversteeg/registers.nvim'
-- use 'christoomey/vim-titlecase'
-- use 'chiedo/vim-case-convert'
use 'jremmen/vim-ripgrep' use 'jremmen/vim-ripgrep'
use 'preservim/nerdtree' use 'preservim/nerdtree'
@ -228,14 +244,8 @@ vim.opt.completeopt = { "menu", "menuone", "noselect" }
-- Don't show the dumb matching stuff -- Don't show the dumb matching stuff
vim.opt.shortmess:append("c") vim.opt.shortmess:append("c")
require('lspconfig') vim.opt.spell = true
require("lsp") vim.opt.spelllang = { 'en_us' }
require("diagnostics")
require("treesitter")
require("telescope_config")
require("symbols-outline-config")
require("spell_config")
-- redundant w/ lsp_lines -- redundant w/ lsp_lines
vim.diagnostic.config({ vim.diagnostic.config({

View File

@ -1,2 +0,0 @@
vim.opt.spell = true
vim.opt.spelllang = { 'en_us' }

15
vim/.vim/prefs/1 Normal file
View File

@ -0,0 +1,15 @@
" perl plugins
" node plugins
" python3 plugins
" ruby plugins
" python plugins

View File

@ -78,6 +78,11 @@ set omnifunc= completeopt=menuone,noinsert,noselect
set updatetime=100 set updatetime=100
lua require('impatient')
" Enable profiling data
" lua require'impatient'.enable_profile()
call plug#begin('~/.vim/plugged') call plug#begin('~/.vim/plugged')
if filereadable(expand("~/.vimrc.local")) if filereadable(expand("~/.vimrc.local"))
source ~/.vimrc.local source ~/.vimrc.local
@ -164,3 +169,20 @@ set mouse=
" makes sure that when opening, files are normal, i.e. not folded. " makes sure that when opening, files are normal, i.e. not folded.
set nofoldenable set nofoldenable
" Disable built in neovim plugins to speed up
let g:loaded_matchparen = 1
let g:loaded_matchit = 1
let g:loaded_logiPat = 1
let g:loaded_rrhelper = 1
let g:loaded_tarPlugin = 1
" let g:loaded_man = 1
let g:loaded_gzip = 1
let g:loaded_zipPlugin = 1
let g:loaded_2html_plugin = 1
let g:loaded_shada_plugin = 1
let g:loaded_spellfile_plugin = 1
let g:loaded_netrw = 1
let g:loaded_netrwPlugin = 1
let g:loaded_tutor_mode_plugin = 1
let g:loaded_remote_plugins = 1