Updated theme

This commit is contained in:
Christoffer Martinsson 2023-06-15 11:17:43 +02:00
parent b7e907d548
commit 4a05a27e54
3 changed files with 55 additions and 13 deletions

View File

@ -57,6 +57,17 @@ vim.o.wrap = false
-- vim.o.cmdheight = 0 -- vim.o.cmdheight = 0
-- show cursor line only in active window
local cursorLineGrp = vim.api.nvim_create_augroup("CursorLine", { clear = true })
vim.api.nvim_create_autocmd(
{ "InsertLeave", "WinEnter" },
{ pattern = "*", command = "set cursorline", group = cursorLineGrp }
)
vim.api.nvim_create_autocmd(
{ "InsertEnter", "WinLeave" },
{ pattern = "*", command = "set nocursorline", group = cursorLineGrp }
)
------------------------------------------------------------------- -------------------------------------------------------------------
-- Plugin management -- Plugin management
------------------------------------------------------------------- -------------------------------------------------------------------
@ -329,6 +340,9 @@ require('lazy').setup({
config = function() config = function()
require("neo-tree").setup { require("neo-tree").setup {
close_if_last_window = true, close_if_last_window = true,
default_component_configs = {
indent = { padding = 0, indent_size = 1 },
},
commands = { commands = {
parent_or_close = function(state) parent_or_close = function(state)
local node = state.tree:get_node() local node = state.tree:get_node()
@ -347,7 +361,7 @@ require('lazy').setup({
require("neo-tree.ui.renderer").focus_node(state, node:get_child_ids()[1]) require("neo-tree.ui.renderer").focus_node(state, node:get_child_ids()[1])
end end
else -- if not a directory just open it else -- if not a directory just open it
state.commands.open(state) state.commands.open_with_window_picker(state)
end end
end, end,
copy_selector = function(state) copy_selector = function(state)
@ -390,21 +404,22 @@ require('lazy').setup({
width = 30, width = 30,
mappings = { mappings = {
["<space>"] = false, -- disable space until we figure out which-key disabling ["<space>"] = false, -- disable space until we figure out which-key disabling
o = "open",
h = "parent_or_close", h = "parent_or_close",
l = "child_or_open", l = "child_or_open",
Y = "copy_selector", Y = "copy_selector",
}, },
}, },
} -- filesystem = {
end, -- follow_current_file = false,
}, -- hijack_netrw_behavior = "open_current",
-- use_libuv_file_watcher = true,
{ -- },
"levouh/tint.nvim", -- event_handlers = {
config = function() -- {
require("tint").setup { -- event = "neo_tree_buffer_enter",
highlight_ignore_patterns = { "EndOfBuffer" }, -- handler = function(_) vim.opt_local.signcolumn = "auto" end,
-- },
-- },
} }
end, end,
}, },
@ -428,6 +443,31 @@ require('lazy').setup({
end, end,
}, },
{
"s1n7ax/nvim-window-picker",
opts = {
use_winbar = "smart",
highlights = {
statusline = {
unfocused = {
fg = '#d7af5f',
bg = '#262626',
bold = true,
},
},
},
}
},
-- {
-- "levouh/tint.nvim",
-- config = function()
-- require("tint").setup {
-- highlight_ignore_patterns = { "EndOfBuffer" },
-- }
-- end,
-- },
}, {}) }, {})
------------------------------------------------------------------- -------------------------------------------------------------------
@ -701,6 +741,7 @@ require('nvim-treesitter.configs').setup {
}, },
} }
-- resizing splits -- resizing splits
vim.keymap.set('n', '<A-h>', require('smart-splits').resize_left, { desc = 'Resize left' }) vim.keymap.set('n', '<A-h>', require('smart-splits').resize_left, { desc = 'Resize left' })
vim.keymap.set('n', '<A-j>', require('smart-splits').resize_down, { desc = 'Resize down' }) vim.keymap.set('n', '<A-j>', require('smart-splits').resize_down, { desc = 'Resize down' })

View File

@ -26,7 +26,7 @@ local nightly = {
}, },
terminal = { terminal = {
a = { bg = "#87afd7", fg = "#0c0c0c" }, a = { bg = "#d7af5f", fg = "#0c0c0c" },
b = { bg = "#303030", fg = "#c6c6c6" }, b = { bg = "#303030", fg = "#c6c6c6" },
}, },

View File

@ -20,6 +20,7 @@ function theme.setup()
Conditional = { fg = p.color6 }, Conditional = { fg = p.color6 },
Constant = { fg = p.color7 }, Constant = { fg = p.color7 },
Cursor = { fg = p.foreground, bg = p.foreground }, Cursor = { fg = p.foreground, bg = p.foreground },
CursorNC = { fg = "NONE", bg = "NONE" },
CurSearch = { link = "IncSearch" }, CurSearch = { link = "IncSearch" },
CursorColumn = { bg = p.background }, CursorColumn = { bg = p.background },
CursorIM = { fg = p.foreground, bg = p.foreground }, CursorIM = { fg = p.foreground, bg = p.foreground },