Skip to content

Commit

Permalink
Add multiple choices for colorscheme and add customized Kanagawa scheme
Browse files Browse the repository at this point in the history
Fix truecolor support in tmux config
Add additional lualine theme choices
Add nvim-surround plugin
Add gx keymap to open url under cursor
  • Loading branch information
bcampolo committed Dec 22, 2023
1 parent 94529fd commit 07ffc6c
Show file tree
Hide file tree
Showing 7 changed files with 180 additions and 9 deletions.
1 change: 1 addition & 0 deletions .config/nvim/lazy-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" },
"nvim-lspconfig": { "branch": "master", "commit": "48347089666d5b77d054088aa72e4e0b58026e6e" },
"nvim-surround": { "branch": "main", "commit": "703ec63aa798e5e07d309b35e42def34bebe0174" },
"nvim-tree.lua": { "branch": "master", "commit": "80cfeadf179d5cba76f0f502c71dbcff1b515cd8" },
"nvim-treesitter": { "branch": "master", "commit": "8f16c39f5b439bd9540336c4d5da705d180e34b9" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "dbcd9388e3b119a87c785e10a00d62876077d23d" },
Expand Down
1 change: 1 addition & 0 deletions .config/nvim/lua/core/keymaps.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ keymap.set("i", "ii", "<ESC>") -- exit insert mode with ii
keymap.set("n", "<leader>wq", ":wq<CR>") -- save and quit
keymap.set("n", "<leader>qq", ":q!<CR>") -- quit without saving
keymap.set("n", "<leader>ww", ":w<CR>") -- save
keymap.set("n", "gx", ":!open <c-r><c-a><CR>") -- open URL under cursor

