Compare commits
2 Commits
7dd5258f9b
...
4f98470a4e
| Author | SHA1 | Date |
|---|---|---|
|
|
4f98470a4e | |
|
|
dc027d7da5 |
|
|
@ -1,117 +1,132 @@
|
||||||
local overrides = require "custom.configs.overrides"
|
local overrides = require("custom.configs.overrides")
|
||||||
|
|
||||||
|
|
||||||
---@type NvPluginSpec[]
|
---@type NvPluginSpec[]
|
||||||
local plugins = {
|
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
|
||||||
|
|
||||||
{
|
{
|
||||||
"christoomey/vim-tmux-navigator",
|
"hrsh7th/nvim-cmp",
|
||||||
cmd = {
|
opts = overrides.cmp,
|
||||||
"TmuxNavigateLeft",
|
},
|
||||||
"TmuxNavigateDown",
|
|
||||||
"TmuxNavigateUp",
|
|
||||||
"TmuxNavigateRight",
|
|
||||||
"TmuxNavigatePrevious",
|
|
||||||
},
|
|
||||||
lazy = false,
|
|
||||||
},
|
|
||||||
-- Override plugin definition options
|
|
||||||
|
|
||||||
{
|
{
|
||||||
"hrsh7th/nvim-cmp",
|
"neovim/nvim-lspconfig",
|
||||||
opts = overrides.cmp
|
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
|
||||||
|
},
|
||||||
|
|
||||||
{
|
-- override plugin configs
|
||||||
"neovim/nvim-lspconfig",
|
{
|
||||||
dependencies = {
|
"williamboman/mason.nvim",
|
||||||
-- format & linting
|
opts = overrides.mason,
|
||||||
{
|
},
|
||||||
"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
|
|
||||||
},
|
|
||||||
|
|
||||||
-- override plugin configs
|
{
|
||||||
{
|
"williamboman/mason-lspconfig.nvim",
|
||||||
"williamboman/mason.nvim",
|
setup = {
|
||||||
opts = overrides.mason,
|
ensure_installed = { "jedi" },
|
||||||
},
|
},
|
||||||
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"williamboman/mason-lspconfig.nvim",
|
"nvim-treesitter/nvim-treesitter",
|
||||||
setup = {
|
opts = overrides.treesitter,
|
||||||
ensure_installed = { "jedi" },
|
},
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
{
|
||||||
"nvim-treesitter/nvim-treesitter",
|
"nvim-tree/nvim-tree.lua",
|
||||||
opts = overrides.treesitter,
|
opts = overrides.nvimtree,
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
-- Install a plugin
|
||||||
"nvim-tree/nvim-tree.lua",
|
{
|
||||||
opts = overrides.nvimtree,
|
"max397574/better-escape.nvim",
|
||||||
},
|
event = "InsertEnter",
|
||||||
|
config = function()
|
||||||
|
require("better_escape").setup()
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
|
||||||
-- Install a plugin
|
{ "nvim-treesitter/nvim-treesitter-context", lazy = false },
|
||||||
{
|
|
||||||
"max397574/better-escape.nvim",
|
|
||||||
event = "InsertEnter",
|
|
||||||
config = function()
|
|
||||||
require("better_escape").setup()
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
|
|
||||||
{ "nvim-treesitter/nvim-treesitter-context",
|
{
|
||||||
lazy = false,
|
"theprimeagen/harpoon",
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"theprimeagen/harpoon",
|
"simrat39/rust-tools.nvim",
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
'simrat39/rust-tools.nvim'
|
"ellisonleao/glow.nvim",
|
||||||
},
|
config = true,
|
||||||
|
cmd = "Glow",
|
||||||
{
|
event = "BufEnter *.md",
|
||||||
"ellisonleao/glow.nvim",
|
},
|
||||||
config = true,
|
|
||||||
cmd = "Glow",
|
|
||||||
event = 'BufEnter *.md',
|
|
||||||
},
|
|
||||||
|
|
||||||
-- Disable nvchad plugins
|
-- Disable nvchad plugins
|
||||||
|
|
||||||
{
|
{
|
||||||
"tpope/vim-sleuth",
|
"tpope/vim-sleuth",
|
||||||
lazy = false,
|
lazy = false,
|
||||||
},
|
},
|
||||||
|
|
||||||
{ "NvChad/nvterm", enabled = false },
|
{ "NvChad/nvterm", enabled = false },
|
||||||
|
|
||||||
-- To make a plugin not be loaded
|
-- To make a plugin not be loaded
|
||||||
-- {
|
-- {
|
||||||
-- "NvChad/nvim-colorizer.lua",
|
-- "NvChad/nvim-colorizer.lua",
|
||||||
-- enabled = false
|
-- enabled = false
|
||||||
-- },
|
-- },
|
||||||
|
|
||||||
-- All NvChad plugins are lazy-loaded by default
|
-- 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`
|
-- 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
|
-- If you want a plugin to load on startup, add `lazy = false` to a plugin spec, for example
|
||||||
-- {
|
-- {
|
||||||
-- "mg979/vim-visual-multi",
|
-- "mg979/vim-visual-multi",
|
||||||
-- lazy = false,
|
-- lazy = false,
|
||||||
-- }
|
-- }
|
||||||
}
|
}
|
||||||
|
|
||||||
return plugins
|
return plugins
|
||||||
|
|
|
||||||
|
|
@ -33,10 +33,11 @@ unbind h
|
||||||
bind h attach-session -t . -c "#{pane_current_path}"
|
bind h attach-session -t . -c "#{pane_current_path}"
|
||||||
|
|
||||||
# status bar
|
# status bar
|
||||||
set -g status-right '%H:%m %d-%b-%y '
|
set -g status-right '#[fg=black]#[bg=black fg=colour135] %H:%m #[fg=default]%b %d %Y'
|
||||||
if-shell 'test "$(acpi -t)"' {
|
if-shell 'test "$(acpi -t)"' {
|
||||||
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 ♥#(acpi | cut -d ',' -f 2)'
|
||||||
}
|
}
|
||||||
|
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
|
# Start windows and panes at 1, not 0
|
||||||
set -g base-index 1
|
set -g base-index 1
|
||||||
|
|
@ -56,3 +57,15 @@ 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-h resize-pane -L
|
||||||
bind-key -r -T prefix M-l resize-pane -R
|
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