Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a101b3eba2 | ||
|
|
a01a7bba9b | ||
|
|
9863588ebf | ||
|
|
50ef290642 |
@@ -40,9 +40,9 @@ P.S. You can delete this when you're done too. It's your config now :)
|
|||||||
-- Set <space> as the leader key
|
-- Set <space> as the leader key
|
||||||
-- See `:help mapleader`
|
-- See `:help mapleader`
|
||||||
-- NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
|
-- NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
|
||||||
vim.cmd([[source ~/repos/nvim-kickstart/lua/custom/vimrc]])
|
|
||||||
vim.g.mapleader = ' '
|
vim.g.mapleader = ' '
|
||||||
vim.g.maplocalleader = ' '
|
vim.g.maplocalleader = ' '
|
||||||
|
vim.cmd([[source ~/repos/nvim-kickstart/lua/custom/vimrc]])
|
||||||
|
|
||||||
---------- treesitter.start guard >------------------------------
|
---------- treesitter.start guard >------------------------------
|
||||||
-- Neovim's own bundled ftplugin/<lang>.lua calls vim.treesitter.start()
|
-- Neovim's own bundled ftplugin/<lang>.lua calls vim.treesitter.start()
|
||||||
@@ -272,9 +272,7 @@ require('custom.toggleterm')
|
|||||||
require('custom.autopairs')
|
require('custom.autopairs')
|
||||||
require('custom.colorizer')
|
require('custom.colorizer')
|
||||||
require('custom.keymaps')
|
require('custom.keymaps')
|
||||||
require('custom.harpoon')
|
|
||||||
require('custom.mason')
|
require('custom.mason')
|
||||||
require('custom.bufferline')
|
|
||||||
require('custom.kulala')
|
require('custom.kulala')
|
||||||
require('custom.rainbow')
|
require('custom.rainbow')
|
||||||
require('custom.none-ls')
|
require('custom.none-ls')
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
vim.opt.termguicolors = true
|
|
||||||
local bufferline = require('bufferline')
|
|
||||||
bufferline.setup({
|
|
||||||
options = {
|
|
||||||
mode = "buffers", -- set to "tabs" to only show tabpages instead
|
|
||||||
style_preset = bufferline.style_preset.minimal, -- or bufferline.style_preset.minimal,
|
|
||||||
|
|
||||||
separator_style = { "", "" }, --"thin", --| "slope" | "thick" | "thin" | { 'any', 'any' },
|
|
||||||
indicator = {
|
|
||||||
icon = '', -- this should be omitted if indicator style is not 'icon'
|
|
||||||
style = 'none',
|
|
||||||
},
|
|
||||||
}
|
|
||||||
})
|
|
||||||
@@ -1,9 +1,3 @@
|
|||||||
vim.api.nvim_create_autocmd("ColorScheme", {
|
|
||||||
callback = function()
|
|
||||||
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "NONE", fg = "#cdd6f5" })
|
|
||||||
vim.api.nvim_set_hl(0, "FloatBorder", { bg = "NONE", fg = "#3e4452" })
|
|
||||||
end
|
|
||||||
})
|
|
||||||
-- Detect dark or light theme saved in .colorscheme. defaults to dark
|
-- Detect dark or light theme saved in .colorscheme. defaults to dark
|
||||||
local background_mode
|
local background_mode
|
||||||
local f = io.open(os.getenv('HOME') .. '/.colorscheme', 'r')
|
local f = io.open(os.getenv('HOME') .. '/.colorscheme', 'r')
|
||||||
@@ -15,6 +9,26 @@ else
|
|||||||
background_mode = 'dark'
|
background_mode = 'dark'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- Applying these via the ColorScheme autocmd (rather than one-off `:highlight`
|
||||||
|
-- calls after the colorscheme is set) means every plugin that listens for
|
||||||
|
-- ColorScheme to pick up transparency - not just whatever runs immediately
|
||||||
|
-- after this file - sees the final, transparent highlights too.
|
||||||
|
vim.api.nvim_create_autocmd("ColorScheme", {
|
||||||
|
callback = function()
|
||||||
|
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "NONE", fg = "#cdd6f5" })
|
||||||
|
vim.api.nvim_set_hl(0, "FloatBorder", { bg = "NONE", fg = "#3e4452" })
|
||||||
|
if background_mode ~= 'dark' then
|
||||||
|
vim.api.nvim_set_hl(0, "Normal", { bg = "NONE" })
|
||||||
|
vim.api.nvim_set_hl(0, "StatusLine", { bg = "NONE" })
|
||||||
|
vim.api.nvim_set_hl(0, "LineNr", { bg = "NONE" })
|
||||||
|
vim.api.nvim_set_hl(0, "CursorLineNr", { bg = "NONE" })
|
||||||
|
vim.api.nvim_set_hl(0, "TabLine", { bg = "NONE" })
|
||||||
|
vim.api.nvim_set_hl(0, "Visual", { bg = "NONE" })
|
||||||
|
vim.api.nvim_set_hl(0, "NormalNC", { bg = "NONE" })
|
||||||
|
end
|
||||||
|
end
|
||||||
|
})
|
||||||
|
|
||||||
-- use ayu theme for dark mode, selenized for light mode
|
-- use ayu theme for dark mode, selenized for light mode
|
||||||
if background_mode == 'dark' then
|
if background_mode == 'dark' then
|
||||||
vim.g.ayucolor = background_mode
|
vim.g.ayucolor = background_mode
|
||||||
@@ -23,6 +37,4 @@ if background_mode == 'dark' then
|
|||||||
else
|
else
|
||||||
vim.cmd("colorscheme zenbones")
|
vim.cmd("colorscheme zenbones")
|
||||||
vim.cmd("set background=" .. background_mode)
|
vim.cmd("set background=" .. background_mode)
|
||||||
vim.cmd(
|
|
||||||
'highlight Normal ctermbg=NONE guibg=NONE | highlight StatusLine ctermbg=NONE guibg=NONE | highlight LineNr ctermbg=NONE guibg=NONE | highlight CursorLineNr ctermbg=NONE guibg=NONE | highlight TabLine ctermbg=NONE guibg=NONE | highlight Visual ctermbg=NONE guibg=NONE | highlight NormalNC ctermbg=NONE guibg=NONE')
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
local keymap = vim.keymap
|
|
||||||
|
|
||||||
keymap.set('n', '<leader>ha', '<cmd>lua require("harpoon.mark").add_file()<cr>')
|
|
||||||
keymap.set('n', '<leader>hs', '<cmd>lua require("harpoon.ui").toggle_quick_menu()<cr>')
|
|
||||||
keymap.set('n', '<leader>hn', '<cmd>lua require("harpoon.ui").nav_next()<cr>')
|
|
||||||
keymap.set('n', '<leader>hp', '<cmd>lua require("harpoon.ui").nav_prev()<cr>')
|
|
||||||
keymap.set('n', '<leader>hh', '<cmd>lua require("harpoon.ui").nav_file(1)<cr>')
|
|
||||||
keymap.set('n', '<leader>hj', '<cmd>lua require("harpoon.ui").nav_file(2)<cr>')
|
|
||||||
keymap.set('n', '<leader>hk', '<cmd>lua require("harpoon.ui").nav_file(3)<cr>')
|
|
||||||
keymap.set('n', '<leader>hl', '<cmd>lua require("harpoon.ui").nav_file(4)<cr>')
|
|
||||||
@@ -18,7 +18,6 @@ return {
|
|||||||
"hrsh7th/cmp-path", -- source for file system paths
|
"hrsh7th/cmp-path", -- source for file system paths
|
||||||
"mechatroner/rainbow_csv",
|
"mechatroner/rainbow_csv",
|
||||||
"nvim-telescope/telescope-project.nvim",
|
"nvim-telescope/telescope-project.nvim",
|
||||||
"ThePrimeagen/harpoon",
|
|
||||||
|
|
||||||
-- vs-code like icons for autocompletion
|
-- vs-code like icons for autocompletion
|
||||||
"onsails/lspkind.nvim",
|
"onsails/lspkind.nvim",
|
||||||
@@ -84,12 +83,6 @@ return {
|
|||||||
-- ft = { "markdown" },
|
-- ft = { "markdown" },
|
||||||
-- },
|
-- },
|
||||||
|
|
||||||
{
|
|
||||||
'akinsho/bufferline.nvim',
|
|
||||||
version = "*",
|
|
||||||
dependencies = 'nvim-tree/nvim-web-devicons'
|
|
||||||
},
|
|
||||||
|
|
||||||
-- local history
|
-- local history
|
||||||
{
|
{
|
||||||
'dawsers/telescope-file-history.nvim',
|
'dawsers/telescope-file-history.nvim',
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ telescope.setup({
|
|||||||
|
|
||||||
telescope.load_extension("fzf")
|
telescope.load_extension("fzf")
|
||||||
telescope.load_extension("project")
|
telescope.load_extension("project")
|
||||||
telescope.load_extension("harpoon")
|
|
||||||
telescope.load_extension("persisted")
|
telescope.load_extension("persisted")
|
||||||
require('file_history').setup {
|
require('file_history').setup {
|
||||||
-- This is the location where it will create your file history repository
|
-- This is the location where it will create your file history repository
|
||||||
|
|||||||
Reference in New Issue
Block a user