Compare commits

..

No commits in common. "4f98470a4eda3e76298f7787a85ffe1899a7b611" and "7dd5258f9baa4cd965a84f87d203dc97521719d2" have entirely different histories.

2 changed files with 96 additions and 124 deletions

View File

@ -1,132 +1,117 @@
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
{ {
"hrsh7th/nvim-cmp", "christoomey/vim-tmux-navigator",
opts = overrides.cmp, cmd = {
}, "TmuxNavigateLeft",
"TmuxNavigateDown",
"TmuxNavigateUp",
"TmuxNavigateRight",
"TmuxNavigatePrevious",
},
lazy = false,
},
-- Override plugin definition options
{ {
"neovim/nvim-lspconfig", "hrsh7th/nvim-cmp",
dependencies = { opts = overrides.cmp
-- 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",
"williamboman/mason.nvim", dependencies = {
opts = overrides.mason, -- 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
"williamboman/mason-lspconfig.nvim", {
setup = { "williamboman/mason.nvim",
ensure_installed = { "jedi" }, opts = overrides.mason,
}, },
},
{ {
"nvim-treesitter/nvim-treesitter", "williamboman/mason-lspconfig.nvim",
opts = overrides.treesitter, setup = {
}, ensure_installed = { "jedi" },
},
},
{ {
"nvim-tree/nvim-tree.lua", "nvim-treesitter/nvim-treesitter",
opts = overrides.nvimtree, opts = overrides.treesitter,
}, },
-- Install a plugin {
{ "nvim-tree/nvim-tree.lua",
"max397574/better-escape.nvim", opts = overrides.nvimtree,
event = "InsertEnter", },
config = function()
require("better_escape").setup()
end,
},
{ "nvim-treesitter/nvim-treesitter-context", lazy = false }, -- Install a plugin
{
"max397574/better-escape.nvim",
event = "InsertEnter",
config = function()
require("better_escape").setup()
end,
},
{ { "nvim-treesitter/nvim-treesitter-context",
"theprimeagen/harpoon", lazy = false,
}, },
{ {
"simrat39/rust-tools.nvim", "theprimeagen/harpoon",
}, },
{ {
"ellisonleao/glow.nvim", 'simrat39/rust-tools.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

View File

@ -33,11 +33,10 @@ 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 '#[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)"' { 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 # Start windows and panes at 1, not 0
set -g base-index 1 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-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