diff --git a/config/neovim/init.vim b/config/neovim/archive-vimscript/init.vim similarity index 98% rename from config/neovim/init.vim rename to config/neovim/archive-vimscript/init.vim index 8d889f1..387ed5c 100644 --- a/config/neovim/init.vim +++ b/config/neovim/archive-vimscript/init.vim @@ -37,7 +37,6 @@ Plug 'nvim-lua/plenary.nvim' Plug 'nvim-telescope/telescope.nvim' Plug 'akinsho/toggleterm.nvim', {'tag' : 'v1.*'} " Plug 'neoclide/coc.nvim', {'branch': 'release'} -Plug 'ms-jpq/coq_nvim', {'branch': 'coq'} Plug 'neovim/nvim-lspconfig' Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} Plug 'jiangmiao/auto-pairs' @@ -69,7 +68,6 @@ if exists("g:neovide") endif " Start up plugins -autocmd VimEnter * :COQnow autocmd VimEnter * :TSEnable highlight " Navigation & Shortcuts diff --git a/config/neovim/lua/plugins.lua b/config/neovim/archive-vimscript/lua/plugins.lua similarity index 100% rename from config/neovim/lua/plugins.lua rename to config/neovim/archive-vimscript/lua/plugins.lua diff --git a/config/neovim/macos/init.lua b/config/neovim/macos/init.lua new file mode 100644 index 0000000..7df0100 --- /dev/null +++ b/config/neovim/macos/init.lua @@ -0,0 +1,74 @@ +-- aliases + +local o = vim.o +local c = vim.cmd +local map = vim.api.nvim_set_keymap + +-- options + +o.termguicolors = true +o.mouse = 'a' +o.autoindent = true +o.wrap = true +o.nobinary = true +o.relativenumber = true +o.tabstop = 4 +o.shiftwidth = 4 +c.colorscheme 'catppuccin' + +-- keybinds + +-- file management +map('n', '', ':CHADopen', {silent = true}) + +map('n', '', ':ToggleTerm', {silent = true}) +-- exit terminal requires prefix +map('t', '', ':ToggleTerm', {silent = true}) + +map('n', 'gs', ':Telescope git_status', {silent = true}) +map('n', 'gc', ':Telescope git_commits', {silent = true}) +map('n', '', ':Telescope find_files', {silent = true}) + +-- buffer management +map('n', '', ':bp', {silent = true}) +map('n', '', ':bn', {silent = true}) + +-- plugin configs + +vim.g['airline_powerline_fonts'] = 1 +vim.g['airline_theme'] = 'powerlineish' +vim.g['airline#extensions#tabline#enabled'] = 1 +vim.g['airline#extensions#tabline#fnamemod'] = ':t' + +-- plugin imports + +return require('packer').startup(function(use) + + -- Packer can manage itself + use 'wbthomason/packer.nvim' + + + -- Visual + use 'vim-airline/vim-airline' + use 'vim-airline/vim-airline-themes' + use { "catppuccin/nvim", as = "catppuccin" } + + -- Editor + use {'neovim/nvim-lspconfig', config = function() + local lspc = require('lspconfig') + lspc['pyright'].setup{} + lspc['tsserver'].setup{} + lspc['rust-analyzer'].setup{} + end} + use {'ms-jpq/chadtree', branch = 'chad'} + use 'nvim-lua/plenary.nvim' + use 'nvim-telescope/telescope.nvim' + use {"akinsho/toggleterm.nvim", tag = '*', config = function() + require("toggleterm").setup() + end} + use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate', config = function() + vim.cmd[[TSEnable highlight]] + end} + +end) +