-- Split window management
keymap.set("n", "<leader>sv", "<C-w>v") -- split window vertically
Expand Down
147 changes: 142 additions & 5 deletions .config/nvim/lua/plugins/colorscheme.lua
Original file line number Diff line number Diff line change
@@ -1,19 +1,77 @@
-- Theme/Colorscheme
-- Theme/Colorscheme (uncomment section for whichever theme you prefer or use your own)
-- Kanagawa Theme (Custom Palette)
return {
-- https://github.com/rebelot/kanagawa.nvim
'rebelot/kanagawa.nvim', -- You can replace this with your favorite colorscheme
lazy = false, -- We want the colorscheme to load immediately when starting Neovim
priority = 1000, -- Load the colorscheme before other non-lazy-loaded plugins
opts = {
-- Replace this with your scheme-specific settings or remove to use the defaults
-- background = {
-- dark = "wave",
-- },
-- transparent = true,
background = {
-- light = "lotus",
dark = "wave", -- "wave, dragon"
},
colors = {
palette = {
-- Background colors
sumiInk0 = "#161616", -- modified
sumiInk1 = "#181818", -- modified
sumiInk2 = "#1a1a1a", -- modified
sumiInk3 = "#1F1F1F", -- modified
sumiInk4 = "#2A2A2A", -- modified
sumiInk5 = "#363636", -- modified
sumiInk6 = "#545454", -- modified

-- Popup and Floats
waveBlue1 = "#322C47", -- modified
waveBlue2 = "#4c4464", -- modified

-- Diff and Git
winterGreen = "#2B3328",
winterYellow = "#49443C",
winterRed = "#43242B",
winterBlue = "#252535",
autumnGreen = "#76A56A", -- modified
autumnRed = "#C34043",
autumnYellow = "#DCA561",

-- Diag
samuraiRed = "#E82424",
roninYellow = "#FF9E3B",
waveAqua1 = "#7E9CD8", -- modified
dragonBlue = "#7FB4CA", -- modified

-- Foreground and Comments
oldWhite = "#C8C093",
fujiWhite = "#F9E7C0", -- modified
fujiGray = "#727169",
oniViolet = "#BFA3E6", -- modified
oniViolet2 = "#BCACDB", -- modified
crystalBlue = "#8CABFF", -- modified
springViolet1 = "#938AA9",
springViolet2 = "#9CABCA",
springBlue = "#7FC4EF", -- modified
waveAqua2 = "#77BBDD", -- modified

springGreen = "#98BB6C",
boatYellow1 = "#938056",
boatYellow2 = "#C0A36E",
carpYellow = "#FFEE99", -- modified

sakuraPink = "#D27E99",
waveRed = "#E46876",
peachRed = "#FF5D62",
surimiOrange = "#FFAA44", -- modified
katanaGray = "#717C7C",
},
},
},
config = function(_, opts)
require('kanagawa').setup(opts) -- Replace this with your favorite colorscheme
vim.cmd("colorscheme kanagawa") -- Replace this with your favorite colorscheme
-- Colorscheme overrides

-- Custom diff colors
vim.cmd([[
autocmd VimEnter * hi DiffAdd guifg=#00FF00 guibg=#005500
autocmd VimEnter * hi DiffDelete guifg=#FF0000 guibg=#550000
Expand All @@ -23,3 +81,82 @@ return {
end
}

-- Kanagawa Theme (Original)
-- return {
-- -- https://github.com/rebelot/kanagawa.nvim
-- 'rebelot/kanagawa.nvim', -- You can replace this with your favorite colorscheme
-- lazy = false, -- We want the colorscheme to load immediately when starting Neovim
-- priority = 1000, -- Load the colorscheme before other non-lazy-loaded plugins
-- opts = {
-- -- Replace this with your scheme-specific settings or remove to use the defaults
-- -- transparent = true,
-- background = {
-- -- light = "lotus",
-- dark = "wave", -- "wave, dragon"
-- },
-- },
-- config = function(_, opts)
-- require('kanagawa').setup(opts) -- Replace this with your favorite colorscheme
-- vim.cmd("colorscheme kanagawa") -- Replace this with your favorite colorscheme
-- end
-- }

-- Tokyo Night Theme
-- return {
-- -- https://github.com/folke/tokyonight.nvim
-- 'folke/tokyonight.nvim', -- You can replace this with your favorite colorscheme
-- lazy = false, -- We want the colorscheme to load immediately when starting Neovim
-- priority = 1000, -- Load the colorscheme before other non-lazy-loaded plugins
-- opts = {
-- -- Replace this with your scheme-specific settings or remove to use the defaults
-- -- transparent = true,
-- style = "night", -- other variations "storm, night, moon, day"
-- },
-- config = function(_, opts)
-- require('tokyonight').setup(opts) -- Replace this with your favorite colorscheme
-- vim.cmd("colorscheme tokyonight") -- Replace this with your favorite colorscheme
-- end
-- }

-- Catppuccin Theme
-- return {
-- -- https://github.com/catppuccin/nvim
-- 'catppuccin/nvim',
-- name = "catppuccin", -- name is needed otherwise plugin shows up as "nvim" due to github URI
-- lazy = false, -- We want the colorscheme to load immediately when starting Neovim
-- priority = 1000, -- Load the colorscheme before other non-lazy-loaded plugins
-- opts = {
-- -- -- Replace this with your scheme-specific settings or remove to use the defaults
-- -- transparent = true,
-- flavour = "mocha", -- "latte, frappe, macchiato, mocha"
-- },
-- config = function(_, opts)
-- require('catppuccin').setup(opts) -- Replace this with your favorite colorscheme
-- vim.cmd("colorscheme catppuccin") -- Replace this with your favorite colorscheme
-- end
-- }

-- Sonokai Theme
-- return {
-- -- https://github.com/sainnhe/sonokai
-- 'sainnhe/sonokai',
-- lazy = false, -- We want the colorscheme to load immediately when starting Neovim
-- priority = 1000, -- Load the colorscheme before other non-lazy-loaded plugins
-- config = function(_, opts)
-- vim.g.sonokai_style = "default" -- "default, atlantis, andromeda, shusia, maia, espresso"
-- vim.cmd("colorscheme sonokai") -- Replace this with your favorite colorscheme
-- end
-- }

-- One Nord Theme
-- return {
-- -- https://github.com/rmehri01/onenord.nvim
-- 'rmehri01/onenord.nvim',
-- lazy = false, -- We want the colorscheme to load immediately when starting Neovim
-- priority = 1000, -- Load the colorscheme before other non-lazy-loaded plugins
-- config = function(_, opts)
-- vim.cmd("colorscheme onenord") -- Replace this with your favorite colorscheme
-- end
-- }


3 changes: 2 additions & 1 deletion .config/nvim/lua/plugins/lualine-nvim.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ return {
},
opts = {
options = {
theme = 'codedark', -- lualine theme
-- For more themes, see https://github.com/nvim-lualine/lualine.nvim/blob/master/THEMES.md
theme = "codedark", -- "auto, tokyonight, catppuccin, codedark, nord"
},
sections = {
lualine_c = {
Expand Down
7 changes: 7 additions & 0 deletions .config/nvim/lua/plugins/nvim-surround.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
return {
"kylechui/nvim-surround",
version = "*", -- Use for stability; omit to use `main` branch for the latest features
event = "VeryLazy",
opts = {}
}

1 change: 0 additions & 1 deletion .config/nvim/lua/plugins/vim-maximizer.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ return {
event = 'VeryLazy',
}


29 changes: 27 additions & 2 deletions .tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ bind-key C-a send-prefix
unbind r
bind r source-file ~/.tmux.conf

# Truecolor support
set -g default-terminal 'tmux-256color'
set-option -sa terminal-overrides ",xterm*:Tc"

# Session management bindings
# Update the below line to bind prefix + 1 to a named TMUX Session
bind 1 switchc -t 'My Session 1'
Expand Down Expand Up @@ -47,11 +51,32 @@ set -g @resurrect-strategy-vim 'session' # resurrect nvim session as well as tmu
set -g @resurrect-strategy-nvim 'session' # resurrect nvim session as well as tmux
set -g @plugin 'tmux-plugins/tmux-continuum' # auto save sessions every 15 min
set -g @continuum-restore 'on' # turn on resurrect restore
set -g @plugin 'wfxr/tmux-power' # theme
set -g @tmux_power_theme 'gold' # theme color

# TMUX Theme (uncomment section for whichever theme you prefer or use your own)
# TMUX Power Theme
set -g @plugin 'wfxr/tmux-power'
set -g @tmux_power_theme 'gold' # gold, everforest, moon, coral, snow, forest, violet, redwine, #HEXCODE
set -g @tmux_power_date_format '%m/%d/%Y'
set -g @tmux_power_time_format '%-I:%M %p'
set -g @tmux_power_date_icon ' ' # set it to a blank will disable the icon
set -g @tmux_power_time_icon ' ' # set it to a blank will disable the icon

# Tokyo Night Theme
# set -g @plugin 'fabioluciano/tmux-tokyo-night'
# set -g @theme_variation 'night' # storm, night, moon, day
# set -g @theme_plugin_datetime_format '%m/%d/%Y %-I:%M %p'

# Catppuccin Theme
# set -g @plugin 'catppuccin/tmux'
# set -g @catppuccin_flavour 'mocha' # latte, frappe, macchiato, mocha
# set -g @catppuccin_window_number_position "none"
# set -g @catppuccin_status_modules_left "session application"
# set -g @catppuccin_status_modules_right "date_time"
# set -g @catppuccin_status_left_separator ""
# set -g @catppuccin_status_right_separator ""
# set -g @catppuccin_status_right_separIator_inverse "no"
# set -g @catppuccin_status_fill "all"
# set -g @catppuccin_status_connect_separator "no"
# set -g @catppuccin_date_time_text "%m/%d/%Y %-I:%M %p"
# Initialize tmux plugin manager (keep this line at the bottom)
run '~/.tmux/plugins/tpm/tpm'

0 comments on commit 07ffc6c

Please sign in to comment.