some shit
This commit is contained in:
@ -9,7 +9,7 @@ g.mapleader = " "
|
||||
map("n", "<C-o>", ":Telescope git_files<CR>", options)
|
||||
map("n", "<C-f>", ":lua require'telescope.builtin'.live_grep{ cwd = vim.fn.getcwd() }<CR>", options)
|
||||
map("n", "<C-p>", ":Telescope command_center<CR>", options)
|
||||
map("n", "<Leader-Leader>", "za", remap)
|
||||
map("n", "<Leader><Leader>", "za", remap)
|
||||
|
||||
-- LSP Functionality
|
||||
map("n", "<Leader>n", ":lua vim.diagnostic.goto_next()<CR>", options)
|
||||
@ -39,6 +39,10 @@ map("n", "<Leader>3", "3gt", options)
|
||||
map("n", "<Leader>4", "4gt", options)
|
||||
map("n", "<Leader>0", ":tablast<CR>", options)
|
||||
|
||||
map("n", "<C-t>", ":lua require('harpoon.mark').add_file()<CR>", options)
|
||||
-- Navigate Files
|
||||
map("n", "<S-t>", ":Telescope harpoon marks<CR>", options)
|
||||
|
||||
-- Handling Splits
|
||||
map("n", "<C-w>h", ":sp<CR>", remap) -- horizontal
|
||||
map("n", "<C-w>v", ":vs<CR>", remap) -- vertical
|
||||
@ -101,6 +105,3 @@ map("n", "<C-n>", ":NvimTreeToggle<CR>", options)
|
||||
-- Make ctrl+s work
|
||||
map("n", "<C-s>", "<Esc>:w<CR>", options)
|
||||
map("i", "<C-s>", "<Esc>:w<CR>i", options)
|
||||
|
||||
-- Update vim config
|
||||
map("n", "<C-u>", "<Esc>:source $MYVIMRC<CR>", options)
|
||||
|
||||
@ -47,6 +47,9 @@ set.laststatus = 3 -- Always display the status line
|
||||
set.title = true -- Show current txt that you editing
|
||||
set.relativenumber = false -- Vim’s absolute, relative and hybrid line numbers
|
||||
set.cursorline = false -- Enable highlighting of the current line
|
||||
set.synmaxcol = 128
|
||||
vim.cmd("syntax sync minlines=256")
|
||||
set.mousescroll = "ver:1,hor:1"
|
||||
set.shiftwidth = 2 -- Change the number of space characters inserted for indentation
|
||||
set.showtabline = 1 -- Always show tabs
|
||||
set.cmdheight = 1 -- More space for displaying messages
|
||||
|
||||
@ -2,135 +2,140 @@ local fn = vim.fn
|
||||
local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
|
||||
local packer_bootstrap = false
|
||||
if fn.empty(fn.glob(install_path)) > 0 then
|
||||
packer_bootstrap =
|
||||
fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path })
|
||||
vim.cmd("packadd packer.nvim")
|
||||
packer_bootstrap =
|
||||
fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path })
|
||||
vim.cmd("packadd packer.nvim")
|
||||
end
|
||||
|
||||
local packer = require("packer")
|
||||
packer.init({
|
||||
display = {
|
||||
open_fn = function()
|
||||
return require("packer.util").float({ border = "rounded" })
|
||||
end,
|
||||
},
|
||||
display = {
|
||||
open_fn = function()
|
||||
return require("packer.util").float({ border = "rounded" })
|
||||
end,
|
||||
},
|
||||
})
|
||||
|
||||
return packer.startup(function(use)
|
||||
-- Let packer manage itself
|
||||
use("wbthomason/packer.nvim")
|
||||
use("lewis6991/impatient.nvim")
|
||||
-- Let packer manage itself
|
||||
use("wbthomason/packer.nvim")
|
||||
use("lewis6991/impatient.nvim")
|
||||
|
||||
-- General Helper Functions
|
||||
use("nvim-lua/plenary.nvim")
|
||||
-- General Helper Functions
|
||||
use("nvim-lua/plenary.nvim")
|
||||
|
||||
-- Theming Section
|
||||
use("rktjmp/fwatch.nvim") -- Used to check dark/light theme
|
||||
use("EdenEast/nightfox.nvim")
|
||||
use("nvim-lualine/lualine.nvim")
|
||||
-- Theming Section
|
||||
use("rktjmp/fwatch.nvim") -- Used to check dark/light theme
|
||||
use("EdenEast/nightfox.nvim")
|
||||
use({ "catppuccin/nvim", as = "catppuccin" })
|
||||
use("nvim-lualine/lualine.nvim")
|
||||
|
||||
-- Layout Plugins
|
||||
use("dstein64/nvim-scrollview") -- ScrollBars
|
||||
use("akinsho/nvim-toggleterm.lua")
|
||||
use({
|
||||
"folke/zen-mode.nvim",
|
||||
config = function()
|
||||
require("zen-mode").setup({})
|
||||
end,
|
||||
})
|
||||
use("rcarriga/nvim-notify")
|
||||
use("kyazdani42/nvim-web-devicons")
|
||||
use("kyazdani42/nvim-tree.lua")
|
||||
use("nvim-lua/popup.nvim")
|
||||
use("goolord/alpha-nvim")
|
||||
use({
|
||||
"terrortylor/nvim-comment",
|
||||
config = function()
|
||||
require("nvim_comment").setup()
|
||||
end,
|
||||
})
|
||||
use({
|
||||
"windwp/nvim-autopairs",
|
||||
config = function()
|
||||
require("nvim-autopairs").setup()
|
||||
end,
|
||||
})
|
||||
use("gfeiyou/command-center.nvim")
|
||||
-- Layout Plugins
|
||||
use("dstein64/nvim-scrollview") -- ScrollBars
|
||||
use("akinsho/nvim-toggleterm.lua")
|
||||
use({
|
||||
"folke/zen-mode.nvim",
|
||||
config = function()
|
||||
require("zen-mode").setup({})
|
||||
end,
|
||||
})
|
||||
use("rcarriga/nvim-notify")
|
||||
use("kyazdani42/nvim-web-devicons")
|
||||
use("kyazdani42/nvim-tree.lua")
|
||||
use("nvim-lua/popup.nvim")
|
||||
use("goolord/alpha-nvim")
|
||||
use({
|
||||
"terrortylor/nvim-comment",
|
||||
config = function()
|
||||
require("nvim_comment").setup()
|
||||
end,
|
||||
})
|
||||
use({
|
||||
"windwp/nvim-autopairs",
|
||||
config = function()
|
||||
require("nvim-autopairs").setup()
|
||||
end,
|
||||
})
|
||||
use("gfeiyou/command-center.nvim")
|
||||
|
||||
-- Code Navigation
|
||||
use("junegunn/fzf")
|
||||
use("nvim-telescope/telescope.nvim")
|
||||
-- Code Navigation
|
||||
use("junegunn/fzf")
|
||||
use("nvim-telescope/telescope.nvim")
|
||||
|
||||
-- Lsp Errors
|
||||
use("folke/lsp-colors.nvim")
|
||||
use("kosayoda/nvim-lightbulb")
|
||||
use({
|
||||
"folke/trouble.nvim",
|
||||
requires = "kyazdani42/nvim-web-devicons",
|
||||
config = function()
|
||||
require("trouble").setup({})
|
||||
end,
|
||||
})
|
||||
use({
|
||||
"https://git.sr.ht/~whynothugo/lsp_lines.nvim",
|
||||
config = function()
|
||||
require("lsp_lines").setup()
|
||||
end,
|
||||
})
|
||||
-- Lsp Errors
|
||||
use("folke/lsp-colors.nvim")
|
||||
use("kosayoda/nvim-lightbulb")
|
||||
use({
|
||||
"folke/trouble.nvim",
|
||||
requires = "kyazdani42/nvim-web-devicons",
|
||||
config = function()
|
||||
require("trouble").setup({})
|
||||
end,
|
||||
})
|
||||
use({
|
||||
"https://git.sr.ht/~whynothugo/lsp_lines.nvim",
|
||||
config = function()
|
||||
require("lsp_lines").setup()
|
||||
end,
|
||||
})
|
||||
|
||||
-- Syntax / Autocomplete
|
||||
use("tpope/vim-surround")
|
||||
use("neovim/nvim-lspconfig")
|
||||
use("hrsh7th/nvim-cmp")
|
||||
use("onsails/lspkind.nvim")
|
||||
use({ "tzachar/cmp-tabnine", run = "./install.sh", requires = "hrsh7th/nvim-cmp" })
|
||||
-- use({ "hrsh7th/cmp-copilot", requires = "github/copilot.vim" })
|
||||
use("hrsh7th/cmp-nvim-lsp")
|
||||
use("hrsh7th/cmp-path")
|
||||
use("hrsh7th/cmp-calc")
|
||||
use("hrsh7th/cmp-buffer")
|
||||
use("hrsh7th/cmp-cmdline")
|
||||
use("rafamadriz/friendly-snippets")
|
||||
use("L3MON4D3/LuaSnip")
|
||||
use("saadparwaiz1/cmp_luasnip")
|
||||
-- Syntax / Autocomplete
|
||||
use("tpope/vim-surround")
|
||||
use("neovim/nvim-lspconfig")
|
||||
use("hrsh7th/nvim-cmp")
|
||||
use("onsails/lspkind.nvim")
|
||||
use({ "tzachar/cmp-tabnine", run = "./install.sh", requires = "hrsh7th/nvim-cmp" })
|
||||
-- use({ "hrsh7th/cmp-copilot", requires = "github/copilot.vim" })
|
||||
use("hrsh7th/cmp-nvim-lsp")
|
||||
use("hrsh7th/cmp-path")
|
||||
use("hrsh7th/cmp-calc")
|
||||
use("hrsh7th/cmp-buffer")
|
||||
use("hrsh7th/cmp-cmdline")
|
||||
use("rafamadriz/friendly-snippets")
|
||||
use("L3MON4D3/LuaSnip")
|
||||
use("saadparwaiz1/cmp_luasnip")
|
||||
|
||||
use({ "williamboman/mason.nvim" })
|
||||
use({ "williamboman/mason-lspconfig.nvim" })
|
||||
use({ "jose-elias-alvarez/null-ls.nvim" })
|
||||
use({ "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" })
|
||||
use({ "williamboman/mason.nvim" })
|
||||
use({ "williamboman/mason-lspconfig.nvim" })
|
||||
use({ "jose-elias-alvarez/null-ls.nvim" })
|
||||
use("MunifTanjim/prettier.nvim")
|
||||
use({ "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" })
|
||||
|
||||
-- Dap Debugger
|
||||
use({ "mfussenegger/nvim-dap" })
|
||||
use({ "rcarriga/nvim-dap-ui" })
|
||||
-- Dap Debugger
|
||||
use({ "mfussenegger/nvim-dap" })
|
||||
use({ "rcarriga/nvim-dap-ui" })
|
||||
|
||||
-- More IDE like features
|
||||
use({
|
||||
"rmagatti/session-lens",
|
||||
requires = { "rmagatti/auto-session", "nvim-telescope/telescope.nvim" },
|
||||
config = function()
|
||||
require("session-lens").setup({ path_display = { "shorten" } })
|
||||
end,
|
||||
})
|
||||
-- FIle Navigation
|
||||
use({ "ThePrimeagen/harpoon" })
|
||||
|
||||
use({
|
||||
"edluffy/hologram.nvim",
|
||||
config = function() end,
|
||||
})
|
||||
-- More IDE like features
|
||||
use({
|
||||
"rmagatti/session-lens",
|
||||
requires = { "rmagatti/auto-session", "nvim-telescope/telescope.nvim" },
|
||||
config = function()
|
||||
require("session-lens").setup({ path_display = { "shorten" } })
|
||||
end,
|
||||
})
|
||||
|
||||
use({
|
||||
"nvim-neotest/neotest",
|
||||
requires = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
"antoinemadec/FixCursorHold.nvim",
|
||||
},
|
||||
})
|
||||
use({
|
||||
"edluffy/hologram.nvim",
|
||||
config = function() end,
|
||||
})
|
||||
|
||||
-- Database Feature
|
||||
use("tpope/vim-dadbod")
|
||||
use("kristijanhusak/vim-dadbod-ui")
|
||||
use({
|
||||
"nvim-neotest/neotest",
|
||||
requires = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
"antoinemadec/FixCursorHold.nvim",
|
||||
},
|
||||
})
|
||||
|
||||
if packer_bootstrap then
|
||||
packer.sync()
|
||||
end
|
||||
-- Database Feature
|
||||
use("tpope/vim-dadbod")
|
||||
use("kristijanhusak/vim-dadbod-ui")
|
||||
|
||||
if packer_bootstrap then
|
||||
packer.sync()
|
||||
end
|
||||
end)
|
||||
|
||||
@ -1,9 +1,48 @@
|
||||
-- Enable Theming / Syntax
|
||||
vim.g.catppuccin_flavour = "mocha" -- latte, frappe, macchiato, mocha
|
||||
|
||||
local cat = require("catppuccin")
|
||||
cat.setup({
|
||||
transparent_background = true,
|
||||
compile = {
|
||||
enabled = true,
|
||||
path = vim.fn.stdpath("cache") .. "/catppuccin",
|
||||
},
|
||||
styles = {
|
||||
comments = { "italic" },
|
||||
strings = { "italic" },
|
||||
},
|
||||
integrations = {
|
||||
gitsigns = true,
|
||||
telescope = true,
|
||||
treesitter = true,
|
||||
cmp = true,
|
||||
nvimtree = {
|
||||
enabled = true,
|
||||
show_root = false,
|
||||
},
|
||||
dap = {
|
||||
enabled = true,
|
||||
enable_ui = true,
|
||||
},
|
||||
native_lsp = {
|
||||
enabled = true,
|
||||
},
|
||||
ts_rainbow = true,
|
||||
indent_blankline = {
|
||||
enabled = true,
|
||||
colored_indent_levels = false,
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
require("nightfox").setup({
|
||||
options = {
|
||||
transparent = true
|
||||
}
|
||||
transparent = true,
|
||||
},
|
||||
})
|
||||
vim.cmd("colorscheme nightfox")
|
||||
require "utils.theme-reloader"
|
||||
require "configs.lualine"
|
||||
|
||||
vim.cmd("colorscheme catppuccin")
|
||||
|
||||
require("utils.theme-reloader")
|
||||
require("configs.lualine")
|
||||
|
||||
Reference in New Issue
Block a user