Update config
This commit is contained in:
parent
e769cd88ba
commit
27b9212cf8
5 changed files with 86 additions and 58 deletions
|
|
@ -1,13 +1,6 @@
|
||||||
require('rose-pine').setup({
|
|
||||||
disable_background = true
|
|
||||||
})
|
|
||||||
|
|
||||||
function ColorMyPencils(color)
|
function ColorMyPencils(color)
|
||||||
color = color or "rose-pine"
|
color = color or "kanagawa-dragon"
|
||||||
vim.cmd.colorscheme(color)
|
vim.cmd.colorscheme(color)
|
||||||
|
|
||||||
vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
|
|
||||||
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
|
|
||||||
end
|
end
|
||||||
|
|
||||||
ColorMyPencils()
|
ColorMyPencils()
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,22 @@
|
||||||
local builtin = require('telescope.builtin')
|
local builtin = require('telescope.builtin')
|
||||||
vim.keymap.set('n', '<leader>pf', builtin.find_files, {})
|
|
||||||
vim.keymap.set('n', '<C-p>', builtin.git_files, {})
|
-- Function to check if the current directory is a git directory
|
||||||
|
local function is_git_directory()
|
||||||
|
return vim.fn.system('git rev-parse --is-inside-work-tree') == 1
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Custom function that calls git_files if in a git directory, otherwise find_files
|
||||||
|
local function custom_git_files()
|
||||||
|
if is_git_directory() then
|
||||||
|
builtin.git_files()
|
||||||
|
else
|
||||||
|
builtin.find_files()
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Keybindings
|
||||||
|
vim.keymap.set('n', '<C-p>', custom_git_files, {}) -- Use the custom function here
|
||||||
vim.keymap.set('n', '<leader>ps', function()
|
vim.keymap.set('n', '<leader>ps', function()
|
||||||
builtin.grep_string({ search = vim.fn.input("Grep > ") })
|
builtin.grep_string({ search = vim.fn.input("Grep > ") })
|
||||||
end)
|
end)
|
||||||
vim.keymap.set('n', '<leader>vh', builtin.help_tags, {})
|
vim.keymap.set('n', '<leader>vh', builtin.help_tags, {})
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ require'nvim-treesitter.configs'.setup {
|
||||||
-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
|
-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
|
||||||
-- Using this option may slow down your editor, and you may see some duplicate highlights.
|
-- Using this option may slow down your editor, and you may see some duplicate highlights.
|
||||||
-- Instead of true it can also be a list of languages
|
-- Instead of true it can also be a list of languages
|
||||||
additional_vim_regex_highlighting = false,
|
additional_vim_regex_highlighting = { "php" }
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,43 +1,36 @@
|
||||||
-- This file can be loaded by calling `lua require('plugins')` from your init.vim
|
-- This file can be loaded by calling `lua require('plugins')` from your init.vim
|
||||||
|
|
||||||
-- Only required if you have packer configured as `opt`
|
-- Only required if you have packer configured as `opt`
|
||||||
vim.cmd.packadd('packer.nvim')
|
vim.cmd.packadd("packer.nvim")
|
||||||
|
|
||||||
return require('packer').startup(function(use)
|
return require("packer").startup(function(use)
|
||||||
-- Packer can manage itself
|
-- Packer can manage itself
|
||||||
use 'wbthomason/packer.nvim'
|
use "wbthomason/packer.nvim"
|
||||||
|
|
||||||
use {
|
use {
|
||||||
'nvim-telescope/telescope.nvim', tag = '0.1.0',
|
"nvim-telescope/telescope.nvim", tag = "0.1.0",
|
||||||
-- or , branch = '0.1.x',
|
requires = { {"nvim-lua/plenary.nvim"} }
|
||||||
requires = { {'nvim-lua/plenary.nvim'} }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
use({
|
use("rebelot/kanagawa.nvim")
|
||||||
'rose-pine/neovim',
|
|
||||||
as = 'rose-pine',
|
|
||||||
config = function()
|
|
||||||
vim.cmd('colorscheme rose-pine')
|
|
||||||
end
|
|
||||||
})
|
|
||||||
|
|
||||||
use('vuciv/vim-bujo')
|
use("vuciv/vim-bujo")
|
||||||
|
|
||||||
use({
|
use({
|
||||||
"folke/trouble.nvim",
|
"folke/trouble.nvim",
|
||||||
config = function()
|
config = function()
|
||||||
require("trouble").setup {
|
require("trouble").setup {
|
||||||
icons = false,
|
icons = true,
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
})
|
})
|
||||||
|
|
||||||
use('ThePrimeagen/refactoring.nvim')
|
use("ThePrimeagen/refactoring.nvim")
|
||||||
|
|
||||||
use {
|
use {
|
||||||
'nvim-treesitter/nvim-treesitter',
|
"nvim-treesitter/nvim-treesitter",
|
||||||
run = function()
|
run = function()
|
||||||
local ts_update = require('nvim-treesitter.install').update({ with_sync = true })
|
local ts_update = require("nvim-treesitter.install").update({ with_sync = true })
|
||||||
ts_update()
|
ts_update()
|
||||||
end,}
|
end,}
|
||||||
use("nvim-treesitter/playground")
|
use("nvim-treesitter/playground")
|
||||||
|
|
@ -46,25 +39,25 @@ return require('packer').startup(function(use)
|
||||||
use("nvim-treesitter/nvim-treesitter-context");
|
use("nvim-treesitter/nvim-treesitter-context");
|
||||||
|
|
||||||
use {
|
use {
|
||||||
'VonHeikemen/lsp-zero.nvim',
|
"VonHeikemen/lsp-zero.nvim",
|
||||||
branch = 'v1.x',
|
branch = 'v1.x',
|
||||||
requires = {
|
requires = {
|
||||||
-- LSP Support
|
-- LSP Support
|
||||||
{'neovim/nvim-lspconfig'},
|
{"neovim/nvim-lspconfig"},
|
||||||
{'williamboman/mason.nvim'},
|
{"williamboman/mason.nvim"},
|
||||||
{'williamboman/mason-lspconfig.nvim'},
|
{"williamboman/mason-lspconfig.nvim"},
|
||||||
|
|
||||||
-- Autocompletion
|
-- Autocompletion
|
||||||
{'hrsh7th/nvim-cmp'},
|
{"hrsh7th/nvim-cmp"},
|
||||||
{'hrsh7th/cmp-buffer'},
|
{"hrsh7th/cmp-buffer"},
|
||||||
{'hrsh7th/cmp-path'},
|
{"hrsh7th/cmp-path"},
|
||||||
{'saadparwaiz1/cmp_luasnip'},
|
{"saadparwaiz1/cmp_luasnip"},
|
||||||
{'hrsh7th/cmp-nvim-lsp'},
|
{"hrsh7th/cmp-nvim-lsp"},
|
||||||
{'hrsh7th/cmp-nvim-lua'},
|
{"hrsh7th/cmp-nvim-lua"},
|
||||||
|
|
||||||
-- Snippets
|
-- Snippets
|
||||||
{'L3MON4D3/LuaSnip'},
|
{"L3MON4D3/LuaSnip"},
|
||||||
{'rafamadriz/friendly-snippets'},
|
{"rafamadriz/friendly-snippets"},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -39,3 +39,31 @@ vim.keymap.set("n", "<leader><leader>", function()
|
||||||
vim.cmd("so")
|
vim.cmd("so")
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
-- Keybinding for deleting the current buffer using :bd
|
||||||
|
vim.keymap.set("n", "<leader>bd", function()
|
||||||
|
vim.cmd("bd")
|
||||||
|
end, {})
|
||||||
|
|
||||||
|
-- Define a function to execute the appropriate program based on file type
|
||||||
|
vim.keymap.set("n", "<leader>/", function()
|
||||||
|
local filetype = vim.bo.filetype
|
||||||
|
local app = ""
|
||||||
|
if filetype == "javascript" then
|
||||||
|
app = "node"
|
||||||
|
elseif filetype == "typescript" then
|
||||||
|
app = "ts-node"
|
||||||
|
elseif filetype == "lua" then
|
||||||
|
app = "lua"
|
||||||
|
elseif filetype == "python" then
|
||||||
|
app = "python"
|
||||||
|
elseif filetype == "rust" then
|
||||||
|
app = "cargo run"
|
||||||
|
elseif filetype == "go" then
|
||||||
|
app = "go run"
|
||||||
|
else
|
||||||
|
print("Unsupported file type: " .. filetype)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
vim.cmd("terminal " .. app .. " %")
|
||||||
|
end, { noremap = true, silent = true })
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue