Compare commits
No commits in common. "4f98470a4eda3e76298f7787a85ffe1899a7b611" and "7dd5258f9baa4cd965a84f87d203dc97521719d2" have entirely different histories.
4f98470a4e
...
7dd5258f9b
|
|
@ -1,132 +1,117 @@
|
|||
local overrides = require("custom.configs.overrides")
|
||||
local overrides = require "custom.configs.overrides"
|
||||
|
||||
|
||||
---@type NvPluginSpec[]
|
||||
local plugins = {
|
||||
{
|
||||
"folke/twilight.nvim",
|
||||
opts = {
|
||||
context = 20,
|
||||
expand = {
|
||||
"function",
|
||||
},
|
||||
},
|
||||
lazy = false,
|
||||
},
|
||||
{
|
||||
"folke/zen-mode.nvim",
|
||||
opts = {
|
||||
tmux = {
|
||||
enable = false,
|
||||
},
|
||||
},
|
||||
lazy = false,
|
||||
},
|
||||
{
|
||||
"christoomey/vim-tmux-navigator",
|
||||
cmd = {
|
||||
"TmuxNavigateLeft",
|
||||
"TmuxNavigateDown",
|
||||
"TmuxNavigateUp",
|
||||
"TmuxNavigateRight",
|
||||
"TmuxNavigatePrevious",
|
||||
},
|
||||
lazy = false,
|
||||
},
|
||||
-- Override plugin definition options
|
||||
|
||||
{
|
||||
"hrsh7th/nvim-cmp",
|
||||
opts = overrides.cmp,
|
||||
},
|
||||
{
|
||||
"christoomey/vim-tmux-navigator",
|
||||
cmd = {
|
||||
"TmuxNavigateLeft",
|
||||
"TmuxNavigateDown",
|
||||
"TmuxNavigateUp",
|
||||
"TmuxNavigateRight",
|
||||
"TmuxNavigatePrevious",
|
||||
},
|
||||
lazy = false,
|
||||
},
|
||||
-- Override plugin definition options
|
||||
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
dependencies = {
|
||||
-- format & linting
|
||||
{
|
||||
"jose-elias-alvarez/null-ls.nvim",
|
||||
config = function()
|
||||
require("custom.configs.null-ls")
|
||||
end,
|
||||
},
|
||||
},
|
||||
config = function()
|
||||
require("plugins.configs.lspconfig")
|
||||
require("custom.configs.lspconfig")
|
||||
end, -- Override to setup mason-lspconfig
|
||||
},
|
||||
{
|
||||
"hrsh7th/nvim-cmp",
|
||||
opts = overrides.cmp
|
||||
},
|
||||
|
||||
-- override plugin configs
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
opts = overrides.mason,
|
||||
},
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
dependencies = {
|
||||
-- format & linting
|
||||
{
|
||||
"jose-elias-alvarez/null-ls.nvim",
|
||||
config = function()
|
||||
require "custom.configs.null-ls"
|
||||
end,
|
||||
},
|
||||
},
|
||||
config = function()
|
||||
require "plugins.configs.lspconfig"
|
||||
require "custom.configs.lspconfig"
|
||||
end, -- Override to setup mason-lspconfig
|
||||
},
|
||||
|
||||
{
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
setup = {
|
||||
ensure_installed = { "jedi" },
|
||||
},
|
||||
},
|
||||
-- override plugin configs
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
opts = overrides.mason,
|
||||
},
|
||||
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
opts = overrides.treesitter,
|
||||
},
|
||||
{
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
setup = {
|
||||
ensure_installed = { "jedi" },
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
"nvim-tree/nvim-tree.lua",
|
||||
opts = overrides.nvimtree,
|
||||
},
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
opts = overrides.treesitter,
|
||||
},
|
||||
|
||||
-- Install a plugin
|
||||
{
|
||||
"max397574/better-escape.nvim",
|
||||
event = "InsertEnter",
|
||||
config = function()
|
||||
require("better_escape").setup()
|
||||
end,
|
||||
},
|
||||
{
|
||||
"nvim-tree/nvim-tree.lua",
|
||||
opts = overrides.nvimtree,
|
||||
},
|
||||
|
||||
{ "nvim-treesitter/nvim-treesitter-context", lazy = false },
|
||||
-- Install a plugin
|
||||
{
|
||||
"max397574/better-escape.nvim",
|
||||
event = "InsertEnter",
|
||||
config = function()
|
||||
require("better_escape").setup()
|
||||
end,
|
||||
},
|
||||
|
||||
{
|
||||
"theprimeagen/harpoon",
|
||||
},
|
||||
{ "nvim-treesitter/nvim-treesitter-context",
|
||||
lazy = false,
|
||||
},
|
||||
|
||||
{
|
||||
"simrat39/rust-tools.nvim",
|
||||
},
|
||||
{
|
||||
"theprimeagen/harpoon",
|
||||
},
|
||||
|
||||
{
|
||||
"ellisonleao/glow.nvim",
|
||||
config = true,
|
||||
cmd = "Glow",
|
||||
event = "BufEnter *.md",
|
||||
},
|
||||
{
|
||||
'simrat39/rust-tools.nvim'
|
||||
},
|
||||
|
||||
{
|
||||
"ellisonleao/glow.nvim",
|
||||
config = true,
|
||||
cmd = "Glow",
|
||||
event = 'BufEnter *.md',
|
||||
},
|
||||
|
||||
-- Disable nvchad plugins
|
||||
|
||||
{
|
||||
"tpope/vim-sleuth",
|
||||
lazy = false,
|
||||
},
|
||||
{
|
||||
"tpope/vim-sleuth",
|
||||
lazy = false,
|
||||
},
|
||||
|
||||
{ "NvChad/nvterm", enabled = false },
|
||||
{ "NvChad/nvterm", enabled = false },
|
||||
|
||||
-- To make a plugin not be loaded
|
||||
-- {
|
||||
-- "NvChad/nvim-colorizer.lua",
|
||||
-- enabled = false
|
||||
-- },
|
||||
-- To make a plugin not be loaded
|
||||
-- {
|
||||
-- "NvChad/nvim-colorizer.lua",
|
||||
-- enabled = false
|
||||
-- },
|
||||
|
||||
-- All NvChad plugins are lazy-loaded by default
|
||||
-- For a plugin to be loaded, you will need to set either `ft`, `cmd`, `keys`, `event`, or set `lazy = false`
|
||||
-- If you want a plugin to load on startup, add `lazy = false` to a plugin spec, for example
|
||||
-- {
|
||||
-- "mg979/vim-visual-multi",
|
||||
-- lazy = false,
|
||||
-- }
|
||||
-- All NvChad plugins are lazy-loaded by default
|
||||
-- For a plugin to be loaded, you will need to set either `ft`, `cmd`, `keys`, `event`, or set `lazy = false`
|
||||
-- If you want a plugin to load on startup, add `lazy = false` to a plugin spec, for example
|
||||
-- {
|
||||
-- "mg979/vim-visual-multi",
|
||||
-- lazy = false,
|
||||
-- }
|
||||
}
|
||||
|
||||
return plugins
|
||||
|
|
|
|||
|
|
@ -33,11 +33,10 @@ unbind h
|
|||
bind h attach-session -t . -c "#{pane_current_path}"
|
||||
|
||||
# status bar
|
||||
set -g status-right '#[fg=black]#[bg=black fg=colour135] %H:%m #[fg=default]%b %d %Y'
|
||||
set -g status-right '%H:%m %d-%b-%y '
|
||||
if-shell 'test "$(acpi -t)"' {
|
||||
set -g status-right '#[fg=black]#[bg=black fg=colour135] %H:%m #[fg=default]%b %d %Y ♥#(acpi | cut -d ',' -f 2)'
|
||||
set -g status-right '♥#(acpi | cut -d ',' -f 2) | %H:%m %d-%b-%y '
|
||||
}
|
||||
set -g status-right '#[fg=black]#[bg=black fg=colour135] %H:%m #[fg=default]%b %d %Y #[fg=pink] ♥#(acpi | cut -d ',' -f 2)'
|
||||
|
||||
# Start windows and panes at 1, not 0
|
||||
set -g base-index 1
|
||||
|
|
@ -57,15 +56,3 @@ bind-key -r -T prefix M-j resize-pane -D
|
|||
bind-key -r -T prefix M-h resize-pane -L
|
||||
bind-key -r -T prefix M-l resize-pane -R
|
||||
|
||||
set-option -g allow-passthrough on
|
||||
|
||||
set -g default-terminal "xterm-256color"
|
||||
set-option -ga terminal-overrides "xterm-256color"
|
||||
|
||||
set -g status-left-length 85
|
||||
set -g status-left "#[bg=black]working on#[fg=colour135] #S #[bg=default fg=black]"
|
||||
set -g window-status-current-format "#[fg=colour135]#W"
|
||||
set -g status-style bg=default
|
||||
set -g pane-active-border-style fgkcolour135
|
||||
#set -g status-justify centre
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue