Skip to content

Commit

Permalink
correct dir layout
Browse files Browse the repository at this point in the history
  • Loading branch information
RemoteRabbit committed Jun 5, 2023
1 parent ea9eaf4 commit 5f86417
Show file tree
Hide file tree
Showing 18 changed files with 88 additions and 56 deletions.
46 changes: 46 additions & 0 deletions nvim/after/plugin/catppuccin.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
require("catppuccin").setup({
flavour = "mocha", -- latte, frappe, macchiato, mocha
background = { -- :h background
light = "latte",
dark = "mocha",
},
transparent_background = false, -- disables setting the background color.
show_end_of_buffer = false, -- shows the '~' characters after the end of buffers
term_colors = false, -- sets terminal colors (e.g. `g:terminal_color_0`)
dim_inactive = {
enabled = false, -- dims the background color of inactive window
shade = "dark",
percentage = 0.15, -- percentage of the shade to apply to the inactive window
},
no_italic = false, -- Force no italic
no_bold = false, -- Force no bold
no_underline = false, -- Force no underline
styles = { -- Handles the styles of general hi groups (see `:h highlight-args`):
comments = { "italic" }, -- Change the style of comments
conditionals = { "italic" },
loops = {},
functions = {},
keywords = {},
strings = {},
variables = {},
numbers = {},
booleans = {},
properties = {},
types = {},
operators = {},
},
color_overrides = {},
custom_highlights = {},
integrations = {
cmp = true,
gitsigns = true,
nvimtree = true,
telescope = true,
notify = false,
mini = false,
-- For more plugins integrations please scroll down (https://github.com/catppuccin/nvim#integrations)
},
})

-- setup must be called before loading
vim.cmd.colorscheme "catppuccin"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 1 addition & 3 deletions nvim/init.lua
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
require("options")
require("mappings")
require("plugins")
require("RemoteRabbit")
34 changes: 34 additions & 0 deletions nvim/lua/RemoteRabbit/init.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
require("RemoteRabbit.mappings")
require("RemoteRabbit.options")
require("RemoteRabbit.plugins")

local augroup = vim.api.nvim_create_augroup
local RemoteRabbitGroup = augroup('RemoteRabbit', {})

local autocmd = vim.api.nvim_create_autocmd
local yank_group = augroup('HighlightYank', {})

function R(name)
require("plenary.reload").reload_module(name)
end

autocmd('TextYankPost', {
group = yank_group,
pattern = '*',
callback = function()
vim.highlight.on_yank({
higroup = 'IncSearch',
timeout = 40,
})
end,
})

autocmd({"BufWritePre"}, {
group = RemoteRabbitGroup,
pattern = "*",
command = [[%s/\s\+$//e]],
})

vim.g.netrw_browse_split = 0
vim.g.netrw_banner = 0
vim.g.netrw_winsize = 25
File renamed without changes.
File renamed without changes.
28 changes: 7 additions & 21 deletions nvim/lua/plugins.lua → nvim/lua/RemoteRabbit/plugins.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ augroup end
-- Only required if you have packer configured as `opt`
vim.cmd.packadd('packer.nvim')

function get_setup(name)
return string.format("require('config.%s')", name)
end

return require('packer').startup(function(use)
-- Packer can manage itself
use ('wbthomason/packer.nvim')
Expand All @@ -33,10 +29,9 @@ return require('packer').startup(function(use)
'nvim-telescope/telescope.nvim', tag = '0.1.0',
-- or , branch = '0.1.x',
requires = { {'nvim-lua/plenary.nvim'} },
config = get_setup("telescope")
})

use ({ "catppuccin/nvim", as = "catppuccin", config = get_setup("catppuccin") })
use ({ "catppuccin/nvim", as = "catppuccin"})

use({
"folke/trouble.nvim",
Expand All @@ -53,20 +48,18 @@ return require('packer').startup(function(use)
local ts_update = require('nvim-treesitter.install').update({ with_sync = true })
ts_update()
end,
config = get_setup("treesitter")
})

use({"nvim-treesitter/playground", config = get_setup("treesitter-playground")})
use({"theprimeagen/harpoon", config = get_setup("harpoon")})
use({"mbbill/undotree", config = get_setup("undotree")})
use({"tpope/vim-fugitive", config = get_setup("fugitive")})
use({"nvim-treesitter/nvim-treesitter-context", config = get_setup("treesitter-context")})
use({"nvim-treesitter/playground"})
use({"theprimeagen/harpoon"})
use({"mbbill/undotree"})
use({"tpope/vim-fugitive"})
use({"nvim-treesitter/nvim-treesitter-context"})

-- LSP ------------------------------------------------------------------
use({
'VonHeikemen/lsp-zero.nvim',
branch = 'v2.x',
config = get_setup("lsp"),
requires = {
-- LSP Support
{'neovim/nvim-lspconfig'}, -- Required
Expand All @@ -92,15 +85,8 @@ return require('packer').startup(function(use)
-----------------------------------------------------------------------------
use({'rcarriga/nvim-notify'})

use({"github/copilot.vim", config = get_setup("copilot")})
use({"github/copilot.vim"})

use {
"startup-nvim/startup.nvim",
requires = {"nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim"},
config = function()
require"startup".setup({theme = 'evil'})
end
}
-- Put this at the end after all plugins
if packer_bootstrap then
require('packer').sync()
Expand Down
1 change: 0 additions & 1 deletion nvim/lua/config/catppuccin.lua

This file was deleted.

31 changes: 0 additions & 31 deletions nvim/lua/config/startup.lua

This file was deleted.

0 comments on commit 5f86417

Please sign in to comment.