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,26 +1,9 @@
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", "christoomey/vim-tmux-navigator",
cmd = { cmd = {
@ -36,7 +19,7 @@ local plugins = {
{ {
"hrsh7th/nvim-cmp", "hrsh7th/nvim-cmp",
opts = overrides.cmp, opts = overrides.cmp
}, },
{ {
@ -46,13 +29,13 @@ local plugins = {
{ {
"jose-elias-alvarez/null-ls.nvim", "jose-elias-alvarez/null-ls.nvim",
config = function() config = function()
require("custom.configs.null-ls") require "custom.configs.null-ls"
end, end,
}, },
}, },
config = function() config = function()
require("plugins.configs.lspconfig") require "plugins.configs.lspconfig"
require("custom.configs.lspconfig") require "custom.configs.lspconfig"
end, -- Override to setup mason-lspconfig end, -- Override to setup mason-lspconfig
}, },
@ -88,21 +71,23 @@ local plugins = {
end, end,
}, },
{ "nvim-treesitter/nvim-treesitter-context", lazy = false }, { "nvim-treesitter/nvim-treesitter-context",
lazy = false,
},
{ {
"theprimeagen/harpoon", "theprimeagen/harpoon",
}, },
{ {
"simrat39/rust-tools.nvim", 'simrat39/rust-tools.nvim'
}, },
{ {
"ellisonleao/glow.nvim", "ellisonleao/glow.nvim",
config = true, config = true,
cmd = "Glow", cmd = "Glow",
event = "BufEnter *.md", event = 'BufEnter *.md',
}, },
-- Disable nvchad plugins -- Disable nvchad 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