feat: cleanup
This commit is contained in:
parent
d7f36e407c
commit
5bb81b0903
@ -9,7 +9,7 @@ require("core.keymappings")
|
||||
|
||||
require("configs.autocomplete")
|
||||
require("configs.dashboard")
|
||||
require("configs.dap")
|
||||
-- require("configs.dap")
|
||||
require("configs.command-center")
|
||||
require("configs.notify")
|
||||
require("configs.lsp")
|
||||
|
@ -5,12 +5,7 @@ command_center.add({
|
||||
{
|
||||
description = "Show Sessions",
|
||||
cmd = ":lua require('session-lens').search_session()<CR>",
|
||||
keybindings = { "n", "<leader><C-o>", noremap }
|
||||
},
|
||||
{
|
||||
description = "ZenMode",
|
||||
cmd = "<CMD>ZenMode<CR>",
|
||||
keybindings = { "n", "z", noremap }
|
||||
keybindings = { "n", "<leader><C-o>", noremap },
|
||||
},
|
||||
{
|
||||
description = "Search inside current buffer",
|
||||
@ -27,6 +22,6 @@ command_center.add({
|
||||
},
|
||||
{
|
||||
description = "(TS) Organize Imports",
|
||||
cmd = "<CMD>OrganizeImports<CR>"
|
||||
cmd = "<CMD>OrganizeImports<CR>",
|
||||
},
|
||||
})
|
||||
|
@ -61,6 +61,5 @@ telescope.setup(default)
|
||||
-- telescope.load_extension("themes");
|
||||
--
|
||||
telescope.load_extension("harpoon")
|
||||
telescope.load_extension("session-lens")
|
||||
telescope.load_extension("command_center")
|
||||
telescope.load_extension("notify")
|
||||
|
@ -3,6 +3,13 @@ local map = vim.keymap.set
|
||||
local g = vim.g
|
||||
|
||||
local saga = require("lspsaga")
|
||||
local truezen = require("true-zen")
|
||||
truezen.setup({
|
||||
integrations = {
|
||||
tmux = true, -- hide tmux status bar in (minimalist, ataraxis)
|
||||
lualine = true, -- hide nvim-lualine (ataraxis)
|
||||
},
|
||||
})
|
||||
saga.init_lsp_saga()
|
||||
|
||||
local options = { noremap = true, silent = true }
|
||||
@ -85,6 +92,7 @@ map("v", "<A-j>", ":m '>+1<CR>gv=gv", options)
|
||||
map("v", "<A-k>", ":m '<-2<CR>gv=gv", options)
|
||||
map("n", "<A-S-k>", "YP", options)
|
||||
map("n", "<A-S-j>", "Yp", options)
|
||||
map({ "v", "n" }, "z", truezen.ataraxis, options)
|
||||
|
||||
-- Faster git merge
|
||||
map("n", "<Leader>gd", ":Gvdiffsplit!<CR>", options)
|
||||
|
@ -45,7 +45,7 @@ set.smartcase = true -- turns on case sensitive search when letters are capitali
|
||||
set.termguicolors = true -- set term gui colors (most terminals support this)
|
||||
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.relativenumber = true -- 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")
|
||||
|
@ -26,24 +26,20 @@ return packer.startup(function(use)
|
||||
|
||||
-- Theming Section
|
||||
use("rktjmp/fwatch.nvim") -- Used to check dark/light theme
|
||||
use("EdenEast/nightfox.nvim")
|
||||
use({ "catppuccin/nvim", as = "catppuccin" })
|
||||
-- use("EdenEast/nightfox.nvim")
|
||||
-- use({ "catppuccin/nvim", as = "catppuccin" })
|
||||
use("nvim-lualine/lualine.nvim")
|
||||
use("sam4llis/nvim-tundra")
|
||||
|
||||
-- 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("goolord/alpha-nvim") -- startup screen
|
||||
use("Pocco81/true-zen.nvim")
|
||||
use({
|
||||
"terrortylor/nvim-comment",
|
||||
config = function()
|
||||
@ -67,6 +63,7 @@ return packer.startup(function(use)
|
||||
require("trouble").setup({})
|
||||
end,
|
||||
})
|
||||
use("onsails/lspkind.nvim")
|
||||
use({
|
||||
"https://git.sr.ht/~whynothugo/lsp_lines.nvim",
|
||||
config = function()
|
||||
@ -78,7 +75,6 @@ return packer.startup(function(use)
|
||||
use("tpope/vim-surround")
|
||||
use("neovim/nvim-lspconfig")
|
||||
use("hrsh7th/nvim-cmp")
|
||||
use("onsails/lspkind.nvim")
|
||||
use({
|
||||
"windwp/nvim-autopairs",
|
||||
config = function()
|
||||
@ -87,7 +83,7 @@ return packer.startup(function(use)
|
||||
})
|
||||
use("hrsh7th/cmp-nvim-lsp")
|
||||
use("hrsh7th/cmp-path")
|
||||
use("hrsh7th/cmp-calc")
|
||||
-- use("hrsh7th/cmp-calc")
|
||||
use("hrsh7th/cmp-buffer")
|
||||
use("hrsh7th/cmp-cmdline")
|
||||
use("rafamadriz/friendly-snippets")
|
||||
@ -100,26 +96,14 @@ return packer.startup(function(use)
|
||||
use("MunifTanjim/prettier.nvim")
|
||||
use({ "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" })
|
||||
|
||||
-- Dap Debugger
|
||||
use({ "mfussenegger/nvim-dap" })
|
||||
use({ "rcarriga/nvim-dap-ui" })
|
||||
-- Dap Debugger -- Have not yet been able to set this up
|
||||
-- use({ "mfussenegger/nvim-dap" })
|
||||
-- use({ "rcarriga/nvim-dap-ui" })
|
||||
|
||||
-- FIle Navigation
|
||||
use({ "ThePrimeagen/harpoon" })
|
||||
|
||||
-- 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({
|
||||
"edluffy/hologram.nvim",
|
||||
config = function() end,
|
||||
})
|
||||
|
||||
use({
|
||||
"nvim-neotest/neotest",
|
||||
|
48
configs/nvim/lua/core/theme-cat.lua
Normal file
48
configs/nvim/lua/core/theme-cat.lua
Normal file
@ -0,0 +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,
|
||||
},
|
||||
})
|
||||
|
||||
vim.cmd("colorscheme catppuccin")
|
||||
|
||||
require("utils.theme-reloader")
|
||||
require("configs.lualine")
|
@ -1,48 +1,43 @@
|
||||
-- Enable Theming / Syntax
|
||||
vim.g.catppuccin_flavour = "mocha" -- latte, frappe, macchiato, mocha
|
||||
|
||||
local cat = require("catppuccin")
|
||||
cat.setup({
|
||||
require("nvim-tundra").setup({
|
||||
transparent_background = true,
|
||||
compile = {
|
||||
enabled = true,
|
||||
path = vim.fn.stdpath("cache") .. "/catppuccin",
|
||||
editor = {
|
||||
search = {},
|
||||
substitute = {},
|
||||
},
|
||||
styles = {
|
||||
comments = { "italic" },
|
||||
strings = { "italic" },
|
||||
syntax = {
|
||||
booleans = { bold = true, italic = true },
|
||||
comments = { bold = true, italic = true },
|
||||
conditionals = {},
|
||||
constants = { bold = true },
|
||||
functions = {},
|
||||
keywords = {},
|
||||
loops = {},
|
||||
numbers = { bold = true },
|
||||
operators = { bold = true },
|
||||
punctuation = {},
|
||||
strings = {},
|
||||
types = { italic = true },
|
||||
},
|
||||
integrations = {
|
||||
gitsigns = true,
|
||||
telescope = true,
|
||||
diagnostics = {
|
||||
errors = {},
|
||||
warnings = {},
|
||||
information = {},
|
||||
hints = {},
|
||||
},
|
||||
plugins = {
|
||||
lsp = 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,
|
||||
context = true,
|
||||
dbui = true,
|
||||
gitsigns = true,
|
||||
telescope = true,
|
||||
},
|
||||
overwrite = {
|
||||
colors = {},
|
||||
highlights = {},
|
||||
},
|
||||
})
|
||||
|
||||
require("nightfox").setup({
|
||||
options = {
|
||||
transparent = true,
|
||||
},
|
||||
})
|
||||
|
||||
vim.cmd("colorscheme catppuccin")
|
||||
|
||||
require("utils.theme-reloader")
|
||||
require("configs.lualine")
|
||||
vim.opt.background = "dark"
|
||||
vim.cmd("colorscheme tundra")
|
||||
|
Loading…
Reference in New Issue
Block a user